diff --git a/.gitignore b/.gitignore index 0fe28724f7..9d95296627 100644 --- a/.gitignore +++ b/.gitignore @@ -136,4 +136,5 @@ project.properties /external/version.json /templates/lua-template-runtime/runtime /v*-deps-*.zip -/v*-lua-runtime-*.zip \ No newline at end of file +/v*-lua-runtime-*.zip +/tools/fbx-conv/ diff --git a/AUTHORS b/AUTHORS index c68d82da64..93f56e9cbd 100644 --- a/AUTHORS +++ b/AUTHORS @@ -25,7 +25,7 @@ Developers: longlene Improve android project creation script - simpliplant + reneklacan Hardware keyboard support liuyq @@ -108,6 +108,7 @@ Developers: Added support for x64 target of windows. Added Dutch Language support. Added clang support for Windows. + Cmake update and remove old scripts from build folder mchinen fix emulator issue for OpenGL ES 2.0 on Android @@ -530,6 +531,7 @@ Developers: Casting variables to their own type, and print warning info if no corresponding lua callback function instead of crash. fix of WebSocket url parse error for 'ws://domain.com/websocket' pattern. Fixed a bug that Websocket doesn't support send/receive data which larger than 4096 bytes. + Show detail class & function name in error message of lua-binding musikov Fixing a bug that missing precision when getting strokeColor and fontFillColor @@ -658,6 +660,7 @@ Developers: Fixed a bug that Node's anchor point was changed after being added to ScrollView. Added HttpClient::sendImmediate() Added operator == != for Value + Replace dynamic_cast to std::is_base_of in object_to_luaval superrad Clear NoSuchMethodError Exception when JniHelper fails to find methodID @@ -692,6 +695,7 @@ Developers: Fixed an issue that there is an useless conversion in ScrollView::onTouchBegan. Deleted several lines of useless code in ScrollView::deaccelerateScrolling. Fixed that ScrollView should implement ActionTweenDelegate. + Fixed LabelBMFont::getBoundingBox() position error yinkaile (2youyouo2) Maintainer of Armature Bone Animation. @@ -741,6 +745,7 @@ Developers: Corrected a few mistakes in the README file of project-creator. Corrected a mistake in README. Fixed a bug that a string which only contains CJK characters can't make a line-break when it's needed. + Fixed a bug that if the UISlider is faded, the slide ball won't fade together hbbalfred Fixed a bug that crash if file doesn't exist when using FileUtils::getStringFromFile. @@ -797,6 +802,11 @@ Developers: Adds support for get response when Activity's onActivityResult is triggered Improve Android projects Android jni error clear & more readable log + Add support of software PVRTC v1 decompression + Fixed a bug that ttf font have not effect on Mac OS X + Fixed a bug that before touchMove Touch::_prevPoint contains junk + Added Device::setKeepScreenOn() + Fixed Label performance problem youknowone Adds iOS-like elastic bounceback support for cocos2d::extension::ScrollView @@ -829,6 +839,7 @@ Developers: HttpRequest uses std::function as callback EditBox: mac secure input Fix a bug that can not get/set text in password mode on Mac OS X + Make sure TableView parents are visible before handling touch iSevenDays Fixed a bug that the result of 'malloc' is incompatible with type 'unsigned char *' in Image::saveImageToPNG @@ -904,12 +915,17 @@ Developers: gin0606 Add a new line at the end of a file Fix a bug that crash happened when try to remove videoView(STATE_PLAYBACK_COMPLETED) in android + Fix video scale issue in iOS + Fix iOS VideoPlayer memory leak + Added c++11 random library support billtt Fixed a bug that Node::setScale(float) may not work properly Teivaz Custom uniform search optimization + Fixed compiling error on WP8. + Added method for custom precompiled shader program loading on WP8 chareice Make `setup.py` work on zsh @@ -919,6 +935,57 @@ Developers: CaiCQ Fix a but that LabelTTF may lost chinese characters on linux + + chenguangqi + Fixed a compiling error on Android + Fixed an error when importing project using Eclipse on Android + + uorbe001 + Allow setting bundle to use in file utils on iOS and Mac OS X + + yongkangchen + Fixed a bug that font size of EditBox is not scaled when glview is scaled on Mac OS X + Fixed a bug that Label::setTextColor does not have any effect on Mac OS X + + wagulu + Fixed a bug that particle effect is wrong when scaled + + reckhou + Optimize FPS control on Android + + dzl-ian + Added getter and setter for TextColor for UIText + + zii + Added utils::gettime() + + takaken1994 + Added function for setting min/max scale for ScrollView + + maltium + Added 3D rotation support to RotateTo action + + Hamken100per + Added a function getAssetManager() on CCFileUtilsAndroid + + rny + Fixed LabelTTF::getBoundingBox() position error + SpriteFrameCache load from plist file content data + + AppleJDay + Add Feature:EventMouse should support getDelta, getDeltaX, getDeltaY functions + + GavinThornton + Fixed a bug that when a sprite added into SpriteBatchNod it will turn black if setting opacity + + DavidPartouche + Fixed the bug that video player not showing on iOS if it's not in FullScreen mode + + zaWasp + Added support for applicationDidEnterBackground / applicationWillEnterForeground on win32 + + xiangxw + Fixed the bug that Console::sendPrompt() will send extra `\0` Retired Core Developers: WenSheng Yang diff --git a/CHANGELOG b/CHANGELOG index ced3fc6798..da8dcfcd4b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,61 @@ +cocos2d-x-3.3 ?? + [NEW] Added UIScale9Sprite + [NEW] Added Camera, AABB, OBB and Ray + [NEW] Added render primitive and render primitive command, support passing point, line and triangle data + [NEW] Added support for applicationDidEnterBackground / applicationWillEnterForeground on desktop + [NEW] Added method for custom precompiled shader program loading on WP8 + [NEW] Added c++11 random support + [NEW] Device: added setKeepScreenOn() for iOS and Android + [NEW] EventMouse: support getDelta, getDeltaX, getDeltaY functions + [NEW] FileUtils: add isDirectoryExist(), createDirectory(), removeDirectory(), removeFile(), renameFile() + getFileSize() + [NEW] FileUtilsApple: allow setting bundle to use in file utils on iOS and Mac OS X + [NEW] Image: support of software PVRTC v1 decompression + [NEW] Lua-binding: added release_print that can print log even in release mode + [NEW] Physics Integration: can invoke update in demand + [NEW] RenderTexture: add a call back function for saveToFile() + [NEW] RotateTo: added 3D rotation support + [NEW] ScrollView: added `setMinScale()` and `setMaxScale()` + [NEW] Sprite3D: added setCullFace() and setCullFaceEnabled() + [NEW] Sprite3D: added getBoundingBox() and getAABB() + [NEW] SpriteFrameCache: load from plist file content data + [NEW] utils: added gettime() + [NEW] ui::Button: support customize how much zoom scale is when pressing a button + [NEW] ui::PageView: added `customScrollThreshold`, could determine the swipe distance to trigger a PageView scroll event + [NEW] ui::TextField: support utf8 + [NEW] ui::TextField: support set color and placehold color + [NEW] ui::Widget: support swallowing touch events + [NEW] Text: added getter and setter for TextColor + + [FIX] EditBox: font size is not scaled when glview is scaled on Mac OS X + [FIX] EditBox: began/end events not work + [FIX] Label: can not set charmap after it is created + [FIX] Label: setTextColor does not have any effect on Mac OS X + [FIX] Label: result of LabelTTF::getBoundingBox() is wrong + [FIX] Label: can not set outline color correctly if using system font on iOS + [FIX] Label: character edeg will be cut a little if character size is small + [FIX] LabelBMFont: result of LabelBMFont::getBoundingBox() is wrong + [FIX] ListView: can not insert an item in specific position, it is added at bottom + [FIX] LoadingBar: position is changed if changing direction + [FIX] ParticleSystem: effect is wrong if scene scaled + [FIX] ParticleSystemQuad: setTotalParticles() can't set a value larger than initialized value + [FIX] PhysicsBody: return wrong bitmask + [FIX] Scale9Sprite: new added sprite will be hidden + [FIX] Slider: if the UISlider is faded, the slide ball won't fade together + [FIX] Sprite: will turn black if opacity is set other than 255 and be added into SpriteBatchNode + [FIX] TabelView: can handle touch event though its parents are invisible + [FIX] TextField: can not use backspace to delete a character + [FIX] Widget: may crash if remove itself in touch call back function + [FIX] Widget: not support cascaded opacity and cascaded color by default + [FIX] VideoPlayer: memory leak on iOS + [FIX] VideoPlayer: video frame size is not calculated correctly on iOS + [FIX] VideoPlayer: video player not showing on iOS if it's not in FullScreen mode + + [FIX] Others: can not import java library shift by engine correctly when using Eclispe on Android + [FIX] Others: optimize FPS contorl algorithm on Android + + [FIX] Lua-binding: replace dynamic_cast to std::is_base_of in object_to_luaval + cocos2d-x-3.2 Jul.17 2014 [NEW] Node: added getChildByName method for get a node that can be cast to Type T [NEW] FileUtils: could add seach path and resolution order path in front diff --git a/CMakeLists.txt b/CMakeLists.txt index 7db3ea143c..bd59e4b987 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ #/**************************************************************************** # Copyright (c) 2013 cocos2d-x.org -# Copyright (c) 2012-2013 martell malone -# +# Copyright (c) 2014 martell malone +# # http://www.cocos2d-x.org # # Permission is hereby granted, free of charge, to any person obtaining a copy @@ -28,38 +28,23 @@ project (Cocos2dx) # The version number set(Cocos2dxSamples_VERSION_MAJOR 3) -set(Cocos2dxSamples_VERSION_MINOR 0) +set(Cocos2dxSamples_VERSION_MINOR 1) include(build/BuildHelpers.CMakeLists.txt) -if(WIN32 OR APPLE) +message(${BUILDING_STRING}) option(USE_CHIPMUNK "Use chipmunk for physics library" ON) option(USE_BOX2D "Use box2d for physics library" OFF) option(DEBUG_MODE "Debug or release?" ON) -option(BUILD_LIBS_LUA "Build lua libraries" OFF) option(BUILD_EXTENSIONS "Build extension library" ON) option(BUILD_EDITOR_SPINE "Build editor support for spine" ON) option(BUILD_EDITOR_COCOSTUDIO "Build editor support for cocostudio" ON) option(BUILD_EDITOR_COCOSBUILDER "Build editor support for cocosbuilder" ON) - -option(BUILD_CppTests "Only build TestCpp sample" ON) -option(BUILD_LuaTests "Only build TestLua sample" OFF) -else()#temp - -option(USE_CHIPMUNK "Use chipmunk for physics library" ON) -option(USE_BOX2D "Use box2d for physics library" OFF) -option(DEBUG_MODE "Debug or release?" ON) +option(BUILD_EXTERN_LIBS "Build Box2d, Chipmunk, Tinyxml2 from source" ON) +option(BUILD_CppTests "Build TestCpp samples" ON) option(BUILD_LIBS_LUA "Build lua libraries" ON) -option(BUILD_EXTENSIONS "Build extension library" ON) -option(BUILD_EDITOR_SPINE "Build editor support for spine" ON) -option(BUILD_EDITOR_COCOSTUDIO "Build editor support for cocostudio" ON) -option(BUILD_EDITOR_COCOSBUILDER "Build editor support for cocosbuilder" ON) - -option(BUILD_CppTests "Only build TestCpp sample" ON) -option(BUILD_LuaTests "Only build TestLua sample" ON) -endif()#temp - +option(BUILD_LuaTests "Build TestLua samples" ON) if(DEBUG_MODE) set(CMAKE_BUILD_TYPE DEBUG) @@ -70,31 +55,25 @@ endif(DEBUG_MODE) set(CMAKE_C_FLAGS_DEBUG "-DCOCOS2D_DEBUG=1") set(CMAKE_CXX_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG}) -if(WIN32) +if(MSVC) + ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS + -wd4251 -wd4244 -wd4334 -wd4005 -wd4820 -wd4710 + -wd4514 -wd4056 -wd4996 -wd4099) +else() + set(CMAKE_C_FLAGS_DEBUG "-g -Wall -DCOCOS2D_DEBUG=1") + set(CMAKE_CXX_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG}) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-exceptions -std=c99") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions -std=c++11") +endif(MSVC) + +if(WINDOWS) ADD_DEFINITIONS (-D_USRDLL -DCOCOS2DXWIN32_EXPORTS -D_WINDOWS -DWIN32) - - if(MSVC) - ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS - -D_SCL_SECURE_NO_WARNINGS - -wd4251 -wd4244 -wd4334 - -wd4005 -wd4820 -wd4710 - -wd4514 -wd4056 -wd4996 -wd4099) - else(MSVC)#MINGW - - endif(MSVC) -elseif(APPLE) - - -else()#Linux -ADD_DEFINITIONS(-DLINUX) -endif() - - -if(NOT MSVC)# all gcc -set(CMAKE_C_FLAGS_DEBUG "-g -Wall -DCOCOS2D_DEBUG=1") -set(CMAKE_CXX_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG}) -set(CMAKE_C_FLAGS ${CMAKE_C_FLAGS} "-std=c99") -set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} "-std=c++11") + set(PLATFORM_FOLDER win32) +elseif(MACOSX) + set(PLATFORM_FOLDER mac) +else(LINUX) + ADD_DEFINITIONS(-DLINUX) + set(PLATFORM_FOLDER linux) endif() if(MINGW) @@ -102,8 +81,12 @@ if(MINGW) add_definitions(-D__SSIZE_T) set(CMAKE_C_STANDARD_LIBRARIES "${CMAKE_C_STANDARD_LIBRARIES} -lws2_32") set(CMAKE_CXX_STANDARD_LIBRARIES "${CMAKE_CXX_STANDARD_LIBRARIES} -lws2_32") -endif() + if(CLANG) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-exceptions ") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions ") + endif() +endif() if(USE_CHIPMUNK) message("Using chipmunk ...") @@ -122,14 +105,6 @@ else() set(ARCH_DIR "32-bit") endif() -if(WIN32) # Win32 - set(PLATFORM_FOLDER win32) -elseif(APPLE)# osx or ios - set(PLATFORM_FOLDER mac) -else() # Assume Linux - set(PLATFORM_FOLDER linux) -endif() - include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/cocos @@ -156,18 +131,18 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/external/xxtea ) -if(WIN32 AND NOT MINGW) +if(MSVC) include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/external/${PLATFORM_FOLDER}-specific/gles/include/OGLES ${CMAKE_CURRENT_SOURCE_DIR}/external/${PLATFORM_FOLDER}-specific/icon/include ${CMAKE_CURRENT_SOURCE_DIR}/external/${PLATFORM_FOLDER}-specific/zlib/include external/curl/include/${PLATFORM_FOLDER} ) -elseif(APPLE) +elseif(MACOSX) include_directories( - ${CMAKE_CURRENT_SOURCE_DIR}/external/curl/include/${PLATFORM_FOLDER} + ${CMAKE_CURRENT_SOURCE_DIR}/external/curl/include/${PLATFORM_FOLDER} ) -else() +elseif(LINUX) include_directories( /usr/include /usr/include/GLFW @@ -177,9 +152,8 @@ else() endif() -if(WIN32) +if(MSVC) - if(NOT MINGW) link_directories( ${CMAKE_CURRENT_SOURCE_DIR}/external/jpeg/prebuilt/${PLATFORM_FOLDER} ${CMAKE_CURRENT_SOURCE_DIR}/external/tiff/prebuilt/${PLATFORM_FOLDER} @@ -189,11 +163,8 @@ if(WIN32) ${CMAKE_CURRENT_SOURCE_DIR}/external/${PLATFORM_FOLDER}-specific/icon/prebuilt ${CMAKE_CURRENT_SOURCE_DIR}/external/${PLATFORM_FOLDER}-specific/zlib/prebuilt ) - endif() -elseif(APPLE) - -else() +elseif(LINUX) link_directories( /usr/local/lib @@ -208,17 +179,21 @@ else() endif() +if(BUILD_EXTERN_LIBS) # chipmunk library add_subdirectory(external/chipmunk/src) # box2d library add_subdirectory(external/Box2D) +endif() # unzip library add_subdirectory(external/unzip) +if(BUILD_EXTERN_LIBS) # tinyxml2 library add_subdirectory(external/tinyxml2) +endif() # xxhash library add_subdirectory(external/xxhash) @@ -229,6 +204,18 @@ add_subdirectory(cocos/audio) # cocos2d library add_subdirectory(cocos) +# cocos3d library +add_subdirectory(cocos/3d) + +# network library +add_subdirectory(cocos/network) + +# ui library +add_subdirectory(cocos/ui) + +# sqlite3 library +add_subdirectory(cocos/storage) + if(BUILD_EXTENSIONS) # extensions add_subdirectory(extensions) @@ -266,11 +253,9 @@ add_subdirectory(cocos/scripting/lua-bindings) add_subdirectory(external/xxtea) endif(BUILD_LIBS_LUA) -# build tests - -add_subdirectory(tests/cpp-empty-test) - +# build tests if(BUILD_CppTests) +add_subdirectory(tests/cpp-empty-test) add_subdirectory(tests/cpp-tests) endif(BUILD_CppTests) diff --git a/README.md b/README.md index 4112f6aace..c9dad1ce6b 100644 --- a/README.md +++ b/README.md @@ -21,12 +21,12 @@ cocos2d-x is: Git user attention ----------------------- -1. After cloning the repo, please execute `download-deps.py` to download and install some dependences. +1. After cloning the repo, please execute `download-deps.py` to download and install dependencies. $ 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. +2. Please execute `download-deps.py` once you synchronize with this repo. If there aren't any updates, it will not download dependencies again. How to start a new game ----------------------- @@ -43,21 +43,21 @@ Example: $ cocos new MyGame -p com.your_company.mygame -l cpp -d NEW_PROJECTS_DIR $ cd NEW_PROJECTS_DIR/MyGame -### Build and run new project for android ### +### Build and run a new project for Android ### $ cocos run -p android -j 4 -### Build and run new project for iOS ### +### Build and run a new project for iOS ### $ cocos run -p ios -### Build and run new project for OSX ### +### Build and run a new project for OSX ### $ cocos run -p mac -### Build and run new project for linux ### +### Build and run a new project for Linux ### -if you never run cocos2d-x on linux, you need to install all dependences by the +if you never run cocos2d-x on Linux, you need to install all dependencies by the script in **cocos2d/build/install-deps-linux.sh** $ cd cocos2d-x/build @@ -104,9 +104,9 @@ Main features * Sound Engine support (CocosDenshion library) based on OpenAL * Integrated Slow motion/Fast forward * Fast and compressed textures: PVR compressed and uncompressed textures, ETC1 compressed textures, and more - * Resolution Independence + * Resolution Independent * Language: C++, with Lua and JavaScript bindings - * Open Source Commercial Friendly: Compatible with open and closed source projects + * Open Source Commercial Friendly(MIT): Compatible with open and closed source projects * OpenGL ES 2.0 (mobile) / OpenGL 2.1 (desktop) based Build Requirements diff --git a/build/BuildHelpers.CMakeLists.txt b/build/BuildHelpers.CMakeLists.txt index 6e848d4f29..225e3c7ed7 100644 --- a/build/BuildHelpers.CMakeLists.txt +++ b/build/BuildHelpers.CMakeLists.txt @@ -11,3 +11,59 @@ macro(pre_build TARGET_NAME) add_custom_target( ${TARGET_NAME}_CORE_PRE_BUILD ) add_dependencies( ${TARGET_NAME}_PRE_BUILD ${TARGET_NAME}_CORE_PRE_BUILD ) endmacro() + +#cmake has some strange defaults, this should help us a lot +#Please use them everywhere + +#WINDOWS = Windows Desktop +#WINRT = Windows RT +#WP8 = Windows Phone 8 +#ANDROID = ANDROID +#IOS = IOS +#MACOSX = MAC OSX + +if (${CMAKE_SYSTEM_NAME} MATCHES "Windows") + if(WINRT) + set(SYSTEM_STRING "Windows RT") + elseif(WP8) + set(SYSTEM_STRING "Windows Phone 8") + else() + set(WINDOWS TRUE) + set(SYSTEM_STRING "Windows Desktop") + endif() +elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux") + if(ANDROID) + set(SYSTEM_STRING "Android") + else() + set(LINUX TRUE) + set(SYSTEM_STRING "Linux") + endif() +elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + if(IOS) + set(SYSTEM_STRING "IOS") + else() + set(MACOSX TRUE) + set(SYSTEM_STRING "Mac OSX") + endif() +endif() + +if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") + set(COMPILER_STRING ${CMAKE_CXX_COMPILER_ID}) + set(CLANG TRUE) +elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") + if(MINGW) + set(COMPILER_STRING "Mingw GCC") + else() + set(COMPILER_STRING "GCC") + endif() +elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel") + set(COMPILER_STRING "${CMAKE_CXX_COMPILER_ID} C++") +elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") + set(COMPILER_STRING "Visual Studio C++") +endif() + +if(CMAKE_CROSSCOMPILING) + set(BUILDING_STRING "It appears you are cross compiling for ${SYSTEM_STRING} with ${COMPILER_STRING}") +else() + set(BUILDING_STRING "It appears you are builing natively for ${SYSTEM_STRING} with ${COMPILER_STRING}") +endif() diff --git a/build/android-build.py b/build/android-build.py index 675ff3ae56..cb1405b38e 100755 --- a/build/android-build.py +++ b/build/android-build.py @@ -123,6 +123,10 @@ def copy_files(src, dst): os.mkdir(new_dst) copy_files(path, new_dst) +def copy_file(src_file, dst): + if not src_file.startswith('.') and not src_file.endswith('.gz') and os.path.isfile(src_file): + shutil.copy(src_file, dst) + def copy_resources(target, app_android_root): # remove app_android_root/assets if it exists @@ -154,7 +158,21 @@ def copy_resources(target, app_android_root): copy_files(src_dir, assets_src_dir) common_script_dir = os.path.join(app_android_root, "../../../../cocos/scripting/lua-bindings/script") - copy_files(common_script_dir, assets_dir) + if target == "lua-tests": + copy_files(os.path.join(common_script_dir, "cocos2d"), assets_dir) + copy_files(os.path.join(common_script_dir, "cocosbuilder"), assets_dir) + copy_files(os.path.join(common_script_dir, "cocosdenshion"), assets_dir) + copy_files(os.path.join(common_script_dir, "cocostudio"), assets_dir) + copy_files(os.path.join(common_script_dir, "extension"), assets_dir) + copy_files(os.path.join(common_script_dir, "network"), assets_dir) + copy_files(os.path.join(common_script_dir, "ui"), assets_dir) + elif target == "lua-empty-test": + copy_files(os.path.join(common_script_dir, "cocos2d"), assets_dir) + copy_files(os.path.join(common_script_dir, "cocosdenshion"), assets_dir) + copy_files(os.path.join(common_script_dir, "network"), assets_dir) + elif target == "lua-game-controller-test": + copy_files(os.path.join(common_script_dir, "cocos2d"), assets_dir) + copy_files(os.path.join(common_script_dir, "controller"), assets_dir) luasocket_script_dir = os.path.join(app_android_root, "../../../../external/lua/luasocket") for root, dirs, files in os.walk(luasocket_script_dir): diff --git a/build/build-mingw32-clang-make.sh b/build/build-mingw32-clang-make.sh deleted file mode 100644 index acf5961c03..0000000000 --- a/build/build-mingw32-clang-make.sh +++ /dev/null @@ -1,62 +0,0 @@ -#!/bin/bash - -# msys2 Pacman Manager for cocos2d-x - -#/**************************************************************************** -# Copyright (c) 2013-2014 Martell Malone -# -# -# 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. -# ****************************************************************************/ - -set -e - -THISDIR="$(dirname $0)" -test "$THISDIR" = "." && THISDIR=${PWD} -OSTYPE=${OSTYPE//[0-9.]/} -HOST_ARCH=$(uname -m) - -if [ "${HOST_ARCH}" = "i686" ]; then - BITS=32 -elif [ "${HOST_ARCH}" = "x86_64" ]; then - BITS=64 -fi - -if [ "${OSTYPE}" = "msys" ]; then - - CC=clang - CXX=clang++ - PP=mingw-w64-${HOST_ARCH} - - MINGW_PACKAGES=(glfw glew libwebp libjpeg-turbo libpng freetype libiconv zlib curl - make clang binutils headers cmake) - - MINGW_PACKAGES=(${MINGW_PACKAGES[@]/#/${PP}-}) - - pacman -S --force --noconfirm --needed ${MINGW_PACKAGES[@]} - - mkdir -p mingw${BITS}-clang && cd mingw${BITS}-clang - - export PATH=/mingw${BITS}/bin:${PATH} - - cmake -G"MinGW Makefiles" -DCMAKE_MAKE_PROGRAM="mingw32-make" \ - -DCMAKE_C_COMPILER="${CC}" -DCMAKE_CXX_COMPILER="${CXX}" ../.. - - mingw32-make -fi diff --git a/build/build-mingw32-gcc-make.sh b/build/build-mingw32-gcc-make.sh deleted file mode 100644 index 09b0313791..0000000000 --- a/build/build-mingw32-gcc-make.sh +++ /dev/null @@ -1,62 +0,0 @@ -#!/bin/bash - -# msys2 Pacman Manager for cocos2d-x - -#/**************************************************************************** -# Copyright (c) 2012-2013 Martell Malone -# -# -# 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. -# ****************************************************************************/ - -set -e - -THISDIR="$(dirname $0)" -test "$THISDIR" = "." && THISDIR=${PWD} -OSTYPE=${OSTYPE//[0-9.]/} -HOST_ARCH=$(uname -m) - -if [ "${HOST_ARCH}" = "i686" ]; then - BITS=32 -elif [ "${HOST_ARCH}" = "x86_64" ]; then - BITS=64 -fi - -if [ "${OSTYPE}" = "msys" ]; then - - CC=${HOST_ARCH}-w64-mingw32-gcc - CXX=${HOST_ARCH}-w64-mingw32-g++ - PP=mingw-w64-${HOST_ARCH} - - MINGW_PACKAGES=(glfw glew libwebp libjpeg-turbo libpng freetype libiconv zlib curl - make gcc binutils headers cmake) - - MINGW_PACKAGES=(${MINGW_PACKAGES[@]/#/${PP}-}) - - pacman -S --force --noconfirm --needed ${MINGW_PACKAGES[@]} - - mkdir -p mingw${BITS} && cd mingw${BITS} - - export PATH=/mingw${BITS}/bin:${PATH} - - cmake -G"MinGW Makefiles" -DCMAKE_MAKE_PROGRAM="mingw32-make" \ - -DCMAKE_C_COMPILER="${CC}" -DCMAKE_CXX_COMPILER="${CXX}" ../.. - - mingw32-make -fi diff --git a/build/cocos2d-win32.vc2012.sln b/build/cocos2d-win32.vc2012.sln index dc713f721a..1407201e55 100644 --- a/build/cocos2d-win32.vc2012.sln +++ b/build/cocos2d-win32.vc2012.sln @@ -1,100 +1,76 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Express 2012 for Windows Desktop -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libAudio", "..\cocos\audio\proj.win32\CocosDenshion.vcxproj", "{F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos2d", "..\cocos\2d\cocos2d.vcxproj", "{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libBox2D", "..\external\Box2D\proj.win32\Box2D.vcxproj", "{929480E7-23C0-4DF6-8456-096D71547116}" -EndProject +# Visual Studio 2012 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libchipmunk", "..\external\chipmunk\proj.win32\chipmunk.vcxproj", "{207BC7A9-CCF1-4F2F-A04D-45F72242AE25}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libExtensions", "..\extensions\proj.win32\libExtensions.vcxproj", "{21B2C324-891F-48EA-AD1A-5AE13DE12E28}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cpp-tests", "..\tests\cpp-tests\proj.win32\cpp-tests.vcxproj", "{76A39BB2-9B84-4C65-98A5-654D86B86F2A}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libCocosBuilder", "..\cocos\editor-support\cocosbuilder\proj.win32\libCocosBuilder.vcxproj", "{811C0DAB-7B96-4BD3-A154-B7572B58E4AB}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libCocosStudio", "..\cocos\editor-support\cocostudio\proj.win32\libCocosStudio.vcxproj", "{B57CF53F-2E49-4031-9822-047CC0E6BDE2}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libNetwork", "..\cocos\network\proj.win32\libNetwork.vcxproj", "{DF2638C0-8128-4847-867C-6EAFE3DEE7B5}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libSpine", "..\cocos\editor-support\spine\proj.win32\libSpine.vcxproj", "{B7C2A162-DEC9-4418-972E-240AB3CBFCAE}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libLocalStorage", "..\cocos\storage\local-storage\proj.win32\libLocalStorage.vcxproj", "{632A8F38-D0F0-4D22-86B3-D69F5E6BF63A}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblua", "..\cocos\scripting\lua-bindings\proj.win32\liblua.vcxproj", "{DDC3E27F-004D-4DD4-9DD3-931A013D2159}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libnetwork", "..\cocos\network\proj.win32\libNetwork.vcxproj", "{DF2638C0-8128-4847-867C-6EAFE3DEE7B5}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua-tests", "..\tests\lua-tests\project\proj.win32\lua-tests.win32.vcxproj", "{4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGUI", "..\cocos\ui\proj.win32\libGUI.vcxproj", "{7E06E92C-537A-442B-9E4A-4761C84F8A1A}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cpp-empty-test", "..\tests\cpp-empty-test\proj.win32\cpp-empty-test.vcxproj", "{B8BF9E81-35FD-4582-BA1C-B85FA365BABB}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua-empty-test", "..\tests\lua-empty-test\project\proj.win32\lua-empty-test.vcxproj", "{13E55395-94A2-4CD9-BFC2-1A051F80C17D}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbox2d", "..\external\Box2D\proj.win32\libbox2d.vcxproj", "{929480E7-23C0-4DF6-8456-096D71547116}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos2d", "..\cocos\2d\libcocos2d.vcxproj", "{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocosdenshion", "..\cocos\audio\proj.win32\libcocosdenshion.vcxproj", "{F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libui", "..\cocos\ui\proj.win32\libui.vcxproj", "{7E06E92C-537A-442B-9E4A-4761C84F8A1A}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libextension", "..\extensions\proj.win32\libextension.vcxproj", "{21B2C324-891F-48EA-AD1A-5AE13DE12E28}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libspine", "..\cocos\editor-support\spine\proj.win32\libspine.vcxproj", "{B7C2A162-DEC9-4418-972E-240AB3CBFCAE}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocosbuilder", "..\cocos\editor-support\cocosbuilder\proj.win32\libcocosbuilder.vcxproj", "{811C0DAB-7B96-4BD3-A154-B7572B58E4AB}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocostudio", "..\cocos\editor-support\cocostudio\proj.win32\libcocostudio.vcxproj", "{B57CF53F-2E49-4031-9822-047CC0E6BDE2}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libluacocos2d", "..\cocos\scripting\lua-bindings\proj.win32\libluacocos2d.vcxproj", "{9F2D6CE6-C893-4400-B50C-6DB70CC2562F}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libluacocosdenshion", "..\cocos\scripting\lua-bindings\proj.win32\libluacocosdenshion.vcxproj", "{46A7D57A-7F25-4F52-823B-FFAC4FF3A624}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libluanetwork", "..\cocos\scripting\lua-bindings\proj.win32\libluanetwork.vcxproj", "{65E52F4B-703F-419E-AD67-926241A10042}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libluacocosbuilder", "..\cocos\scripting\lua-bindings\proj.win32\libluacocosbuilder.vcxproj", "{F8198014-F4F3-49F0-88AB-C1969A5829AF}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libluacocostudio", "..\cocos\scripting\lua-bindings\proj.win32\libluacocostudio.vcxproj", "{9640951E-C5D0-47B5-9C42-0BCADA261C50}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libluaui", "..\cocos\scripting\lua-bindings\proj.win32\libluaui.vcxproj", "{FE78EEBB-3DBB-4713-8CBF-63D742C5BD82}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libluaextension", "..\cocos\scripting\lua-bindings\proj.win32\libluaextension.vcxproj", "{7068296E-38A4-4BCA-85DB-3A09BD014847}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libluaspine", "..\cocos\scripting\lua-bindings\proj.win32\libluaspine.vcxproj", "{31EF6AB1-0D9A-4BC6-99B8-2C482EA373C4}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos3d", "..\cocos\3d\proj.win32\libcocos3d.vcxproj", "{E24950FA-5BC1-4AEE-A900-4F0259354BF0}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libluacocos3d", "..\cocos\scripting\lua-bindings\proj.win32\libluacocos3d.vcxproj", "{06840490-14A4-43D6-88BC-AAFA44D043EB}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 Release|Win32 = Release|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}.Debug|Win32.ActiveCfg = Debug|Win32 - {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}.Debug|Win32.Build.0 = Debug|Win32 - {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}.Release|Win32.ActiveCfg = Release|Win32 - {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}.Release|Win32.Build.0 = Release|Win32 - {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Debug|Win32.ActiveCfg = Debug|Win32 - {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Debug|Win32.Build.0 = Debug|Win32 - {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Release|Win32.ActiveCfg = Release|Win32 - {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Release|Win32.Build.0 = Release|Win32 - {929480E7-23C0-4DF6-8456-096D71547116}.Debug|Win32.ActiveCfg = Debug|Win32 - {929480E7-23C0-4DF6-8456-096D71547116}.Debug|Win32.Build.0 = Debug|Win32 - {929480E7-23C0-4DF6-8456-096D71547116}.Release|Win32.ActiveCfg = Release|Win32 - {929480E7-23C0-4DF6-8456-096D71547116}.Release|Win32.Build.0 = Release|Win32 {207BC7A9-CCF1-4F2F-A04D-45F72242AE25}.Debug|Win32.ActiveCfg = Debug|Win32 {207BC7A9-CCF1-4F2F-A04D-45F72242AE25}.Debug|Win32.Build.0 = Debug|Win32 {207BC7A9-CCF1-4F2F-A04D-45F72242AE25}.Release|Win32.ActiveCfg = Release|Win32 {207BC7A9-CCF1-4F2F-A04D-45F72242AE25}.Release|Win32.Build.0 = Release|Win32 - {21B2C324-891F-48EA-AD1A-5AE13DE12E28}.Debug|Win32.ActiveCfg = Debug|Win32 - {21B2C324-891F-48EA-AD1A-5AE13DE12E28}.Debug|Win32.Build.0 = Debug|Win32 - {21B2C324-891F-48EA-AD1A-5AE13DE12E28}.Release|Win32.ActiveCfg = Release|Win32 - {21B2C324-891F-48EA-AD1A-5AE13DE12E28}.Release|Win32.Build.0 = Release|Win32 {76A39BB2-9B84-4C65-98A5-654D86B86F2A}.Debug|Win32.ActiveCfg = Debug|Win32 {76A39BB2-9B84-4C65-98A5-654D86B86F2A}.Debug|Win32.Build.0 = Debug|Win32 {76A39BB2-9B84-4C65-98A5-654D86B86F2A}.Release|Win32.ActiveCfg = Release|Win32 {76A39BB2-9B84-4C65-98A5-654D86B86F2A}.Release|Win32.Build.0 = Release|Win32 - {811C0DAB-7B96-4BD3-A154-B7572B58E4AB}.Debug|Win32.ActiveCfg = Debug|Win32 - {811C0DAB-7B96-4BD3-A154-B7572B58E4AB}.Debug|Win32.Build.0 = Debug|Win32 - {811C0DAB-7B96-4BD3-A154-B7572B58E4AB}.Release|Win32.ActiveCfg = Release|Win32 - {811C0DAB-7B96-4BD3-A154-B7572B58E4AB}.Release|Win32.Build.0 = Release|Win32 - {B57CF53F-2E49-4031-9822-047CC0E6BDE2}.Debug|Win32.ActiveCfg = Debug|Win32 - {B57CF53F-2E49-4031-9822-047CC0E6BDE2}.Debug|Win32.Build.0 = Debug|Win32 - {B57CF53F-2E49-4031-9822-047CC0E6BDE2}.Release|Win32.ActiveCfg = Release|Win32 - {B57CF53F-2E49-4031-9822-047CC0E6BDE2}.Release|Win32.Build.0 = Release|Win32 {DF2638C0-8128-4847-867C-6EAFE3DEE7B5}.Debug|Win32.ActiveCfg = Debug|Win32 {DF2638C0-8128-4847-867C-6EAFE3DEE7B5}.Debug|Win32.Build.0 = Debug|Win32 {DF2638C0-8128-4847-867C-6EAFE3DEE7B5}.Release|Win32.ActiveCfg = Release|Win32 {DF2638C0-8128-4847-867C-6EAFE3DEE7B5}.Release|Win32.Build.0 = Release|Win32 - {B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Debug|Win32.ActiveCfg = Debug|Win32 - {B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Debug|Win32.Build.0 = Debug|Win32 - {B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Release|Win32.ActiveCfg = Release|Win32 - {B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Release|Win32.Build.0 = Release|Win32 - {632A8F38-D0F0-4D22-86B3-D69F5E6BF63A}.Debug|Win32.ActiveCfg = Debug|Win32 - {632A8F38-D0F0-4D22-86B3-D69F5E6BF63A}.Debug|Win32.Build.0 = Debug|Win32 - {632A8F38-D0F0-4D22-86B3-D69F5E6BF63A}.Release|Win32.ActiveCfg = Release|Win32 - {632A8F38-D0F0-4D22-86B3-D69F5E6BF63A}.Release|Win32.Build.0 = Release|Win32 - {DDC3E27F-004D-4DD4-9DD3-931A013D2159}.Debug|Win32.ActiveCfg = Debug|Win32 - {DDC3E27F-004D-4DD4-9DD3-931A013D2159}.Debug|Win32.Build.0 = Debug|Win32 - {DDC3E27F-004D-4DD4-9DD3-931A013D2159}.Release|Win32.ActiveCfg = Release|Win32 - {DDC3E27F-004D-4DD4-9DD3-931A013D2159}.Release|Win32.Build.0 = Release|Win32 {4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}.Debug|Win32.ActiveCfg = Debug|Win32 {4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}.Debug|Win32.Build.0 = Debug|Win32 {4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}.Release|Win32.ActiveCfg = Release|Win32 {4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}.Release|Win32.Build.0 = Release|Win32 - {7E06E92C-537A-442B-9E4A-4761C84F8A1A}.Debug|Win32.ActiveCfg = Debug|Win32 - {7E06E92C-537A-442B-9E4A-4761C84F8A1A}.Debug|Win32.Build.0 = Debug|Win32 - {7E06E92C-537A-442B-9E4A-4761C84F8A1A}.Release|Win32.ActiveCfg = Release|Win32 - {7E06E92C-537A-442B-9E4A-4761C84F8A1A}.Release|Win32.Build.0 = Release|Win32 {B8BF9E81-35FD-4582-BA1C-B85FA365BABB}.Debug|Win32.ActiveCfg = Debug|Win32 {B8BF9E81-35FD-4582-BA1C-B85FA365BABB}.Debug|Win32.Build.0 = Debug|Win32 {B8BF9E81-35FD-4582-BA1C-B85FA365BABB}.Release|Win32.ActiveCfg = Release|Win32 @@ -103,6 +79,78 @@ Global {13E55395-94A2-4CD9-BFC2-1A051F80C17D}.Debug|Win32.Build.0 = Debug|Win32 {13E55395-94A2-4CD9-BFC2-1A051F80C17D}.Release|Win32.ActiveCfg = Release|Win32 {13E55395-94A2-4CD9-BFC2-1A051F80C17D}.Release|Win32.Build.0 = Release|Win32 + {929480E7-23C0-4DF6-8456-096D71547116}.Debug|Win32.ActiveCfg = Debug|Win32 + {929480E7-23C0-4DF6-8456-096D71547116}.Debug|Win32.Build.0 = Debug|Win32 + {929480E7-23C0-4DF6-8456-096D71547116}.Release|Win32.ActiveCfg = Release|Win32 + {929480E7-23C0-4DF6-8456-096D71547116}.Release|Win32.Build.0 = Release|Win32 + {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Debug|Win32.ActiveCfg = Debug|Win32 + {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Debug|Win32.Build.0 = Debug|Win32 + {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Release|Win32.ActiveCfg = Release|Win32 + {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Release|Win32.Build.0 = Release|Win32 + {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}.Debug|Win32.ActiveCfg = Debug|Win32 + {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}.Debug|Win32.Build.0 = Debug|Win32 + {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}.Release|Win32.ActiveCfg = Release|Win32 + {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}.Release|Win32.Build.0 = Release|Win32 + {7E06E92C-537A-442B-9E4A-4761C84F8A1A}.Debug|Win32.ActiveCfg = Debug|Win32 + {7E06E92C-537A-442B-9E4A-4761C84F8A1A}.Debug|Win32.Build.0 = Debug|Win32 + {7E06E92C-537A-442B-9E4A-4761C84F8A1A}.Release|Win32.ActiveCfg = Release|Win32 + {7E06E92C-537A-442B-9E4A-4761C84F8A1A}.Release|Win32.Build.0 = Release|Win32 + {21B2C324-891F-48EA-AD1A-5AE13DE12E28}.Debug|Win32.ActiveCfg = Debug|Win32 + {21B2C324-891F-48EA-AD1A-5AE13DE12E28}.Debug|Win32.Build.0 = Debug|Win32 + {21B2C324-891F-48EA-AD1A-5AE13DE12E28}.Release|Win32.ActiveCfg = Release|Win32 + {21B2C324-891F-48EA-AD1A-5AE13DE12E28}.Release|Win32.Build.0 = Release|Win32 + {B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Debug|Win32.ActiveCfg = Debug|Win32 + {B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Debug|Win32.Build.0 = Debug|Win32 + {B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Release|Win32.ActiveCfg = Release|Win32 + {B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Release|Win32.Build.0 = Release|Win32 + {811C0DAB-7B96-4BD3-A154-B7572B58E4AB}.Debug|Win32.ActiveCfg = Debug|Win32 + {811C0DAB-7B96-4BD3-A154-B7572B58E4AB}.Debug|Win32.Build.0 = Debug|Win32 + {811C0DAB-7B96-4BD3-A154-B7572B58E4AB}.Release|Win32.ActiveCfg = Release|Win32 + {811C0DAB-7B96-4BD3-A154-B7572B58E4AB}.Release|Win32.Build.0 = Release|Win32 + {B57CF53F-2E49-4031-9822-047CC0E6BDE2}.Debug|Win32.ActiveCfg = Debug|Win32 + {B57CF53F-2E49-4031-9822-047CC0E6BDE2}.Debug|Win32.Build.0 = Debug|Win32 + {B57CF53F-2E49-4031-9822-047CC0E6BDE2}.Release|Win32.ActiveCfg = Release|Win32 + {B57CF53F-2E49-4031-9822-047CC0E6BDE2}.Release|Win32.Build.0 = Release|Win32 + {9F2D6CE6-C893-4400-B50C-6DB70CC2562F}.Debug|Win32.ActiveCfg = Debug|Win32 + {9F2D6CE6-C893-4400-B50C-6DB70CC2562F}.Debug|Win32.Build.0 = Debug|Win32 + {9F2D6CE6-C893-4400-B50C-6DB70CC2562F}.Release|Win32.ActiveCfg = Release|Win32 + {9F2D6CE6-C893-4400-B50C-6DB70CC2562F}.Release|Win32.Build.0 = Release|Win32 + {46A7D57A-7F25-4F52-823B-FFAC4FF3A624}.Debug|Win32.ActiveCfg = Debug|Win32 + {46A7D57A-7F25-4F52-823B-FFAC4FF3A624}.Debug|Win32.Build.0 = Debug|Win32 + {46A7D57A-7F25-4F52-823B-FFAC4FF3A624}.Release|Win32.ActiveCfg = Release|Win32 + {46A7D57A-7F25-4F52-823B-FFAC4FF3A624}.Release|Win32.Build.0 = Release|Win32 + {65E52F4B-703F-419E-AD67-926241A10042}.Debug|Win32.ActiveCfg = Debug|Win32 + {65E52F4B-703F-419E-AD67-926241A10042}.Debug|Win32.Build.0 = Debug|Win32 + {65E52F4B-703F-419E-AD67-926241A10042}.Release|Win32.ActiveCfg = Release|Win32 + {65E52F4B-703F-419E-AD67-926241A10042}.Release|Win32.Build.0 = Release|Win32 + {F8198014-F4F3-49F0-88AB-C1969A5829AF}.Debug|Win32.ActiveCfg = Debug|Win32 + {F8198014-F4F3-49F0-88AB-C1969A5829AF}.Debug|Win32.Build.0 = Debug|Win32 + {F8198014-F4F3-49F0-88AB-C1969A5829AF}.Release|Win32.ActiveCfg = Release|Win32 + {F8198014-F4F3-49F0-88AB-C1969A5829AF}.Release|Win32.Build.0 = Release|Win32 + {9640951E-C5D0-47B5-9C42-0BCADA261C50}.Debug|Win32.ActiveCfg = Debug|Win32 + {9640951E-C5D0-47B5-9C42-0BCADA261C50}.Debug|Win32.Build.0 = Debug|Win32 + {9640951E-C5D0-47B5-9C42-0BCADA261C50}.Release|Win32.ActiveCfg = Release|Win32 + {9640951E-C5D0-47B5-9C42-0BCADA261C50}.Release|Win32.Build.0 = Release|Win32 + {FE78EEBB-3DBB-4713-8CBF-63D742C5BD82}.Debug|Win32.ActiveCfg = Debug|Win32 + {FE78EEBB-3DBB-4713-8CBF-63D742C5BD82}.Debug|Win32.Build.0 = Debug|Win32 + {FE78EEBB-3DBB-4713-8CBF-63D742C5BD82}.Release|Win32.ActiveCfg = Release|Win32 + {FE78EEBB-3DBB-4713-8CBF-63D742C5BD82}.Release|Win32.Build.0 = Release|Win32 + {7068296E-38A4-4BCA-85DB-3A09BD014847}.Debug|Win32.ActiveCfg = Debug|Win32 + {7068296E-38A4-4BCA-85DB-3A09BD014847}.Debug|Win32.Build.0 = Debug|Win32 + {7068296E-38A4-4BCA-85DB-3A09BD014847}.Release|Win32.ActiveCfg = Release|Win32 + {7068296E-38A4-4BCA-85DB-3A09BD014847}.Release|Win32.Build.0 = Release|Win32 + {31EF6AB1-0D9A-4BC6-99B8-2C482EA373C4}.Debug|Win32.ActiveCfg = Debug|Win32 + {31EF6AB1-0D9A-4BC6-99B8-2C482EA373C4}.Debug|Win32.Build.0 = Debug|Win32 + {31EF6AB1-0D9A-4BC6-99B8-2C482EA373C4}.Release|Win32.ActiveCfg = Release|Win32 + {31EF6AB1-0D9A-4BC6-99B8-2C482EA373C4}.Release|Win32.Build.0 = Release|Win32 + {E24950FA-5BC1-4AEE-A900-4F0259354BF0}.Debug|Win32.ActiveCfg = Debug|Win32 + {E24950FA-5BC1-4AEE-A900-4F0259354BF0}.Debug|Win32.Build.0 = Debug|Win32 + {E24950FA-5BC1-4AEE-A900-4F0259354BF0}.Release|Win32.ActiveCfg = Release|Win32 + {E24950FA-5BC1-4AEE-A900-4F0259354BF0}.Release|Win32.Build.0 = Release|Win32 + {06840490-14A4-43D6-88BC-AAFA44D043EB}.Debug|Win32.ActiveCfg = Debug|Win32 + {06840490-14A4-43D6-88BC-AAFA44D043EB}.Debug|Win32.Build.0 = Debug|Win32 + {06840490-14A4-43D6-88BC-AAFA44D043EB}.Release|Win32.ActiveCfg = Release|Win32 + {06840490-14A4-43D6-88BC-AAFA44D043EB}.Release|Win32.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 08b4c96517..8c43ccab30 100644 --- a/build/cocos2d_libs.xcodeproj/project.pbxproj +++ b/build/cocos2d_libs.xcodeproj/project.pbxproj @@ -13,6 +13,12 @@ buildPhases = ( ); dependencies = ( + 1516202F199E76D9006099B8 /* PBXTargetDependency */, + B2F0AFEC198794EE002FE562 /* PBXTargetDependency */, + B2F0AFEE198794EE002FE562 /* PBXTargetDependency */, + B2F0AFF0198794EE002FE562 /* PBXTargetDependency */, + B2F0AFF2198794EE002FE562 /* PBXTargetDependency */, + B2F0AFF4198794EE002FE562 /* PBXTargetDependency */, A03F31FF178147CB006731B9 /* PBXTargetDependency */, A03F2FC01781458C006731B9 /* PBXTargetDependency */, A03F2E93178141D1006731B9 /* PBXTargetDependency */, @@ -28,6 +34,12 @@ buildPhases = ( ); dependencies = ( + 15162225199E7B9E006099B8 /* PBXTargetDependency */, + B2F0AFF619879508002FE562 /* PBXTargetDependency */, + B2F0AFF819879508002FE562 /* PBXTargetDependency */, + B2F0AFFA19879508002FE562 /* PBXTargetDependency */, + B2F0AFFC19879508002FE562 /* PBXTargetDependency */, + B2F0AFFE19879508002FE562 /* PBXTargetDependency */, A07A4E10178386520073F6A7 /* PBXTargetDependency */, A07A5047178389710073F6A7 /* PBXTargetDependency */, A07A5049178389710073F6A7 /* PBXTargetDependency */, @@ -40,40 +52,80 @@ /* End PBXAggregateTarget section */ /* Begin PBXBuildFile section */ - 0634A4D0194B19E400E608AF /* CCActionTimeline.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0634A4C5194B19E400E608AF /* CCActionTimeline.cpp */; }; - 0634A4D1194B19E400E608AF /* CCActionTimeline.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0634A4C5194B19E400E608AF /* CCActionTimeline.cpp */; }; - 0634A4D2194B19E400E608AF /* CCActionTimeline.h in Headers */ = {isa = PBXBuildFile; fileRef = 0634A4C6194B19E400E608AF /* CCActionTimeline.h */; }; - 0634A4D3194B19E400E608AF /* CCActionTimeline.h in Headers */ = {isa = PBXBuildFile; fileRef = 0634A4C6194B19E400E608AF /* CCActionTimeline.h */; }; - 0634A4D4194B19E400E608AF /* CCActionTimelineCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0634A4C7194B19E400E608AF /* CCActionTimelineCache.cpp */; }; - 0634A4D5194B19E400E608AF /* CCActionTimelineCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0634A4C7194B19E400E608AF /* CCActionTimelineCache.cpp */; }; - 0634A4D6194B19E400E608AF /* CCActionTimelineCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 0634A4C8194B19E400E608AF /* CCActionTimelineCache.h */; }; - 0634A4D7194B19E400E608AF /* CCActionTimelineCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 0634A4C8194B19E400E608AF /* CCActionTimelineCache.h */; }; - 0634A4D8194B19E400E608AF /* CCFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0634A4C9194B19E400E608AF /* CCFrame.cpp */; }; - 0634A4D9194B19E400E608AF /* CCFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0634A4C9194B19E400E608AF /* CCFrame.cpp */; }; - 0634A4DA194B19E400E608AF /* CCFrame.h in Headers */ = {isa = PBXBuildFile; fileRef = 0634A4CA194B19E400E608AF /* CCFrame.h */; }; - 0634A4DB194B19E400E608AF /* CCFrame.h in Headers */ = {isa = PBXBuildFile; fileRef = 0634A4CA194B19E400E608AF /* CCFrame.h */; }; - 0634A4DC194B19E400E608AF /* CCNodeReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0634A4CB194B19E400E608AF /* CCNodeReader.cpp */; }; - 0634A4DD194B19E400E608AF /* CCNodeReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0634A4CB194B19E400E608AF /* CCNodeReader.cpp */; }; - 0634A4DE194B19E400E608AF /* CCNodeReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 0634A4CC194B19E400E608AF /* CCNodeReader.h */; }; - 0634A4DF194B19E400E608AF /* CCNodeReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 0634A4CC194B19E400E608AF /* CCNodeReader.h */; }; - 0634A4E0194B19E400E608AF /* CCTimeLine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0634A4CD194B19E400E608AF /* CCTimeLine.cpp */; }; - 0634A4E1194B19E400E608AF /* CCTimeLine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0634A4CD194B19E400E608AF /* CCTimeLine.cpp */; }; - 0634A4E2194B19E400E608AF /* CCTimeLine.h in Headers */ = {isa = PBXBuildFile; fileRef = 0634A4CE194B19E400E608AF /* CCTimeLine.h */; }; - 0634A4E3194B19E400E608AF /* CCTimeLine.h in Headers */ = {isa = PBXBuildFile; fileRef = 0634A4CE194B19E400E608AF /* CCTimeLine.h */; }; - 0634A4E4194B19E400E608AF /* CCTimelineMacro.h in Headers */ = {isa = PBXBuildFile; fileRef = 0634A4CF194B19E400E608AF /* CCTimelineMacro.h */; }; - 0634A4E5194B19E400E608AF /* CCTimelineMacro.h in Headers */ = {isa = PBXBuildFile; fileRef = 0634A4CF194B19E400E608AF /* CCTimelineMacro.h */; }; - 06CAAAC5186AD7E50012A414 /* TriggerObj.h in Headers */ = {isa = PBXBuildFile; fileRef = 06CAAAC1186AD63B0012A414 /* TriggerObj.h */; }; - 06CAAAC6186AD7E60012A414 /* TriggerObj.h in Headers */ = {isa = PBXBuildFile; fileRef = 06CAAAC1186AD63B0012A414 /* TriggerObj.h */; }; - 06CAAAC7186AD7E90012A414 /* TriggerObj.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 06CAAAC0186AD63B0012A414 /* TriggerObj.cpp */; }; - 06CAAAC8186AD7EB0012A414 /* TriggerObj.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 06CAAAC0186AD63B0012A414 /* TriggerObj.cpp */; }; - 06CAAAC9186AD7EE0012A414 /* TriggerMng.h in Headers */ = {isa = PBXBuildFile; fileRef = 06CAAABF186AD63B0012A414 /* TriggerMng.h */; }; - 06CAAACA186AD7EF0012A414 /* TriggerMng.h in Headers */ = {isa = PBXBuildFile; fileRef = 06CAAABF186AD63B0012A414 /* TriggerMng.h */; }; - 06CAAACB186AD7F20012A414 /* TriggerMng.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 06CAAABE186AD63B0012A414 /* TriggerMng.cpp */; }; - 06CAAACC186AD7F50012A414 /* TriggerMng.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 06CAAABE186AD63B0012A414 /* TriggerMng.cpp */; }; - 06CAAACD186AD7F90012A414 /* TriggerBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 06CAAABD186AD63B0012A414 /* TriggerBase.h */; }; - 06CAAACE186AD7FA0012A414 /* TriggerBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 06CAAABD186AD63B0012A414 /* TriggerBase.h */; }; - 06CAAACF186AD7FC0012A414 /* TriggerBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 06CAAABC186AD63B0012A414 /* TriggerBase.cpp */; }; - 06CAAAD0186AD7FE0012A414 /* TriggerBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 06CAAABC186AD63B0012A414 /* TriggerBase.cpp */; }; + 1516200C199E75C2006099B8 /* CCAABB.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B6105175199CB1A600DC41CE /* CCAABB.cpp */; }; + 1516200D199E75C2006099B8 /* CCOBB.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B6105177199CB1A600DC41CE /* CCOBB.cpp */; }; + 1516200E199E75C2006099B8 /* CCRay.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B6105179199CB1A600DC41CE /* CCRay.cpp */; }; + 1516200F199E75C2006099B8 /* CCSkeleton3D.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3EA2A83E1987A6810077B3D4 /* CCSkeleton3D.cpp */; }; + 15162010199E75C2006099B8 /* CCAttachNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E9E80E3198639EF00FA95D0 /* CCAttachNode.cpp */; }; + 15162011199E75C2006099B8 /* CCSubMesh.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E9E80E5198639EF00FA95D0 /* CCSubMesh.cpp */; }; + 15162012199E75C2006099B8 /* CCSubMeshState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E9E80E7198639EF00FA95D0 /* CCSubMeshState.cpp */; }; + 15162013199E75C2006099B8 /* CCBundleReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3EA4786E195478E00068D9D1 /* CCBundleReader.cpp */; }; + 15162014199E75C2006099B8 /* CCBundle3D.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B6AAF83F19404E0D0069DE01 /* CCBundle3D.cpp */; }; + 15162015199E75C2006099B8 /* CCAnimate3D.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B6ACD89C193DC0CC005E0B8A /* CCAnimate3D.cpp */; }; + 15162016199E75C2006099B8 /* CCMeshSkin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B6ACD895193D6693005E0B8A /* CCMeshSkin.cpp */; }; + 15162017199E75C2006099B8 /* CCAnimation3D.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B6B26341193884D60088FE25 /* CCAnimation3D.cpp */; }; + 15162018199E75C2006099B8 /* CCMesh.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B29594B91926D61F003EEF37 /* CCMesh.cpp */; }; + 15162019199E75C2006099B8 /* CCObjLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B29594BB1926D61F003EEF37 /* CCObjLoader.cpp */; }; + 1516201A199E75C2006099B8 /* CCSprite3D.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B29594BD1926D61F003EEF37 /* CCSprite3D.cpp */; }; + 1516201B199E75C2006099B8 /* CCSprite3DMaterial.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B29594BF1926D61F003EEF37 /* CCSprite3DMaterial.cpp */; }; + 1516201C199E75FE006099B8 /* CCAABB.h in Headers */ = {isa = PBXBuildFile; fileRef = B6105176199CB1A600DC41CE /* CCAABB.h */; }; + 1516201D199E75FE006099B8 /* CCOBB.h in Headers */ = {isa = PBXBuildFile; fileRef = B6105178199CB1A600DC41CE /* CCOBB.h */; }; + 1516201E199E75FE006099B8 /* CCRay.h in Headers */ = {isa = PBXBuildFile; fileRef = B610517A199CB1A600DC41CE /* CCRay.h */; }; + 1516201F199E75FE006099B8 /* CCSkeleton3D.h in Headers */ = {isa = PBXBuildFile; fileRef = 3EA2A83F1987A6810077B3D4 /* CCSkeleton3D.h */; }; + 15162020199E75FE006099B8 /* CCAttachNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 3E9E80E4198639EF00FA95D0 /* CCAttachNode.h */; }; + 15162021199E75FE006099B8 /* CCSubMesh.h in Headers */ = {isa = PBXBuildFile; fileRef = 3E9E80E6198639EF00FA95D0 /* CCSubMesh.h */; }; + 15162022199E75FF006099B8 /* CCSubMeshState.h in Headers */ = {isa = PBXBuildFile; fileRef = 3E9E80E8198639EF00FA95D0 /* CCSubMeshState.h */; }; + 15162023199E75FF006099B8 /* CCBundleReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 3EA4786F195478E00068D9D1 /* CCBundleReader.h */; }; + 15162024199E75FF006099B8 /* CCBundle3D.h in Headers */ = {isa = PBXBuildFile; fileRef = B6AAF84019404E0D0069DE01 /* CCBundle3D.h */; }; + 15162025199E75FF006099B8 /* CCAnimate3D.h in Headers */ = {isa = PBXBuildFile; fileRef = B6ACD89D193DC0CC005E0B8A /* CCAnimate3D.h */; }; + 15162026199E75FF006099B8 /* CCMeshSkin.h in Headers */ = {isa = PBXBuildFile; fileRef = B6ACD896193D6693005E0B8A /* CCMeshSkin.h */; }; + 15162027199E75FF006099B8 /* CCAnimation3D.h in Headers */ = {isa = PBXBuildFile; fileRef = B6B26342193884D60088FE25 /* CCAnimation3D.h */; }; + 15162028199E75FF006099B8 /* CCAnimationCurve.h in Headers */ = {isa = PBXBuildFile; fileRef = B6B2633C19381FBF0088FE25 /* CCAnimationCurve.h */; }; + 15162029199E75FF006099B8 /* CCMesh.h in Headers */ = {isa = PBXBuildFile; fileRef = B29594BA1926D61F003EEF37 /* CCMesh.h */; }; + 1516202A199E75FF006099B8 /* CCObjLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = B29594BC1926D61F003EEF37 /* CCObjLoader.h */; }; + 1516202B199E75FF006099B8 /* CCSprite3D.h in Headers */ = {isa = PBXBuildFile; fileRef = B29594BE1926D61F003EEF37 /* CCSprite3D.h */; }; + 1516202C199E75FF006099B8 /* CCSprite3DMaterial.h in Headers */ = {isa = PBXBuildFile; fileRef = B29594C01926D61F003EEF37 /* CCSprite3DMaterial.h */; }; + 1516202D199E75FF006099B8 /* CCBundle3DData.h in Headers */ = {isa = PBXBuildFile; fileRef = B2D3D3B81948613300BA4831 /* CCBundle3DData.h */; }; + 15162202199E7874006099B8 /* CCAABB.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B6105175199CB1A600DC41CE /* CCAABB.cpp */; }; + 15162203199E7874006099B8 /* CCOBB.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B6105177199CB1A600DC41CE /* CCOBB.cpp */; }; + 15162204199E7874006099B8 /* CCRay.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B6105179199CB1A600DC41CE /* CCRay.cpp */; }; + 15162205199E7874006099B8 /* CCSkeleton3D.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3EA2A83E1987A6810077B3D4 /* CCSkeleton3D.cpp */; }; + 15162206199E7874006099B8 /* CCAttachNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E9E80E3198639EF00FA95D0 /* CCAttachNode.cpp */; }; + 15162207199E7874006099B8 /* CCSubMesh.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E9E80E5198639EF00FA95D0 /* CCSubMesh.cpp */; }; + 15162208199E7874006099B8 /* CCSubMeshState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E9E80E7198639EF00FA95D0 /* CCSubMeshState.cpp */; }; + 15162209199E7874006099B8 /* CCBundleReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3EA4786E195478E00068D9D1 /* CCBundleReader.cpp */; }; + 1516220A199E7874006099B8 /* CCBundle3D.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B6AAF83F19404E0D0069DE01 /* CCBundle3D.cpp */; }; + 1516220B199E7874006099B8 /* CCAnimate3D.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B6ACD89C193DC0CC005E0B8A /* CCAnimate3D.cpp */; }; + 1516220C199E7874006099B8 /* CCMeshSkin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B6ACD895193D6693005E0B8A /* CCMeshSkin.cpp */; }; + 1516220D199E7874006099B8 /* CCAnimation3D.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B6B26341193884D60088FE25 /* CCAnimation3D.cpp */; }; + 1516220E199E7874006099B8 /* CCMesh.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B29594B91926D61F003EEF37 /* CCMesh.cpp */; }; + 1516220F199E7874006099B8 /* CCObjLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B29594BB1926D61F003EEF37 /* CCObjLoader.cpp */; }; + 15162210199E7874006099B8 /* CCSprite3D.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B29594BD1926D61F003EEF37 /* CCSprite3D.cpp */; }; + 15162211199E7874006099B8 /* CCSprite3DMaterial.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B29594BF1926D61F003EEF37 /* CCSprite3DMaterial.cpp */; }; + 15162212199E7A32006099B8 /* CCAABB.h in Headers */ = {isa = PBXBuildFile; fileRef = B6105176199CB1A600DC41CE /* CCAABB.h */; }; + 15162213199E7A32006099B8 /* CCOBB.h in Headers */ = {isa = PBXBuildFile; fileRef = B6105178199CB1A600DC41CE /* CCOBB.h */; }; + 15162214199E7A32006099B8 /* CCRay.h in Headers */ = {isa = PBXBuildFile; fileRef = B610517A199CB1A600DC41CE /* CCRay.h */; }; + 15162215199E7A32006099B8 /* CCSkeleton3D.h in Headers */ = {isa = PBXBuildFile; fileRef = 3EA2A83F1987A6810077B3D4 /* CCSkeleton3D.h */; }; + 15162216199E7A32006099B8 /* CCAttachNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 3E9E80E4198639EF00FA95D0 /* CCAttachNode.h */; }; + 15162217199E7A32006099B8 /* CCSubMesh.h in Headers */ = {isa = PBXBuildFile; fileRef = 3E9E80E6198639EF00FA95D0 /* CCSubMesh.h */; }; + 15162218199E7A32006099B8 /* CCSubMeshState.h in Headers */ = {isa = PBXBuildFile; fileRef = 3E9E80E8198639EF00FA95D0 /* CCSubMeshState.h */; }; + 15162219199E7A32006099B8 /* CCBundleReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 3EA4786F195478E00068D9D1 /* CCBundleReader.h */; }; + 1516221A199E7A32006099B8 /* CCBundle3D.h in Headers */ = {isa = PBXBuildFile; fileRef = B6AAF84019404E0D0069DE01 /* CCBundle3D.h */; }; + 1516221B199E7A32006099B8 /* CCAnimate3D.h in Headers */ = {isa = PBXBuildFile; fileRef = B6ACD89D193DC0CC005E0B8A /* CCAnimate3D.h */; }; + 1516221C199E7A32006099B8 /* CCMeshSkin.h in Headers */ = {isa = PBXBuildFile; fileRef = B6ACD896193D6693005E0B8A /* CCMeshSkin.h */; }; + 1516221D199E7A32006099B8 /* CCAnimation3D.h in Headers */ = {isa = PBXBuildFile; fileRef = B6B26342193884D60088FE25 /* CCAnimation3D.h */; }; + 1516221E199E7A32006099B8 /* CCAnimationCurve.h in Headers */ = {isa = PBXBuildFile; fileRef = B6B2633C19381FBF0088FE25 /* CCAnimationCurve.h */; }; + 1516221F199E7A32006099B8 /* CCMesh.h in Headers */ = {isa = PBXBuildFile; fileRef = B29594BA1926D61F003EEF37 /* CCMesh.h */; }; + 15162220199E7A32006099B8 /* CCObjLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = B29594BC1926D61F003EEF37 /* CCObjLoader.h */; }; + 15162221199E7A32006099B8 /* CCSprite3D.h in Headers */ = {isa = PBXBuildFile; fileRef = B29594BE1926D61F003EEF37 /* CCSprite3D.h */; }; + 15162222199E7A32006099B8 /* CCSprite3DMaterial.h in Headers */ = {isa = PBXBuildFile; fileRef = B29594C01926D61F003EEF37 /* CCSprite3DMaterial.h */; }; + 15162223199E7A32006099B8 /* CCBundle3DData.h in Headers */ = {isa = PBXBuildFile; fileRef = B2D3D3B81948613300BA4831 /* CCBundle3DData.h */; }; + 15162237199F9EEA006099B8 /* cocos3d.h in Headers */ = {isa = PBXBuildFile; fileRef = 15162236199F9EEA006099B8 /* cocos3d.h */; }; + 15162238199F9EEA006099B8 /* cocos3d.h in Headers */ = {isa = PBXBuildFile; fileRef = 15162236199F9EEA006099B8 /* cocos3d.h */; }; + 15EFA211198A2BB5000C57D3 /* CCProtectedNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15EFA20F198A2BB5000C57D3 /* CCProtectedNode.cpp */; }; + 15EFA212198A2BB5000C57D3 /* CCProtectedNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15EFA20F198A2BB5000C57D3 /* CCProtectedNode.cpp */; }; + 15EFA213198A2BB5000C57D3 /* CCProtectedNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 15EFA210198A2BB5000C57D3 /* CCProtectedNode.h */; }; + 15EFA214198A2BB5000C57D3 /* CCProtectedNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 15EFA210198A2BB5000C57D3 /* CCProtectedNode.h */; }; 1A01C68418F57BE800EFE3A6 /* CCArray.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A01C67618F57BE800EFE3A6 /* CCArray.cpp */; }; 1A01C68518F57BE800EFE3A6 /* CCArray.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A01C67618F57BE800EFE3A6 /* CCArray.cpp */; }; 1A01C68618F57BE800EFE3A6 /* CCArray.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A01C67718F57BE800EFE3A6 /* CCArray.h */; }; @@ -376,133 +428,6 @@ 1A5703BB180BD2800088DEC7 /* libwebp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A5703BA180BD2800088DEC7 /* libwebp.a */; }; 1A57052B180BD31F0088DEC7 /* libfreetype.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A57052A180BD31F0088DEC7 /* libfreetype.a */; }; 1A57052E180BD3280088DEC7 /* libfreetype.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A57052D180BD3280088DEC7 /* libfreetype.a */; }; - 1A8C598B180E930E00EF57C3 /* CCActionFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5948180E930E00EF57C3 /* CCActionFrame.cpp */; }; - 1A8C598C180E930E00EF57C3 /* CCActionFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5948180E930E00EF57C3 /* CCActionFrame.cpp */; }; - 1A8C598D180E930E00EF57C3 /* CCActionFrame.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5949180E930E00EF57C3 /* CCActionFrame.h */; }; - 1A8C598E180E930E00EF57C3 /* CCActionFrame.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5949180E930E00EF57C3 /* CCActionFrame.h */; }; - 1A8C598F180E930E00EF57C3 /* CCActionFrameEasing.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C594A180E930E00EF57C3 /* CCActionFrameEasing.cpp */; }; - 1A8C5990180E930E00EF57C3 /* CCActionFrameEasing.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C594A180E930E00EF57C3 /* CCActionFrameEasing.cpp */; }; - 1A8C5991180E930E00EF57C3 /* CCActionFrameEasing.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C594B180E930E00EF57C3 /* CCActionFrameEasing.h */; }; - 1A8C5992180E930E00EF57C3 /* CCActionFrameEasing.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C594B180E930E00EF57C3 /* CCActionFrameEasing.h */; }; - 1A8C5993180E930E00EF57C3 /* CCActionManagerEx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C594C180E930E00EF57C3 /* CCActionManagerEx.cpp */; }; - 1A8C5994180E930E00EF57C3 /* CCActionManagerEx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C594C180E930E00EF57C3 /* CCActionManagerEx.cpp */; }; - 1A8C5995180E930E00EF57C3 /* CCActionManagerEx.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C594D180E930E00EF57C3 /* CCActionManagerEx.h */; }; - 1A8C5996180E930E00EF57C3 /* CCActionManagerEx.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C594D180E930E00EF57C3 /* CCActionManagerEx.h */; }; - 1A8C5997180E930E00EF57C3 /* CCActionNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C594E180E930E00EF57C3 /* CCActionNode.cpp */; }; - 1A8C5998180E930E00EF57C3 /* CCActionNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C594E180E930E00EF57C3 /* CCActionNode.cpp */; }; - 1A8C5999180E930E00EF57C3 /* CCActionNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C594F180E930E00EF57C3 /* CCActionNode.h */; }; - 1A8C599A180E930E00EF57C3 /* CCActionNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C594F180E930E00EF57C3 /* CCActionNode.h */; }; - 1A8C599B180E930E00EF57C3 /* CCActionObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5950180E930E00EF57C3 /* CCActionObject.cpp */; }; - 1A8C599C180E930E00EF57C3 /* CCActionObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5950180E930E00EF57C3 /* CCActionObject.cpp */; }; - 1A8C599D180E930E00EF57C3 /* CCActionObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5951180E930E00EF57C3 /* CCActionObject.h */; }; - 1A8C599E180E930E00EF57C3 /* CCActionObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5951180E930E00EF57C3 /* CCActionObject.h */; }; - 1A8C599F180E930E00EF57C3 /* CCArmature.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5952180E930E00EF57C3 /* CCArmature.cpp */; }; - 1A8C59A0180E930E00EF57C3 /* CCArmature.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5952180E930E00EF57C3 /* CCArmature.cpp */; }; - 1A8C59A1180E930E00EF57C3 /* CCArmature.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5953180E930E00EF57C3 /* CCArmature.h */; }; - 1A8C59A2180E930E00EF57C3 /* CCArmature.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5953180E930E00EF57C3 /* CCArmature.h */; }; - 1A8C59A3180E930E00EF57C3 /* CCArmatureAnimation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5954180E930E00EF57C3 /* CCArmatureAnimation.cpp */; }; - 1A8C59A4180E930E00EF57C3 /* CCArmatureAnimation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5954180E930E00EF57C3 /* CCArmatureAnimation.cpp */; }; - 1A8C59A5180E930E00EF57C3 /* CCArmatureAnimation.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5955180E930E00EF57C3 /* CCArmatureAnimation.h */; }; - 1A8C59A6180E930E00EF57C3 /* CCArmatureAnimation.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5955180E930E00EF57C3 /* CCArmatureAnimation.h */; }; - 1A8C59A7180E930E00EF57C3 /* CCArmatureDataManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5956180E930E00EF57C3 /* CCArmatureDataManager.cpp */; }; - 1A8C59A8180E930E00EF57C3 /* CCArmatureDataManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5956180E930E00EF57C3 /* CCArmatureDataManager.cpp */; }; - 1A8C59A9180E930E00EF57C3 /* CCArmatureDataManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5957180E930E00EF57C3 /* CCArmatureDataManager.h */; }; - 1A8C59AA180E930E00EF57C3 /* CCArmatureDataManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5957180E930E00EF57C3 /* CCArmatureDataManager.h */; }; - 1A8C59AB180E930E00EF57C3 /* CCArmatureDefine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5958180E930E00EF57C3 /* CCArmatureDefine.cpp */; }; - 1A8C59AC180E930E00EF57C3 /* CCArmatureDefine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5958180E930E00EF57C3 /* CCArmatureDefine.cpp */; }; - 1A8C59AD180E930E00EF57C3 /* CCArmatureDefine.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5959180E930E00EF57C3 /* CCArmatureDefine.h */; }; - 1A8C59AE180E930E00EF57C3 /* CCArmatureDefine.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5959180E930E00EF57C3 /* CCArmatureDefine.h */; }; - 1A8C59AF180E930E00EF57C3 /* CCBatchNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C595A180E930E00EF57C3 /* CCBatchNode.cpp */; }; - 1A8C59B0180E930E00EF57C3 /* CCBatchNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C595A180E930E00EF57C3 /* CCBatchNode.cpp */; }; - 1A8C59B1180E930E00EF57C3 /* CCBatchNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C595B180E930E00EF57C3 /* CCBatchNode.h */; }; - 1A8C59B2180E930E00EF57C3 /* CCBatchNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C595B180E930E00EF57C3 /* CCBatchNode.h */; }; - 1A8C59B3180E930E00EF57C3 /* CCBone.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C595C180E930E00EF57C3 /* CCBone.cpp */; }; - 1A8C59B4180E930E00EF57C3 /* CCBone.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C595C180E930E00EF57C3 /* CCBone.cpp */; }; - 1A8C59B5180E930E00EF57C3 /* CCBone.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C595D180E930E00EF57C3 /* CCBone.h */; }; - 1A8C59B6180E930E00EF57C3 /* CCBone.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C595D180E930E00EF57C3 /* CCBone.h */; }; - 1A8C59B7180E930E00EF57C3 /* CCColliderDetector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C595E180E930E00EF57C3 /* CCColliderDetector.cpp */; }; - 1A8C59B8180E930E00EF57C3 /* CCColliderDetector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C595E180E930E00EF57C3 /* CCColliderDetector.cpp */; }; - 1A8C59B9180E930E00EF57C3 /* CCColliderDetector.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C595F180E930E00EF57C3 /* CCColliderDetector.h */; }; - 1A8C59BA180E930E00EF57C3 /* CCColliderDetector.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C595F180E930E00EF57C3 /* CCColliderDetector.h */; }; - 1A8C59BB180E930E00EF57C3 /* CCComAttribute.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5960180E930E00EF57C3 /* CCComAttribute.cpp */; }; - 1A8C59BC180E930E00EF57C3 /* CCComAttribute.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5960180E930E00EF57C3 /* CCComAttribute.cpp */; }; - 1A8C59BD180E930E00EF57C3 /* CCComAttribute.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5961180E930E00EF57C3 /* CCComAttribute.h */; }; - 1A8C59BE180E930E00EF57C3 /* CCComAttribute.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5961180E930E00EF57C3 /* CCComAttribute.h */; }; - 1A8C59BF180E930E00EF57C3 /* CCComAudio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5962180E930E00EF57C3 /* CCComAudio.cpp */; }; - 1A8C59C0180E930E00EF57C3 /* CCComAudio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5962180E930E00EF57C3 /* CCComAudio.cpp */; }; - 1A8C59C1180E930E00EF57C3 /* CCComAudio.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5963180E930E00EF57C3 /* CCComAudio.h */; }; - 1A8C59C2180E930E00EF57C3 /* CCComAudio.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5963180E930E00EF57C3 /* CCComAudio.h */; }; - 1A8C59C3180E930E00EF57C3 /* CCComController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5964180E930E00EF57C3 /* CCComController.cpp */; }; - 1A8C59C4180E930E00EF57C3 /* CCComController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5964180E930E00EF57C3 /* CCComController.cpp */; }; - 1A8C59C5180E930E00EF57C3 /* CCComController.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5965180E930E00EF57C3 /* CCComController.h */; }; - 1A8C59C6180E930E00EF57C3 /* CCComController.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5965180E930E00EF57C3 /* CCComController.h */; }; - 1A8C59C7180E930E00EF57C3 /* CCComRender.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5966180E930E00EF57C3 /* CCComRender.cpp */; }; - 1A8C59C8180E930E00EF57C3 /* CCComRender.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5966180E930E00EF57C3 /* CCComRender.cpp */; }; - 1A8C59C9180E930E00EF57C3 /* CCComRender.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5967180E930E00EF57C3 /* CCComRender.h */; }; - 1A8C59CA180E930E00EF57C3 /* CCComRender.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5967180E930E00EF57C3 /* CCComRender.h */; }; - 1A8C59CB180E930E00EF57C3 /* CCDataReaderHelper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5968180E930E00EF57C3 /* CCDataReaderHelper.cpp */; }; - 1A8C59CC180E930E00EF57C3 /* CCDataReaderHelper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5968180E930E00EF57C3 /* CCDataReaderHelper.cpp */; }; - 1A8C59CD180E930E00EF57C3 /* CCDataReaderHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5969180E930E00EF57C3 /* CCDataReaderHelper.h */; }; - 1A8C59CE180E930E00EF57C3 /* CCDataReaderHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5969180E930E00EF57C3 /* CCDataReaderHelper.h */; }; - 1A8C59CF180E930E00EF57C3 /* CCDatas.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C596A180E930E00EF57C3 /* CCDatas.cpp */; }; - 1A8C59D0180E930E00EF57C3 /* CCDatas.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C596A180E930E00EF57C3 /* CCDatas.cpp */; }; - 1A8C59D1180E930E00EF57C3 /* CCDatas.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C596B180E930E00EF57C3 /* CCDatas.h */; }; - 1A8C59D2180E930E00EF57C3 /* CCDatas.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C596B180E930E00EF57C3 /* CCDatas.h */; }; - 1A8C59D3180E930E00EF57C3 /* CCDecorativeDisplay.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C596C180E930E00EF57C3 /* CCDecorativeDisplay.cpp */; }; - 1A8C59D4180E930E00EF57C3 /* CCDecorativeDisplay.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C596C180E930E00EF57C3 /* CCDecorativeDisplay.cpp */; }; - 1A8C59D5180E930E00EF57C3 /* CCDecorativeDisplay.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C596D180E930E00EF57C3 /* CCDecorativeDisplay.h */; }; - 1A8C59D6180E930E00EF57C3 /* CCDecorativeDisplay.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C596D180E930E00EF57C3 /* CCDecorativeDisplay.h */; }; - 1A8C59D7180E930E00EF57C3 /* CCDisplayFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C596E180E930E00EF57C3 /* CCDisplayFactory.cpp */; }; - 1A8C59D8180E930E00EF57C3 /* CCDisplayFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C596E180E930E00EF57C3 /* CCDisplayFactory.cpp */; }; - 1A8C59D9180E930E00EF57C3 /* CCDisplayFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C596F180E930E00EF57C3 /* CCDisplayFactory.h */; }; - 1A8C59DA180E930E00EF57C3 /* CCDisplayFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C596F180E930E00EF57C3 /* CCDisplayFactory.h */; }; - 1A8C59DB180E930E00EF57C3 /* CCDisplayManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5970180E930E00EF57C3 /* CCDisplayManager.cpp */; }; - 1A8C59DC180E930E00EF57C3 /* CCDisplayManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5970180E930E00EF57C3 /* CCDisplayManager.cpp */; }; - 1A8C59DD180E930E00EF57C3 /* CCDisplayManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5971180E930E00EF57C3 /* CCDisplayManager.h */; }; - 1A8C59DE180E930E00EF57C3 /* CCDisplayManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5971180E930E00EF57C3 /* CCDisplayManager.h */; }; - 1A8C59DF180E930E00EF57C3 /* CCInputDelegate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5972180E930E00EF57C3 /* CCInputDelegate.cpp */; }; - 1A8C59E0180E930E00EF57C3 /* CCInputDelegate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5972180E930E00EF57C3 /* CCInputDelegate.cpp */; }; - 1A8C59E1180E930E00EF57C3 /* CCInputDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5973180E930E00EF57C3 /* CCInputDelegate.h */; }; - 1A8C59E2180E930E00EF57C3 /* CCInputDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5973180E930E00EF57C3 /* CCInputDelegate.h */; }; - 1A8C59E3180E930E00EF57C3 /* CCProcessBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5974180E930E00EF57C3 /* CCProcessBase.cpp */; }; - 1A8C59E4180E930E00EF57C3 /* CCProcessBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5974180E930E00EF57C3 /* CCProcessBase.cpp */; }; - 1A8C59E5180E930E00EF57C3 /* CCProcessBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5975180E930E00EF57C3 /* CCProcessBase.h */; }; - 1A8C59E6180E930E00EF57C3 /* CCProcessBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5975180E930E00EF57C3 /* CCProcessBase.h */; }; - 1A8C59E7180E930E00EF57C3 /* CCSGUIReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5976180E930E00EF57C3 /* CCSGUIReader.cpp */; }; - 1A8C59E8180E930E00EF57C3 /* CCSGUIReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5976180E930E00EF57C3 /* CCSGUIReader.cpp */; }; - 1A8C59E9180E930E00EF57C3 /* CCSGUIReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5977180E930E00EF57C3 /* CCSGUIReader.h */; }; - 1A8C59EA180E930E00EF57C3 /* CCSGUIReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5977180E930E00EF57C3 /* CCSGUIReader.h */; }; - 1A8C59EB180E930E00EF57C3 /* CCSkin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5978180E930E00EF57C3 /* CCSkin.cpp */; }; - 1A8C59EC180E930E00EF57C3 /* CCSkin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5978180E930E00EF57C3 /* CCSkin.cpp */; }; - 1A8C59ED180E930E00EF57C3 /* CCSkin.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5979180E930E00EF57C3 /* CCSkin.h */; }; - 1A8C59EE180E930E00EF57C3 /* CCSkin.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5979180E930E00EF57C3 /* CCSkin.h */; }; - 1A8C59EF180E930E00EF57C3 /* CCSpriteFrameCacheHelper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C597A180E930E00EF57C3 /* CCSpriteFrameCacheHelper.cpp */; }; - 1A8C59F0180E930E00EF57C3 /* CCSpriteFrameCacheHelper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C597A180E930E00EF57C3 /* CCSpriteFrameCacheHelper.cpp */; }; - 1A8C59F1180E930E00EF57C3 /* CCSpriteFrameCacheHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C597B180E930E00EF57C3 /* CCSpriteFrameCacheHelper.h */; }; - 1A8C59F2180E930E00EF57C3 /* CCSpriteFrameCacheHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C597B180E930E00EF57C3 /* CCSpriteFrameCacheHelper.h */; }; - 1A8C59F3180E930E00EF57C3 /* CCSSceneReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C597C180E930E00EF57C3 /* CCSSceneReader.cpp */; }; - 1A8C59F4180E930E00EF57C3 /* CCSSceneReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C597C180E930E00EF57C3 /* CCSSceneReader.cpp */; }; - 1A8C59F5180E930E00EF57C3 /* CCSSceneReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C597D180E930E00EF57C3 /* CCSSceneReader.h */; }; - 1A8C59F6180E930E00EF57C3 /* CCSSceneReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C597D180E930E00EF57C3 /* CCSSceneReader.h */; }; - 1A8C59F7180E930E00EF57C3 /* CCTransformHelp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C597E180E930E00EF57C3 /* CCTransformHelp.cpp */; }; - 1A8C59F8180E930E00EF57C3 /* CCTransformHelp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C597E180E930E00EF57C3 /* CCTransformHelp.cpp */; }; - 1A8C59F9180E930E00EF57C3 /* CCTransformHelp.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C597F180E930E00EF57C3 /* CCTransformHelp.h */; }; - 1A8C59FA180E930E00EF57C3 /* CCTransformHelp.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C597F180E930E00EF57C3 /* CCTransformHelp.h */; }; - 1A8C59FB180E930E00EF57C3 /* CCTween.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5980180E930E00EF57C3 /* CCTween.cpp */; }; - 1A8C59FC180E930E00EF57C3 /* CCTween.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5980180E930E00EF57C3 /* CCTween.cpp */; }; - 1A8C59FD180E930E00EF57C3 /* CCTween.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5981180E930E00EF57C3 /* CCTween.h */; }; - 1A8C59FE180E930E00EF57C3 /* CCTween.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5981180E930E00EF57C3 /* CCTween.h */; }; - 1A8C5A03180E930E00EF57C3 /* CCUtilMath.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5984180E930E00EF57C3 /* CCUtilMath.cpp */; }; - 1A8C5A04180E930E00EF57C3 /* CCUtilMath.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5984180E930E00EF57C3 /* CCUtilMath.cpp */; }; - 1A8C5A05180E930E00EF57C3 /* CCUtilMath.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5985180E930E00EF57C3 /* CCUtilMath.h */; }; - 1A8C5A06180E930E00EF57C3 /* CCUtilMath.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5985180E930E00EF57C3 /* CCUtilMath.h */; }; - 1A8C5A07180E930E00EF57C3 /* CocoStudio.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5986180E930E00EF57C3 /* CocoStudio.h */; }; - 1A8C5A08180E930E00EF57C3 /* CocoStudio.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5986180E930E00EF57C3 /* CocoStudio.h */; }; - 1A8C5A0D180E930E00EF57C3 /* DictionaryHelper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5989180E930E00EF57C3 /* DictionaryHelper.cpp */; }; - 1A8C5A0E180E930E00EF57C3 /* DictionaryHelper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5989180E930E00EF57C3 /* DictionaryHelper.cpp */; }; - 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 */; }; 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 */; }; @@ -693,25 +618,6 @@ 1AAF5354180E3060000584C8 /* AssetsManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AAF5351180E3060000584C8 /* AssetsManager.cpp */; }; 1AAF5355180E3060000584C8 /* AssetsManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AAF5352180E3060000584C8 /* AssetsManager.h */; }; 1AAF5356180E3060000584C8 /* AssetsManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AAF5352180E3060000584C8 /* AssetsManager.h */; }; - 1AAF536A180E3374000584C8 /* HttpClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AAF5362180E3374000584C8 /* HttpClient.cpp */; }; - 1AAF536B180E3374000584C8 /* HttpClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AAF5362180E3374000584C8 /* HttpClient.cpp */; }; - 1AAF536C180E3374000584C8 /* HttpClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AAF5363180E3374000584C8 /* HttpClient.h */; }; - 1AAF536D180E3374000584C8 /* HttpClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AAF5363180E3374000584C8 /* HttpClient.h */; }; - 1AAF536E180E3374000584C8 /* HttpRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AAF5364180E3374000584C8 /* HttpRequest.h */; }; - 1AAF536F180E3374000584C8 /* HttpRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AAF5364180E3374000584C8 /* HttpRequest.h */; }; - 1AAF5370180E3374000584C8 /* HttpResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AAF5365180E3374000584C8 /* HttpResponse.h */; }; - 1AAF5371180E3374000584C8 /* HttpResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AAF5365180E3374000584C8 /* HttpResponse.h */; }; - 1AAF5372180E3374000584C8 /* SocketIO.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AAF5366180E3374000584C8 /* SocketIO.cpp */; }; - 1AAF5373180E3374000584C8 /* SocketIO.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AAF5366180E3374000584C8 /* SocketIO.cpp */; }; - 1AAF5374180E3374000584C8 /* SocketIO.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AAF5367180E3374000584C8 /* SocketIO.h */; }; - 1AAF5375180E3374000584C8 /* SocketIO.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AAF5367180E3374000584C8 /* SocketIO.h */; }; - 1AAF5376180E3374000584C8 /* WebSocket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AAF5368180E3374000584C8 /* WebSocket.cpp */; }; - 1AAF5377180E3374000584C8 /* WebSocket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AAF5368180E3374000584C8 /* WebSocket.cpp */; }; - 1AAF5378180E3374000584C8 /* WebSocket.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AAF5369180E3374000584C8 /* WebSocket.h */; }; - 1AAF5379180E3374000584C8 /* WebSocket.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AAF5369180E3374000584C8 /* WebSocket.h */; }; - 1AAF5385180E35A3000584C8 /* libwebsockets.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AAF5384180E35A3000584C8 /* libwebsockets.a */; }; - 1AAF5388180E35AC000584C8 /* libwebsockets.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AAF5387180E35AC000584C8 /* libwebsockets.a */; }; - 1AAF541D180E3B6A000584C8 /* libcurl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AAF541C180E3B6A000584C8 /* libcurl.a */; }; 1AAF584F180E40B9000584C8 /* LocalStorage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AAF584C180E40B9000584C8 /* LocalStorage.cpp */; }; 1AAF5850180E40B9000584C8 /* LocalStorage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AAF584C180E40B9000584C8 /* LocalStorage.cpp */; }; 1AAF5851180E40B9000584C8 /* LocalStorage.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AAF584D180E40B9000584C8 /* LocalStorage.h */; }; @@ -724,190 +630,6 @@ 1ABA68B11888D700007D1BB4 /* CCFontCharMap.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ABA68AD1888D700007D1BB4 /* CCFontCharMap.h */; }; 1AC0269C1914068200FA920D /* ConvertUTF.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AC026991914068200FA920D /* ConvertUTF.h */; }; 1AC0269D1914068200FA920D /* ConvertUTF.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AC026991914068200FA920D /* ConvertUTF.h */; }; - 1AD71DA9180E26E600808F54 /* CCBAnimationManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71CFA180E26E600808F54 /* CCBAnimationManager.cpp */; }; - 1AD71DAA180E26E600808F54 /* CCBAnimationManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71CFA180E26E600808F54 /* CCBAnimationManager.cpp */; }; - 1AD71DAB180E26E600808F54 /* CCBAnimationManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71CFB180E26E600808F54 /* CCBAnimationManager.h */; }; - 1AD71DAC180E26E600808F54 /* CCBAnimationManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71CFB180E26E600808F54 /* CCBAnimationManager.h */; }; - 1AD71DAD180E26E600808F54 /* CCBFileLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71CFC180E26E600808F54 /* CCBFileLoader.cpp */; }; - 1AD71DAE180E26E600808F54 /* CCBFileLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71CFC180E26E600808F54 /* CCBFileLoader.cpp */; }; - 1AD71DAF180E26E600808F54 /* CCBFileLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71CFD180E26E600808F54 /* CCBFileLoader.h */; }; - 1AD71DB0180E26E600808F54 /* CCBFileLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71CFD180E26E600808F54 /* CCBFileLoader.h */; }; - 1AD71DB1180E26E600808F54 /* CCBKeyframe.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71CFE180E26E600808F54 /* CCBKeyframe.cpp */; }; - 1AD71DB2180E26E600808F54 /* CCBKeyframe.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71CFE180E26E600808F54 /* CCBKeyframe.cpp */; }; - 1AD71DB3180E26E600808F54 /* CCBKeyframe.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71CFF180E26E600808F54 /* CCBKeyframe.h */; }; - 1AD71DB4180E26E600808F54 /* CCBKeyframe.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71CFF180E26E600808F54 /* CCBKeyframe.h */; }; - 1AD71DB5180E26E600808F54 /* CCBMemberVariableAssigner.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D00180E26E600808F54 /* CCBMemberVariableAssigner.h */; }; - 1AD71DB6180E26E600808F54 /* CCBMemberVariableAssigner.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D00180E26E600808F54 /* CCBMemberVariableAssigner.h */; }; - 1AD71DB7180E26E600808F54 /* CCBReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D01180E26E600808F54 /* CCBReader.cpp */; }; - 1AD71DB8180E26E600808F54 /* CCBReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D01180E26E600808F54 /* CCBReader.cpp */; }; - 1AD71DB9180E26E600808F54 /* CCBReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D02180E26E600808F54 /* CCBReader.h */; }; - 1AD71DBA180E26E600808F54 /* CCBReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D02180E26E600808F54 /* CCBReader.h */; }; - 1AD71DBB180E26E600808F54 /* CCBSelectorResolver.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D03180E26E600808F54 /* CCBSelectorResolver.h */; }; - 1AD71DBC180E26E600808F54 /* CCBSelectorResolver.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D03180E26E600808F54 /* CCBSelectorResolver.h */; }; - 1AD71DBD180E26E600808F54 /* CCBSequence.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D04180E26E600808F54 /* CCBSequence.cpp */; }; - 1AD71DBE180E26E600808F54 /* CCBSequence.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D04180E26E600808F54 /* CCBSequence.cpp */; }; - 1AD71DBF180E26E600808F54 /* CCBSequence.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D05180E26E600808F54 /* CCBSequence.h */; }; - 1AD71DC0180E26E600808F54 /* CCBSequence.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D05180E26E600808F54 /* CCBSequence.h */; }; - 1AD71DC1180E26E600808F54 /* CCBSequenceProperty.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D06180E26E600808F54 /* CCBSequenceProperty.cpp */; }; - 1AD71DC2180E26E600808F54 /* CCBSequenceProperty.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D06180E26E600808F54 /* CCBSequenceProperty.cpp */; }; - 1AD71DC3180E26E600808F54 /* CCBSequenceProperty.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D07180E26E600808F54 /* CCBSequenceProperty.h */; }; - 1AD71DC4180E26E600808F54 /* CCBSequenceProperty.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D07180E26E600808F54 /* CCBSequenceProperty.h */; }; - 1AD71DC9180E26E600808F54 /* CCControlButtonLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D0A180E26E600808F54 /* CCControlButtonLoader.cpp */; }; - 1AD71DCA180E26E600808F54 /* CCControlButtonLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D0A180E26E600808F54 /* CCControlButtonLoader.cpp */; }; - 1AD71DCB180E26E600808F54 /* CCControlButtonLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D0B180E26E600808F54 /* CCControlButtonLoader.h */; }; - 1AD71DCC180E26E600808F54 /* CCControlButtonLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D0B180E26E600808F54 /* CCControlButtonLoader.h */; }; - 1AD71DCD180E26E600808F54 /* CCControlLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D0C180E26E600808F54 /* CCControlLoader.cpp */; }; - 1AD71DCE180E26E600808F54 /* CCControlLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D0C180E26E600808F54 /* CCControlLoader.cpp */; }; - 1AD71DCF180E26E600808F54 /* CCControlLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D0D180E26E600808F54 /* CCControlLoader.h */; }; - 1AD71DD0180E26E600808F54 /* CCControlLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D0D180E26E600808F54 /* CCControlLoader.h */; }; - 1AD71DD1180E26E600808F54 /* CCLabelBMFontLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D0E180E26E600808F54 /* CCLabelBMFontLoader.cpp */; }; - 1AD71DD2180E26E600808F54 /* CCLabelBMFontLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D0E180E26E600808F54 /* CCLabelBMFontLoader.cpp */; }; - 1AD71DD3180E26E600808F54 /* CCLabelBMFontLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D0F180E26E600808F54 /* CCLabelBMFontLoader.h */; }; - 1AD71DD4180E26E600808F54 /* CCLabelBMFontLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D0F180E26E600808F54 /* CCLabelBMFontLoader.h */; }; - 1AD71DD5180E26E600808F54 /* CCLabelTTFLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D10180E26E600808F54 /* CCLabelTTFLoader.cpp */; }; - 1AD71DD6180E26E600808F54 /* CCLabelTTFLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D10180E26E600808F54 /* CCLabelTTFLoader.cpp */; }; - 1AD71DD7180E26E600808F54 /* CCLabelTTFLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D11180E26E600808F54 /* CCLabelTTFLoader.h */; }; - 1AD71DD8180E26E600808F54 /* CCLabelTTFLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D11180E26E600808F54 /* CCLabelTTFLoader.h */; }; - 1AD71DD9180E26E600808F54 /* CCLayerColorLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D12180E26E600808F54 /* CCLayerColorLoader.cpp */; }; - 1AD71DDA180E26E600808F54 /* CCLayerColorLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D12180E26E600808F54 /* CCLayerColorLoader.cpp */; }; - 1AD71DDB180E26E600808F54 /* CCLayerColorLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D13180E26E600808F54 /* CCLayerColorLoader.h */; }; - 1AD71DDC180E26E600808F54 /* CCLayerColorLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D13180E26E600808F54 /* CCLayerColorLoader.h */; }; - 1AD71DDD180E26E600808F54 /* CCLayerGradientLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D14180E26E600808F54 /* CCLayerGradientLoader.cpp */; }; - 1AD71DDE180E26E600808F54 /* CCLayerGradientLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D14180E26E600808F54 /* CCLayerGradientLoader.cpp */; }; - 1AD71DDF180E26E600808F54 /* CCLayerGradientLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D15180E26E600808F54 /* CCLayerGradientLoader.h */; }; - 1AD71DE0180E26E600808F54 /* CCLayerGradientLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D15180E26E600808F54 /* CCLayerGradientLoader.h */; }; - 1AD71DE1180E26E600808F54 /* CCLayerLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D16180E26E600808F54 /* CCLayerLoader.cpp */; }; - 1AD71DE2180E26E600808F54 /* CCLayerLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D16180E26E600808F54 /* CCLayerLoader.cpp */; }; - 1AD71DE3180E26E600808F54 /* CCLayerLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D17180E26E600808F54 /* CCLayerLoader.h */; }; - 1AD71DE4180E26E600808F54 /* CCLayerLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D17180E26E600808F54 /* CCLayerLoader.h */; }; - 1AD71DE5180E26E600808F54 /* CCMenuItemImageLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D18180E26E600808F54 /* CCMenuItemImageLoader.cpp */; }; - 1AD71DE6180E26E600808F54 /* CCMenuItemImageLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D18180E26E600808F54 /* CCMenuItemImageLoader.cpp */; }; - 1AD71DE7180E26E600808F54 /* CCMenuItemImageLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D19180E26E600808F54 /* CCMenuItemImageLoader.h */; }; - 1AD71DE8180E26E600808F54 /* CCMenuItemImageLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D19180E26E600808F54 /* CCMenuItemImageLoader.h */; }; - 1AD71DE9180E26E600808F54 /* CCMenuItemLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D1A180E26E600808F54 /* CCMenuItemLoader.cpp */; }; - 1AD71DEA180E26E600808F54 /* CCMenuItemLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D1A180E26E600808F54 /* CCMenuItemLoader.cpp */; }; - 1AD71DEB180E26E600808F54 /* CCMenuItemLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D1B180E26E600808F54 /* CCMenuItemLoader.h */; }; - 1AD71DEC180E26E600808F54 /* CCMenuItemLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D1B180E26E600808F54 /* CCMenuItemLoader.h */; }; - 1AD71DED180E26E600808F54 /* CCMenuLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D1C180E26E600808F54 /* CCMenuLoader.h */; }; - 1AD71DEE180E26E600808F54 /* CCMenuLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D1C180E26E600808F54 /* CCMenuLoader.h */; }; - 1AD71DEF180E26E600808F54 /* CCNode+CCBRelativePositioning.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D1D180E26E600808F54 /* CCNode+CCBRelativePositioning.cpp */; }; - 1AD71DF0180E26E600808F54 /* CCNode+CCBRelativePositioning.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D1D180E26E600808F54 /* CCNode+CCBRelativePositioning.cpp */; }; - 1AD71DF1180E26E600808F54 /* CCNode+CCBRelativePositioning.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D1E180E26E600808F54 /* CCNode+CCBRelativePositioning.h */; }; - 1AD71DF2180E26E600808F54 /* CCNode+CCBRelativePositioning.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D1E180E26E600808F54 /* CCNode+CCBRelativePositioning.h */; }; - 1AD71DF3180E26E600808F54 /* CCNodeLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D1F180E26E600808F54 /* CCNodeLoader.cpp */; }; - 1AD71DF4180E26E600808F54 /* CCNodeLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D1F180E26E600808F54 /* CCNodeLoader.cpp */; }; - 1AD71DF5180E26E600808F54 /* CCNodeLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D20180E26E600808F54 /* CCNodeLoader.h */; }; - 1AD71DF6180E26E600808F54 /* CCNodeLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D20180E26E600808F54 /* CCNodeLoader.h */; }; - 1AD71DF7180E26E600808F54 /* CCNodeLoaderLibrary.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D21180E26E600808F54 /* CCNodeLoaderLibrary.cpp */; }; - 1AD71DF8180E26E600808F54 /* CCNodeLoaderLibrary.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D21180E26E600808F54 /* CCNodeLoaderLibrary.cpp */; }; - 1AD71DF9180E26E600808F54 /* CCNodeLoaderLibrary.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D22180E26E600808F54 /* CCNodeLoaderLibrary.h */; }; - 1AD71DFA180E26E600808F54 /* CCNodeLoaderLibrary.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D22180E26E600808F54 /* CCNodeLoaderLibrary.h */; }; - 1AD71DFB180E26E600808F54 /* CCNodeLoaderListener.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D23180E26E600808F54 /* CCNodeLoaderListener.h */; }; - 1AD71DFC180E26E600808F54 /* CCNodeLoaderListener.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D23180E26E600808F54 /* CCNodeLoaderListener.h */; }; - 1AD71DFD180E26E600808F54 /* CCParticleSystemQuadLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D24180E26E600808F54 /* CCParticleSystemQuadLoader.cpp */; }; - 1AD71DFE180E26E600808F54 /* CCParticleSystemQuadLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D24180E26E600808F54 /* CCParticleSystemQuadLoader.cpp */; }; - 1AD71DFF180E26E600808F54 /* CCParticleSystemQuadLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D25180E26E600808F54 /* CCParticleSystemQuadLoader.h */; }; - 1AD71E00180E26E600808F54 /* CCParticleSystemQuadLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D25180E26E600808F54 /* CCParticleSystemQuadLoader.h */; }; - 1AD71E01180E26E600808F54 /* CCScale9SpriteLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D26180E26E600808F54 /* CCScale9SpriteLoader.cpp */; }; - 1AD71E02180E26E600808F54 /* CCScale9SpriteLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D26180E26E600808F54 /* CCScale9SpriteLoader.cpp */; }; - 1AD71E03180E26E600808F54 /* CCScale9SpriteLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D27180E26E600808F54 /* CCScale9SpriteLoader.h */; }; - 1AD71E04180E26E600808F54 /* CCScale9SpriteLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D27180E26E600808F54 /* CCScale9SpriteLoader.h */; }; - 1AD71E05180E26E600808F54 /* CCScrollViewLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D28180E26E600808F54 /* CCScrollViewLoader.cpp */; }; - 1AD71E06180E26E600808F54 /* CCScrollViewLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D28180E26E600808F54 /* CCScrollViewLoader.cpp */; }; - 1AD71E07180E26E600808F54 /* CCScrollViewLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D29180E26E600808F54 /* CCScrollViewLoader.h */; }; - 1AD71E08180E26E600808F54 /* CCScrollViewLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D29180E26E600808F54 /* CCScrollViewLoader.h */; }; - 1AD71E09180E26E600808F54 /* CCSpriteLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D2A180E26E600808F54 /* CCSpriteLoader.cpp */; }; - 1AD71E0A180E26E600808F54 /* CCSpriteLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D2A180E26E600808F54 /* CCSpriteLoader.cpp */; }; - 1AD71E0B180E26E600808F54 /* CCSpriteLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D2B180E26E600808F54 /* CCSpriteLoader.h */; }; - 1AD71E0C180E26E600808F54 /* CCSpriteLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D2B180E26E600808F54 /* CCSpriteLoader.h */; }; - 1AD71E0D180E26E600808F54 /* CocosBuilder.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D2C180E26E600808F54 /* CocosBuilder.h */; }; - 1AD71E0E180E26E600808F54 /* CocosBuilder.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D2C180E26E600808F54 /* CocosBuilder.h */; }; - 1AD71E95180E26E600808F54 /* Animation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D7E180E26E600808F54 /* Animation.cpp */; }; - 1AD71E96180E26E600808F54 /* Animation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D7E180E26E600808F54 /* Animation.cpp */; }; - 1AD71E97180E26E600808F54 /* Animation.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D7F180E26E600808F54 /* Animation.h */; }; - 1AD71E98180E26E600808F54 /* Animation.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D7F180E26E600808F54 /* Animation.h */; }; - 1AD71E99180E26E600808F54 /* AnimationState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D80180E26E600808F54 /* AnimationState.cpp */; }; - 1AD71E9A180E26E600808F54 /* AnimationState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D80180E26E600808F54 /* AnimationState.cpp */; }; - 1AD71E9B180E26E600808F54 /* AnimationState.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D81180E26E600808F54 /* AnimationState.h */; }; - 1AD71E9C180E26E600808F54 /* AnimationState.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D81180E26E600808F54 /* AnimationState.h */; }; - 1AD71E9D180E26E600808F54 /* AnimationStateData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D82180E26E600808F54 /* AnimationStateData.cpp */; }; - 1AD71E9E180E26E600808F54 /* AnimationStateData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D82180E26E600808F54 /* AnimationStateData.cpp */; }; - 1AD71E9F180E26E600808F54 /* AnimationStateData.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D83180E26E600808F54 /* AnimationStateData.h */; }; - 1AD71EA0180E26E600808F54 /* AnimationStateData.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D83180E26E600808F54 /* AnimationStateData.h */; }; - 1AD71EA1180E26E600808F54 /* Atlas.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D84180E26E600808F54 /* Atlas.cpp */; }; - 1AD71EA2180E26E600808F54 /* Atlas.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D84180E26E600808F54 /* Atlas.cpp */; }; - 1AD71EA3180E26E600808F54 /* Atlas.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D85180E26E600808F54 /* Atlas.h */; }; - 1AD71EA4180E26E600808F54 /* Atlas.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D85180E26E600808F54 /* Atlas.h */; }; - 1AD71EA5180E26E600808F54 /* AtlasAttachmentLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D86180E26E600808F54 /* AtlasAttachmentLoader.cpp */; }; - 1AD71EA6180E26E600808F54 /* AtlasAttachmentLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D86180E26E600808F54 /* AtlasAttachmentLoader.cpp */; }; - 1AD71EA7180E26E600808F54 /* AtlasAttachmentLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D87180E26E600808F54 /* AtlasAttachmentLoader.h */; }; - 1AD71EA8180E26E600808F54 /* AtlasAttachmentLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D87180E26E600808F54 /* AtlasAttachmentLoader.h */; }; - 1AD71EA9180E26E600808F54 /* Attachment.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D88180E26E600808F54 /* Attachment.cpp */; }; - 1AD71EAA180E26E600808F54 /* Attachment.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D88180E26E600808F54 /* Attachment.cpp */; }; - 1AD71EAB180E26E600808F54 /* Attachment.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D89180E26E600808F54 /* Attachment.h */; }; - 1AD71EAC180E26E600808F54 /* Attachment.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D89180E26E600808F54 /* Attachment.h */; }; - 1AD71EAD180E26E600808F54 /* AttachmentLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D8A180E26E600808F54 /* AttachmentLoader.cpp */; }; - 1AD71EAE180E26E600808F54 /* AttachmentLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D8A180E26E600808F54 /* AttachmentLoader.cpp */; }; - 1AD71EAF180E26E600808F54 /* AttachmentLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D8B180E26E600808F54 /* AttachmentLoader.h */; }; - 1AD71EB0180E26E600808F54 /* AttachmentLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D8B180E26E600808F54 /* AttachmentLoader.h */; }; - 1AD71EB1180E26E600808F54 /* Bone.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D8C180E26E600808F54 /* Bone.cpp */; }; - 1AD71EB2180E26E600808F54 /* Bone.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D8C180E26E600808F54 /* Bone.cpp */; }; - 1AD71EB3180E26E600808F54 /* Bone.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D8D180E26E600808F54 /* Bone.h */; }; - 1AD71EB4180E26E600808F54 /* Bone.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D8D180E26E600808F54 /* Bone.h */; }; - 1AD71EB5180E26E600808F54 /* BoneData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D8E180E26E600808F54 /* BoneData.cpp */; }; - 1AD71EB6180E26E600808F54 /* BoneData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D8E180E26E600808F54 /* BoneData.cpp */; }; - 1AD71EB7180E26E600808F54 /* BoneData.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D8F180E26E600808F54 /* BoneData.h */; }; - 1AD71EB8180E26E600808F54 /* BoneData.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D8F180E26E600808F54 /* BoneData.h */; }; - 1AD71EB9180E26E600808F54 /* CCSkeleton.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D90180E26E600808F54 /* CCSkeleton.cpp */; }; - 1AD71EBA180E26E600808F54 /* CCSkeleton.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D90180E26E600808F54 /* CCSkeleton.cpp */; }; - 1AD71EBB180E26E600808F54 /* CCSkeleton.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D91180E26E600808F54 /* CCSkeleton.h */; }; - 1AD71EBC180E26E600808F54 /* CCSkeleton.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D91180E26E600808F54 /* CCSkeleton.h */; }; - 1AD71EBD180E26E600808F54 /* CCSkeletonAnimation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D92180E26E600808F54 /* CCSkeletonAnimation.cpp */; }; - 1AD71EBE180E26E600808F54 /* CCSkeletonAnimation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D92180E26E600808F54 /* CCSkeletonAnimation.cpp */; }; - 1AD71EBF180E26E600808F54 /* CCSkeletonAnimation.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D93180E26E600808F54 /* CCSkeletonAnimation.h */; }; - 1AD71EC0180E26E600808F54 /* CCSkeletonAnimation.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D93180E26E600808F54 /* CCSkeletonAnimation.h */; }; - 1AD71EC1180E26E600808F54 /* extension.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D94180E26E600808F54 /* extension.cpp */; }; - 1AD71EC2180E26E600808F54 /* extension.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D94180E26E600808F54 /* extension.cpp */; }; - 1AD71EC3180E26E600808F54 /* extension.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D95180E26E600808F54 /* extension.h */; }; - 1AD71EC4180E26E600808F54 /* extension.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D95180E26E600808F54 /* extension.h */; }; - 1AD71EC5180E26E600808F54 /* Json.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D96180E26E600808F54 /* Json.cpp */; }; - 1AD71EC6180E26E600808F54 /* Json.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D96180E26E600808F54 /* Json.cpp */; }; - 1AD71EC7180E26E600808F54 /* Json.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D97180E26E600808F54 /* Json.h */; }; - 1AD71EC8180E26E600808F54 /* Json.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D97180E26E600808F54 /* Json.h */; }; - 1AD71EC9180E26E600808F54 /* RegionAttachment.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D98180E26E600808F54 /* RegionAttachment.cpp */; }; - 1AD71ECA180E26E600808F54 /* RegionAttachment.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D98180E26E600808F54 /* RegionAttachment.cpp */; }; - 1AD71ECB180E26E600808F54 /* RegionAttachment.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D99180E26E600808F54 /* RegionAttachment.h */; }; - 1AD71ECC180E26E600808F54 /* RegionAttachment.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D99180E26E600808F54 /* RegionAttachment.h */; }; - 1AD71ECD180E26E600808F54 /* Skeleton.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D9A180E26E600808F54 /* Skeleton.cpp */; }; - 1AD71ECE180E26E600808F54 /* Skeleton.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D9A180E26E600808F54 /* Skeleton.cpp */; }; - 1AD71ECF180E26E600808F54 /* Skeleton.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D9B180E26E600808F54 /* Skeleton.h */; }; - 1AD71ED0180E26E600808F54 /* Skeleton.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D9B180E26E600808F54 /* Skeleton.h */; }; - 1AD71ED1180E26E600808F54 /* SkeletonData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D9C180E26E600808F54 /* SkeletonData.cpp */; }; - 1AD71ED2180E26E600808F54 /* SkeletonData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D9C180E26E600808F54 /* SkeletonData.cpp */; }; - 1AD71ED3180E26E600808F54 /* SkeletonData.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D9D180E26E600808F54 /* SkeletonData.h */; }; - 1AD71ED4180E26E600808F54 /* SkeletonData.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D9D180E26E600808F54 /* SkeletonData.h */; }; - 1AD71ED5180E26E600808F54 /* SkeletonJson.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D9E180E26E600808F54 /* SkeletonJson.cpp */; }; - 1AD71ED6180E26E600808F54 /* SkeletonJson.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D9E180E26E600808F54 /* SkeletonJson.cpp */; }; - 1AD71ED7180E26E600808F54 /* SkeletonJson.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D9F180E26E600808F54 /* SkeletonJson.h */; }; - 1AD71ED8180E26E600808F54 /* SkeletonJson.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D9F180E26E600808F54 /* SkeletonJson.h */; }; - 1AD71ED9180E26E600808F54 /* Skin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71DA0180E26E600808F54 /* Skin.cpp */; }; - 1AD71EDA180E26E600808F54 /* Skin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71DA0180E26E600808F54 /* Skin.cpp */; }; - 1AD71EDB180E26E600808F54 /* Skin.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71DA1180E26E600808F54 /* Skin.h */; }; - 1AD71EDC180E26E600808F54 /* Skin.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71DA1180E26E600808F54 /* Skin.h */; }; - 1AD71EDD180E26E600808F54 /* Slot.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71DA2180E26E600808F54 /* Slot.cpp */; }; - 1AD71EDE180E26E600808F54 /* Slot.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71DA2180E26E600808F54 /* Slot.cpp */; }; - 1AD71EDF180E26E600808F54 /* Slot.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71DA3180E26E600808F54 /* Slot.h */; }; - 1AD71EE0180E26E600808F54 /* Slot.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71DA3180E26E600808F54 /* Slot.h */; }; - 1AD71EE1180E26E600808F54 /* SlotData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71DA4180E26E600808F54 /* SlotData.cpp */; }; - 1AD71EE2180E26E600808F54 /* SlotData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71DA4180E26E600808F54 /* SlotData.cpp */; }; - 1AD71EE3180E26E600808F54 /* SlotData.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71DA5180E26E600808F54 /* SlotData.h */; }; - 1AD71EE4180E26E600808F54 /* SlotData.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71DA5180E26E600808F54 /* SlotData.h */; }; - 1AD71EE5180E26E600808F54 /* spine-cocos2dx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71DA6180E26E600808F54 /* spine-cocos2dx.cpp */; }; - 1AD71EE6180E26E600808F54 /* spine-cocos2dx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71DA6180E26E600808F54 /* spine-cocos2dx.cpp */; }; - 1AD71EE7180E26E600808F54 /* spine-cocos2dx.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71DA7180E26E600808F54 /* spine-cocos2dx.h */; }; - 1AD71EE8180E26E600808F54 /* spine-cocos2dx.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71DA7180E26E600808F54 /* spine-cocos2dx.h */; }; - 1AD71EE9180E26E600808F54 /* spine.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71DA8180E26E600808F54 /* spine.h */; }; - 1AD71EEA180E26E600808F54 /* spine.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71DA8180E26E600808F54 /* spine.h */; }; 1AD71EF0180E27CF00808F54 /* CCPhysicsDebugNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71EEC180E27CF00808F54 /* CCPhysicsDebugNode.cpp */; }; 1AD71EF1180E27CF00808F54 /* CCPhysicsDebugNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71EEC180E27CF00808F54 /* CCPhysicsDebugNode.cpp */; }; 1AD71EF2180E27CF00808F54 /* CCPhysicsDebugNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71EED180E27CF00808F54 /* CCPhysicsDebugNode.h */; }; @@ -916,113 +638,19 @@ 1AD71EF5180E27CF00808F54 /* CCPhysicsSprite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71EEE180E27CF00808F54 /* CCPhysicsSprite.cpp */; }; 1AD71EF6180E27CF00808F54 /* CCPhysicsSprite.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71EEF180E27CF00808F54 /* CCPhysicsSprite.h */; }; 1AD71EF7180E27CF00808F54 /* CCPhysicsSprite.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71EEF180E27CF00808F54 /* CCPhysicsSprite.h */; }; - 2905FA4018CF08D100240AA3 /* CocosGUI.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905F9E918CF08D000240AA3 /* CocosGUI.cpp */; }; - 2905FA4118CF08D100240AA3 /* CocosGUI.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905F9E918CF08D000240AA3 /* CocosGUI.cpp */; }; - 2905FA4218CF08D100240AA3 /* CocosGUI.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905F9EA18CF08D000240AA3 /* CocosGUI.h */; }; - 2905FA4318CF08D100240AA3 /* CocosGUI.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905F9EA18CF08D000240AA3 /* CocosGUI.h */; }; - 2905FA4418CF08D100240AA3 /* GUIDefine.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905F9EB18CF08D000240AA3 /* GUIDefine.h */; }; - 2905FA4518CF08D100240AA3 /* GUIDefine.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905F9EB18CF08D000240AA3 /* GUIDefine.h */; }; - 2905FA4618CF08D100240AA3 /* UIButton.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905F9F018CF08D000240AA3 /* UIButton.cpp */; }; - 2905FA4718CF08D100240AA3 /* UIButton.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905F9F018CF08D000240AA3 /* UIButton.cpp */; }; - 2905FA4818CF08D100240AA3 /* UIButton.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905F9F118CF08D000240AA3 /* UIButton.h */; }; - 2905FA4918CF08D100240AA3 /* UIButton.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905F9F118CF08D000240AA3 /* UIButton.h */; }; - 2905FA4A18CF08D100240AA3 /* UICheckBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905F9F218CF08D000240AA3 /* UICheckBox.cpp */; }; - 2905FA4B18CF08D100240AA3 /* UICheckBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905F9F218CF08D000240AA3 /* UICheckBox.cpp */; }; - 2905FA4C18CF08D100240AA3 /* UICheckBox.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905F9F318CF08D000240AA3 /* UICheckBox.h */; }; - 2905FA4D18CF08D100240AA3 /* UICheckBox.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905F9F318CF08D000240AA3 /* UICheckBox.h */; }; - 2905FA4E18CF08D100240AA3 /* UIHelper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905F9F418CF08D000240AA3 /* UIHelper.cpp */; }; - 2905FA4F18CF08D100240AA3 /* UIHelper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905F9F418CF08D000240AA3 /* UIHelper.cpp */; }; - 2905FA5018CF08D100240AA3 /* UIHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905F9F518CF08D000240AA3 /* UIHelper.h */; }; - 2905FA5118CF08D100240AA3 /* UIHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905F9F518CF08D000240AA3 /* UIHelper.h */; }; - 2905FA5218CF08D100240AA3 /* UIImageView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905F9F618CF08D000240AA3 /* UIImageView.cpp */; }; - 2905FA5318CF08D100240AA3 /* UIImageView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905F9F618CF08D000240AA3 /* UIImageView.cpp */; }; - 2905FA5418CF08D100240AA3 /* UIImageView.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905F9F718CF08D000240AA3 /* UIImageView.h */; }; - 2905FA5518CF08D100240AA3 /* UIImageView.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905F9F718CF08D000240AA3 /* UIImageView.h */; }; - 2905FA5618CF08D100240AA3 /* UILayout.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905F9F818CF08D000240AA3 /* UILayout.cpp */; }; - 2905FA5718CF08D100240AA3 /* UILayout.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905F9F818CF08D000240AA3 /* UILayout.cpp */; }; - 2905FA5818CF08D100240AA3 /* UILayout.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905F9F918CF08D000240AA3 /* UILayout.h */; }; - 2905FA5918CF08D100240AA3 /* UILayout.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905F9F918CF08D000240AA3 /* UILayout.h */; }; - 2905FA5E18CF08D100240AA3 /* UILayoutParameter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905F9FC18CF08D000240AA3 /* UILayoutParameter.cpp */; }; - 2905FA5F18CF08D100240AA3 /* UILayoutParameter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905F9FC18CF08D000240AA3 /* UILayoutParameter.cpp */; }; - 2905FA6018CF08D100240AA3 /* UILayoutParameter.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905F9FD18CF08D000240AA3 /* UILayoutParameter.h */; }; - 2905FA6118CF08D100240AA3 /* UILayoutParameter.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905F9FD18CF08D000240AA3 /* UILayoutParameter.h */; }; - 2905FA6218CF08D100240AA3 /* UIListView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905F9FE18CF08D000240AA3 /* UIListView.cpp */; }; - 2905FA6318CF08D100240AA3 /* UIListView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905F9FE18CF08D000240AA3 /* UIListView.cpp */; }; - 2905FA6418CF08D100240AA3 /* UIListView.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905F9FF18CF08D000240AA3 /* UIListView.h */; }; - 2905FA6518CF08D100240AA3 /* UIListView.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905F9FF18CF08D000240AA3 /* UIListView.h */; }; - 2905FA6618CF08D100240AA3 /* UILoadingBar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905FA0018CF08D000240AA3 /* UILoadingBar.cpp */; }; - 2905FA6718CF08D100240AA3 /* UILoadingBar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905FA0018CF08D000240AA3 /* UILoadingBar.cpp */; }; - 2905FA6818CF08D100240AA3 /* UILoadingBar.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905FA0118CF08D000240AA3 /* UILoadingBar.h */; }; - 2905FA6918CF08D100240AA3 /* UILoadingBar.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905FA0118CF08D000240AA3 /* UILoadingBar.h */; }; - 2905FA6A18CF08D100240AA3 /* UIPageView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905FA0218CF08D000240AA3 /* UIPageView.cpp */; }; - 2905FA6B18CF08D100240AA3 /* UIPageView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905FA0218CF08D000240AA3 /* UIPageView.cpp */; }; - 2905FA6C18CF08D100240AA3 /* UIPageView.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905FA0318CF08D000240AA3 /* UIPageView.h */; }; - 2905FA6D18CF08D100240AA3 /* UIPageView.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905FA0318CF08D000240AA3 /* UIPageView.h */; }; - 2905FA6E18CF08D100240AA3 /* UIRichText.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905FA0418CF08D000240AA3 /* UIRichText.cpp */; }; - 2905FA6F18CF08D100240AA3 /* UIRichText.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905FA0418CF08D000240AA3 /* UIRichText.cpp */; }; - 2905FA7018CF08D100240AA3 /* UIRichText.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905FA0518CF08D000240AA3 /* UIRichText.h */; }; - 2905FA7118CF08D100240AA3 /* UIRichText.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905FA0518CF08D000240AA3 /* UIRichText.h */; }; - 2905FA7418CF08D100240AA3 /* UIScrollView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905FA0718CF08D000240AA3 /* UIScrollView.cpp */; }; - 2905FA7518CF08D100240AA3 /* UIScrollView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905FA0718CF08D000240AA3 /* UIScrollView.cpp */; }; - 2905FA7618CF08D100240AA3 /* UIScrollView.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905FA0818CF08D000240AA3 /* UIScrollView.h */; }; - 2905FA7718CF08D100240AA3 /* UIScrollView.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905FA0818CF08D000240AA3 /* UIScrollView.h */; }; - 2905FA7818CF08D100240AA3 /* UISlider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905FA0918CF08D000240AA3 /* UISlider.cpp */; }; - 2905FA7918CF08D100240AA3 /* UISlider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905FA0918CF08D000240AA3 /* UISlider.cpp */; }; - 2905FA7A18CF08D100240AA3 /* UISlider.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905FA0A18CF08D100240AA3 /* UISlider.h */; }; - 2905FA7B18CF08D100240AA3 /* UISlider.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905FA0A18CF08D100240AA3 /* UISlider.h */; }; - 2905FA7C18CF08D100240AA3 /* UIText.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905FA0B18CF08D100240AA3 /* UIText.cpp */; }; - 2905FA7D18CF08D100240AA3 /* UIText.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905FA0B18CF08D100240AA3 /* UIText.cpp */; }; - 2905FA7E18CF08D100240AA3 /* UIText.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905FA0C18CF08D100240AA3 /* UIText.h */; }; - 2905FA7F18CF08D100240AA3 /* UIText.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905FA0C18CF08D100240AA3 /* UIText.h */; }; - 2905FA8018CF08D100240AA3 /* UITextAtlas.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905FA0D18CF08D100240AA3 /* UITextAtlas.cpp */; }; - 2905FA8118CF08D100240AA3 /* UITextAtlas.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905FA0D18CF08D100240AA3 /* UITextAtlas.cpp */; }; - 2905FA8218CF08D100240AA3 /* UITextAtlas.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905FA0E18CF08D100240AA3 /* UITextAtlas.h */; }; - 2905FA8318CF08D100240AA3 /* UITextAtlas.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905FA0E18CF08D100240AA3 /* UITextAtlas.h */; }; - 2905FA8418CF08D100240AA3 /* UITextBMFont.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905FA0F18CF08D100240AA3 /* UITextBMFont.cpp */; }; - 2905FA8518CF08D100240AA3 /* UITextBMFont.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905FA0F18CF08D100240AA3 /* UITextBMFont.cpp */; }; - 2905FA8618CF08D100240AA3 /* UITextBMFont.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905FA1018CF08D100240AA3 /* UITextBMFont.h */; }; - 2905FA8718CF08D100240AA3 /* UITextBMFont.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905FA1018CF08D100240AA3 /* UITextBMFont.h */; }; - 2905FA8818CF08D100240AA3 /* UITextField.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905FA1118CF08D100240AA3 /* UITextField.cpp */; }; - 2905FA8918CF08D100240AA3 /* UITextField.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905FA1118CF08D100240AA3 /* UITextField.cpp */; }; - 2905FA8A18CF08D100240AA3 /* UITextField.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905FA1218CF08D100240AA3 /* UITextField.h */; }; - 2905FA8B18CF08D100240AA3 /* UITextField.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905FA1218CF08D100240AA3 /* UITextField.h */; }; - 2905FA8C18CF08D100240AA3 /* UIWidget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905FA1318CF08D100240AA3 /* UIWidget.cpp */; }; - 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 */; }; + 2958244B19873D8E00F9746D /* UIScale9Sprite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2958244919873D8E00F9746D /* UIScale9Sprite.cpp */; }; + 2958244C19873D8E00F9746D /* UIScale9Sprite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2958244919873D8E00F9746D /* UIScale9Sprite.cpp */; }; + 2958244D19873D8E00F9746D /* UIScale9Sprite.h in Headers */ = {isa = PBXBuildFile; fileRef = 2958244A19873D8E00F9746D /* UIScale9Sprite.h */; }; + 2958244E19873D8E00F9746D /* UIScale9Sprite.h in Headers */ = {isa = PBXBuildFile; fileRef = 2958244A19873D8E00F9746D /* UIScale9Sprite.h */; }; 2986667F18B1B246000E39CA /* CCTweenFunction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2986667818B1B079000E39CA /* CCTweenFunction.cpp */; }; 299754F4193EC95400A54AC3 /* ObjectFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 299754F2193EC95400A54AC3 /* ObjectFactory.cpp */; }; 299754F5193EC95400A54AC3 /* ObjectFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 299754F2193EC95400A54AC3 /* ObjectFactory.cpp */; }; 299754F6193EC95400A54AC3 /* ObjectFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = 299754F3193EC95400A54AC3 /* ObjectFactory.h */; }; 299754F7193EC95400A54AC3 /* ObjectFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = 299754F3193EC95400A54AC3 /* ObjectFactory.h */; }; - 29BDBA53195D597A003225C9 /* UIDeprecated.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29BDBA52195D597A003225C9 /* UIDeprecated.cpp */; }; - 29BDBA54195D597A003225C9 /* UIDeprecated.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29BDBA52195D597A003225C9 /* UIDeprecated.cpp */; }; - 29CB8F4C1929D1BB00C841D6 /* UILayoutManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29CB8F4A1929D1BB00C841D6 /* UILayoutManager.cpp */; }; - 29CB8F4D1929D1BB00C841D6 /* UILayoutManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29CB8F4A1929D1BB00C841D6 /* UILayoutManager.cpp */; }; - 29CB8F4E1929D1BB00C841D6 /* UILayoutManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 29CB8F4B1929D1BB00C841D6 /* UILayoutManager.h */; }; - 29CB8F4F1929D1BB00C841D6 /* UILayoutManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 29CB8F4B1929D1BB00C841D6 /* UILayoutManager.h */; }; - 29E99D1E1957BA7000046604 /* CocoLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29E99D1C1957BA7000046604 /* CocoLoader.cpp */; }; - 29E99D1F1957BA7000046604 /* CocoLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29E99D1C1957BA7000046604 /* CocoLoader.cpp */; }; - 29E99D201957BA7000046604 /* CocoLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 29E99D1D1957BA7000046604 /* CocoLoader.h */; }; - 29E99D211957BA7000046604 /* CocoLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 29E99D1D1957BA7000046604 /* CocoLoader.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 */; }; - 2AC795DE1862870F005EC8E1 /* BoundingBoxAttachment.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2AC795D318628672005EC8E1 /* BoundingBoxAttachment.cpp */; }; - 2AC795DF18628723005EC8E1 /* SkeletonBounds.h in Headers */ = {isa = PBXBuildFile; fileRef = 2AC795DA18628689005EC8E1 /* SkeletonBounds.h */; }; - 2AC795E018628723005EC8E1 /* Event.h in Headers */ = {isa = PBXBuildFile; fileRef = 2AC795D61862867D005EC8E1 /* Event.h */; }; - 2AC795E118628723005EC8E1 /* EventData.h in Headers */ = {isa = PBXBuildFile; fileRef = 2AC795D81862867D005EC8E1 /* EventData.h */; }; - 2AC795E218628723005EC8E1 /* BoundingBoxAttachment.h in Headers */ = {isa = PBXBuildFile; fileRef = 2AC795D418628672005EC8E1 /* BoundingBoxAttachment.h */; }; - 2AC795E318628746005EC8E1 /* SkeletonBounds.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2AC795D918628689005EC8E1 /* SkeletonBounds.cpp */; }; - 2AC795E418628746005EC8E1 /* Event.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2AC795D51862867D005EC8E1 /* Event.cpp */; }; - 2AC795E518628746005EC8E1 /* EventData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2AC795D71862867D005EC8E1 /* EventData.cpp */; }; - 2AC795E618628746005EC8E1 /* BoundingBoxAttachment.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2AC795D318628672005EC8E1 /* BoundingBoxAttachment.cpp */; }; - 2AC795E71862875D005EC8E1 /* SkeletonBounds.h in Headers */ = {isa = PBXBuildFile; fileRef = 2AC795DA18628689005EC8E1 /* SkeletonBounds.h */; }; - 2AC795E81862875D005EC8E1 /* Event.h in Headers */ = {isa = PBXBuildFile; fileRef = 2AC795D61862867D005EC8E1 /* Event.h */; }; - 2AC795E91862875D005EC8E1 /* EventData.h in Headers */ = {isa = PBXBuildFile; fileRef = 2AC795D81862867D005EC8E1 /* EventData.h */; }; - 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 */; }; + 299CF1FB19A434BC00C378C1 /* ccRandom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 299CF1F919A434BC00C378C1 /* ccRandom.cpp */; }; + 299CF1FC19A434BC00C378C1 /* ccRandom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 299CF1F919A434BC00C378C1 /* ccRandom.cpp */; }; + 299CF1FD19A434BC00C378C1 /* ccRandom.h in Headers */ = {isa = PBXBuildFile; fileRef = 299CF1FA19A434BC00C378C1 /* ccRandom.h */; }; + 299CF1FE19A434BC00C378C1 /* ccRandom.h in Headers */ = {isa = PBXBuildFile; fileRef = 299CF1FA19A434BC00C378C1 /* ccRandom.h */; }; 3E6176681960F89B00DE83F5 /* CCController-iOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3E6176551960F89B00DE83F5 /* CCController-iOS.mm */; }; 3E6176691960F89B00DE83F5 /* CCController.h in Headers */ = {isa = PBXBuildFile; fileRef = 3E6176561960F89B00DE83F5 /* CCController.h */; }; 3E6176741960F89B00DE83F5 /* CCEventController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E6176611960F89B00DE83F5 /* CCEventController.cpp */; }; @@ -1031,12 +659,10 @@ 3E6176771960F89B00DE83F5 /* CCEventListenerController.h in Headers */ = {isa = PBXBuildFile; fileRef = 3E6176641960F89B00DE83F5 /* CCEventListenerController.h */; }; 3E6176781960F89B00DE83F5 /* CCGameController.h in Headers */ = {isa = PBXBuildFile; fileRef = 3E6176651960F89B00DE83F5 /* CCGameController.h */; }; 3E61781D1966A5A300DE83F5 /* CCController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E61781C1966A5A300DE83F5 /* CCController.cpp */; }; - 3EA0FB6B191C841D00B170C8 /* UIVideoPlayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 3EA0FB69191C841D00B170C8 /* UIVideoPlayer.h */; }; - 3EA0FB6C191C841D00B170C8 /* UIVideoPlayerIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3EA0FB6A191C841D00B170C8 /* UIVideoPlayerIOS.mm */; }; - 3EA47870195478E00068D9D1 /* CCBundleReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3EA4786E195478E00068D9D1 /* CCBundleReader.cpp */; }; - 3EA47871195478E00068D9D1 /* CCBundleReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3EA4786E195478E00068D9D1 /* CCBundleReader.cpp */; }; - 3EA47872195478E00068D9D1 /* CCBundleReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 3EA4786F195478E00068D9D1 /* CCBundleReader.h */; }; - 3EA47873195478E00068D9D1 /* CCBundleReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 3EA4786F195478E00068D9D1 /* CCBundleReader.h */; }; + 3EA3EDBC1991CDFA00645534 /* CCCamera.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3EA3EDBA1991CDFA00645534 /* CCCamera.cpp */; }; + 3EA3EDBD1991CDFA00645534 /* CCCamera.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3EA3EDBA1991CDFA00645534 /* CCCamera.cpp */; }; + 3EA3EDBE1991CDFA00645534 /* CCCamera.h in Headers */ = {isa = PBXBuildFile; fileRef = 3EA3EDBB1991CDFA00645534 /* CCCamera.h */; }; + 3EA3EDBF1991CDFA00645534 /* CCCamera.h in Headers */ = {isa = PBXBuildFile; fileRef = 3EA3EDBB1991CDFA00645534 /* CCCamera.h */; }; 460E468118080832000CDD6D /* cocos-ext.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A167D21807AF4D005B8026 /* cocos-ext.h */; }; 460E468218080836000CDD6D /* cocos-ext.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A167D21807AF4D005B8026 /* cocos-ext.h */; }; 460E477B180808F5000CDD6D /* ExtensionMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A168321807AF4E005B8026 /* ExtensionMacros.h */; }; @@ -1094,15 +720,6 @@ 460E47AF1808090B000CDD6D /* CCEditBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46A1684F1807AF4E005B8026 /* CCEditBox.cpp */; }; 460E47B01808090B000CDD6D /* CCEditBox.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A168501807AF4E005B8026 /* CCEditBox.h */; }; 460E47B11808090B000CDD6D /* CCEditBoxImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A168511807AF4E005B8026 /* CCEditBoxImpl.h */; }; - 460E47B21808090B000CDD6D /* CCEditBoxImplAndroid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46A168521807AF4E005B8026 /* CCEditBoxImplAndroid.cpp */; }; - 460E47B31808090B000CDD6D /* CCEditBoxImplAndroid.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A168531807AF4E005B8026 /* CCEditBoxImplAndroid.h */; }; - 460E47B41808090B000CDD6D /* CCEditBoxImplIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A168541807AF4E005B8026 /* CCEditBoxImplIOS.h */; }; - 460E47B51808090B000CDD6D /* CCEditBoxImplIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 46A168551807AF4E005B8026 /* CCEditBoxImplIOS.mm */; }; - 460E47B61808090B000CDD6D /* CCEditBoxImplMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A168561807AF4E005B8026 /* CCEditBoxImplMac.h */; }; - 460E47B71808090B000CDD6D /* CCEditBoxImplMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 46A168571807AF4E005B8026 /* CCEditBoxImplMac.mm */; }; - 460E47B81808090B000CDD6D /* CCEditBoxImplNone.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46A168581807AF4E005B8026 /* CCEditBoxImplNone.cpp */; }; - 460E47BB1808090B000CDD6D /* CCEditBoxImplWin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46A1685B1807AF4E005B8026 /* CCEditBoxImplWin.cpp */; }; - 460E47BC1808090B000CDD6D /* CCEditBoxImplWin.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A1685C1807AF4E005B8026 /* CCEditBoxImplWin.h */; }; 460E47BD1808090D000CDD6D /* CCEditBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46A1684F1807AF4E005B8026 /* CCEditBox.cpp */; }; 460E47BE1808090D000CDD6D /* CCEditBox.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A168501807AF4E005B8026 /* CCEditBox.h */; }; 460E47BF1808090D000CDD6D /* CCEditBoxImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A168511807AF4E005B8026 /* CCEditBoxImpl.h */; }; @@ -1110,8 +727,6 @@ 460E47C11808090D000CDD6D /* CCEditBoxImplAndroid.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A168531807AF4E005B8026 /* CCEditBoxImplAndroid.h */; }; 460E47C21808090D000CDD6D /* CCEditBoxImplIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A168541807AF4E005B8026 /* CCEditBoxImplIOS.h */; }; 460E47C31808090D000CDD6D /* CCEditBoxImplIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 46A168551807AF4E005B8026 /* CCEditBoxImplIOS.mm */; }; - 460E47C41808090D000CDD6D /* CCEditBoxImplMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A168561807AF4E005B8026 /* CCEditBoxImplMac.h */; }; - 460E47C51808090D000CDD6D /* CCEditBoxImplMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 46A168571807AF4E005B8026 /* CCEditBoxImplMac.mm */; }; 460E47C61808090D000CDD6D /* CCEditBoxImplNone.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46A168581807AF4E005B8026 /* CCEditBoxImplNone.cpp */; }; 460E47C91808090D000CDD6D /* CCEditBoxImplWin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46A1685B1807AF4E005B8026 /* CCEditBoxImplWin.cpp */; }; 460E47CA1808090D000CDD6D /* CCEditBoxImplWin.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A1685C1807AF4E005B8026 /* CCEditBoxImplWin.h */; }; @@ -1127,6 +742,14 @@ 460E47D818080914000CDD6D /* CCTableView.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A168631807AF4E005B8026 /* CCTableView.h */; }; 460E47D918080914000CDD6D /* CCTableViewCell.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46A168641807AF4E005B8026 /* CCTableViewCell.cpp */; }; 460E47DA18080914000CDD6D /* CCTableViewCell.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A168651807AF4E005B8026 /* CCTableViewCell.h */; }; + 464AD6E5197EBB1400E502D8 /* pvr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 464AD6E3197EBB1400E502D8 /* pvr.cpp */; }; + 464AD6E6197EBB1400E502D8 /* pvr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 464AD6E3197EBB1400E502D8 /* pvr.cpp */; }; + 464AD6E7197EBB1400E502D8 /* pvr.h in Headers */ = {isa = PBXBuildFile; fileRef = 464AD6E4197EBB1400E502D8 /* pvr.h */; }; + 464AD6E8197EBB1400E502D8 /* pvr.h in Headers */ = {isa = PBXBuildFile; fileRef = 464AD6E4197EBB1400E502D8 /* pvr.h */; }; + 46633BC4199DDB2F00F6E838 /* CCModuleManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46633BC2199DDB2F00F6E838 /* CCModuleManager.cpp */; }; + 46633BC5199DDB2F00F6E838 /* CCModuleManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46633BC2199DDB2F00F6E838 /* CCModuleManager.cpp */; }; + 46633BC6199DDB2F00F6E838 /* CCModuleManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 46633BC3199DDB2F00F6E838 /* CCModuleManager.h */; }; + 46633BC7199DDB2F00F6E838 /* CCModuleManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 46633BC3199DDB2F00F6E838 /* CCModuleManager.h */; }; 46A160421807A5D4005B8026 /* Export.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A15FE11807A56F005B8026 /* Export.h */; }; 46A160431807A5D4005B8026 /* SimpleAudioEngine.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A15FE21807A56F005B8026 /* SimpleAudioEngine.h */; }; 46A160441807A5D4005B8026 /* CDAudioManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A15FF41807A56F005B8026 /* CDAudioManager.h */; }; @@ -1167,7 +790,6 @@ 46A170FD1807CECB005B8026 /* CCPhysicsBody.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A1706F1807CE7A005B8026 /* CCPhysicsBody.h */; }; 46A170FE1807CECB005B8026 /* CCPhysicsContact.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46A170701807CE7A005B8026 /* CCPhysicsContact.cpp */; }; 46A170FF1807CECB005B8026 /* CCPhysicsContact.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A170711807CE7A005B8026 /* CCPhysicsContact.h */; }; - 46A171001807CECB005B8026 /* CCPhysicsJoint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46A170721807CE7A005B8026 /* CCPhysicsJoint.cpp */; }; 46A171011807CECB005B8026 /* CCPhysicsJoint.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A170731807CE7A005B8026 /* CCPhysicsJoint.h */; }; 46A171031807CECB005B8026 /* CCPhysicsShape.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46A170751807CE7A005B8026 /* CCPhysicsShape.cpp */; }; 46A171041807CECB005B8026 /* CCPhysicsShape.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A170761807CE7A005B8026 /* CCPhysicsShape.h */; }; @@ -1300,7 +922,6 @@ 5034CA2F191D591100CE6051 /* ccShader_PositionTexture.vert in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA02191D591000CE6051 /* ccShader_PositionTexture.vert */; }; 5034CA30191D591100CE6051 /* ccShader_PositionTexture.vert in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA02191D591000CE6051 /* ccShader_PositionTexture.vert */; }; 5034CA31191D591100CE6051 /* ccShader_PositionTexture_uColor.vert in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA03191D591000CE6051 /* ccShader_PositionTexture_uColor.vert */; }; - 5034CA32191D591100CE6051 /* ccShader_PositionTexture_uColor.vert in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA03191D591000CE6051 /* ccShader_PositionTexture_uColor.vert */; }; 5034CA33191D591100CE6051 /* ccShader_PositionTexture_uColor.frag in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA04191D591000CE6051 /* ccShader_PositionTexture_uColor.frag */; }; 5034CA34191D591100CE6051 /* ccShader_PositionTexture_uColor.frag in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA04191D591000CE6051 /* ccShader_PositionTexture_uColor.frag */; }; 5034CA35191D591100CE6051 /* ccShader_PositionTexture.frag in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA05191D591000CE6051 /* ccShader_PositionTexture.frag */; }; @@ -1339,8 +960,8 @@ 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 */; }; + 503DD8EC1926736A00CD74DD /* CCGLViewImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = 503DD8DA1926736A00CD74DD /* CCGLViewImpl.h */; }; + 503DD8ED1926736A00CD74DD /* CCGLViewImpl.mm in Sources */ = {isa = PBXBuildFile; fileRef = 503DD8DB1926736A00CD74DD /* CCGLViewImpl.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 */; }; @@ -1665,10 +1286,10 @@ 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 */; }; + 50ABC0111926664800A911A9 /* CCGLView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBF251926664700A911A9 /* CCGLView.cpp */; }; + 50ABC0121926664800A911A9 /* CCGLView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBF251926664700A911A9 /* CCGLView.cpp */; }; + 50ABC0131926664800A911A9 /* CCGLView.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBF261926664700A911A9 /* CCGLView.h */; }; + 50ABC0141926664800A911A9 /* CCGLView.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBF261926664700A911A9 /* CCGLView.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 */; }; @@ -1681,8 +1302,8 @@ 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 */; }; + 50ABC0211926664800A911A9 /* CCGLViewImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBF2E1926664700A911A9 /* CCGLViewImpl.cpp */; }; + 50ABC0231926664800A911A9 /* CCGLViewImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBF2F1926664700A911A9 /* CCGLViewImpl.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 */; }; @@ -1690,81 +1311,23 @@ 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 */; }; - 50E6D31118DAF01E0051CA34 /* CCProtectedNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 50E6D30D18DADB5D0051CA34 /* CCProtectedNode.h */; }; - 50E6D33418E174130051CA34 /* UIHBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50E6D32E18E174130051CA34 /* UIHBox.cpp */; }; - 50E6D33518E174130051CA34 /* UIHBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50E6D32E18E174130051CA34 /* UIHBox.cpp */; }; - 50E6D33618E174130051CA34 /* UIHBox.h in Headers */ = {isa = PBXBuildFile; fileRef = 50E6D32F18E174130051CA34 /* UIHBox.h */; }; - 50E6D33718E174130051CA34 /* UIHBox.h in Headers */ = {isa = PBXBuildFile; fileRef = 50E6D32F18E174130051CA34 /* UIHBox.h */; }; - 50E6D33818E174130051CA34 /* UIRelativeBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50E6D33018E174130051CA34 /* UIRelativeBox.cpp */; }; - 50E6D33918E174130051CA34 /* UIRelativeBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50E6D33018E174130051CA34 /* UIRelativeBox.cpp */; }; - 50E6D33A18E174130051CA34 /* UIRelativeBox.h in Headers */ = {isa = PBXBuildFile; fileRef = 50E6D33118E174130051CA34 /* UIRelativeBox.h */; }; - 50E6D33B18E174130051CA34 /* UIRelativeBox.h in Headers */ = {isa = PBXBuildFile; fileRef = 50E6D33118E174130051CA34 /* UIRelativeBox.h */; }; - 50E6D33C18E174130051CA34 /* UIVBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50E6D33218E174130051CA34 /* UIVBox.cpp */; }; - 50E6D33D18E174130051CA34 /* UIVBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50E6D33218E174130051CA34 /* UIVBox.cpp */; }; - 50E6D33E18E174130051CA34 /* UIVBox.h in Headers */ = {isa = PBXBuildFile; fileRef = 50E6D33318E174130051CA34 /* UIVBox.h */; }; - 50E6D33F18E174130051CA34 /* UIVBox.h in Headers */ = {isa = PBXBuildFile; fileRef = 50E6D33318E174130051CA34 /* UIVBox.h */; }; - 50FCEB9318C72017004AD434 /* ButtonReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB6A18C72017004AD434 /* ButtonReader.cpp */; }; - 50FCEB9418C72017004AD434 /* ButtonReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB6A18C72017004AD434 /* ButtonReader.cpp */; }; - 50FCEB9518C72017004AD434 /* ButtonReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB6B18C72017004AD434 /* ButtonReader.h */; }; - 50FCEB9618C72017004AD434 /* ButtonReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB6B18C72017004AD434 /* ButtonReader.h */; }; - 50FCEB9718C72017004AD434 /* CheckBoxReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB6D18C72017004AD434 /* CheckBoxReader.cpp */; }; - 50FCEB9818C72017004AD434 /* CheckBoxReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB6D18C72017004AD434 /* CheckBoxReader.cpp */; }; - 50FCEB9918C72017004AD434 /* CheckBoxReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB6E18C72017004AD434 /* CheckBoxReader.h */; }; - 50FCEB9A18C72017004AD434 /* CheckBoxReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB6E18C72017004AD434 /* CheckBoxReader.h */; }; - 50FCEB9B18C72017004AD434 /* ImageViewReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB7018C72017004AD434 /* ImageViewReader.cpp */; }; - 50FCEB9C18C72017004AD434 /* ImageViewReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB7018C72017004AD434 /* ImageViewReader.cpp */; }; - 50FCEB9D18C72017004AD434 /* ImageViewReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB7118C72017004AD434 /* ImageViewReader.h */; }; - 50FCEB9E18C72017004AD434 /* ImageViewReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB7118C72017004AD434 /* ImageViewReader.h */; }; - 50FCEB9F18C72017004AD434 /* LayoutReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB7318C72017004AD434 /* LayoutReader.cpp */; }; - 50FCEBA018C72017004AD434 /* LayoutReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB7318C72017004AD434 /* LayoutReader.cpp */; }; - 50FCEBA118C72017004AD434 /* LayoutReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB7418C72017004AD434 /* LayoutReader.h */; }; - 50FCEBA218C72017004AD434 /* LayoutReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB7418C72017004AD434 /* LayoutReader.h */; }; - 50FCEBA318C72017004AD434 /* ListViewReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB7618C72017004AD434 /* ListViewReader.cpp */; }; - 50FCEBA418C72017004AD434 /* ListViewReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB7618C72017004AD434 /* ListViewReader.cpp */; }; - 50FCEBA518C72017004AD434 /* ListViewReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB7718C72017004AD434 /* ListViewReader.h */; }; - 50FCEBA618C72017004AD434 /* ListViewReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB7718C72017004AD434 /* ListViewReader.h */; }; - 50FCEBA718C72017004AD434 /* LoadingBarReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB7918C72017004AD434 /* LoadingBarReader.cpp */; }; - 50FCEBA818C72017004AD434 /* LoadingBarReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB7918C72017004AD434 /* LoadingBarReader.cpp */; }; - 50FCEBA918C72017004AD434 /* LoadingBarReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB7A18C72017004AD434 /* LoadingBarReader.h */; }; - 50FCEBAA18C72017004AD434 /* LoadingBarReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB7A18C72017004AD434 /* LoadingBarReader.h */; }; - 50FCEBAB18C72017004AD434 /* PageViewReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB7C18C72017004AD434 /* PageViewReader.cpp */; }; - 50FCEBAC18C72017004AD434 /* PageViewReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB7C18C72017004AD434 /* PageViewReader.cpp */; }; - 50FCEBAD18C72017004AD434 /* PageViewReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB7D18C72017004AD434 /* PageViewReader.h */; }; - 50FCEBAE18C72017004AD434 /* PageViewReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB7D18C72017004AD434 /* PageViewReader.h */; }; - 50FCEBAF18C72017004AD434 /* ScrollViewReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB7F18C72017004AD434 /* ScrollViewReader.cpp */; }; - 50FCEBB018C72017004AD434 /* ScrollViewReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB7F18C72017004AD434 /* ScrollViewReader.cpp */; }; - 50FCEBB118C72017004AD434 /* ScrollViewReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB8018C72017004AD434 /* ScrollViewReader.h */; }; - 50FCEBB218C72017004AD434 /* ScrollViewReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB8018C72017004AD434 /* ScrollViewReader.h */; }; - 50FCEBB318C72017004AD434 /* SliderReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB8218C72017004AD434 /* SliderReader.cpp */; }; - 50FCEBB418C72017004AD434 /* SliderReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB8218C72017004AD434 /* SliderReader.cpp */; }; - 50FCEBB518C72017004AD434 /* SliderReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB8318C72017004AD434 /* SliderReader.h */; }; - 50FCEBB618C72017004AD434 /* SliderReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB8318C72017004AD434 /* SliderReader.h */; }; - 50FCEBB718C72017004AD434 /* TextAtlasReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB8518C72017004AD434 /* TextAtlasReader.cpp */; }; - 50FCEBB818C72017004AD434 /* TextAtlasReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB8518C72017004AD434 /* TextAtlasReader.cpp */; }; - 50FCEBB918C72017004AD434 /* TextAtlasReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB8618C72017004AD434 /* TextAtlasReader.h */; }; - 50FCEBBA18C72017004AD434 /* TextAtlasReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB8618C72017004AD434 /* TextAtlasReader.h */; }; - 50FCEBBB18C72017004AD434 /* TextBMFontReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB8818C72017004AD434 /* TextBMFontReader.cpp */; }; - 50FCEBBC18C72017004AD434 /* TextBMFontReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB8818C72017004AD434 /* TextBMFontReader.cpp */; }; - 50FCEBBD18C72017004AD434 /* TextBMFontReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB8918C72017004AD434 /* TextBMFontReader.h */; }; - 50FCEBBE18C72017004AD434 /* TextBMFontReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB8918C72017004AD434 /* TextBMFontReader.h */; }; - 50FCEBBF18C72017004AD434 /* TextFieldReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB8B18C72017004AD434 /* TextFieldReader.cpp */; }; - 50FCEBC018C72017004AD434 /* TextFieldReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB8B18C72017004AD434 /* TextFieldReader.cpp */; }; - 50FCEBC118C72017004AD434 /* TextFieldReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB8C18C72017004AD434 /* TextFieldReader.h */; }; - 50FCEBC218C72017004AD434 /* TextFieldReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB8C18C72017004AD434 /* TextFieldReader.h */; }; - 50FCEBC318C72017004AD434 /* TextReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB8E18C72017004AD434 /* TextReader.cpp */; }; - 50FCEBC418C72017004AD434 /* TextReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB8E18C72017004AD434 /* TextReader.cpp */; }; - 50FCEBC518C72017004AD434 /* TextReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB8F18C72017004AD434 /* TextReader.h */; }; - 50FCEBC618C72017004AD434 /* TextReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB8F18C72017004AD434 /* TextReader.h */; }; - 50FCEBC718C72017004AD434 /* WidgetReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB9018C72017004AD434 /* WidgetReader.cpp */; }; - 50FCEBC818C72017004AD434 /* WidgetReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB9018C72017004AD434 /* WidgetReader.cpp */; }; - 50FCEBC918C72017004AD434 /* WidgetReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB9118C72017004AD434 /* WidgetReader.h */; }; - 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 */; }; A07A4CAF1783777C0073F6A7 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1551A342158F2AB200E66CFE /* Foundation.framework */; }; + B2165EEA19921124000BE3E6 /* CCPrimitiveCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B257B45E198A353E00D9A687 /* CCPrimitiveCommand.cpp */; }; + B217703C1977ECB4009EE11B /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B217703B1977ECB4009EE11B /* IOKit.framework */; }; + B21770401977ECE6009EE11B /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B217703F1977ECE6009EE11B /* OpenGL.framework */; }; + B21770421977ECF8009EE11B /* ApplicationServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B21770411977ECF8009EE11B /* ApplicationServices.framework */; }; + B21770451977ED14009EE11B /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B21770431977ED07009EE11B /* Cocoa.framework */; }; + B21770471977ED34009EE11B /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B21770461977ED34009EE11B /* QuartzCore.framework */; }; + B21770491977ED4C009EE11B /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = B21770481977ED4C009EE11B /* libz.dylib */; }; + B217704E1977ED9F009EE11B /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = B217704C1977ED8B009EE11B /* libsqlite3.dylib */; }; + B244F3071976871800ED1926 /* HttpClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AAF5363180E3374000584C8 /* HttpClient.h */; }; + B244F3081976871C00ED1926 /* HttpResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AAF5365180E3374000584C8 /* HttpResponse.h */; }; + B244F3091976871F00ED1926 /* SocketIO.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AAF5367180E3374000584C8 /* SocketIO.h */; }; + B244F30A1976872C00ED1926 /* WebSocket.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AAF5369180E3374000584C8 /* WebSocket.h */; }; + B244F30B1976873300ED1926 /* HttpRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AAF5364180E3374000584C8 /* HttpRequest.h */; }; + B244F30C1976874300ED1926 /* HttpClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AAF5362180E3374000584C8 /* HttpClient.cpp */; }; + B244F30E1976875100ED1926 /* SocketIO.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AAF5366180E3374000584C8 /* SocketIO.cpp */; }; + B244F30F1976875300ED1926 /* WebSocket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AAF5368180E3374000584C8 /* WebSocket.cpp */; }; B24AA985195A675C007B4522 /* CCFastTMXLayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B24AA981195A675C007B4522 /* CCFastTMXLayer.cpp */; }; B24AA986195A675C007B4522 /* CCFastTMXLayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B24AA981195A675C007B4522 /* CCFastTMXLayer.cpp */; }; B24AA987195A675C007B4522 /* CCFastTMXLayer.h in Headers */ = {isa = PBXBuildFile; fileRef = B24AA982195A675C007B4522 /* CCFastTMXLayer.h */; }; @@ -1773,28 +1336,555 @@ B24AA98A195A675C007B4522 /* CCFastTMXTiledMap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B24AA983195A675C007B4522 /* CCFastTMXTiledMap.cpp */; }; B24AA98B195A675C007B4522 /* CCFastTMXTiledMap.h in Headers */ = {isa = PBXBuildFile; fileRef = B24AA984195A675C007B4522 /* CCFastTMXTiledMap.h */; }; B24AA98C195A675C007B4522 /* CCFastTMXTiledMap.h in Headers */ = {isa = PBXBuildFile; fileRef = B24AA984195A675C007B4522 /* CCFastTMXTiledMap.h */; }; + B257B44E1989D5E800D9A687 /* CCPrimitive.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B257B44C1989D5E800D9A687 /* CCPrimitive.cpp */; }; + B257B44F1989D5E800D9A687 /* CCPrimitive.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B257B44C1989D5E800D9A687 /* CCPrimitive.cpp */; }; + B257B4501989D5E800D9A687 /* CCPrimitive.h in Headers */ = {isa = PBXBuildFile; fileRef = B257B44D1989D5E800D9A687 /* CCPrimitive.h */; }; + B257B4511989D5E800D9A687 /* CCPrimitive.h in Headers */ = {isa = PBXBuildFile; fileRef = B257B44D1989D5E800D9A687 /* CCPrimitive.h */; }; + B257B460198A353E00D9A687 /* CCPrimitiveCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B257B45E198A353E00D9A687 /* CCPrimitiveCommand.cpp */; }; + B257B461198A353E00D9A687 /* CCPrimitiveCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = B257B45F198A353E00D9A687 /* CCPrimitiveCommand.h */; }; + B276EF5F1988D1D500CD400F /* CCVertexIndexData.h in Headers */ = {isa = PBXBuildFile; fileRef = B276EF5B1988D1D500CD400F /* CCVertexIndexData.h */; }; + B276EF601988D1D500CD400F /* CCVertexIndexData.h in Headers */ = {isa = PBXBuildFile; fileRef = B276EF5B1988D1D500CD400F /* CCVertexIndexData.h */; }; + B276EF611988D1D500CD400F /* CCVertexIndexData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B276EF5C1988D1D500CD400F /* CCVertexIndexData.cpp */; }; + B276EF621988D1D500CD400F /* CCVertexIndexData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B276EF5C1988D1D500CD400F /* CCVertexIndexData.cpp */; }; + B276EF631988D1D500CD400F /* CCVertexIndexBuffer.h in Headers */ = {isa = PBXBuildFile; fileRef = B276EF5D1988D1D500CD400F /* CCVertexIndexBuffer.h */; }; + B276EF641988D1D500CD400F /* CCVertexIndexBuffer.h in Headers */ = {isa = PBXBuildFile; fileRef = B276EF5D1988D1D500CD400F /* CCVertexIndexBuffer.h */; }; + B276EF651988D1D500CD400F /* CCVertexIndexBuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B276EF5E1988D1D500CD400F /* CCVertexIndexBuffer.cpp */; }; + B276EF661988D1D500CD400F /* CCVertexIndexBuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B276EF5E1988D1D500CD400F /* CCVertexIndexBuffer.cpp */; }; + B27AEE0219768934008BD575 /* libwebsockets.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AAF5384180E35A3000584C8 /* libwebsockets.a */; }; + B282B4801980E08F00666787 /* CCEditBoxImplMac.h in Headers */ = {isa = PBXBuildFile; fileRef = B282B47D1980E02B00666787 /* CCEditBoxImplMac.h */; }; + B282B4811980E0A300666787 /* CCEditBoxImplMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = B282B47C1980E02B00666787 /* CCEditBoxImplMac.mm */; }; 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 /* CCSprite3DMaterial.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B29594BF1926D61F003EEF37 /* CCSprite3DMaterial.cpp */; }; - B29594CF1926D61F003EEF37 /* CCSprite3DMaterial.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B29594BF1926D61F003EEF37 /* CCSprite3DMaterial.cpp */; }; - B29594D01926D61F003EEF37 /* CCSprite3DMaterial.h in Headers */ = {isa = PBXBuildFile; fileRef = B29594C01926D61F003EEF37 /* CCSprite3DMaterial.h */; }; - B29594D11926D61F003EEF37 /* CCSprite3DMaterial.h in Headers */ = {isa = PBXBuildFile; fileRef = B29594C01926D61F003EEF37 /* CCSprite3DMaterial.h */; }; - B2D3D3B91948613300BA4831 /* CCBundle3DData.h in Headers */ = {isa = PBXBuildFile; fileRef = B2D3D3B81948613300BA4831 /* CCBundle3DData.h */; }; - B2D3D3BA1948613300BA4831 /* CCBundle3DData.h in Headers */ = {isa = PBXBuildFile; fileRef = B2D3D3B81948613300BA4831 /* CCBundle3DData.h */; }; + B2C599BF1977703300B452DF /* CCBAnimationManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71CFB180E26E600808F54 /* CCBAnimationManager.h */; }; + B2C599C01977703300B452DF /* CCBFileLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71CFD180E26E600808F54 /* CCBFileLoader.h */; }; + B2C599C11977703300B452DF /* CCBKeyframe.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71CFF180E26E600808F54 /* CCBKeyframe.h */; }; + B2C599C21977703300B452DF /* CCBMemberVariableAssigner.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D00180E26E600808F54 /* CCBMemberVariableAssigner.h */; }; + B2C599C31977703300B452DF /* CCBReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D02180E26E600808F54 /* CCBReader.h */; }; + B2C599C41977703300B452DF /* CCBSelectorResolver.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D03180E26E600808F54 /* CCBSelectorResolver.h */; }; + B2C599C51977703300B452DF /* CCBSequence.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D05180E26E600808F54 /* CCBSequence.h */; }; + B2C599C61977703300B452DF /* CCBSequenceProperty.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D07180E26E600808F54 /* CCBSequenceProperty.h */; }; + B2C599C71977703300B452DF /* CCControlButtonLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D0B180E26E600808F54 /* CCControlButtonLoader.h */; }; + B2C599C81977703300B452DF /* CCControlLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D0D180E26E600808F54 /* CCControlLoader.h */; }; + B2C599C91977703300B452DF /* CCLabelBMFontLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D0F180E26E600808F54 /* CCLabelBMFontLoader.h */; }; + B2C599CA1977703300B452DF /* CCLabelTTFLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D11180E26E600808F54 /* CCLabelTTFLoader.h */; }; + B2C599CB1977703300B452DF /* CCLayerColorLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D13180E26E600808F54 /* CCLayerColorLoader.h */; }; + B2C599CC1977703300B452DF /* CCLayerGradientLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D15180E26E600808F54 /* CCLayerGradientLoader.h */; }; + B2C599CD1977703300B452DF /* CCLayerLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D17180E26E600808F54 /* CCLayerLoader.h */; }; + B2C599CE1977703300B452DF /* CCMenuItemImageLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D19180E26E600808F54 /* CCMenuItemImageLoader.h */; }; + B2C599CF1977703300B452DF /* CCMenuItemLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D1B180E26E600808F54 /* CCMenuItemLoader.h */; }; + B2C599D01977703300B452DF /* CCMenuLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D1C180E26E600808F54 /* CCMenuLoader.h */; }; + B2C599D11977703300B452DF /* CCNode+CCBRelativePositioning.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D1E180E26E600808F54 /* CCNode+CCBRelativePositioning.h */; }; + B2C599D21977703300B452DF /* CCNodeLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D20180E26E600808F54 /* CCNodeLoader.h */; }; + B2C599D31977703300B452DF /* CCNodeLoaderLibrary.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D22180E26E600808F54 /* CCNodeLoaderLibrary.h */; }; + B2C599D41977703300B452DF /* CCNodeLoaderListener.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D23180E26E600808F54 /* CCNodeLoaderListener.h */; }; + B2C599D51977703300B452DF /* CCParticleSystemQuadLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D25180E26E600808F54 /* CCParticleSystemQuadLoader.h */; }; + B2C599D61977703300B452DF /* CCScale9SpriteLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D27180E26E600808F54 /* CCScale9SpriteLoader.h */; }; + B2C599D71977703300B452DF /* CCScrollViewLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D29180E26E600808F54 /* CCScrollViewLoader.h */; }; + B2C599D81977703300B452DF /* CCSpriteLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D2B180E26E600808F54 /* CCSpriteLoader.h */; }; + B2C599D91977703300B452DF /* CocosBuilder.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D2C180E26E600808F54 /* CocosBuilder.h */; }; + B2C59A061977706500B452DF /* CCBAnimationManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71CFA180E26E600808F54 /* CCBAnimationManager.cpp */; }; + B2C59A071977706500B452DF /* CCBFileLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71CFC180E26E600808F54 /* CCBFileLoader.cpp */; }; + B2C59A081977706500B452DF /* CCBKeyframe.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71CFE180E26E600808F54 /* CCBKeyframe.cpp */; }; + B2C59A091977706500B452DF /* CCBReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D01180E26E600808F54 /* CCBReader.cpp */; }; + B2C59A0A1977706500B452DF /* CCBSequence.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D04180E26E600808F54 /* CCBSequence.cpp */; }; + B2C59A0B1977706500B452DF /* CCBSequenceProperty.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D06180E26E600808F54 /* CCBSequenceProperty.cpp */; }; + B2C59A0C1977706500B452DF /* CCControlButtonLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D0A180E26E600808F54 /* CCControlButtonLoader.cpp */; }; + B2C59A0D1977706500B452DF /* CCControlLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D0C180E26E600808F54 /* CCControlLoader.cpp */; }; + B2C59A0E1977706500B452DF /* CCLabelBMFontLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D0E180E26E600808F54 /* CCLabelBMFontLoader.cpp */; }; + B2C59A0F1977706500B452DF /* CCLabelTTFLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D10180E26E600808F54 /* CCLabelTTFLoader.cpp */; }; + B2C59A101977706500B452DF /* CCLayerColorLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D12180E26E600808F54 /* CCLayerColorLoader.cpp */; }; + B2C59A111977706500B452DF /* CCLayerGradientLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D14180E26E600808F54 /* CCLayerGradientLoader.cpp */; }; + B2C59A121977706500B452DF /* CCLayerLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D16180E26E600808F54 /* CCLayerLoader.cpp */; }; + B2C59A131977706500B452DF /* CCMenuItemImageLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D18180E26E600808F54 /* CCMenuItemImageLoader.cpp */; }; + B2C59A141977706500B452DF /* CCMenuItemLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D1A180E26E600808F54 /* CCMenuItemLoader.cpp */; }; + B2C59A151977706500B452DF /* CCNode+CCBRelativePositioning.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D1D180E26E600808F54 /* CCNode+CCBRelativePositioning.cpp */; }; + B2C59A161977706500B452DF /* CCNodeLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D1F180E26E600808F54 /* CCNodeLoader.cpp */; }; + B2C59A171977706500B452DF /* CCNodeLoaderLibrary.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D21180E26E600808F54 /* CCNodeLoaderLibrary.cpp */; }; + B2C59A181977706500B452DF /* CCParticleSystemQuadLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D24180E26E600808F54 /* CCParticleSystemQuadLoader.cpp */; }; + B2C59A191977706500B452DF /* CCScale9SpriteLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D26180E26E600808F54 /* CCScale9SpriteLoader.cpp */; }; + B2C59A1A1977706500B452DF /* CCScrollViewLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D28180E26E600808F54 /* CCScrollViewLoader.cpp */; }; + B2C59A1B1977706500B452DF /* CCSpriteLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D2A180E26E600808F54 /* CCSpriteLoader.cpp */; }; + B2C59A1C19777E7500B452DF /* UIListView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905F9FE18CF08D000240AA3 /* UIListView.cpp */; }; + B2C59A1D19777E7500B452DF /* UILoadingBar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905FA0018CF08D000240AA3 /* UILoadingBar.cpp */; }; + B2C59A1E19777E7500B452DF /* UIPageView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905FA0218CF08D000240AA3 /* UIPageView.cpp */; }; + B2C59A1F19777E7500B452DF /* UIRichText.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905FA0418CF08D000240AA3 /* UIRichText.cpp */; }; + B2C59A2019777E7500B452DF /* UIScrollView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905FA0718CF08D000240AA3 /* UIScrollView.cpp */; }; + B2C59A2119777E7500B452DF /* UISlider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905FA0918CF08D000240AA3 /* UISlider.cpp */; }; + B2C59A2219777E7500B452DF /* UIText.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905FA0B18CF08D100240AA3 /* UIText.cpp */; }; + B2C59A2319777E7500B452DF /* UITextAtlas.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905FA0D18CF08D100240AA3 /* UITextAtlas.cpp */; }; + B2C59A2419777E7500B452DF /* UITextBMFont.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905FA0F18CF08D100240AA3 /* UITextBMFont.cpp */; }; + B2C59A2519777E7500B452DF /* UITextField.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905FA1118CF08D100240AA3 /* UITextField.cpp */; }; + B2C59A2619777E7500B452DF /* UIButton.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905F9F018CF08D000240AA3 /* UIButton.cpp */; }; + B2C59A2719777E7500B452DF /* UICheckBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905F9F218CF08D000240AA3 /* UICheckBox.cpp */; }; + B2C59A2819777E7500B452DF /* UIImageView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905F9F618CF08D000240AA3 /* UIImageView.cpp */; }; + B2C59A2919777E7A00B452DF /* CocosGUI.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905F9E918CF08D000240AA3 /* CocosGUI.cpp */; }; + B2C59A2A19777E8300B452DF /* UIDeprecated.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29BDBA52195D597A003225C9 /* UIDeprecated.cpp */; }; + B2C59A2B19777E8300B452DF /* UIWidget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905FA1318CF08D100240AA3 /* UIWidget.cpp */; }; + B2C59A2D19777E8300B452DF /* UIHelper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905F9F418CF08D000240AA3 /* UIHelper.cpp */; }; + B2C59A2E19777E8C00B452DF /* UIHBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50E6D32E18E174130051CA34 /* UIHBox.cpp */; }; + B2C59A2F19777E8C00B452DF /* UIRelativeBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50E6D33018E174130051CA34 /* UIRelativeBox.cpp */; }; + B2C59A3019777E8C00B452DF /* UIVBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50E6D33218E174130051CA34 /* UIVBox.cpp */; }; + B2C59A3119777E8C00B452DF /* UILayout.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905F9F818CF08D000240AA3 /* UILayout.cpp */; }; + B2C59A3219777E8C00B452DF /* UILayoutParameter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905F9FC18CF08D000240AA3 /* UILayoutParameter.cpp */; }; + B2C59A3319777E8C00B452DF /* UILayoutManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29CB8F4A1929D1BB00C841D6 /* UILayoutManager.cpp */; }; + B2C59A3419777EB600B452DF /* UIListView.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905F9FF18CF08D000240AA3 /* UIListView.h */; }; + B2C59A3519777EB600B452DF /* UILoadingBar.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905FA0118CF08D000240AA3 /* UILoadingBar.h */; }; + B2C59A3619777EB600B452DF /* UIPageView.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905FA0318CF08D000240AA3 /* UIPageView.h */; }; + B2C59A3719777EB600B452DF /* UIRichText.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905FA0518CF08D000240AA3 /* UIRichText.h */; }; + B2C59A3819777EB600B452DF /* UIScrollView.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905FA0818CF08D000240AA3 /* UIScrollView.h */; }; + B2C59A3919777EB600B452DF /* UISlider.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905FA0A18CF08D100240AA3 /* UISlider.h */; }; + B2C59A3A19777EB600B452DF /* UIText.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905FA0C18CF08D100240AA3 /* UIText.h */; }; + B2C59A3B19777EB600B452DF /* UITextAtlas.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905FA0E18CF08D100240AA3 /* UITextAtlas.h */; }; + B2C59A3C19777EB600B452DF /* UITextBMFont.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905FA1018CF08D100240AA3 /* UITextBMFont.h */; }; + B2C59A3D19777EB600B452DF /* UITextField.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905FA1218CF08D100240AA3 /* UITextField.h */; }; + B2C59A3E19777EB600B452DF /* UIButton.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905F9F118CF08D000240AA3 /* UIButton.h */; }; + B2C59A3F19777EB600B452DF /* UICheckBox.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905F9F318CF08D000240AA3 /* UICheckBox.h */; }; + B2C59A4019777EB600B452DF /* UIImageView.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905F9F718CF08D000240AA3 /* UIImageView.h */; }; + B2C59A4119777EBC00B452DF /* UIVideoPlayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 3EA0FB69191C841D00B170C8 /* UIVideoPlayer.h */; }; + B2C59A4219777EC700B452DF /* UIDeprecated.h in Headers */ = {isa = PBXBuildFile; fileRef = 29080DEB191B82CE0066F8DF /* UIDeprecated.h */; }; + B2C59A4319777EC700B452DF /* UIWidget.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905FA1418CF08D100240AA3 /* UIWidget.h */; }; + B2C59A4519777EC700B452DF /* UIHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905F9F518CF08D000240AA3 /* UIHelper.h */; }; + B2C59A4619777EC700B452DF /* GUIDefine.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905F9EB18CF08D000240AA3 /* GUIDefine.h */; }; + B2C59A4719777ECF00B452DF /* UIHBox.h in Headers */ = {isa = PBXBuildFile; fileRef = 50E6D32F18E174130051CA34 /* UIHBox.h */; }; + B2C59A4819777ECF00B452DF /* UIRelativeBox.h in Headers */ = {isa = PBXBuildFile; fileRef = 50E6D33118E174130051CA34 /* UIRelativeBox.h */; }; + B2C59A4919777ECF00B452DF /* UIVBox.h in Headers */ = {isa = PBXBuildFile; fileRef = 50E6D33318E174130051CA34 /* UIVBox.h */; }; + B2C59A4A19777ECF00B452DF /* UILayout.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905F9F918CF08D000240AA3 /* UILayout.h */; }; + B2C59A4B19777ECF00B452DF /* UILayoutParameter.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905F9FD18CF08D000240AA3 /* UILayoutParameter.h */; }; + B2C59A4C19777ECF00B452DF /* UILayoutManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 29CB8F4B1929D1BB00C841D6 /* UILayoutManager.h */; }; + B2C59A4D19777F8A00B452DF /* CocoLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 29E99D1D1957BA7000046604 /* CocoLoader.h */; }; + B2C59A4E19777F9200B452DF /* CCActionTimeline.h in Headers */ = {isa = PBXBuildFile; fileRef = 0634A4C6194B19E400E608AF /* CCActionTimeline.h */; }; + B2C59A4F19777F9200B452DF /* CCActionTimelineCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 0634A4C8194B19E400E608AF /* CCActionTimelineCache.h */; }; + B2C59A5019777F9200B452DF /* CCFrame.h in Headers */ = {isa = PBXBuildFile; fileRef = 0634A4CA194B19E400E608AF /* CCFrame.h */; }; + B2C59A5119777F9200B452DF /* CCNodeReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 0634A4CC194B19E400E608AF /* CCNodeReader.h */; }; + B2C59A5219777F9200B452DF /* CCTimeLine.h in Headers */ = {isa = PBXBuildFile; fileRef = 0634A4CE194B19E400E608AF /* CCTimeLine.h */; }; + B2C59A5319777F9200B452DF /* CCTimelineMacro.h in Headers */ = {isa = PBXBuildFile; fileRef = 0634A4CF194B19E400E608AF /* CCTimelineMacro.h */; }; + B2C59A5419777F9700B452DF /* ButtonReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB6B18C72017004AD434 /* ButtonReader.h */; }; + B2C59A5519777F9800B452DF /* CheckBoxReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB6E18C72017004AD434 /* CheckBoxReader.h */; }; + B2C59A5619777FC200B452DF /* ImageViewReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB7118C72017004AD434 /* ImageViewReader.h */; }; + B2C59A5719777FC200B452DF /* LayoutReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB7418C72017004AD434 /* LayoutReader.h */; }; + B2C59A5819777FC200B452DF /* ListViewReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB7718C72017004AD434 /* ListViewReader.h */; }; + B2C59A5919777FC200B452DF /* LoadingBarReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB7A18C72017004AD434 /* LoadingBarReader.h */; }; + B2C59A5A19777FC200B452DF /* PageViewReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB7D18C72017004AD434 /* PageViewReader.h */; }; + B2C59A5B19777FC200B452DF /* ScrollViewReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB8018C72017004AD434 /* ScrollViewReader.h */; }; + B2C59A5C19777FC200B452DF /* SliderReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB8318C72017004AD434 /* SliderReader.h */; }; + B2C59A5D19777FC200B452DF /* TextAtlasReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB8618C72017004AD434 /* TextAtlasReader.h */; }; + B2C59A5E19777FC200B452DF /* TextBMFontReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB8918C72017004AD434 /* TextBMFontReader.h */; }; + B2C59A5F19777FC200B452DF /* TextFieldReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB8C18C72017004AD434 /* TextFieldReader.h */; }; + B2C59A6019777FC200B452DF /* TextReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB8F18C72017004AD434 /* TextReader.h */; }; + B2C59A6119777FC200B452DF /* WidgetReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB9118C72017004AD434 /* WidgetReader.h */; }; + B2C59A6219777FC200B452DF /* WidgetReaderProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB9218C72017004AD434 /* WidgetReaderProtocol.h */; }; + B2C59A6319777FD000B452DF /* TriggerObj.h in Headers */ = {isa = PBXBuildFile; fileRef = 06CAAAC1186AD63B0012A414 /* TriggerObj.h */; }; + B2C59A6419777FD000B452DF /* TriggerBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 06CAAABD186AD63B0012A414 /* TriggerBase.h */; }; + B2C59A6519777FD000B452DF /* TriggerMng.h in Headers */ = {isa = PBXBuildFile; fileRef = 06CAAABF186AD63B0012A414 /* TriggerMng.h */; }; + B2C59A6619777FD000B452DF /* CCActionFrame.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5949180E930E00EF57C3 /* CCActionFrame.h */; }; + B2C59A6719777FD000B452DF /* CCActionFrameEasing.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C594B180E930E00EF57C3 /* CCActionFrameEasing.h */; }; + B2C59A6819777FD000B452DF /* CCActionManagerEx.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C594D180E930E00EF57C3 /* CCActionManagerEx.h */; }; + B2C59A6919777FD000B452DF /* CCActionNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C594F180E930E00EF57C3 /* CCActionNode.h */; }; + B2C59A6A19777FD000B452DF /* CCActionObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5951180E930E00EF57C3 /* CCActionObject.h */; }; + B2C59A6B19777FD000B452DF /* CCArmature.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5953180E930E00EF57C3 /* CCArmature.h */; }; + B2C59A6C19777FD000B452DF /* CCArmatureAnimation.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5955180E930E00EF57C3 /* CCArmatureAnimation.h */; }; + B2C59A6D19777FD000B452DF /* CCArmatureDataManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5957180E930E00EF57C3 /* CCArmatureDataManager.h */; }; + B2C59A6E19777FD000B452DF /* CCArmatureDefine.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5959180E930E00EF57C3 /* CCArmatureDefine.h */; }; + B2C59A6F19777FD000B452DF /* CCBatchNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C595B180E930E00EF57C3 /* CCBatchNode.h */; }; + B2C59A7019777FD000B452DF /* CCBone.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C595D180E930E00EF57C3 /* CCBone.h */; }; + B2C59A7119777FD000B452DF /* CCColliderDetector.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C595F180E930E00EF57C3 /* CCColliderDetector.h */; }; + B2C59A7219777FD000B452DF /* CCComBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 373B910718787C0B00198F86 /* CCComBase.h */; }; + B2C59A7319777FD000B452DF /* CCComAttribute.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5961180E930E00EF57C3 /* CCComAttribute.h */; }; + B2C59A7419777FD000B452DF /* CCComAudio.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5963180E930E00EF57C3 /* CCComAudio.h */; }; + B2C59A7519777FD000B452DF /* CCComController.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5965180E930E00EF57C3 /* CCComController.h */; }; + B2C59A7619777FD000B452DF /* CCComRender.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5967180E930E00EF57C3 /* CCComRender.h */; }; + B2C59A7719777FD000B452DF /* CCDataReaderHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5969180E930E00EF57C3 /* CCDataReaderHelper.h */; }; + B2C59A7819777FD000B452DF /* CCDatas.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C596B180E930E00EF57C3 /* CCDatas.h */; }; + B2C59A7919777FD000B452DF /* CCDecorativeDisplay.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C596D180E930E00EF57C3 /* CCDecorativeDisplay.h */; }; + B2C59A7A19777FD000B452DF /* CCDisplayFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C596F180E930E00EF57C3 /* CCDisplayFactory.h */; }; + B2C59A7B19777FD000B452DF /* CCDisplayManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5971180E930E00EF57C3 /* CCDisplayManager.h */; }; + B2C59A7C19777FD000B452DF /* CCInputDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5973180E930E00EF57C3 /* CCInputDelegate.h */; }; + B2C59A7D19777FD000B452DF /* CCProcessBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5975180E930E00EF57C3 /* CCProcessBase.h */; }; + B2C59A7E19777FD100B452DF /* CCSGUIReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5977180E930E00EF57C3 /* CCSGUIReader.h */; }; + B2C59A7F19777FD100B452DF /* CCSkin.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5979180E930E00EF57C3 /* CCSkin.h */; }; + B2C59A8019777FD100B452DF /* CCSpriteFrameCacheHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C597B180E930E00EF57C3 /* CCSpriteFrameCacheHelper.h */; }; + B2C59A8119777FD100B452DF /* CCSSceneReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C597D180E930E00EF57C3 /* CCSSceneReader.h */; }; + B2C59A8219777FD100B452DF /* CCTransformHelp.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C597F180E930E00EF57C3 /* CCTransformHelp.h */; }; + B2C59A8319777FD100B452DF /* CCTween.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5981180E930E00EF57C3 /* CCTween.h */; }; + B2C59A8419777FD100B452DF /* CCUtilMath.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5985180E930E00EF57C3 /* CCUtilMath.h */; }; + B2C59A8519777FD100B452DF /* CocoStudio.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5986180E930E00EF57C3 /* CocoStudio.h */; }; + B2C59A8619777FD100B452DF /* DictionaryHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C598A180E930E00EF57C3 /* DictionaryHelper.h */; }; + B2C59A871977801A00B452DF /* CocoLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29E99D1C1957BA7000046604 /* CocoLoader.cpp */; }; + B2C59A881977802100B452DF /* CCActionTimeline.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0634A4C5194B19E400E608AF /* CCActionTimeline.cpp */; }; + B2C59A891977802100B452DF /* CCActionTimelineCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0634A4C7194B19E400E608AF /* CCActionTimelineCache.cpp */; }; + B2C59A8A1977802100B452DF /* CCFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0634A4C9194B19E400E608AF /* CCFrame.cpp */; }; + B2C59A8B1977802100B452DF /* CCNodeReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0634A4CB194B19E400E608AF /* CCNodeReader.cpp */; }; + B2C59A8C1977802100B452DF /* CCTimeLine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0634A4CD194B19E400E608AF /* CCTimeLine.cpp */; }; + B2C59A8D1977803400B452DF /* ButtonReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB6A18C72017004AD434 /* ButtonReader.cpp */; }; + B2C59A8E1977803400B452DF /* CheckBoxReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB6D18C72017004AD434 /* CheckBoxReader.cpp */; }; + B2C59A8F1977803400B452DF /* ImageViewReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB7018C72017004AD434 /* ImageViewReader.cpp */; }; + B2C59A901977803400B452DF /* LayoutReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB7318C72017004AD434 /* LayoutReader.cpp */; }; + B2C59A911977803400B452DF /* ListViewReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB7618C72017004AD434 /* ListViewReader.cpp */; }; + B2C59A921977803400B452DF /* LoadingBarReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB7918C72017004AD434 /* LoadingBarReader.cpp */; }; + B2C59A931977803400B452DF /* PageViewReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB7C18C72017004AD434 /* PageViewReader.cpp */; }; + B2C59A941977803400B452DF /* ScrollViewReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB7F18C72017004AD434 /* ScrollViewReader.cpp */; }; + B2C59A951977803400B452DF /* SliderReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB8218C72017004AD434 /* SliderReader.cpp */; }; + B2C59A961977803400B452DF /* TextAtlasReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB8518C72017004AD434 /* TextAtlasReader.cpp */; }; + B2C59A971977803400B452DF /* TextBMFontReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB8818C72017004AD434 /* TextBMFontReader.cpp */; }; + B2C59A981977803400B452DF /* TextFieldReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB8B18C72017004AD434 /* TextFieldReader.cpp */; }; + B2C59A991977803400B452DF /* TextReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB8E18C72017004AD434 /* TextReader.cpp */; }; + B2C59A9A1977803400B452DF /* WidgetReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB9018C72017004AD434 /* WidgetReader.cpp */; }; + B2C59A9B1977804700B452DF /* TriggerBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 06CAAABC186AD63B0012A414 /* TriggerBase.cpp */; }; + B2C59A9C1977804700B452DF /* TriggerMng.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 06CAAABE186AD63B0012A414 /* TriggerMng.cpp */; }; + B2C59A9D1977804700B452DF /* TriggerObj.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 06CAAAC0186AD63B0012A414 /* TriggerObj.cpp */; }; + B2C59A9E1977804700B452DF /* CCActionFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5948180E930E00EF57C3 /* CCActionFrame.cpp */; }; + B2C59A9F1977804700B452DF /* CCActionFrameEasing.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C594A180E930E00EF57C3 /* CCActionFrameEasing.cpp */; }; + B2C59AA01977804700B452DF /* CCActionManagerEx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C594C180E930E00EF57C3 /* CCActionManagerEx.cpp */; }; + B2C59AA11977804800B452DF /* CCActionNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C594E180E930E00EF57C3 /* CCActionNode.cpp */; }; + B2C59AA21977804800B452DF /* CCActionObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5950180E930E00EF57C3 /* CCActionObject.cpp */; }; + B2C59AA31977804800B452DF /* CCArmature.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5952180E930E00EF57C3 /* CCArmature.cpp */; }; + B2C59AA41977804800B452DF /* CCArmatureAnimation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5954180E930E00EF57C3 /* CCArmatureAnimation.cpp */; }; + B2C59AA51977804800B452DF /* CCArmatureDataManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5956180E930E00EF57C3 /* CCArmatureDataManager.cpp */; }; + B2C59AA61977804800B452DF /* CCArmatureDefine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5958180E930E00EF57C3 /* CCArmatureDefine.cpp */; }; + B2C59AA71977804800B452DF /* CCBatchNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C595A180E930E00EF57C3 /* CCBatchNode.cpp */; }; + B2C59AA81977804800B452DF /* CCBone.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C595C180E930E00EF57C3 /* CCBone.cpp */; }; + B2C59AA91977804800B452DF /* CCColliderDetector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C595E180E930E00EF57C3 /* CCColliderDetector.cpp */; }; + B2C59AAA1977804800B452DF /* CCComAttribute.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5960180E930E00EF57C3 /* CCComAttribute.cpp */; }; + B2C59AAB1977804800B452DF /* CCComAudio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5962180E930E00EF57C3 /* CCComAudio.cpp */; }; + B2C59AAC1977804800B452DF /* CCComController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5964180E930E00EF57C3 /* CCComController.cpp */; }; + B2C59AAD1977804800B452DF /* CCComRender.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5966180E930E00EF57C3 /* CCComRender.cpp */; }; + B2C59AAE1977804800B452DF /* CCDataReaderHelper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5968180E930E00EF57C3 /* CCDataReaderHelper.cpp */; }; + B2C59AAF1977804800B452DF /* CCDatas.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C596A180E930E00EF57C3 /* CCDatas.cpp */; }; + B2C59AB01977804800B452DF /* CCDecorativeDisplay.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C596C180E930E00EF57C3 /* CCDecorativeDisplay.cpp */; }; + B2C59AB11977804800B452DF /* CCDisplayFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C596E180E930E00EF57C3 /* CCDisplayFactory.cpp */; }; + B2C59AB21977804800B452DF /* CCDisplayManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5970180E930E00EF57C3 /* CCDisplayManager.cpp */; }; + B2C59AB31977804800B452DF /* CCInputDelegate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5972180E930E00EF57C3 /* CCInputDelegate.cpp */; }; + B2C59AB41977804800B452DF /* CCProcessBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5974180E930E00EF57C3 /* CCProcessBase.cpp */; }; + B2C59AB51977804800B452DF /* CCSGUIReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5976180E930E00EF57C3 /* CCSGUIReader.cpp */; }; + B2C59AB61977804800B452DF /* CCSkin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5978180E930E00EF57C3 /* CCSkin.cpp */; }; + B2C59AB71977804800B452DF /* CCSpriteFrameCacheHelper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C597A180E930E00EF57C3 /* CCSpriteFrameCacheHelper.cpp */; }; + B2C59AB81977804800B452DF /* CCSSceneReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C597C180E930E00EF57C3 /* CCSSceneReader.cpp */; }; + B2C59AB91977804800B452DF /* CCTransformHelp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C597E180E930E00EF57C3 /* CCTransformHelp.cpp */; }; + B2C59ABA1977804800B452DF /* CCTween.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5980180E930E00EF57C3 /* CCTween.cpp */; }; + B2C59ABB1977804800B452DF /* CCUtilMath.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5984180E930E00EF57C3 /* CCUtilMath.cpp */; }; + B2C59ABC1977804800B452DF /* DictionaryHelper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5989180E930E00EF57C3 /* DictionaryHelper.cpp */; }; + B2C59ACB197782FF00B452DF /* UIVideoPlayerIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3EA0FB6A191C841D00B170C8 /* UIVideoPlayerIOS.mm */; }; + B2CC5025197763350041958E /* HttpClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AAF5363180E3374000584C8 /* HttpClient.h */; }; + B2CC50261977633B0041958E /* HttpRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AAF5364180E3374000584C8 /* HttpRequest.h */; }; + B2CC50271977633D0041958E /* HttpResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AAF5365180E3374000584C8 /* HttpResponse.h */; }; + B2CC50291977634A0041958E /* HttpClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AAF5362180E3374000584C8 /* HttpClient.cpp */; }; + B2CC502A1977635D0041958E /* WebSocket.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AAF5369180E3374000584C8 /* WebSocket.h */; }; + B2CC502B1977635F0041958E /* SocketIO.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AAF5367180E3374000584C8 /* SocketIO.h */; }; + B2CC502C197763620041958E /* WebSocket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AAF5368180E3374000584C8 /* WebSocket.cpp */; }; + B2CC502D197763640041958E /* SocketIO.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AAF5366180E3374000584C8 /* SocketIO.cpp */; }; + B2CC502E1977638A0041958E /* libwebsockets.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AAF5387180E35AC000584C8 /* libwebsockets.a */; }; + B2CC504619776C0D0041958E /* SkeletonBounds.h in Headers */ = {isa = PBXBuildFile; fileRef = 2AC795DA18628689005EC8E1 /* SkeletonBounds.h */; }; + B2CC504719776C0D0041958E /* Event.h in Headers */ = {isa = PBXBuildFile; fileRef = 2AC795D61862867D005EC8E1 /* Event.h */; }; + B2CC504819776C0D0041958E /* EventData.h in Headers */ = {isa = PBXBuildFile; fileRef = 2AC795D81862867D005EC8E1 /* EventData.h */; }; + B2CC504919776C0D0041958E /* BoundingBoxAttachment.h in Headers */ = {isa = PBXBuildFile; fileRef = 2AC795D418628672005EC8E1 /* BoundingBoxAttachment.h */; }; + B2CC504A19776C0D0041958E /* Animation.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D7F180E26E600808F54 /* Animation.h */; }; + B2CC504B19776C0D0041958E /* AnimationState.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D81180E26E600808F54 /* AnimationState.h */; }; + B2CC504C19776C0D0041958E /* AnimationStateData.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D83180E26E600808F54 /* AnimationStateData.h */; }; + B2CC504D19776C0D0041958E /* Atlas.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D85180E26E600808F54 /* Atlas.h */; }; + B2CC504E19776C0D0041958E /* AtlasAttachmentLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D87180E26E600808F54 /* AtlasAttachmentLoader.h */; }; + B2CC504F19776C0D0041958E /* Attachment.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D89180E26E600808F54 /* Attachment.h */; }; + B2CC505019776C0D0041958E /* AttachmentLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D8B180E26E600808F54 /* AttachmentLoader.h */; }; + B2CC505119776C0D0041958E /* Bone.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D8D180E26E600808F54 /* Bone.h */; }; + B2CC505219776C0D0041958E /* BoneData.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D8F180E26E600808F54 /* BoneData.h */; }; + B2CC505319776C0E0041958E /* CCSkeleton.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D91180E26E600808F54 /* CCSkeleton.h */; }; + B2CC505419776C0E0041958E /* CCSkeletonAnimation.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D93180E26E600808F54 /* CCSkeletonAnimation.h */; }; + B2CC505519776C0E0041958E /* extension.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D95180E26E600808F54 /* extension.h */; }; + B2CC505619776C0E0041958E /* Json.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D97180E26E600808F54 /* Json.h */; }; + B2CC505719776C0E0041958E /* RegionAttachment.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D99180E26E600808F54 /* RegionAttachment.h */; }; + B2CC505819776C0E0041958E /* Skeleton.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D9B180E26E600808F54 /* Skeleton.h */; }; + B2CC505919776C0E0041958E /* SkeletonData.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D9D180E26E600808F54 /* SkeletonData.h */; }; + B2CC505A19776C0E0041958E /* SkeletonJson.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D9F180E26E600808F54 /* SkeletonJson.h */; }; + B2CC505B19776C0E0041958E /* Skin.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71DA1180E26E600808F54 /* Skin.h */; }; + B2CC505C19776C0E0041958E /* Slot.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71DA3180E26E600808F54 /* Slot.h */; }; + B2CC505D19776C0E0041958E /* SlotData.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71DA5180E26E600808F54 /* SlotData.h */; }; + B2CC505E19776C0E0041958E /* spine-cocos2dx.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71DA7180E26E600808F54 /* spine-cocos2dx.h */; }; + B2CC505F19776C0E0041958E /* spine.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71DA8180E26E600808F54 /* spine.h */; }; + B2CC506019776C340041958E /* SkeletonBounds.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2AC795D918628689005EC8E1 /* SkeletonBounds.cpp */; }; + B2CC506119776C340041958E /* Event.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2AC795D51862867D005EC8E1 /* Event.cpp */; }; + B2CC506219776C340041958E /* EventData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2AC795D71862867D005EC8E1 /* EventData.cpp */; }; + B2CC506319776C340041958E /* BoundingBoxAttachment.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2AC795D318628672005EC8E1 /* BoundingBoxAttachment.cpp */; }; + B2CC506419776C340041958E /* Animation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D7E180E26E600808F54 /* Animation.cpp */; }; + B2CC506519776C340041958E /* AnimationState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D80180E26E600808F54 /* AnimationState.cpp */; }; + B2CC506619776C340041958E /* AnimationStateData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D82180E26E600808F54 /* AnimationStateData.cpp */; }; + B2CC506719776C340041958E /* Atlas.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D84180E26E600808F54 /* Atlas.cpp */; }; + B2CC506819776C340041958E /* AtlasAttachmentLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D86180E26E600808F54 /* AtlasAttachmentLoader.cpp */; }; + B2CC506919776C340041958E /* Attachment.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D88180E26E600808F54 /* Attachment.cpp */; }; + B2CC506A19776C340041958E /* AttachmentLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D8A180E26E600808F54 /* AttachmentLoader.cpp */; }; + B2CC506B19776C340041958E /* Bone.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D8C180E26E600808F54 /* Bone.cpp */; }; + B2CC506C19776C340041958E /* BoneData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D8E180E26E600808F54 /* BoneData.cpp */; }; + B2CC506D19776C340041958E /* CCSkeleton.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D90180E26E600808F54 /* CCSkeleton.cpp */; }; + B2CC506E19776C340041958E /* CCSkeletonAnimation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D92180E26E600808F54 /* CCSkeletonAnimation.cpp */; }; + B2CC506F19776C340041958E /* extension.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D94180E26E600808F54 /* extension.cpp */; }; + B2CC507019776C340041958E /* Json.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D96180E26E600808F54 /* Json.cpp */; }; + B2CC507119776C340041958E /* RegionAttachment.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D98180E26E600808F54 /* RegionAttachment.cpp */; }; + B2CC507219776C340041958E /* Skeleton.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D9A180E26E600808F54 /* Skeleton.cpp */; }; + B2CC507319776C340041958E /* SkeletonData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D9C180E26E600808F54 /* SkeletonData.cpp */; }; + B2CC507419776C340041958E /* SkeletonJson.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D9E180E26E600808F54 /* SkeletonJson.cpp */; }; + B2CC507519776C340041958E /* Skin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71DA0180E26E600808F54 /* Skin.cpp */; }; + B2CC507619776C340041958E /* Slot.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71DA2180E26E600808F54 /* Slot.cpp */; }; + B2CC507719776C340041958E /* SlotData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71DA4180E26E600808F54 /* SlotData.cpp */; }; + B2CC507819776C340041958E /* spine-cocos2dx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71DA6180E26E600808F54 /* spine-cocos2dx.cpp */; }; + B2CC507C19776DD10041958E /* CCPhysicsJoint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46A170721807CE7A005B8026 /* CCPhysicsJoint.cpp */; }; + B2DB4764197661D500411E16 /* UIWidget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905FA1318CF08D100240AA3 /* UIWidget.cpp */; }; + B2DB4765197661E400411E16 /* UIHBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50E6D32E18E174130051CA34 /* UIHBox.cpp */; }; + B2DB4766197661EE00411E16 /* UILayout.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905F9F818CF08D000240AA3 /* UILayout.cpp */; }; + B2DB47681976650A00411E16 /* UIWidget.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905FA1418CF08D100240AA3 /* UIWidget.h */; }; + B2DB47691976651E00411E16 /* UIHBox.h in Headers */ = {isa = PBXBuildFile; fileRef = 50E6D32F18E174130051CA34 /* UIHBox.h */; }; + B2DB476A1976653000411E16 /* UILayout.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905F9F918CF08D000240AA3 /* UILayout.h */; }; + B2DB476B1976654800411E16 /* UILayoutManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29CB8F4A1929D1BB00C841D6 /* UILayoutManager.cpp */; }; + B2DB476C1976654D00411E16 /* UILayoutManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 29CB8F4B1929D1BB00C841D6 /* UILayoutManager.h */; }; + B2DB476D1976655700411E16 /* UILayoutParameter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905F9FC18CF08D000240AA3 /* UILayoutParameter.cpp */; }; + B2DB476E1976655C00411E16 /* UILayoutParameter.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905F9FD18CF08D000240AA3 /* UILayoutParameter.h */; }; + B2DB476F1976656D00411E16 /* UIRelativeBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50E6D33018E174130051CA34 /* UIRelativeBox.cpp */; }; + B2DB47701976657000411E16 /* UIRelativeBox.h in Headers */ = {isa = PBXBuildFile; fileRef = 50E6D33118E174130051CA34 /* UIRelativeBox.h */; }; + B2DB47711976657A00411E16 /* UIVBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50E6D33218E174130051CA34 /* UIVBox.cpp */; }; + B2DB47721976658000411E16 /* UIVBox.h in Headers */ = {isa = PBXBuildFile; fileRef = 50E6D33318E174130051CA34 /* UIVBox.h */; }; + B2DB47731976658E00411E16 /* CocosGUI.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905F9E918CF08D000240AA3 /* CocosGUI.cpp */; }; + B2DB47741976659800411E16 /* CocosGUI.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905F9EA18CF08D000240AA3 /* CocosGUI.h */; }; + B2DB4775197665A500411E16 /* UIDeprecated.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29BDBA52195D597A003225C9 /* UIDeprecated.cpp */; }; + B2DB4776197665AA00411E16 /* UIDeprecated.h in Headers */ = {isa = PBXBuildFile; fileRef = 29080DEB191B82CE0066F8DF /* UIDeprecated.h */; }; + B2DB4777197665B400411E16 /* UIHelper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905F9F418CF08D000240AA3 /* UIHelper.cpp */; }; + B2DB4778197665BF00411E16 /* UIHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905F9F518CF08D000240AA3 /* UIHelper.h */; }; + B2DB4779197665CD00411E16 /* UIListView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905F9FE18CF08D000240AA3 /* UIListView.cpp */; }; + B2DB477A197665D000411E16 /* UIListView.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905F9FF18CF08D000240AA3 /* UIListView.h */; }; + B2DB477B197665D900411E16 /* UIPageView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905FA0218CF08D000240AA3 /* UIPageView.cpp */; }; + B2DB477C197665DB00411E16 /* UIPageView.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905FA0318CF08D000240AA3 /* UIPageView.h */; }; + B2DB477D197665E500411E16 /* UIScrollView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905FA0718CF08D000240AA3 /* UIScrollView.cpp */; }; + B2DB477E197665E700411E16 /* UIScrollView.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905FA0818CF08D000240AA3 /* UIScrollView.h */; }; + B2DB477F1976660000411E16 /* UIButton.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905F9F018CF08D000240AA3 /* UIButton.cpp */; }; + B2DB47801976660200411E16 /* UIButton.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905F9F118CF08D000240AA3 /* UIButton.h */; }; + B2DB47811976660A00411E16 /* UICheckBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905F9F218CF08D000240AA3 /* UICheckBox.cpp */; }; + B2DB47821976660C00411E16 /* UICheckBox.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905F9F318CF08D000240AA3 /* UICheckBox.h */; }; + B2DB47831976661800411E16 /* UIImageView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905F9F618CF08D000240AA3 /* UIImageView.cpp */; }; + B2DB47841976661A00411E16 /* UIImageView.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905F9F718CF08D000240AA3 /* UIImageView.h */; }; + B2DB47851976662B00411E16 /* UILoadingBar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905FA0018CF08D000240AA3 /* UILoadingBar.cpp */; }; + B2DB47861976662D00411E16 /* UILoadingBar.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905FA0118CF08D000240AA3 /* UILoadingBar.h */; }; + B2DB47871976663800411E16 /* UIRichText.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905FA0418CF08D000240AA3 /* UIRichText.cpp */; }; + B2DB47881976663A00411E16 /* UIRichText.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905FA0518CF08D000240AA3 /* UIRichText.h */; }; + B2DB47891976664200411E16 /* UISlider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905FA0918CF08D000240AA3 /* UISlider.cpp */; }; + B2DB478A1976664400411E16 /* UISlider.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905FA0A18CF08D100240AA3 /* UISlider.h */; }; + B2DB478B1976665700411E16 /* UIText.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905FA0B18CF08D100240AA3 /* UIText.cpp */; }; + B2DB478C1976665700411E16 /* UITextAtlas.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905FA0D18CF08D100240AA3 /* UITextAtlas.cpp */; }; + B2DB478D1976665700411E16 /* UITextBMFont.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905FA0F18CF08D100240AA3 /* UITextBMFont.cpp */; }; + B2DB478E1976665700411E16 /* UITextField.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905FA1118CF08D100240AA3 /* UITextField.cpp */; }; + B2DB478F1976666100411E16 /* UIText.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905FA0C18CF08D100240AA3 /* UIText.h */; }; + B2DB47901976666100411E16 /* UITextAtlas.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905FA0E18CF08D100240AA3 /* UITextAtlas.h */; }; + B2DB47911976666100411E16 /* UITextBMFont.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905FA1018CF08D100240AA3 /* UITextBMFont.h */; }; + B2DB47921976666100411E16 /* UITextField.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905FA1218CF08D100240AA3 /* UITextField.h */; }; + B2DB47D319766CD100411E16 /* CCBAnimationManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71CFA180E26E600808F54 /* CCBAnimationManager.cpp */; }; + B2DB47D419766CD300411E16 /* CCBFileLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71CFC180E26E600808F54 /* CCBFileLoader.cpp */; }; + B2DB47D519766CD600411E16 /* CCBKeyframe.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71CFE180E26E600808F54 /* CCBKeyframe.cpp */; }; + B2DB47D619766CD900411E16 /* CCBReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D01180E26E600808F54 /* CCBReader.cpp */; }; + B2DB47D719766CE100411E16 /* CCBSequence.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D04180E26E600808F54 /* CCBSequence.cpp */; }; + B2DB47D819766CE500411E16 /* CCBSequenceProperty.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D06180E26E600808F54 /* CCBSequenceProperty.cpp */; }; + B2DB47D919766CEA00411E16 /* CCNode+CCBRelativePositioning.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D1D180E26E600808F54 /* CCNode+CCBRelativePositioning.cpp */; }; + B2DB47DA19766D4200411E16 /* CCControlButtonLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D0A180E26E600808F54 /* CCControlButtonLoader.cpp */; }; + B2DB47DB19766D4400411E16 /* CCControlLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D0C180E26E600808F54 /* CCControlLoader.cpp */; }; + B2DB47DC19766D5600411E16 /* CCLabelBMFontLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D0E180E26E600808F54 /* CCLabelBMFontLoader.cpp */; }; + B2DB47DD19766D5800411E16 /* CCLabelTTFLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D10180E26E600808F54 /* CCLabelTTFLoader.cpp */; }; + B2DB47DE19766D6700411E16 /* CCLayerColorLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D12180E26E600808F54 /* CCLayerColorLoader.cpp */; }; + B2DB47DF19766D6900411E16 /* CCLayerGradientLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D14180E26E600808F54 /* CCLayerGradientLoader.cpp */; }; + B2DB47E019766D6A00411E16 /* CCLayerLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D16180E26E600808F54 /* CCLayerLoader.cpp */; }; + B2DB47E119766D7600411E16 /* CCMenuItemImageLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D18180E26E600808F54 /* CCMenuItemImageLoader.cpp */; }; + B2DB47E219766D7800411E16 /* CCMenuItemLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D1A180E26E600808F54 /* CCMenuItemLoader.cpp */; }; + B2DB47E319766D8600411E16 /* CCNodeLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D1F180E26E600808F54 /* CCNodeLoader.cpp */; }; + B2DB47E419766D8700411E16 /* CCNodeLoaderLibrary.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D21180E26E600808F54 /* CCNodeLoaderLibrary.cpp */; }; + B2DB47E519766D9400411E16 /* CCParticleSystemQuadLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D24180E26E600808F54 /* CCParticleSystemQuadLoader.cpp */; }; + B2DB47E619766D9E00411E16 /* CCScale9SpriteLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D26180E26E600808F54 /* CCScale9SpriteLoader.cpp */; }; + B2DB47E719766DAE00411E16 /* CCScrollViewLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D28180E26E600808F54 /* CCScrollViewLoader.cpp */; }; + B2DB47E819766DBB00411E16 /* CCSpriteLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D2A180E26E600808F54 /* CCSpriteLoader.cpp */; }; + B2DB47E919766E2A00411E16 /* CCBAnimationManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71CFB180E26E600808F54 /* CCBAnimationManager.h */; }; + B2DB47EA19766E2A00411E16 /* CCBFileLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71CFD180E26E600808F54 /* CCBFileLoader.h */; }; + B2DB47EB19766E2A00411E16 /* CCBKeyframe.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71CFF180E26E600808F54 /* CCBKeyframe.h */; }; + B2DB47EC19766E2A00411E16 /* CCBMemberVariableAssigner.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D00180E26E600808F54 /* CCBMemberVariableAssigner.h */; }; + B2DB47ED19766E2A00411E16 /* CCBReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D02180E26E600808F54 /* CCBReader.h */; }; + B2DB47EE19766E2A00411E16 /* CCBSelectorResolver.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D03180E26E600808F54 /* CCBSelectorResolver.h */; }; + B2DB47EF19766E2A00411E16 /* CCBSequence.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D05180E26E600808F54 /* CCBSequence.h */; }; + B2DB47F019766E2A00411E16 /* CCBSequenceProperty.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D07180E26E600808F54 /* CCBSequenceProperty.h */; }; + B2DB47F119766E2A00411E16 /* CCControlButtonLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D0B180E26E600808F54 /* CCControlButtonLoader.h */; }; + B2DB47F219766E2A00411E16 /* CCControlLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D0D180E26E600808F54 /* CCControlLoader.h */; }; + B2DB47F319766E2A00411E16 /* CCLabelBMFontLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D0F180E26E600808F54 /* CCLabelBMFontLoader.h */; }; + B2DB47F419766E2A00411E16 /* CCLabelTTFLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D11180E26E600808F54 /* CCLabelTTFLoader.h */; }; + B2DB47F519766E2A00411E16 /* CCLayerColorLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D13180E26E600808F54 /* CCLayerColorLoader.h */; }; + B2DB47F619766E2A00411E16 /* CCLayerGradientLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D15180E26E600808F54 /* CCLayerGradientLoader.h */; }; + B2DB47F719766E2A00411E16 /* CCLayerLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D17180E26E600808F54 /* CCLayerLoader.h */; }; + B2DB47F819766E2A00411E16 /* CCMenuItemImageLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D19180E26E600808F54 /* CCMenuItemImageLoader.h */; }; + B2DB47F919766E2A00411E16 /* CCMenuItemLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D1B180E26E600808F54 /* CCMenuItemLoader.h */; }; + B2DB47FA19766E2A00411E16 /* CCMenuLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D1C180E26E600808F54 /* CCMenuLoader.h */; }; + B2DB47FB19766E2A00411E16 /* CCNode+CCBRelativePositioning.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D1E180E26E600808F54 /* CCNode+CCBRelativePositioning.h */; }; + B2DB47FC19766E2A00411E16 /* CCNodeLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D20180E26E600808F54 /* CCNodeLoader.h */; }; + B2DB47FD19766E2A00411E16 /* CCNodeLoaderLibrary.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D22180E26E600808F54 /* CCNodeLoaderLibrary.h */; }; + B2DB47FE19766E2A00411E16 /* CCNodeLoaderListener.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D23180E26E600808F54 /* CCNodeLoaderListener.h */; }; + B2DB47FF19766E2A00411E16 /* CCParticleSystemQuadLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D25180E26E600808F54 /* CCParticleSystemQuadLoader.h */; }; + B2DB480019766E2A00411E16 /* CCScale9SpriteLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D27180E26E600808F54 /* CCScale9SpriteLoader.h */; }; + B2DB480119766E2A00411E16 /* CCScrollViewLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D29180E26E600808F54 /* CCScrollViewLoader.h */; }; + B2DB480219766E2A00411E16 /* CCSpriteLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D2B180E26E600808F54 /* CCSpriteLoader.h */; }; + B2DB480319766E2A00411E16 /* CocosBuilder.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D2C180E26E600808F54 /* CocosBuilder.h */; }; + B2DB484E19767C7000411E16 /* TriggerObj.h in Headers */ = {isa = PBXBuildFile; fileRef = 06CAAAC1186AD63B0012A414 /* TriggerObj.h */; }; + B2DB484F19767C7000411E16 /* TriggerBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 06CAAABD186AD63B0012A414 /* TriggerBase.h */; }; + B2DB485019767C7000411E16 /* TriggerMng.h in Headers */ = {isa = PBXBuildFile; fileRef = 06CAAABF186AD63B0012A414 /* TriggerMng.h */; }; + B2DB485119767C7000411E16 /* CCActionFrame.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5949180E930E00EF57C3 /* CCActionFrame.h */; }; + B2DB485219767C7000411E16 /* CCActionFrameEasing.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C594B180E930E00EF57C3 /* CCActionFrameEasing.h */; }; + B2DB485319767C7000411E16 /* CCActionManagerEx.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C594D180E930E00EF57C3 /* CCActionManagerEx.h */; }; + B2DB485419767C7000411E16 /* CCActionNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C594F180E930E00EF57C3 /* CCActionNode.h */; }; + B2DB485519767C7000411E16 /* CCActionObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5951180E930E00EF57C3 /* CCActionObject.h */; }; + B2DB485619767C7000411E16 /* CCArmature.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5953180E930E00EF57C3 /* CCArmature.h */; }; + B2DB485719767C7000411E16 /* CCArmatureAnimation.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5955180E930E00EF57C3 /* CCArmatureAnimation.h */; }; + B2DB485819767C7000411E16 /* CCArmatureDataManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5957180E930E00EF57C3 /* CCArmatureDataManager.h */; }; + B2DB485919767C7000411E16 /* CCArmatureDefine.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5959180E930E00EF57C3 /* CCArmatureDefine.h */; }; + B2DB485A19767C7000411E16 /* CCBatchNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C595B180E930E00EF57C3 /* CCBatchNode.h */; }; + B2DB485B19767C7000411E16 /* CCBone.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C595D180E930E00EF57C3 /* CCBone.h */; }; + B2DB485C19767C7000411E16 /* CCColliderDetector.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C595F180E930E00EF57C3 /* CCColliderDetector.h */; }; + B2DB485D19767C7000411E16 /* CCComBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 373B910718787C0B00198F86 /* CCComBase.h */; }; + B2DB485E19767C7000411E16 /* CCComAttribute.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5961180E930E00EF57C3 /* CCComAttribute.h */; }; + B2DB485F19767C7000411E16 /* CCComAudio.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5963180E930E00EF57C3 /* CCComAudio.h */; }; + B2DB486019767C7000411E16 /* CCComController.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5965180E930E00EF57C3 /* CCComController.h */; }; + B2DB486119767C7000411E16 /* CCComRender.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5967180E930E00EF57C3 /* CCComRender.h */; }; + B2DB486219767C7000411E16 /* CCDataReaderHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5969180E930E00EF57C3 /* CCDataReaderHelper.h */; }; + B2DB486319767C7000411E16 /* CCDatas.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C596B180E930E00EF57C3 /* CCDatas.h */; }; + B2DB486419767C7000411E16 /* CCDecorativeDisplay.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C596D180E930E00EF57C3 /* CCDecorativeDisplay.h */; }; + B2DB486519767C7000411E16 /* CCDisplayFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C596F180E930E00EF57C3 /* CCDisplayFactory.h */; }; + B2DB486619767C7000411E16 /* CCDisplayManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5971180E930E00EF57C3 /* CCDisplayManager.h */; }; + B2DB486719767C7000411E16 /* CCInputDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5973180E930E00EF57C3 /* CCInputDelegate.h */; }; + B2DB486819767C7000411E16 /* CCProcessBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5975180E930E00EF57C3 /* CCProcessBase.h */; }; + B2DB486919767C7000411E16 /* CCSGUIReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5977180E930E00EF57C3 /* CCSGUIReader.h */; }; + B2DB486A19767C7000411E16 /* CCSkin.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5979180E930E00EF57C3 /* CCSkin.h */; }; + B2DB486B19767C7000411E16 /* CCSpriteFrameCacheHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C597B180E930E00EF57C3 /* CCSpriteFrameCacheHelper.h */; }; + B2DB486C19767C7000411E16 /* CCSSceneReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C597D180E930E00EF57C3 /* CCSSceneReader.h */; }; + B2DB486D19767C7000411E16 /* CCTransformHelp.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C597F180E930E00EF57C3 /* CCTransformHelp.h */; }; + B2DB486E19767C7000411E16 /* CCTween.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5981180E930E00EF57C3 /* CCTween.h */; }; + B2DB486F19767C7000411E16 /* CCUtilMath.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5985180E930E00EF57C3 /* CCUtilMath.h */; }; + B2DB487019767C7000411E16 /* CocoStudio.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C5986180E930E00EF57C3 /* CocoStudio.h */; }; + B2DB487119767C7000411E16 /* DictionaryHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C598A180E930E00EF57C3 /* DictionaryHelper.h */; }; + B2DB487219767C7C00411E16 /* CCActionTimeline.h in Headers */ = {isa = PBXBuildFile; fileRef = 0634A4C6194B19E400E608AF /* CCActionTimeline.h */; }; + B2DB487319767C7C00411E16 /* CCActionTimelineCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 0634A4C8194B19E400E608AF /* CCActionTimelineCache.h */; }; + B2DB487419767C7C00411E16 /* CCFrame.h in Headers */ = {isa = PBXBuildFile; fileRef = 0634A4CA194B19E400E608AF /* CCFrame.h */; }; + B2DB487519767C7C00411E16 /* CCNodeReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 0634A4CC194B19E400E608AF /* CCNodeReader.h */; }; + B2DB487619767C7C00411E16 /* CCTimeLine.h in Headers */ = {isa = PBXBuildFile; fileRef = 0634A4CE194B19E400E608AF /* CCTimeLine.h */; }; + B2DB487719767C7C00411E16 /* CCTimelineMacro.h in Headers */ = {isa = PBXBuildFile; fileRef = 0634A4CF194B19E400E608AF /* CCTimelineMacro.h */; }; + B2DB487819767C7F00411E16 /* CocoLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 29E99D1D1957BA7000046604 /* CocoLoader.h */; }; + B2DB487919767C9D00411E16 /* WidgetReaderProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB9218C72017004AD434 /* WidgetReaderProtocol.h */; }; + B2DB487A19767C9E00411E16 /* WidgetReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB9118C72017004AD434 /* WidgetReader.h */; }; + B2DB487B19767CA100411E16 /* TextReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB8F18C72017004AD434 /* TextReader.h */; }; + B2DB487C19767CA300411E16 /* TextFieldReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB8C18C72017004AD434 /* TextFieldReader.h */; }; + B2DB487D19767CA500411E16 /* TextBMFontReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB8918C72017004AD434 /* TextBMFontReader.h */; }; + B2DB487E19767CA800411E16 /* TextAtlasReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB8618C72017004AD434 /* TextAtlasReader.h */; }; + B2DB487F19767CAA00411E16 /* SliderReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB8318C72017004AD434 /* SliderReader.h */; }; + B2DB488019767CAD00411E16 /* ScrollViewReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB8018C72017004AD434 /* ScrollViewReader.h */; }; + B2DB488119767CB000411E16 /* PageViewReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB7D18C72017004AD434 /* PageViewReader.h */; }; + B2DB488219767CB300411E16 /* LoadingBarReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB7A18C72017004AD434 /* LoadingBarReader.h */; }; + B2DB488319767CB500411E16 /* ListViewReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB7718C72017004AD434 /* ListViewReader.h */; }; + B2DB488419767CB700411E16 /* LayoutReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB7418C72017004AD434 /* LayoutReader.h */; }; + B2DB488519767CBA00411E16 /* ImageViewReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB7118C72017004AD434 /* ImageViewReader.h */; }; + B2DB488619767CBD00411E16 /* CheckBoxReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB6E18C72017004AD434 /* CheckBoxReader.h */; }; + B2DB488719767CBF00411E16 /* ButtonReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB6B18C72017004AD434 /* ButtonReader.h */; }; + B2DB488819767CD900411E16 /* CocoLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29E99D1C1957BA7000046604 /* CocoLoader.cpp */; }; + B2DB488919767CDC00411E16 /* CCActionTimeline.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0634A4C5194B19E400E608AF /* CCActionTimeline.cpp */; }; + B2DB488A19767CDD00411E16 /* CCActionTimelineCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0634A4C7194B19E400E608AF /* CCActionTimelineCache.cpp */; }; + B2DB488B19767CE000411E16 /* CCFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0634A4C9194B19E400E608AF /* CCFrame.cpp */; }; + B2DB488C19767CE200411E16 /* CCNodeReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0634A4CB194B19E400E608AF /* CCNodeReader.cpp */; }; + B2DB488D19767CE300411E16 /* CCTimeLine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0634A4CD194B19E400E608AF /* CCTimeLine.cpp */; }; + B2DB488E19767CEE00411E16 /* ButtonReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB6A18C72017004AD434 /* ButtonReader.cpp */; }; + B2DB488F19767CF200411E16 /* CheckBoxReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB6D18C72017004AD434 /* CheckBoxReader.cpp */; }; + B2DB489019767CF400411E16 /* ImageViewReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB7018C72017004AD434 /* ImageViewReader.cpp */; }; + B2DB489119767CF700411E16 /* LayoutReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB7318C72017004AD434 /* LayoutReader.cpp */; }; + B2DB489219767CFA00411E16 /* ListViewReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB7618C72017004AD434 /* ListViewReader.cpp */; }; + B2DB489319767CFD00411E16 /* LoadingBarReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB7918C72017004AD434 /* LoadingBarReader.cpp */; }; + B2DB489419767D0000411E16 /* PageViewReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB7C18C72017004AD434 /* PageViewReader.cpp */; }; + B2DB489519767D0200411E16 /* ScrollViewReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB7F18C72017004AD434 /* ScrollViewReader.cpp */; }; + B2DB489619767D0600411E16 /* SliderReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB8218C72017004AD434 /* SliderReader.cpp */; }; + B2DB489719767D0800411E16 /* TextAtlasReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB8518C72017004AD434 /* TextAtlasReader.cpp */; }; + B2DB489819767D0B00411E16 /* TextBMFontReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB8818C72017004AD434 /* TextBMFontReader.cpp */; }; + B2DB489919767D0E00411E16 /* TextFieldReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB8B18C72017004AD434 /* TextFieldReader.cpp */; }; + B2DB489A19767D1100411E16 /* TextReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB8E18C72017004AD434 /* TextReader.cpp */; }; + B2DB489B19767D1400411E16 /* WidgetReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50FCEB9018C72017004AD434 /* WidgetReader.cpp */; }; + B2DB489C19767D2000411E16 /* TriggerBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 06CAAABC186AD63B0012A414 /* TriggerBase.cpp */; }; + B2DB489D19767D2000411E16 /* TriggerMng.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 06CAAABE186AD63B0012A414 /* TriggerMng.cpp */; }; + B2DB489E19767D2000411E16 /* TriggerObj.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 06CAAAC0186AD63B0012A414 /* TriggerObj.cpp */; }; + B2DB489F19767D2000411E16 /* CCActionFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5948180E930E00EF57C3 /* CCActionFrame.cpp */; }; + B2DB48A019767D2000411E16 /* CCActionFrameEasing.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C594A180E930E00EF57C3 /* CCActionFrameEasing.cpp */; }; + B2DB48A119767D2000411E16 /* CCActionManagerEx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C594C180E930E00EF57C3 /* CCActionManagerEx.cpp */; }; + B2DB48A219767D2000411E16 /* CCActionNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C594E180E930E00EF57C3 /* CCActionNode.cpp */; }; + B2DB48A319767D2000411E16 /* CCActionObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5950180E930E00EF57C3 /* CCActionObject.cpp */; }; + B2DB48A419767D2000411E16 /* CCArmature.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5952180E930E00EF57C3 /* CCArmature.cpp */; }; + B2DB48A519767D2000411E16 /* CCArmatureAnimation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5954180E930E00EF57C3 /* CCArmatureAnimation.cpp */; }; + B2DB48A619767D2000411E16 /* CCArmatureDataManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5956180E930E00EF57C3 /* CCArmatureDataManager.cpp */; }; + B2DB48A719767D2000411E16 /* CCArmatureDefine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5958180E930E00EF57C3 /* CCArmatureDefine.cpp */; }; + B2DB48A819767D2000411E16 /* CCBatchNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C595A180E930E00EF57C3 /* CCBatchNode.cpp */; }; + B2DB48A919767D2000411E16 /* CCBone.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C595C180E930E00EF57C3 /* CCBone.cpp */; }; + B2DB48AA19767D2000411E16 /* CCColliderDetector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C595E180E930E00EF57C3 /* CCColliderDetector.cpp */; }; + B2DB48AB19767D2000411E16 /* CCComAttribute.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5960180E930E00EF57C3 /* CCComAttribute.cpp */; }; + B2DB48AC19767D2000411E16 /* CCComAudio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5962180E930E00EF57C3 /* CCComAudio.cpp */; }; + B2DB48AD19767D2000411E16 /* CCComController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5964180E930E00EF57C3 /* CCComController.cpp */; }; + B2DB48AE19767D2000411E16 /* CCComRender.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5966180E930E00EF57C3 /* CCComRender.cpp */; }; + B2DB48AF19767D2000411E16 /* CCDataReaderHelper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5968180E930E00EF57C3 /* CCDataReaderHelper.cpp */; }; + B2DB48B019767D2000411E16 /* CCDatas.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C596A180E930E00EF57C3 /* CCDatas.cpp */; }; + B2DB48B119767D2000411E16 /* CCDecorativeDisplay.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C596C180E930E00EF57C3 /* CCDecorativeDisplay.cpp */; }; + B2DB48B219767D2000411E16 /* CCDisplayFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C596E180E930E00EF57C3 /* CCDisplayFactory.cpp */; }; + B2DB48B319767D2000411E16 /* CCDisplayManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5970180E930E00EF57C3 /* CCDisplayManager.cpp */; }; + B2DB48B419767D2000411E16 /* CCInputDelegate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5972180E930E00EF57C3 /* CCInputDelegate.cpp */; }; + B2DB48B519767D2000411E16 /* CCProcessBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5974180E930E00EF57C3 /* CCProcessBase.cpp */; }; + B2DB48B619767D2000411E16 /* CCSGUIReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5976180E930E00EF57C3 /* CCSGUIReader.cpp */; }; + B2DB48B719767D2000411E16 /* CCSkin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5978180E930E00EF57C3 /* CCSkin.cpp */; }; + B2DB48B819767D2000411E16 /* CCSpriteFrameCacheHelper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C597A180E930E00EF57C3 /* CCSpriteFrameCacheHelper.cpp */; }; + B2DB48B919767D2000411E16 /* CCSSceneReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C597C180E930E00EF57C3 /* CCSSceneReader.cpp */; }; + B2DB48BA19767D2000411E16 /* CCTransformHelp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C597E180E930E00EF57C3 /* CCTransformHelp.cpp */; }; + B2DB48BB19767D2000411E16 /* CCTween.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5980180E930E00EF57C3 /* CCTween.cpp */; }; + B2DB48BC19767D2000411E16 /* CCUtilMath.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5984180E930E00EF57C3 /* CCUtilMath.cpp */; }; + B2DB48BD19767D2000411E16 /* DictionaryHelper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5989180E930E00EF57C3 /* DictionaryHelper.cpp */; }; + B2DB490219767F5300411E16 /* SkeletonBounds.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2AC795D918628689005EC8E1 /* SkeletonBounds.cpp */; }; + B2DB490319767F5300411E16 /* Event.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2AC795D51862867D005EC8E1 /* Event.cpp */; }; + B2DB490419767F5300411E16 /* EventData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2AC795D71862867D005EC8E1 /* EventData.cpp */; }; + B2DB490519767F5300411E16 /* BoundingBoxAttachment.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2AC795D318628672005EC8E1 /* BoundingBoxAttachment.cpp */; }; + B2DB490619767F5300411E16 /* Animation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D7E180E26E600808F54 /* Animation.cpp */; }; + B2DB490719767F5300411E16 /* AnimationState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D80180E26E600808F54 /* AnimationState.cpp */; }; + B2DB490819767F5300411E16 /* AnimationStateData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D82180E26E600808F54 /* AnimationStateData.cpp */; }; + B2DB490919767F5300411E16 /* Atlas.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D84180E26E600808F54 /* Atlas.cpp */; }; + B2DB490A19767F5300411E16 /* AtlasAttachmentLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D86180E26E600808F54 /* AtlasAttachmentLoader.cpp */; }; + B2DB490B19767F5300411E16 /* Attachment.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D88180E26E600808F54 /* Attachment.cpp */; }; + B2DB490C19767F5300411E16 /* AttachmentLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D8A180E26E600808F54 /* AttachmentLoader.cpp */; }; + B2DB490D19767F5300411E16 /* Bone.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D8C180E26E600808F54 /* Bone.cpp */; }; + B2DB490E19767F5300411E16 /* BoneData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D8E180E26E600808F54 /* BoneData.cpp */; }; + B2DB490F19767F5300411E16 /* CCSkeleton.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D90180E26E600808F54 /* CCSkeleton.cpp */; }; + B2DB491019767F5300411E16 /* CCSkeletonAnimation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D92180E26E600808F54 /* CCSkeletonAnimation.cpp */; }; + B2DB491119767F5300411E16 /* extension.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D94180E26E600808F54 /* extension.cpp */; }; + B2DB491219767F5300411E16 /* Json.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D96180E26E600808F54 /* Json.cpp */; }; + B2DB491319767F5300411E16 /* RegionAttachment.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D98180E26E600808F54 /* RegionAttachment.cpp */; }; + B2DB491419767F5300411E16 /* Skeleton.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D9A180E26E600808F54 /* Skeleton.cpp */; }; + B2DB491519767F5300411E16 /* SkeletonData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D9C180E26E600808F54 /* SkeletonData.cpp */; }; + B2DB491619767F5300411E16 /* SkeletonJson.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D9E180E26E600808F54 /* SkeletonJson.cpp */; }; + B2DB491719767F5300411E16 /* Skin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71DA0180E26E600808F54 /* Skin.cpp */; }; + B2DB491819767F5300411E16 /* Slot.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71DA2180E26E600808F54 /* Slot.cpp */; }; + B2DB491919767F5300411E16 /* SlotData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71DA4180E26E600808F54 /* SlotData.cpp */; }; + B2DB491A19767F5300411E16 /* spine-cocos2dx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71DA6180E26E600808F54 /* spine-cocos2dx.cpp */; }; + B2DB491B19767F7700411E16 /* SkeletonBounds.h in Headers */ = {isa = PBXBuildFile; fileRef = 2AC795DA18628689005EC8E1 /* SkeletonBounds.h */; }; + B2DB491C19767F7700411E16 /* Event.h in Headers */ = {isa = PBXBuildFile; fileRef = 2AC795D61862867D005EC8E1 /* Event.h */; }; + B2DB491D19767F7700411E16 /* EventData.h in Headers */ = {isa = PBXBuildFile; fileRef = 2AC795D81862867D005EC8E1 /* EventData.h */; }; + B2DB491E19767F7700411E16 /* BoundingBoxAttachment.h in Headers */ = {isa = PBXBuildFile; fileRef = 2AC795D418628672005EC8E1 /* BoundingBoxAttachment.h */; }; + B2DB491F19767F7700411E16 /* Animation.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D7F180E26E600808F54 /* Animation.h */; }; + B2DB492019767F7700411E16 /* AnimationState.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D81180E26E600808F54 /* AnimationState.h */; }; + B2DB492119767F7700411E16 /* AnimationStateData.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D83180E26E600808F54 /* AnimationStateData.h */; }; + B2DB492219767F7700411E16 /* Atlas.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D85180E26E600808F54 /* Atlas.h */; }; + B2DB492319767F7700411E16 /* AtlasAttachmentLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D87180E26E600808F54 /* AtlasAttachmentLoader.h */; }; + B2DB492419767F7700411E16 /* Attachment.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D89180E26E600808F54 /* Attachment.h */; }; + B2DB492519767F7700411E16 /* AttachmentLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D8B180E26E600808F54 /* AttachmentLoader.h */; }; + B2DB492619767F7700411E16 /* Bone.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D8D180E26E600808F54 /* Bone.h */; }; + B2DB492719767F7700411E16 /* BoneData.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D8F180E26E600808F54 /* BoneData.h */; }; + B2DB492819767F7700411E16 /* CCSkeleton.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D91180E26E600808F54 /* CCSkeleton.h */; }; + B2DB492919767F7700411E16 /* CCSkeletonAnimation.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D93180E26E600808F54 /* CCSkeletonAnimation.h */; }; + B2DB492A19767F7700411E16 /* extension.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D95180E26E600808F54 /* extension.h */; }; + B2DB492B19767F7700411E16 /* Json.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D97180E26E600808F54 /* Json.h */; }; + B2DB492C19767F7700411E16 /* RegionAttachment.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D99180E26E600808F54 /* RegionAttachment.h */; }; + B2DB492D19767F7700411E16 /* Skeleton.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D9B180E26E600808F54 /* Skeleton.h */; }; + B2DB492E19767F7700411E16 /* SkeletonData.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D9D180E26E600808F54 /* SkeletonData.h */; }; + B2DB492F19767F7700411E16 /* SkeletonJson.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71D9F180E26E600808F54 /* SkeletonJson.h */; }; + B2DB493019767F7700411E16 /* Skin.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71DA1180E26E600808F54 /* Skin.h */; }; + B2DB493119767F7700411E16 /* Slot.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71DA3180E26E600808F54 /* Slot.h */; }; + B2DB493219767F7700411E16 /* SlotData.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71DA5180E26E600808F54 /* SlotData.h */; }; + B2DB493319767F7700411E16 /* spine-cocos2dx.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71DA7180E26E600808F54 /* spine-cocos2dx.h */; }; + B2DB493419767F7700411E16 /* spine.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD71DA8180E26E600808F54 /* spine.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 */; }; @@ -1823,31 +1913,29 @@ B3AF01A31842FBA400A98B85 /* b2MotorJoint.h in Headers */ = {isa = PBXBuildFile; fileRef = B3AF019F1842FBA400A98B85 /* b2MotorJoint.h */; }; B3B12A5A17E7F44000026B4A /* libchipmunk Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A03F2CB81780BD04006731B9 /* libchipmunk Mac.a */; }; B3B12A5B17E7F45C00026B4A /* libchipmunk iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A07A4F3B178387670073F6A7 /* libchipmunk iOS.a */; }; - B6AAF84119404E0D0069DE01 /* CCBundle3D.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B6AAF83F19404E0D0069DE01 /* CCBundle3D.cpp */; }; - B6AAF84219404E0D0069DE01 /* CCBundle3D.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B6AAF83F19404E0D0069DE01 /* CCBundle3D.cpp */; }; - B6AAF84319404E0D0069DE01 /* CCBundle3D.h in Headers */ = {isa = PBXBuildFile; fileRef = B6AAF84019404E0D0069DE01 /* CCBundle3D.h */; }; - B6AAF84419404E0D0069DE01 /* CCBundle3D.h in Headers */ = {isa = PBXBuildFile; fileRef = B6AAF84019404E0D0069DE01 /* CCBundle3D.h */; }; - B6ACD897193D6693005E0B8A /* CCMeshSkin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B6ACD895193D6693005E0B8A /* CCMeshSkin.cpp */; }; - B6ACD898193D6693005E0B8A /* CCMeshSkin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B6ACD895193D6693005E0B8A /* CCMeshSkin.cpp */; }; - B6ACD899193D6693005E0B8A /* CCMeshSkin.h in Headers */ = {isa = PBXBuildFile; fileRef = B6ACD896193D6693005E0B8A /* CCMeshSkin.h */; }; - B6ACD89A193D6693005E0B8A /* CCMeshSkin.h in Headers */ = {isa = PBXBuildFile; fileRef = B6ACD896193D6693005E0B8A /* CCMeshSkin.h */; }; - B6ACD89E193DC0CC005E0B8A /* CCAnimate3D.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B6ACD89C193DC0CC005E0B8A /* CCAnimate3D.cpp */; }; - B6ACD89F193DC0CC005E0B8A /* CCAnimate3D.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B6ACD89C193DC0CC005E0B8A /* CCAnimate3D.cpp */; }; - B6ACD8A0193DC0CC005E0B8A /* CCAnimate3D.h in Headers */ = {isa = PBXBuildFile; fileRef = B6ACD89D193DC0CC005E0B8A /* CCAnimate3D.h */; }; - B6ACD8A1193DC0CC005E0B8A /* CCAnimate3D.h in Headers */ = {isa = PBXBuildFile; fileRef = B6ACD89D193DC0CC005E0B8A /* CCAnimate3D.h */; }; - B6B2633F19381FBF0088FE25 /* CCAnimationCurve.h in Headers */ = {isa = PBXBuildFile; fileRef = B6B2633C19381FBF0088FE25 /* CCAnimationCurve.h */; }; - B6B2634019381FBF0088FE25 /* CCAnimationCurve.h in Headers */ = {isa = PBXBuildFile; fileRef = B6B2633C19381FBF0088FE25 /* CCAnimationCurve.h */; }; - B6B26343193884D60088FE25 /* CCAnimation3D.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B6B26341193884D60088FE25 /* CCAnimation3D.cpp */; }; - B6B26344193884D60088FE25 /* CCAnimation3D.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B6B26341193884D60088FE25 /* CCAnimation3D.cpp */; }; - B6B26345193884D60088FE25 /* CCAnimation3D.h in Headers */ = {isa = PBXBuildFile; fileRef = B6B26342193884D60088FE25 /* CCAnimation3D.h */; }; - B6B26346193884D60088FE25 /* CCAnimation3D.h in Headers */ = {isa = PBXBuildFile; fileRef = B6B26342193884D60088FE25 /* CCAnimation3D.h */; }; ED9C6A9418599AD8000A5232 /* CCNodeGrid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ED9C6A9218599AD8000A5232 /* CCNodeGrid.cpp */; }; ED9C6A9518599AD8000A5232 /* CCNodeGrid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ED9C6A9218599AD8000A5232 /* CCNodeGrid.cpp */; }; ED9C6A9618599AD8000A5232 /* CCNodeGrid.h in Headers */ = {isa = PBXBuildFile; fileRef = ED9C6A9318599AD8000A5232 /* CCNodeGrid.h */; }; ED9C6A9718599AD8000A5232 /* CCNodeGrid.h in Headers */ = {isa = PBXBuildFile; fileRef = ED9C6A9318599AD8000A5232 /* CCNodeGrid.h */; }; + FAA9E17D1998A42A00E2E252 /* libcurl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AAF541C180E3B6A000584C8 /* libcurl.a */; }; + FAA9E17E1998A43800E2E252 /* libcurl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AAF541C180E3B6A000584C8 /* libcurl.a */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ + 1516202E199E76D9006099B8 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1551A336158F2AB200E66CFE /* Project object */; + proxyType = 1; + remoteGlobalIDString = 15161E42199E7362006099B8; + remoteInfo = "libcocos3d Mac"; + }; + 15162224199E7B9E006099B8 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1551A336158F2AB200E66CFE /* Project object */; + proxyType = 1; + remoteGlobalIDString = 15162030199E7810006099B8; + remoteInfo = "libcocos3d iOS"; + }; 460E44F31807E241000CDD6D /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 1551A336158F2AB200E66CFE /* Project object */; @@ -1932,6 +2020,76 @@ remoteGlobalIDString = A07A4F9F178387730073F6A7; remoteInfo = "CocosDenshion iOS"; }; + B2F0AFEB198794EE002FE562 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1551A336158F2AB200E66CFE /* Project object */; + proxyType = 1; + remoteGlobalIDString = B245F10019766132001920FD; + remoteInfo = "libui Mac"; + }; + B2F0AFED198794EE002FE562 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1551A336158F2AB200E66CFE /* Project object */; + proxyType = 1; + remoteGlobalIDString = B2DB48161976716E00411E16; + remoteInfo = "libcocostudio Mac"; + }; + B2F0AFEF198794EE002FE562 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1551A336158F2AB200E66CFE /* Project object */; + proxyType = 1; + remoteGlobalIDString = B2DB479B197669A100411E16; + remoteInfo = "libcocosbuilder Mac"; + }; + B2F0AFF1198794EE002FE562 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1551A336158F2AB200E66CFE /* Project object */; + proxyType = 1; + remoteGlobalIDString = B2DB48CA19767F1F00411E16; + remoteInfo = "libspine Mac"; + }; + B2F0AFF3198794EE002FE562 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1551A336158F2AB200E66CFE /* Project object */; + proxyType = 1; + remoteGlobalIDString = B2DB498D197686CB00411E16; + remoteInfo = "libnetwork Mac"; + }; + B2F0AFF519879508002FE562 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1551A336158F2AB200E66CFE /* Project object */; + proxyType = 1; + remoteGlobalIDString = B24EEA2C19775E92004493CC; + remoteInfo = "libui iOS"; + }; + B2F0AFF719879508002FE562 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1551A336158F2AB200E66CFE /* Project object */; + proxyType = 1; + remoteGlobalIDString = B24EEA6719775EBB004493CC; + remoteInfo = "libcocostudio iOS"; + }; + B2F0AFF919879508002FE562 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1551A336158F2AB200E66CFE /* Project object */; + proxyType = 1; + remoteGlobalIDString = B24EEA6F19775ECE004493CC; + remoteInfo = "libcocosbuilder iOS"; + }; + B2F0AFFB19879508002FE562 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1551A336158F2AB200E66CFE /* Project object */; + proxyType = 1; + remoteGlobalIDString = B24EEA7719775EE1004493CC; + remoteInfo = "libspine iOS"; + }; + B2F0AFFD19879508002FE562 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1551A336158F2AB200E66CFE /* Project object */; + proxyType = 1; + remoteGlobalIDString = B24EEA7F19775EF3004493CC; + remoteInfo = "libnetwork iOS"; + }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ @@ -1952,8 +2110,13 @@ 06CAAABF186AD63B0012A414 /* TriggerMng.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TriggerMng.h; sourceTree = ""; }; 06CAAAC0186AD63B0012A414 /* TriggerObj.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TriggerObj.cpp; sourceTree = ""; }; 06CAAAC1186AD63B0012A414 /* TriggerObj.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TriggerObj.h; sourceTree = ""; }; - 1551A33F158F2AB200E66CFE /* libcocos2dx Mac.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libcocos2dx Mac.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 1516200B199E7363006099B8 /* libcocos3d Mac.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libcocos3d Mac.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 15162201199E7810006099B8 /* libcocos3d iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libcocos3d iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 15162236199F9EEA006099B8 /* cocos3d.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cocos3d.h; sourceTree = ""; }; + 1551A33F158F2AB200E66CFE /* libcocos2d Mac.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libcocos2d Mac.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 1551A342158F2AB200E66CFE /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; + 15EFA20F198A2BB5000C57D3 /* CCProtectedNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCProtectedNode.cpp; sourceTree = ""; }; + 15EFA210198A2BB5000C57D3 /* CCProtectedNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCProtectedNode.h; sourceTree = ""; }; 1A01C67618F57BE800EFE3A6 /* CCArray.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCArray.cpp; sourceTree = ""; }; 1A01C67718F57BE800EFE3A6 /* CCArray.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCArray.h; sourceTree = ""; }; 1A01C67818F57BE800EFE3A6 /* CCBool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCBool.h; sourceTree = ""; }; @@ -2329,10 +2492,14 @@ 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 = ""; }; + 2958244919873D8E00F9746D /* UIScale9Sprite.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UIScale9Sprite.cpp; sourceTree = ""; }; + 2958244A19873D8E00F9746D /* UIScale9Sprite.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIScale9Sprite.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 = ""; }; 299754F2193EC95400A54AC3 /* ObjectFactory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ObjectFactory.cpp; path = ../base/ObjectFactory.cpp; sourceTree = ""; }; 299754F3193EC95400A54AC3 /* ObjectFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ObjectFactory.h; path = ../base/ObjectFactory.h; sourceTree = ""; }; + 299CF1F919A434BC00C378C1 /* ccRandom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ccRandom.cpp; path = ../base/ccRandom.cpp; sourceTree = ""; }; + 299CF1FA19A434BC00C378C1 /* ccRandom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ccRandom.h; path = ../base/ccRandom.h; sourceTree = ""; }; 29BDBA52195D597A003225C9 /* UIDeprecated.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UIDeprecated.cpp; sourceTree = ""; }; 29CB8F4A1929D1BB00C841D6 /* UILayoutManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UILayoutManager.cpp; sourceTree = ""; }; 29CB8F4B1929D1BB00C841D6 /* UILayoutManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UILayoutManager.h; sourceTree = ""; }; @@ -2365,10 +2532,24 @@ 3E6176641960F89B00DE83F5 /* CCEventListenerController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCEventListenerController.h; path = ../base/CCEventListenerController.h; sourceTree = ""; }; 3E6176651960F89B00DE83F5 /* CCGameController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCGameController.h; path = ../base/CCGameController.h; sourceTree = ""; }; 3E61781C1966A5A300DE83F5 /* CCController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCController.cpp; path = ../base/CCController.cpp; sourceTree = ""; }; + 3E9E80E3198639EF00FA95D0 /* CCAttachNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCAttachNode.cpp; sourceTree = ""; }; + 3E9E80E4198639EF00FA95D0 /* CCAttachNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCAttachNode.h; sourceTree = ""; }; + 3E9E80E5198639EF00FA95D0 /* CCSubMesh.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCSubMesh.cpp; sourceTree = ""; }; + 3E9E80E6198639EF00FA95D0 /* CCSubMesh.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCSubMesh.h; sourceTree = ""; }; + 3E9E80E7198639EF00FA95D0 /* CCSubMeshState.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCSubMeshState.cpp; sourceTree = ""; }; + 3E9E80E8198639EF00FA95D0 /* CCSubMeshState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCSubMeshState.h; 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 = ""; }; + 3EA2A83E1987A6810077B3D4 /* CCSkeleton3D.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCSkeleton3D.cpp; sourceTree = ""; }; + 3EA2A83F1987A6810077B3D4 /* CCSkeleton3D.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCSkeleton3D.h; sourceTree = ""; }; + 3EA3EDBA1991CDFA00645534 /* CCCamera.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCCamera.cpp; path = ../base/CCCamera.cpp; sourceTree = ""; }; + 3EA3EDBB1991CDFA00645534 /* CCCamera.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCCamera.h; path = ../base/CCCamera.h; sourceTree = ""; }; 3EA4786E195478E00068D9D1 /* CCBundleReader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCBundleReader.cpp; sourceTree = ""; }; 3EA4786F195478E00068D9D1 /* CCBundleReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCBundleReader.h; sourceTree = ""; }; + 464AD6E3197EBB1400E502D8 /* pvr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = pvr.cpp; path = ../base/pvr.cpp; sourceTree = ""; }; + 464AD6E4197EBB1400E502D8 /* pvr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pvr.h; path = ../base/pvr.h; sourceTree = ""; }; + 46633BC2199DDB2F00F6E838 /* CCModuleManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCModuleManager.cpp; path = ../base/CCModuleManager.cpp; sourceTree = ""; }; + 46633BC3199DDB2F00F6E838 /* CCModuleManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCModuleManager.h; path = ../base/CCModuleManager.h; sourceTree = ""; }; 46A15FCC1807A544005B8026 /* AUTHORS */ = {isa = PBXFileReference; lastKnownFileType = text; name = AUTHORS; path = ../AUTHORS; sourceTree = ""; }; 46A15FCE1807A544005B8026 /* README.md */ = {isa = PBXFileReference; lastKnownFileType = text; name = README.md; path = ../README.md; sourceTree = ""; }; 46A15FE11807A56F005B8026 /* Export.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Export.h; sourceTree = ""; }; @@ -2429,8 +2610,6 @@ 46A168531807AF4E005B8026 /* CCEditBoxImplAndroid.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCEditBoxImplAndroid.h; sourceTree = ""; }; 46A168541807AF4E005B8026 /* CCEditBoxImplIOS.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCEditBoxImplIOS.h; sourceTree = ""; }; 46A168551807AF4E005B8026 /* CCEditBoxImplIOS.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = CCEditBoxImplIOS.mm; sourceTree = ""; }; - 46A168561807AF4E005B8026 /* CCEditBoxImplMac.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCEditBoxImplMac.h; sourceTree = ""; }; - 46A168571807AF4E005B8026 /* CCEditBoxImplMac.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = CCEditBoxImplMac.mm; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; 46A168581807AF4E005B8026 /* CCEditBoxImplNone.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CCEditBoxImplNone.cpp; sourceTree = ""; }; 46A1685B1807AF4E005B8026 /* CCEditBoxImplWin.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CCEditBoxImplWin.cpp; sourceTree = ""; }; 46A1685C1807AF4E005B8026 /* CCEditBoxImplWin.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCEditBoxImplWin.h; sourceTree = ""; }; @@ -2636,8 +2815,8 @@ 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 = ""; }; + 503DD8DA1926736A00CD74DD /* CCGLViewImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCGLViewImpl.h; sourceTree = ""; }; + 503DD8DB1926736A00CD74DD /* CCGLViewImpl.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CCGLViewImpl.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 = ""; }; @@ -2809,16 +2988,16 @@ 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 = ""; }; + 50ABBF251926664700A911A9 /* CCGLView.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCGLView.cpp; sourceTree = ""; }; + 50ABBF261926664700A911A9 /* CCGLView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCGLView.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 = ""; }; + 50ABBF2E1926664700A911A9 /* CCGLViewImpl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCGLViewImpl.cpp; sourceTree = ""; }; + 50ABBF2F1926664700A911A9 /* CCGLViewImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCGLViewImpl.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 = ""; }; @@ -2827,8 +3006,6 @@ 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 = ""; }; 50E6D32E18E174130051CA34 /* UIHBox.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UIHBox.cpp; sourceTree = ""; }; 50E6D32F18E174130051CA34 /* UIHBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIHBox.h; sourceTree = ""; }; 50E6D33018E174130051CA34 /* UIRelativeBox.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UIRelativeBox.cpp; sourceTree = ""; }; @@ -2866,17 +3043,42 @@ 50FCEB9218C72017004AD434 /* WidgetReaderProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WidgetReaderProtocol.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; }; - 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; }; + A03F2ED617814268006731B9 /* libcocosdenshion Mac.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libcocosdenshion Mac.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + A03F2FD617814595006731B9 /* libextension Mac.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libextension Mac.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + A07A4D641783777C0073F6A7 /* libcocos2d iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libcocos2d iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + A07A4EFC1783867C0073F6A7 /* libextension iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libextension 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; }; + A07A4FB4178387730073F6A7 /* libcocosdenshion iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libcocosdenshion iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + B217703B1977ECB4009EE11B /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; }; + B217703D1977ECC1009EE11B /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; }; + B217703F1977ECE6009EE11B /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; }; + B21770411977ECF8009EE11B /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = System/Library/Frameworks/ApplicationServices.framework; sourceTree = SDKROOT; }; + B21770431977ED07009EE11B /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; }; + B21770461977ED34009EE11B /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; }; + B21770481977ED4C009EE11B /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; }; + B217704A1977ED55009EE11B /* libcurl.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcurl.dylib; path = usr/lib/libcurl.dylib; sourceTree = SDKROOT; }; + B217704C1977ED8B009EE11B /* libsqlite3.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libsqlite3.dylib; path = usr/lib/libsqlite3.dylib; sourceTree = SDKROOT; }; + B245F13A19766132001920FD /* libui Mac.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libui Mac.a"; sourceTree = BUILT_PRODUCTS_DIR; }; B24AA981195A675C007B4522 /* CCFastTMXLayer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCFastTMXLayer.cpp; sourceTree = ""; }; B24AA982195A675C007B4522 /* CCFastTMXLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCFastTMXLayer.h; sourceTree = ""; }; B24AA983195A675C007B4522 /* CCFastTMXTiledMap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCFastTMXTiledMap.cpp; sourceTree = ""; }; B24AA984195A675C007B4522 /* CCFastTMXTiledMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCFastTMXTiledMap.h; sourceTree = ""; }; + B24EEA6619775E92004493CC /* libui iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libui iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + B24EEA6E19775EBB004493CC /* libcocostudio iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libcocostudio iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + B24EEA7619775ECE004493CC /* libcocosbuilder iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libcocosbuilder iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + B24EEA7E19775EE1004493CC /* libspine iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libspine iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + B24EEA8619775EF3004493CC /* libnetwork iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libnetwork iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + B257B44C1989D5E800D9A687 /* CCPrimitive.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCPrimitive.cpp; sourceTree = ""; }; + B257B44D1989D5E800D9A687 /* CCPrimitive.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCPrimitive.h; sourceTree = ""; }; + B257B45E198A353E00D9A687 /* CCPrimitiveCommand.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCPrimitiveCommand.cpp; sourceTree = ""; }; + B257B45F198A353E00D9A687 /* CCPrimitiveCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCPrimitiveCommand.h; sourceTree = ""; }; + B276EF5B1988D1D500CD400F /* CCVertexIndexData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCVertexIndexData.h; sourceTree = ""; }; + B276EF5C1988D1D500CD400F /* CCVertexIndexData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCVertexIndexData.cpp; sourceTree = ""; }; + B276EF5D1988D1D500CD400F /* CCVertexIndexBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCVertexIndexBuffer.h; sourceTree = ""; }; + B276EF5E1988D1D500CD400F /* CCVertexIndexBuffer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCVertexIndexBuffer.cpp; sourceTree = ""; }; + B282B47C1980E02B00666787 /* CCEditBoxImplMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CCEditBoxImplMac.mm; sourceTree = ""; }; + B282B47D1980E02B00666787 /* CCEditBoxImplMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCEditBoxImplMac.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 = ""; }; @@ -2891,6 +3093,10 @@ B29594BF1926D61F003EEF37 /* CCSprite3DMaterial.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCSprite3DMaterial.cpp; sourceTree = ""; }; B29594C01926D61F003EEF37 /* CCSprite3DMaterial.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCSprite3DMaterial.h; sourceTree = ""; }; B2D3D3B81948613300BA4831 /* CCBundle3DData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCBundle3DData.h; sourceTree = ""; }; + B2DB47D2197669A100411E16 /* libcocosbuilder Mac.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libcocosbuilder Mac.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + B2DB484D1976716E00411E16 /* libcocostudio Mac.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libcocostudio Mac.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + B2DB490119767F1F00411E16 /* libspine Mac.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libspine Mac.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + B2DB49C4197686CB00411E16 /* libnetwork Mac.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libnetwork Mac.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 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 = ""; }; @@ -2904,6 +3110,12 @@ B375104F1823AC7B00B3BA6A /* CCPhysicsWorldInfo_chipmunk.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCPhysicsWorldInfo_chipmunk.h; sourceTree = ""; }; B3AF019E1842FBA400A98B85 /* b2MotorJoint.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = b2MotorJoint.cpp; sourceTree = ""; }; B3AF019F1842FBA400A98B85 /* b2MotorJoint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = b2MotorJoint.h; sourceTree = ""; }; + B6105175199CB1A600DC41CE /* CCAABB.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCAABB.cpp; sourceTree = ""; }; + B6105176199CB1A600DC41CE /* CCAABB.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCAABB.h; sourceTree = ""; }; + B6105177199CB1A600DC41CE /* CCOBB.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCOBB.cpp; sourceTree = ""; }; + B6105178199CB1A600DC41CE /* CCOBB.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCOBB.h; sourceTree = ""; }; + B6105179199CB1A600DC41CE /* CCRay.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCRay.cpp; sourceTree = ""; }; + B610517A199CB1A600DC41CE /* CCRay.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCRay.h; sourceTree = ""; }; B6AAF83F19404E0D0069DE01 /* CCBundle3D.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCBundle3D.cpp; sourceTree = ""; }; B6AAF84019404E0D0069DE01 /* CCBundle3D.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCBundle3D.h; sourceTree = ""; }; B6ACD895193D6693005E0B8A /* CCMeshSkin.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCMeshSkin.cpp; sourceTree = ""; }; @@ -2919,19 +3131,38 @@ /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ + 15161F0B199E7362006099B8 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 15162101199E7810006099B8 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; 1551A33C158F2AB200E66CFE /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + B217704E1977ED9F009EE11B /* libsqlite3.dylib in Frameworks */, + B21770491977ED4C009EE11B /* libz.dylib in Frameworks */, + B21770471977ED34009EE11B /* QuartzCore.framework in Frameworks */, + B21770451977ED14009EE11B /* Cocoa.framework in Frameworks */, + B21770421977ECF8009EE11B /* ApplicationServices.framework in Frameworks */, + B21770401977ECE6009EE11B /* OpenGL.framework in Frameworks */, + B217703C1977ECB4009EE11B /* IOKit.framework in Frameworks */, B3B12A5A17E7F44000026B4A /* libchipmunk Mac.a in Frameworks */, - 1A94D35116C2072800D79D09 /* Foundation.framework in Frameworks */, 1A570347180BD0850088DEC7 /* libglfw3.a in Frameworks */, 1A570361180BD1080088DEC7 /* libpng.a in Frameworks */, 1A57037B180BD1C90088DEC7 /* libjpeg.a in Frameworks */, 1A5703A1180BD22C0088DEC7 /* libtiff.a in Frameworks */, 1A5703B8180BD2780088DEC7 /* libwebp.a in Frameworks */, 1A57052B180BD31F0088DEC7 /* libfreetype.a in Frameworks */, - 1AAF5385180E35A3000584C8 /* libwebsockets.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2974,8 +3205,6 @@ 1A5703A4180BD2350088DEC7 /* libtiff.a in Frameworks */, 1A5703BB180BD2800088DEC7 /* libwebp.a in Frameworks */, 1A57052E180BD3280088DEC7 /* libfreetype.a in Frameworks */, - 1AAF5388180E35AC000584C8 /* libwebsockets.a in Frameworks */, - 1AAF541D180E3B6A000584C8 /* libcurl.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2983,6 +3212,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + FAA9E17D1998A42A00E2E252 /* libcurl.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3007,6 +3237,79 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + B245F11A19766132001920FD /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + B24EEA4619775E92004493CC /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + B24EEA6919775EBB004493CC /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + B24EEA7119775ECE004493CC /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + B24EEA7919775EE1004493CC /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + B24EEA8119775EF3004493CC /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + FAA9E17E1998A43800E2E252 /* libcurl.a in Frameworks */, + B2CC502E1977638A0041958E /* libwebsockets.a in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + B2DB47B5197669A100411E16 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + B2DB48301976716E00411E16 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + B2DB48E419767F1F00411E16 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + B2DB49A7197686CB00411E16 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + B27AEE0219768934008BD575 /* libwebsockets.a in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ @@ -3060,16 +3363,28 @@ 1551A340158F2AB200E66CFE /* Products */ = { isa = PBXGroup; children = ( - 1551A33F158F2AB200E66CFE /* libcocos2dx Mac.a */, + 1551A33F158F2AB200E66CFE /* libcocos2d Mac.a */, A03F2CB81780BD04006731B9 /* libchipmunk Mac.a */, A03F2D9B1780BDF7006731B9 /* libbox2d Mac.a */, - A03F2ED617814268006731B9 /* libCocosDenshion Mac.a */, - A03F2FD617814595006731B9 /* libcocos2dx-extensions Mac.a */, - A07A4D641783777C0073F6A7 /* libcocos2dx iOS.a */, - A07A4EFC1783867C0073F6A7 /* libcocos2dx-extensions iOS.a */, + A03F2ED617814268006731B9 /* libcocosdenshion Mac.a */, + A03F2FD617814595006731B9 /* libextension Mac.a */, + A07A4D641783777C0073F6A7 /* libcocos2d iOS.a */, + A07A4EFC1783867C0073F6A7 /* libextension iOS.a */, A07A4F3B178387670073F6A7 /* libchipmunk iOS.a */, A07A4F9E1783876B0073F6A7 /* libbox2d iOS.a */, - A07A4FB4178387730073F6A7 /* libCocosDenshion iOS.a */, + A07A4FB4178387730073F6A7 /* libcocosdenshion iOS.a */, + B245F13A19766132001920FD /* libui Mac.a */, + B2DB47D2197669A100411E16 /* libcocosbuilder Mac.a */, + B2DB484D1976716E00411E16 /* libcocostudio Mac.a */, + B2DB490119767F1F00411E16 /* libspine Mac.a */, + B2DB49C4197686CB00411E16 /* libnetwork Mac.a */, + B24EEA6619775E92004493CC /* libui iOS.a */, + B24EEA6E19775EBB004493CC /* libcocostudio iOS.a */, + B24EEA7619775ECE004493CC /* libcocosbuilder iOS.a */, + B24EEA7E19775EE1004493CC /* libspine iOS.a */, + B24EEA8619775EF3004493CC /* libnetwork iOS.a */, + 1516200B199E7363006099B8 /* libcocos3d Mac.a */, + 15162201199E7810006099B8 /* libcocos3d iOS.a */, ); name = Products; sourceTree = ""; @@ -3077,6 +3392,15 @@ 1551A341158F2AB200E66CFE /* Frameworks */ = { isa = PBXGroup; children = ( + B217704C1977ED8B009EE11B /* libsqlite3.dylib */, + B217704A1977ED55009EE11B /* libcurl.dylib */, + B21770481977ED4C009EE11B /* libz.dylib */, + B21770461977ED34009EE11B /* QuartzCore.framework */, + B21770431977ED07009EE11B /* Cocoa.framework */, + B21770411977ECF8009EE11B /* ApplicationServices.framework */, + B217703F1977ECE6009EE11B /* OpenGL.framework */, + B217703D1977ECC1009EE11B /* AudioToolbox.framework */, + B217703B1977ECB4009EE11B /* IOKit.framework */, 1551A342158F2AB200E66CFE /* Foundation.framework */, ); name = Frameworks; @@ -3154,6 +3478,10 @@ 1A570095180BC5B00088DEC7 /* base-nodes */ = { isa = PBXGroup; children = ( + 46633BC2199DDB2F00F6E838 /* CCModuleManager.cpp */, + 46633BC3199DDB2F00F6E838 /* CCModuleManager.h */, + 15EFA20F198A2BB5000C57D3 /* CCProtectedNode.cpp */, + 15EFA210198A2BB5000C57D3 /* CCProtectedNode.h */, 1A57009C180BC5D20088DEC7 /* CCNode.cpp */, 1A57009D180BC5D20088DEC7 /* CCNode.h */, 1A570096180BC5C10088DEC7 /* CCAtlasNode.cpp */, @@ -3165,6 +3493,12 @@ 1A5700A2180BC5E60088DEC7 /* base */ = { isa = PBXGroup; children = ( + 299CF1F919A434BC00C378C1 /* ccRandom.cpp */, + 299CF1FA19A434BC00C378C1 /* ccRandom.h */, + 3EA3EDBA1991CDFA00645534 /* CCCamera.cpp */, + 3EA3EDBB1991CDFA00645534 /* CCCamera.h */, + 464AD6E3197EBB1400E502D8 /* pvr.cpp */, + 464AD6E4197EBB1400E502D8 /* pvr.h */, 3E61781C1966A5A300DE83F5 /* CCController.cpp */, 3E6176551960F89B00DE83F5 /* CCController-iOS.mm */, 3E6176561960F89B00DE83F5 /* CCController.h */, @@ -4078,12 +4412,12 @@ 29CB8F511929D64500C841D6 /* base */ = { isa = PBXGroup; children = ( + 2958244919873D8E00F9746D /* UIScale9Sprite.cpp */, + 2958244A19873D8E00F9746D /* UIScale9Sprite.h */, 29080DEB191B82CE0066F8DF /* UIDeprecated.h */, 29BDBA52195D597A003225C9 /* UIDeprecated.cpp */, 2905FA1318CF08D100240AA3 /* UIWidget.cpp */, 2905FA1418CF08D100240AA3 /* UIWidget.h */, - 50E6D30C18DADB5D0051CA34 /* CCProtectedNode.cpp */, - 50E6D30D18DADB5D0051CA34 /* CCProtectedNode.h */, 2905F9F418CF08D000240AA3 /* UIHelper.cpp */, 2905F9F518CF08D000240AA3 /* UIHelper.h */, 2905F9EB18CF08D000240AA3 /* GUIDefine.h */, @@ -4257,6 +4591,8 @@ 46A1684E1807AF4E005B8026 /* CCEditBox */ = { isa = PBXGroup; children = ( + B282B47C1980E02B00666787 /* CCEditBoxImplMac.mm */, + B282B47D1980E02B00666787 /* CCEditBoxImplMac.h */, 46A1684F1807AF4E005B8026 /* CCEditBox.cpp */, 46A168501807AF4E005B8026 /* CCEditBox.h */, 46A168511807AF4E005B8026 /* CCEditBoxImpl.h */, @@ -4264,8 +4600,6 @@ 46A168531807AF4E005B8026 /* CCEditBoxImplAndroid.h */, 46A168541807AF4E005B8026 /* CCEditBoxImplIOS.h */, 46A168551807AF4E005B8026 /* CCEditBoxImplIOS.mm */, - 46A168561807AF4E005B8026 /* CCEditBoxImplMac.h */, - 46A168571807AF4E005B8026 /* CCEditBoxImplMac.mm */, 46A168581807AF4E005B8026 /* CCEditBoxImplNone.cpp */, 46A1685B1807AF4E005B8026 /* CCEditBoxImplWin.cpp */, 46A1685C1807AF4E005B8026 /* CCEditBoxImplWin.h */, @@ -4659,6 +4993,10 @@ 500DC89819105D41007B91BF /* renderer */ = { isa = PBXGroup; children = ( + B276EF5B1988D1D500CD400F /* CCVertexIndexData.h */, + B276EF5C1988D1D500CD400F /* CCVertexIndexData.cpp */, + B276EF5D1988D1D500CD400F /* CCVertexIndexBuffer.h */, + B276EF5E1988D1D500CD400F /* CCVertexIndexBuffer.cpp */, 50ABBD641925AB4100A911A9 /* CCBatchCommand.cpp */, 50ABBD651925AB4100A911A9 /* CCBatchCommand.h */, 50ABBD661925AB4100A911A9 /* CCCustomCommand.cpp */, @@ -4692,6 +5030,10 @@ 50ABBD801925AB4100A911A9 /* CCTextureAtlas.h */, 50ABBD811925AB4100A911A9 /* CCTextureCache.cpp */, 50ABBD821925AB4100A911A9 /* CCTextureCache.h */, + B257B44C1989D5E800D9A687 /* CCPrimitive.cpp */, + B257B44D1989D5E800D9A687 /* CCPrimitive.h */, + B257B45E198A353E00D9A687 /* CCPrimitiveCommand.cpp */, + B257B45F198A353E00D9A687 /* CCPrimitiveCommand.h */, 5034CA5D191D591900CE6051 /* shaders */, ); name = renderer; @@ -4745,8 +5087,8 @@ 503DD8D71926736A00CD74DD /* CCES2Renderer.m */, 503DD8D81926736A00CD74DD /* CCESRenderer.h */, 503DD8D91926736A00CD74DD /* CCGL.h */, - 503DD8DA1926736A00CD74DD /* CCGLView.h */, - 503DD8DB1926736A00CD74DD /* CCGLView.mm */, + 503DD8DA1926736A00CD74DD /* CCGLViewImpl.h */, + 503DD8DB1926736A00CD74DD /* CCGLViewImpl.mm */, 503DD8DC1926736A00CD74DD /* CCImage.mm */, 503DD8DD1926736A00CD74DD /* CCPlatformDefine.h */, 503DD8DE1926736A00CD74DD /* CCStdC.h */, @@ -4767,8 +5109,8 @@ 50ABBF221926664700A911A9 /* CCDevice.h */, 50ABBF231926664700A911A9 /* CCFileUtils.cpp */, 50ABBF241926664700A911A9 /* CCFileUtils.h */, - 50ABBF251926664700A911A9 /* CCGLViewProtocol.cpp */, - 50ABBF261926664700A911A9 /* CCGLViewProtocol.h */, + 50ABBF251926664700A911A9 /* CCGLView.cpp */, + 50ABBF261926664700A911A9 /* CCGLView.h */, 50ABBF271926664700A911A9 /* CCImage.cpp */, 50ABBF281926664700A911A9 /* CCImage.h */, 50ABBF291926664700A911A9 /* CCSAXParser.cpp */, @@ -4795,8 +5137,8 @@ 50ABBF2D1926664700A911A9 /* desktop */ = { isa = PBXGroup; children = ( - 50ABBF2E1926664700A911A9 /* CCGLView.cpp */, - 50ABBF2F1926664700A911A9 /* CCGLView.h */, + 50ABBF2E1926664700A911A9 /* CCGLViewImpl.cpp */, + 50ABBF2F1926664700A911A9 /* CCGLViewImpl.h */, ); path = desktop; sourceTree = ""; @@ -4958,6 +5300,21 @@ B29594B81926D61F003EEF37 /* 3d */ = { isa = PBXGroup; children = ( + 15162236199F9EEA006099B8 /* cocos3d.h */, + B6105175199CB1A600DC41CE /* CCAABB.cpp */, + B6105176199CB1A600DC41CE /* CCAABB.h */, + B6105177199CB1A600DC41CE /* CCOBB.cpp */, + B6105178199CB1A600DC41CE /* CCOBB.h */, + B6105179199CB1A600DC41CE /* CCRay.cpp */, + B610517A199CB1A600DC41CE /* CCRay.h */, + 3EA2A83E1987A6810077B3D4 /* CCSkeleton3D.cpp */, + 3EA2A83F1987A6810077B3D4 /* CCSkeleton3D.h */, + 3E9E80E3198639EF00FA95D0 /* CCAttachNode.cpp */, + 3E9E80E4198639EF00FA95D0 /* CCAttachNode.h */, + 3E9E80E5198639EF00FA95D0 /* CCSubMesh.cpp */, + 3E9E80E6198639EF00FA95D0 /* CCSubMesh.h */, + 3E9E80E7198639EF00FA95D0 /* CCSubMeshState.cpp */, + 3E9E80E8198639EF00FA95D0 /* CCSubMeshState.h */, 3EA4786E195478E00068D9D1 /* CCBundleReader.cpp */, 3EA4786F195478E00068D9D1 /* CCBundleReader.h */, B6AAF83F19404E0D0069DE01 /* CCBundle3D.cpp */, @@ -4987,6 +5344,58 @@ /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ + 15161F1A199E7362006099B8 /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 1516201C199E75FE006099B8 /* CCAABB.h in Headers */, + 1516201D199E75FE006099B8 /* CCOBB.h in Headers */, + 1516201E199E75FE006099B8 /* CCRay.h in Headers */, + 1516201F199E75FE006099B8 /* CCSkeleton3D.h in Headers */, + 15162020199E75FE006099B8 /* CCAttachNode.h in Headers */, + 15162021199E75FE006099B8 /* CCSubMesh.h in Headers */, + 15162022199E75FF006099B8 /* CCSubMeshState.h in Headers */, + 15162023199E75FF006099B8 /* CCBundleReader.h in Headers */, + 15162024199E75FF006099B8 /* CCBundle3D.h in Headers */, + 15162025199E75FF006099B8 /* CCAnimate3D.h in Headers */, + 15162237199F9EEA006099B8 /* cocos3d.h in Headers */, + 15162026199E75FF006099B8 /* CCMeshSkin.h in Headers */, + 15162027199E75FF006099B8 /* CCAnimation3D.h in Headers */, + 15162028199E75FF006099B8 /* CCAnimationCurve.h in Headers */, + 15162029199E75FF006099B8 /* CCMesh.h in Headers */, + 1516202A199E75FF006099B8 /* CCObjLoader.h in Headers */, + 1516202B199E75FF006099B8 /* CCSprite3D.h in Headers */, + 1516202C199E75FF006099B8 /* CCSprite3DMaterial.h in Headers */, + 1516202D199E75FF006099B8 /* CCBundle3DData.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 15162109199E7810006099B8 /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 15162212199E7A32006099B8 /* CCAABB.h in Headers */, + 15162213199E7A32006099B8 /* CCOBB.h in Headers */, + 15162214199E7A32006099B8 /* CCRay.h in Headers */, + 15162215199E7A32006099B8 /* CCSkeleton3D.h in Headers */, + 15162216199E7A32006099B8 /* CCAttachNode.h in Headers */, + 15162217199E7A32006099B8 /* CCSubMesh.h in Headers */, + 15162218199E7A32006099B8 /* CCSubMeshState.h in Headers */, + 15162219199E7A32006099B8 /* CCBundleReader.h in Headers */, + 1516221A199E7A32006099B8 /* CCBundle3D.h in Headers */, + 1516221B199E7A32006099B8 /* CCAnimate3D.h in Headers */, + 15162238199F9EEA006099B8 /* cocos3d.h in Headers */, + 1516221C199E7A32006099B8 /* CCMeshSkin.h in Headers */, + 1516221D199E7A32006099B8 /* CCAnimation3D.h in Headers */, + 1516221E199E7A32006099B8 /* CCAnimationCurve.h in Headers */, + 1516221F199E7A32006099B8 /* CCMesh.h in Headers */, + 15162220199E7A32006099B8 /* CCObjLoader.h in Headers */, + 15162221199E7A32006099B8 /* CCSprite3D.h in Headers */, + 15162222199E7A32006099B8 /* CCSprite3DMaterial.h in Headers */, + 15162223199E7A32006099B8 /* CCBundle3DData.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 1551A33D158F2AB200E66CFE /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; @@ -4994,48 +5403,36 @@ 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 /* UILayoutManager.h in Headers */, - 2AC795E018628723005EC8E1 /* Event.h in Headers */, - 2AC795E118628723005EC8E1 /* EventData.h in Headers */, - 50E6D33618E174130051CA34 /* UIHBox.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 /* CCSprite3DMaterial.h in Headers */, 1ABA68B01888D700007D1BB4 /* CCFontCharMap.h in Headers */, 5034CA3F191D591100CE6051 /* ccShader_Position_uColor.vert in Headers */, 50ABBD461925AB0000A911A9 /* CCVertex.h in Headers */, + 46633BC6199DDB2F00F6E838 /* CCModuleManager.h in Headers */, 46A170E71807CECA005B8026 /* CCPhysicsBody.h in Headers */, - 2905FA4818CF08D100240AA3 /* UIButton.h in Headers */, 46A170EB1807CECA005B8026 /* CCPhysicsJoint.h in Headers */, 50ABBD3E1925AB0000A911A9 /* CCGeometry.h in Headers */, 50ABBE631925AB6F00A911A9 /* CCEventListenerAcceleration.h in Headers */, - 2905FA4418CF08D100240AA3 /* GUIDefine.h in Headers */, B37510771823AC9F00B3BA6A /* CCPhysicsJointInfo_chipmunk.h in Headers */, 46A170EE1807CECA005B8026 /* CCPhysicsShape.h in Headers */, - 2905FA5018CF08D100240AA3 /* UIHelper.h in Headers */, 50ABBED31925AB6F00A911A9 /* uthash.h in Headers */, 46A170E91807CECA005B8026 /* CCPhysicsContact.h in Headers */, B375107B1823AC9F00B3BA6A /* CCPhysicsWorldInfo_chipmunk.h in Headers */, - 2905FA6818CF08D100240AA3 /* UILoadingBar.h in Headers */, 46A170F01807CECA005B8026 /* CCPhysicsWorld.h in Headers */, 50ABBEC11925AB6F00A911A9 /* CCValue.h in Headers */, + B276EF631988D1D500CD400F /* CCVertexIndexBuffer.h in Headers */, 50ABBE871925AB6F00A911A9 /* ccMacros.h in Headers */, 50ABBE731925AB6F00A911A9 /* CCEventListenerMouse.h in Headers */, 1A570063180BC5A10088DEC7 /* CCAction.h in Headers */, 1A570067180BC5A10088DEC7 /* CCActionCamera.h in Headers */, - 0634A4DA194B19E400E608AF /* CCFrame.h in Headers */, 1A57006B180BC5A10088DEC7 /* CCActionCatmullRom.h in Headers */, 1A57006F180BC5A10088DEC7 /* CCActionEase.h in Headers */, 1A570073180BC5A10088DEC7 /* CCActionGrid.h in Headers */, - 50FCEBB518C72017004AD434 /* SliderReader.h in Headers */, 5034CA3B191D591100CE6051 /* ccShader_PositionColor.vert in Headers */, 1A570077180BC5A10088DEC7 /* CCActionGrid3D.h in Headers */, 1A57007B180BC5A10088DEC7 /* CCActionInstant.h in Headers */, + B276EF5F1988D1D500CD400F /* CCVertexIndexData.h in Headers */, 1A57007F180BC5A10088DEC7 /* CCActionInterval.h in Headers */, 1A01C69A18F57BE800EFE3A6 /* CCSet.h in Headers */, 1A570083180BC5A10088DEC7 /* CCActionManager.h in Headers */, @@ -5047,9 +5444,6 @@ 50ABBD8D1925AB4100A911A9 /* CCGLProgram.h in Headers */, 50ABBEA11925AB6F00A911A9 /* CCScheduler.h in Headers */, 50ABBDB71925AB4100A911A9 /* CCTexture2D.h in Headers */, - B2D3D3B91948613300BA4831 /* CCBundle3DData.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 */, @@ -5058,17 +5452,12 @@ 1A5700A0180BC5D20088DEC7 /* CCNode.h in Headers */, 50ABC0671926664800A911A9 /* CCPlatformDefine.h in Headers */, 46C02E0918E91123004B7456 /* xxhash.h in Headers */, - 06CAAAC6186AD7E60012A414 /* TriggerObj.h in Headers */, 1A570110180BC8EE0088DEC7 /* CCDrawingPrimitives.h in Headers */, B37510791823AC9F00B3BA6A /* CCPhysicsShapeInfo_chipmunk.h in Headers */, 1A570114180BC8EE0088DEC7 /* CCDrawNode.h in Headers */, 1A57011D180BC90D0088DEC7 /* CCGrabber.h in Headers */, 1A570121180BC90D0088DEC7 /* CCGrid.h in Headers */, 5034CA2D191D591100CE6051 /* ccShader_PositionTextureA8Color.frag in Headers */, - 50E6D33A18E174130051CA34 /* UIRelativeBox.h in Headers */, - 50E6D30F18DADB5D0051CA34 /* CCProtectedNode.h in Headers */, - 50FCEB9918C72017004AD434 /* CheckBoxReader.h in Headers */, - 50E6D33E18E174130051CA34 /* UIVBox.h in Headers */, 1AC0269C1914068200FA920D /* ConvertUTF.h in Headers */, 50ABBED11925AB6F00A911A9 /* TGAlib.h in Headers */, 1A57019F180BCB590088DEC7 /* CCFont.h in Headers */, @@ -5092,7 +5481,6 @@ 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 */, @@ -5115,13 +5503,10 @@ 50ABBE4F1925AB6F00A911A9 /* CCEventCustom.h in Headers */, 50ABBD521925AB0000A911A9 /* Quaternion.h in Headers */, 1A57022F180BCC1A0088DEC7 /* CCParticleSystemQuad.h in Headers */, - 2905FA4218CF08D100240AA3 /* CocosGUI.h in Headers */, 5034CA49191D591100CE6051 /* ccShader_Label_df.frag in Headers */, 1A01C68C18F57BE800EFE3A6 /* CCDeprecated.h in Headers */, 50ABBD561925AB0000A911A9 /* TransformUtils.h in Headers */, - 2905FA6418CF08D100240AA3 /* UIListView.h in Headers */, 299754F6193EC95400A54AC3 /* ObjectFactory.h in Headers */, - 50FCEBB918C72017004AD434 /* TextAtlasReader.h in Headers */, 50ABBD991925AB4100A911A9 /* CCGLProgramStateCache.h in Headers */, 5034CA3D191D591100CE6051 /* ccShader_PositionColor.frag in Headers */, 1A570280180BCC900088DEC7 /* CCSprite.h in Headers */, @@ -5133,23 +5518,18 @@ 1A570294180BCCAB0088DEC7 /* CCAnimation.h in Headers */, 50ABBD421925AB0000A911A9 /* CCMathBase.h in Headers */, 1A570298180BCCAB0088DEC7 /* CCAnimationCache.h in Headers */, - 0634A4DE194B19E400E608AF /* CCNodeReader.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 */, 50ABBD4E1925AB0000A911A9 /* MathUtil.h in Headers */, - 2905FA7618CF08D100240AA3 /* UIScrollView.h in Headers */, 50ABBE431925AB6F00A911A9 /* CCDirector.h in Headers */, 1A12775B18DFCC540005F345 /* CCTweenFunction.h in Headers */, 1A5702CA180BCE370088DEC7 /* CCTextFieldTTF.h in Headers */, + 15EFA213198A2BB5000C57D3 /* CCProtectedNode.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 */, @@ -5161,198 +5541,85 @@ 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 */, 50ABBD621925AB0000A911A9 /* Vec4.h in Headers */, 1A01C69418F57BE800EFE3A6 /* CCFloat.h in Headers */, - 2905FA5818CF08D100240AA3 /* UILayout.h in Headers */, 1A57034D180BD09B0088DEC7 /* tinyxml2.h in Headers */, 1A570356180BD0B00088DEC7 /* ioapi.h in Headers */, - B29594C41926D61F003EEF37 /* CCMesh.h in Headers */, 50ABBE331925AB6F00A911A9 /* CCConfiguration.h in Headers */, 50ABC01F1926664800A911A9 /* CCThread.h in Headers */, 1A57035A180BD0B00088DEC7 /* unzip.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 */, - 1AD71DB3180E26E600808F54 /* CCBKeyframe.h in Headers */, - 1AD71DB5180E26E600808F54 /* CCBMemberVariableAssigner.h in Headers */, - 1AD71DB9180E26E600808F54 /* CCBReader.h in Headers */, - 2905FA7E18CF08D100240AA3 /* UIText.h in Headers */, - 1AD71DBB180E26E600808F54 /* CCBSelectorResolver.h in Headers */, 5034CA35191D591100CE6051 /* ccShader_PositionTexture.frag in Headers */, 50ABBE6F1925AB6F00A911A9 /* CCEventListenerKeyboard.h in Headers */, 50ABBE9D1925AB6F00A911A9 /* CCRefPtr.h in Headers */, - 1AD71DBF180E26E600808F54 /* CCBSequence.h in Headers */, - 1AD71DC3180E26E600808F54 /* CCBSequenceProperty.h in Headers */, + B257B461198A353E00D9A687 /* CCPrimitiveCommand.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 */, - 0634A4D6194B19E400E608AF /* CCActionTimelineCache.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 */, - 1AD71DE7180E26E600808F54 /* CCMenuItemImageLoader.h in Headers */, - 1AD71DEB180E26E600808F54 /* CCMenuItemLoader.h in Headers */, - 1AD71DED180E26E600808F54 /* CCMenuLoader.h in Headers */, + 3EA3EDBE1991CDFA00645534 /* CCCamera.h in Headers */, 50ABBE8F1925AB6F00A911A9 /* CCPlatformConfig.h in Headers */, - 1AD71DF1180E26E600808F54 /* CCNode+CCBRelativePositioning.h in Headers */, - 1AD71DF5180E26E600808F54 /* CCNodeLoader.h in Headers */, - 1AD71DF9180E26E600808F54 /* CCNodeLoaderLibrary.h in Headers */, 50ABBE291925AB6F00A911A9 /* CCAutoreleasePool.h in Headers */, - 2905FA8A18CF08D100240AA3 /* UITextField.h in Headers */, + 299CF1FD19A434BC00C378C1 /* ccRandom.h in Headers */, 50ABBE471925AB6F00A911A9 /* CCEvent.h in Headers */, + B257B4501989D5E800D9A687 /* CCPrimitive.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 */, - 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 */, - 29E99D201957BA7000046604 /* CocoLoader.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 */, - 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 */, 50ABBD5A1925AB0000A911A9 /* Vec2.h in Headers */, - 1AD71EBB180E26E600808F54 /* CCSkeleton.h in Headers */, B24AA987195A675C007B4522 /* CCFastTMXLayer.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 */, - 50ABC0231926664800A911A9 /* CCGLView.h in Headers */, - 06CAAACD186AD7F90012A414 /* TriggerBase.h in Headers */, - 1AD71ECB180E26E600808F54 /* RegionAttachment.h in Headers */, + 50ABC0231926664800A911A9 /* CCGLViewImpl.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 */, - 1AD71ED3180E26E600808F54 /* SkeletonData.h in Headers */, 50ABC00F1926664800A911A9 /* CCFileUtils.h in Headers */, 50ABBE3B1925AB6F00A911A9 /* CCData.h in Headers */, - 1AD71ED7180E26E600808F54 /* SkeletonJson.h in Headers */, - 1AD71EDB180E26E600808F54 /* Skin.h in Headers */, 50ABBE3F1925AB6F00A911A9 /* CCDataVisitor.h in Headers */, - 1AD71EDF180E26E600808F54 /* Slot.h in Headers */, - 1AD71EE3180E26E600808F54 /* SlotData.h in Headers */, - 0634A4E2194B19E400E608AF /* CCTimeLine.h in Headers */, - 1AD71EE7180E26E600808F54 /* spine-cocos2dx.h in Headers */, - 3EA47872195478E00068D9D1 /* CCBundleReader.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 */, - 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 */, 1A9DCA29180E6955007A3AD4 /* CCGLBufferedNode.h in Headers */, - 50FCEBB118C72017004AD434 /* ScrollViewReader.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 */, B24AA98B195A675C007B4522 /* CCFastTMXTiledMap.h in Headers */, B29594B61926D5EC003EEF37 /* CCMeshCommand.h in Headers */, 50ABBE371925AB6F00A911A9 /* CCConsole.h in Headers */, - 1A8C59A1180E930E00EF57C3 /* CCArmature.h in Headers */, - 1A8C59A5180E930E00EF57C3 /* CCArmatureAnimation.h in Headers */, - 0634A4D2194B19E400E608AF /* CCActionTimeline.h in Headers */, - 1A8C59A9180E930E00EF57C3 /* CCArmatureDataManager.h in Headers */, 50ABC00B1926664800A911A9 /* CCDevice.h in Headers */, - 2905FA7A18CF08D100240AA3 /* UISlider.h in Headers */, - 1A8C59AD180E930E00EF57C3 /* CCArmatureDefine.h in Headers */, - 50ABC0131926664800A911A9 /* CCGLViewProtocol.h in Headers */, - 1A8C59B1180E930E00EF57C3 /* CCBatchNode.h in Headers */, + 50ABC0131926664800A911A9 /* CCGLView.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 */, - 1A8C59B9180E930E00EF57C3 /* CCColliderDetector.h in Headers */, - 1A8C59BD180E930E00EF57C3 /* CCComAttribute.h in Headers */, - 1A8C59C1180E930E00EF57C3 /* CCComAudio.h in Headers */, - 1A8C59C5180E930E00EF57C3 /* CCComController.h in Headers */, - 1A8C59C9180E930E00EF57C3 /* CCComRender.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 */, 50ABBDA91925AB4100A911A9 /* CCRenderCommand.h in Headers */, 50ABBD951925AB4100A911A9 /* CCGLProgramState.h in Headers */, - 1A8C59F1180E930E00EF57C3 /* CCSpriteFrameCacheHelper.h in Headers */, - 1A8C59F5180E930E00EF57C3 /* CCSSceneReader.h in Headers */, - 0634A4E4194B19E400E608AF /* CCTimelineMacro.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 */, - 1A8C5A0F180E930E00EF57C3 /* DictionaryHelper.h in Headers */, - 50FCEBBD18C72017004AD434 /* TextBMFontReader.h in Headers */, - 50FCEBCB18C72017004AD434 /* WidgetReaderProtocol.h in Headers */, - B6B2633F19381FBF0088FE25 /* CCAnimationCurve.h in Headers */, - B6B26345193884D60088FE25 /* CCAnimation3D.h in Headers */, - B6ACD899193D6693005E0B8A /* CCMeshSkin.h in Headers */, - B6ACD8A0193DC0CC005E0B8A /* CCAnimate3D.h in Headers */, - B6AAF84319404E0D0069DE01 /* CCBundle3D.h in Headers */, + 464AD6E7197EBB1400E502D8 /* pvr.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -5462,15 +5729,13 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( + B282B4801980E08F00666787 /* CCEditBoxImplMac.h in Headers */, 460E478318080902000CDD6D /* CCControlExtensions.h in Headers */, 460E477E18080902000CDD6D /* CCControl.h in Headers */, 460E47B11808090B000CDD6D /* CCEditBoxImpl.h in Headers */, - 460E47B31808090B000CDD6D /* CCEditBoxImplAndroid.h in Headers */, - 460E47B61808090B000CDD6D /* CCEditBoxImplMac.h in Headers */, 460E477B180808F5000CDD6D /* ExtensionMacros.h in Headers */, 460E479118080902000CDD6D /* CCControlUtils.h in Headers */, 460E468118080832000CDD6D /* cocos-ext.h in Headers */, - 460E47B41808090B000CDD6D /* CCEditBoxImplIOS.h in Headers */, 460E47CC18080913000CDD6D /* CCScrollView.h in Headers */, 460E47B01808090B000CDD6D /* CCEditBox.h in Headers */, 460E478918080902000CDD6D /* CCControlSaturationBrightnessPicker.h in Headers */, @@ -5478,7 +5743,6 @@ 460E478F18080902000CDD6D /* CCControlSwitch.h in Headers */, 460E479518080902000CDD6D /* CCScale9Sprite.h in Headers */, 460E478718080902000CDD6D /* CCControlPotentiometer.h in Headers */, - 460E47BC1808090B000CDD6D /* CCEditBoxImplWin.h in Headers */, 460E478B18080902000CDD6D /* CCControlSlider.h in Headers */, 460E478218080902000CDD6D /* CCControlColourPicker.h in Headers */, 460E478518080902000CDD6D /* CCControlHuePicker.h in Headers */, @@ -5496,26 +5760,16 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 2AC795E71862875D005EC8E1 /* SkeletonBounds.h in Headers */, - 2AC795E81862875D005EC8E1 /* Event.h in Headers */, - 2AC795E91862875D005EC8E1 /* EventData.h in Headers */, - 2AC795EA1862875D005EC8E1 /* BoundingBoxAttachment.h in Headers */, 503DD8F01926736A00CD74DD /* CCStdC.h in Headers */, 46A170FF1807CECB005B8026 /* CCPhysicsContact.h in Headers */, - 0634A4D3194B19E400E608AF /* CCActionTimeline.h in Headers */, 50ABBDA21925AB4100A911A9 /* CCGroupCommand.h in Headers */, 503DD8EF1926736A00CD74DD /* CCPlatformDefine.h in Headers */, 46A171041807CECB005B8026 /* CCPhysicsShape.h in Headers */, - 50FCEBAE18C72017004AD434 /* PageViewReader.h in Headers */, 50ABBD3B1925AB0000A911A9 /* CCAffineTransform.h in Headers */, 5034CA38191D591100CE6051 /* ccShader_PositionColorLengthTexture.vert in Headers */, 50ABBE7C1925AB6F00A911A9 /* CCEventMouse.h in Headers */, - B29594D11926D61F003EEF37 /* CCSprite3DMaterial.h in Headers */, 46A171011807CECB005B8026 /* CCPhysicsJoint.h in Headers */, 46A170FD1807CECB005B8026 /* CCPhysicsBody.h in Headers */, - 2905FA6118CF08D100240AA3 /* UILayoutParameter.h in Headers */, - B29594C51926D61F003EEF37 /* CCMesh.h in Headers */, - 0634A4DB194B19E400E608AF /* CCFrame.h in Headers */, 50ABBE9C1925AB6F00A911A9 /* CCRef.h in Headers */, 50ABBD961925AB4100A911A9 /* CCGLProgramState.h in Headers */, 46A171061807CECB005B8026 /* CCPhysicsWorld.h in Headers */, @@ -5525,15 +5779,12 @@ 50ABC0041926664800A911A9 /* CCLock.h in Headers */, 5034CA40191D591100CE6051 /* ccShader_Position_uColor.vert in Headers */, 50ABBEC21925AB6F00A911A9 /* CCValue.h in Headers */, - 2905FA5518CF08D100240AA3 /* UIImageView.h in Headers */, + 46633BC7199DDB2F00F6E838 /* CCModuleManager.h in Headers */, 50ABBECA1925AB6F00A911A9 /* firePngData.h in Headers */, - 0634A4E3194B19E400E608AF /* CCTimeLine.h in Headers */, + B257B4511989D5E800D9A687 /* CCPrimitive.h in Headers */, 50ABBE401925AB6F00A911A9 /* CCDataVisitor.h in Headers */, 1A570064180BC5A10088DEC7 /* CCAction.h in Headers */, - 06CAAACE186AD7FA0012A414 /* TriggerBase.h in Headers */, - 503DD8EC1926736A00CD74DD /* CCGLView.h in Headers */, - 50FCEBC218C72017004AD434 /* TextFieldReader.h in Headers */, - 29E99D211957BA7000046604 /* CocoLoader.h in Headers */, + 503DD8EC1926736A00CD74DD /* CCGLViewImpl.h in Headers */, 50ABBEBA1925AB6F00A911A9 /* ccUTF8.h in Headers */, 1A570068180BC5A10088DEC7 /* CCActionCamera.h in Headers */, 1A57006C180BC5A10088DEC7 /* CCActionCatmullRom.h in Headers */, @@ -5550,50 +5801,39 @@ 1A57007C180BC5A10088DEC7 /* CCActionInstant.h in Headers */, 3E6176751960F89B00DE83F5 /* CCEventController.h in Headers */, 50ABBE781925AB6F00A911A9 /* CCEventListenerTouch.h in Headers */, - B2D3D3BA1948613300BA4831 /* CCBundle3DData.h in Headers */, B37510861823ACA100B3BA6A /* CCPhysicsWorldInfo_chipmunk.h in Headers */, 1A570080180BC5A10088DEC7 /* CCActionInterval.h in Headers */, 1A570084180BC5A10088DEC7 /* CCActionManager.h in Headers */, - 50ABC0141926664800A911A9 /* CCGLViewProtocol.h in Headers */, + 50ABC0141926664800A911A9 /* CCGLView.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 */, 1A57009B180BC5C10088DEC7 /* CCAtlasNode.h in Headers */, - 2905FA5118CF08D100240AA3 /* UIHelper.h in Headers */, 1A5700A1180BC5D20088DEC7 /* CCNode.h in Headers */, - 50FCEB9618C72017004AD434 /* ButtonReader.h in Headers */, - 2905FA7118CF08D100240AA3 /* UIRichText.h in Headers */, 503DD8E41926736A00CD74DD /* CCDirectorCaller.h in Headers */, 50ABBD8A1925AB4100A911A9 /* CCCustomCommand.h in Headers */, 299754F7193EC95400A54AC3 /* ObjectFactory.h in Headers */, - 2905FA6D18CF08D100240AA3 /* UIPageView.h in Headers */, 50ABBE881925AB6F00A911A9 /* ccMacros.h in Headers */, 50ABC0101926664800A911A9 /* CCFileUtils.h in Headers */, - 2905FA4318CF08D100240AA3 /* CocosGUI.h in Headers */, 5034CA30191D591100CE6051 /* ccShader_PositionTexture.vert 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 */, - 50FCEBBA18C72017004AD434 /* TextAtlasReader.h in Headers */, - 0634A4D7194B19E400E608AF /* CCActionTimelineCache.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 */, + 3EA3EDBF1991CDFA00645534 /* CCCamera.h in Headers */, 50ABBFFE1926664800A911A9 /* CCFileUtilsApple.h in Headers */, 1A5701A4180BCB590088DEC7 /* CCFontAtlas.h in Headers */, 1A5701A8180BCB590088DEC7 /* CCFontAtlasCache.h in Headers */, @@ -5608,12 +5848,10 @@ 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 */, - 50FCEBCA18C72017004AD434 /* WidgetReader.h in Headers */, 1A5701E1180BCB8C0088DEC7 /* CCLayer.h in Headers */, 1A5701E5180BCB8C0088DEC7 /* CCScene.h in Headers */, 1A5701E9180BCB8C0088DEC7 /* CCTransition.h in Headers */, @@ -5621,7 +5859,6 @@ 1A5701ED180BCB8C0088DEC7 /* CCTransitionPageTurn.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 */, @@ -5633,16 +5870,14 @@ 1A570217180BCBF40088DEC7 /* CCRenderTexture.h in Headers */, 1A570224180BCC1A0088DEC7 /* CCParticleBatchNode.h in Headers */, 503DD8F61926B0DB00CD74DD /* CCIMEDelegate.h in Headers */, - 373B912A187891FB00198F86 /* CCComBase.h in Headers */, 1A570228180BCC1A0088DEC7 /* CCParticleExamples.h in Headers */, 1A57022C180BCC1A0088DEC7 /* CCParticleSystem.h in Headers */, 1A570230180BCC1A0088DEC7 /* CCParticleSystemQuad.h in Headers */, B24AA988195A675C007B4522 /* CCFastTMXLayer.h in Headers */, 5034CA2C191D591100CE6051 /* ccShader_PositionTextureA8Color.vert in Headers */, 50ABBE981925AB6F00A911A9 /* CCProtocols.h in Headers */, - 2905FA8B18CF08D100240AA3 /* UITextField.h in Headers */, - 50FCEBA618C72017004AD434 /* ListViewReader.h in Headers */, 50ABBD431925AB0000A911A9 /* CCMathBase.h in Headers */, + 15EFA214198A2BB5000C57D3 /* CCProtectedNode.h in Headers */, 50ABBE441925AB6F00A911A9 /* CCDirector.h in Headers */, 5034CA4A191D591100CE6051 /* ccShader_Label_df.frag in Headers */, 1A570281180BCC900088DEC7 /* CCSprite.h in Headers */, @@ -5655,12 +5890,8 @@ 50ABBE341925AB6F00A911A9 /* CCConfiguration.h in Headers */, 1A570299180BCCAB0088DEC7 /* CCAnimationCache.h in Headers */, 50ABBEAA1925AB6F00A911A9 /* CCTouch.h in Headers */, - 2905FA6918CF08D100240AA3 /* UILoadingBar.h in Headers */, 50ABBE741925AB6F00A911A9 /* CCEventListenerMouse.h in Headers */, - 2905FA8F18CF08D100240AA3 /* UIWidget.h in Headers */, - 50FCEB9A18C72017004AD434 /* CheckBoxReader.h in Headers */, 1A5702CB180BCE370088DEC7 /* CCTextFieldTTF.h in Headers */, - 2905FA7F18CF08D100240AA3 /* UIText.h in Headers */, 1A5702ED180BCE750088DEC7 /* CCTileMapAtlas.h in Headers */, 1A5702F1180BCE750088DEC7 /* CCTMXLayer.h in Headers */, 5034CA44191D591100CE6051 /* ccShader_Label.vert in Headers */, @@ -5672,12 +5903,7 @@ 50ABBE2A1925AB6F00A911A9 /* CCAutoreleasePool.h in Headers */, 1A57030F180BCF190088DEC7 /* CCComponent.h in Headers */, 1A570313180BCF190088DEC7 /* CCComponentContainer.h in Headers */, - 0634A4DF194B19E400E608AF /* CCNodeReader.h in Headers */, 1A087AEB1860400400196EF5 /* edtaa3func.h in Headers */, - 2905FA6518CF08D100240AA3 /* UIListView.h in Headers */, - 50FCEBAA18C72017004AD434 /* LoadingBarReader.h in Headers */, - 50FCEBC618C72017004AD434 /* TextReader.h in Headers */, - 2905FA7718CF08D100240AA3 /* UIScrollView.h in Headers */, B375107F1823ACA100B3BA6A /* CCPhysicsContactInfo_chipmunk.h in Headers */, 1A57034E180BD09B0088DEC7 /* tinyxml2.h in Headers */, 1A570357180BD0B00088DEC7 /* ioapi.h in Headers */, @@ -5687,187 +5913,80 @@ 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 */, - 1AD71DC0180E26E600808F54 /* CCBSequence.h in Headers */, - 50FCEBCC18C72017004AD434 /* WidgetReaderProtocol.h in Headers */, - 1AD71DC4180E26E600808F54 /* CCBSequenceProperty.h in Headers */, - 1AD71DCC180E26E600808F54 /* CCControlButtonLoader.h in Headers */, - 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 */, 3E6176771960F89B00DE83F5 /* CCEventListenerController.h in Headers */, - 1AD71DF6180E26E600808F54 /* CCNodeLoader.h in Headers */, 50ABBD861925AB4100A911A9 /* CCBatchCommand.h in Headers */, - 1AD71DFA180E26E600808F54 /* CCNodeLoaderLibrary.h in Headers */, 50ABBE481925AB6F00A911A9 /* CCEvent.h in Headers */, 5027253B190BF1B900AAF4ED /* cocos2d.h in Headers */, - B29594CD1926D61F003EEF37 /* CCSprite3D.h in Headers */, 3E6176691960F89B00DE83F5 /* CCController.h in Headers */, - 1AD71DFC180E26E600808F54 /* CCNodeLoaderListener.h in Headers */, - 3EA0FB6B191C841D00B170C8 /* UIVideoPlayer.h in Headers */, 3E6176781960F89B00DE83F5 /* CCGameController.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 */, - 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 */, 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 */, - 2905FA4918CF08D100240AA3 /* UIButton.h in Headers */, - 1AD71EB0180E26E600808F54 /* AttachmentLoader.h in Headers */, - 5034CA32191D591100CE6051 /* ccShader_PositionTexture_uColor.vert in Headers */, - 1AD71EB4180E26E600808F54 /* Bone.h in Headers */, - 1AD71EB8180E26E600808F54 /* BoneData.h in Headers */, - 06CAAACA186AD7EF0012A414 /* TriggerMng.h in Headers */, - 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 */, - 1AD71EC4180E26E600808F54 /* extension.h in Headers */, - 1AD71EC8180E26E600808F54 /* Json.h in Headers */, - 1AD71ECC180E26E600808F54 /* RegionAttachment.h in Headers */, + 299CF1FE19A434BC00C378C1 /* ccRandom.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 */, + B276EF601988D1D500CD400F /* CCVertexIndexData.h in Headers */, 50ABBD5F1925AB0000A911A9 /* Vec3.h in Headers */, - 1AD71EE0180E26E600808F54 /* Slot.h in Headers */, - 1AD71EE4180E26E600808F54 /* SlotData.h in Headers */, - 1AD71EE8180E26E600808F54 /* spine-cocos2dx.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 */, 50ABBD471925AB0000A911A9 /* CCVertex.h in Headers */, 1A9DCA2A180E6955007A3AD4 /* CCGLBufferedNode.h in Headers */, 1A01C69F18F57BE800EFE3A6 /* CCString.h in Headers */, + 464AD6E8197EBB1400E502D8 /* pvr.h in Headers */, 1A01C69118F57BE800EFE3A6 /* CCDictionary.h in Headers */, - 0634A4E5194B19E400E608AF /* CCTimelineMacro.h in Headers */, - 1A8C598E180E930E00EF57C3 /* CCActionFrame.h in Headers */, - 1A8C5992180E930E00EF57C3 /* CCActionFrameEasing.h in Headers */, 5034CA36191D591100CE6051 /* ccShader_PositionTexture.frag in Headers */, - 1A8C5996180E930E00EF57C3 /* CCActionManagerEx.h in Headers */, - 2905FA4D18CF08D100240AA3 /* UICheckBox.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 */, - 1A8C59AA180E930E00EF57C3 /* CCArmatureDataManager.h in Headers */, - 1A8C59AE180E930E00EF57C3 /* CCArmatureDefine.h in Headers */, - 1A8C59B2180E930E00EF57C3 /* CCBatchNode.h in Headers */, - 1A8C59B6180E930E00EF57C3 /* CCBone.h in Headers */, - 1A8C59BA180E930E00EF57C3 /* CCColliderDetector.h in Headers */, B24AA98C195A675C007B4522 /* CCFastTMXTiledMap.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 */, - 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 */, + B276EF641988D1D500CD400F /* CCVertexIndexBuffer.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 */, - 3EA47873195478E00068D9D1 /* CCBundleReader.h in Headers */, - 1A8C59DA180E930E00EF57C3 /* CCDisplayFactory.h in Headers */, - 1A8C59DE180E930E00EF57C3 /* CCDisplayManager.h in Headers */, - 50FCEBB618C72017004AD434 /* SliderReader.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 */, - 29CB8F4F1929D1BB00C841D6 /* UILayoutManager.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 */, - 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 */, - B6B2634019381FBF0088FE25 /* CCAnimationCurve.h in Headers */, - B6B26346193884D60088FE25 /* CCAnimation3D.h in Headers */, - B6ACD89A193D6693005E0B8A /* CCMeshSkin.h in Headers */, - B6ACD8A1193DC0CC005E0B8A /* CCAnimate3D.h in Headers */, - B6AAF84419404E0D0069DE01 /* CCBundle3D.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -5881,7 +6000,6 @@ 460E47A418080904000CDD6D /* CCControlSlider.h in Headers */, 460E479E18080904000CDD6D /* CCControlHuePicker.h in Headers */, 460E468218080836000CDD6D /* cocos-ext.h in Headers */, - 460E47C41808090D000CDD6D /* CCEditBoxImplMac.h in Headers */, 460E47BF1808090D000CDD6D /* CCEditBoxImpl.h in Headers */, 460E47AE18080904000CDD6D /* CCScale9Sprite.h in Headers */, 460E477C180808F7000CDD6D /* ExtensionMacros.h in Headers */, @@ -6006,12 +6124,397 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + B245F11B19766132001920FD /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + B2DB4778197665BF00411E16 /* UIHelper.h in Headers */, + B2DB478A1976664400411E16 /* UISlider.h in Headers */, + B2DB47841976661A00411E16 /* UIImageView.h in Headers */, + B2DB47881976663A00411E16 /* UIRichText.h in Headers */, + B2DB47801976660200411E16 /* UIButton.h in Headers */, + B2DB47821976660C00411E16 /* UICheckBox.h in Headers */, + B2DB47861976662D00411E16 /* UILoadingBar.h in Headers */, + B2DB47681976650A00411E16 /* UIWidget.h in Headers */, + 2958244D19873D8E00F9746D /* UIScale9Sprite.h in Headers */, + B2DB47691976651E00411E16 /* UIHBox.h in Headers */, + B2DB478F1976666100411E16 /* UIText.h in Headers */, + B2DB47901976666100411E16 /* UITextAtlas.h in Headers */, + B2DB47911976666100411E16 /* UITextBMFont.h in Headers */, + B2DB47921976666100411E16 /* UITextField.h in Headers */, + B2DB476A1976653000411E16 /* UILayout.h in Headers */, + B2DB477A197665D000411E16 /* UIListView.h in Headers */, + B2DB477C197665DB00411E16 /* UIPageView.h in Headers */, + B2DB477E197665E700411E16 /* UIScrollView.h in Headers */, + B2DB476C1976654D00411E16 /* UILayoutManager.h in Headers */, + B2DB476E1976655C00411E16 /* UILayoutParameter.h in Headers */, + B2DB47701976657000411E16 /* UIRelativeBox.h in Headers */, + B2DB47721976658000411E16 /* UIVBox.h in Headers */, + B2DB47741976659800411E16 /* CocosGUI.h in Headers */, + B2DB4776197665AA00411E16 /* UIDeprecated.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + B24EEA4719775E92004493CC /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + B2C59A3419777EB600B452DF /* UIListView.h in Headers */, + B2C59A3519777EB600B452DF /* UILoadingBar.h in Headers */, + B2C59A3619777EB600B452DF /* UIPageView.h in Headers */, + B2C59A3719777EB600B452DF /* UIRichText.h in Headers */, + B2C59A3819777EB600B452DF /* UIScrollView.h in Headers */, + B2C59A3919777EB600B452DF /* UISlider.h in Headers */, + B2C59A3A19777EB600B452DF /* UIText.h in Headers */, + B2C59A3B19777EB600B452DF /* UITextAtlas.h in Headers */, + B2C59A3C19777EB600B452DF /* UITextBMFont.h in Headers */, + B2C59A3D19777EB600B452DF /* UITextField.h in Headers */, + B2C59A3E19777EB600B452DF /* UIButton.h in Headers */, + B2C59A3F19777EB600B452DF /* UICheckBox.h in Headers */, + B2C59A4019777EB600B452DF /* UIImageView.h in Headers */, + B2C59A4119777EBC00B452DF /* UIVideoPlayer.h in Headers */, + B2C59A4219777EC700B452DF /* UIDeprecated.h in Headers */, + B2C59A4319777EC700B452DF /* UIWidget.h in Headers */, + B2C59A4519777EC700B452DF /* UIHelper.h in Headers */, + B2C59A4619777EC700B452DF /* GUIDefine.h in Headers */, + B2C59A4719777ECF00B452DF /* UIHBox.h in Headers */, + B2C59A4819777ECF00B452DF /* UIRelativeBox.h in Headers */, + B2C59A4919777ECF00B452DF /* UIVBox.h in Headers */, + 2958244E19873D8E00F9746D /* UIScale9Sprite.h in Headers */, + B2C59A4A19777ECF00B452DF /* UILayout.h in Headers */, + B2C59A4B19777ECF00B452DF /* UILayoutParameter.h in Headers */, + B2C59A4C19777ECF00B452DF /* UILayoutManager.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + B24EEA6A19775EBB004493CC /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + B2C59A4D19777F8A00B452DF /* CocoLoader.h in Headers */, + B2C59A4E19777F9200B452DF /* CCActionTimeline.h in Headers */, + B2C59A4F19777F9200B452DF /* CCActionTimelineCache.h in Headers */, + B2C59A5019777F9200B452DF /* CCFrame.h in Headers */, + B2C59A5119777F9200B452DF /* CCNodeReader.h in Headers */, + B2C59A5319777F9200B452DF /* CCTimelineMacro.h in Headers */, + B2C59A5419777F9700B452DF /* ButtonReader.h in Headers */, + B2C59A5519777F9800B452DF /* CheckBoxReader.h in Headers */, + B2C59A5219777F9200B452DF /* CCTimeLine.h in Headers */, + B2C59A5619777FC200B452DF /* ImageViewReader.h in Headers */, + B2C59A5719777FC200B452DF /* LayoutReader.h in Headers */, + B2C59A5819777FC200B452DF /* ListViewReader.h in Headers */, + B2C59A5919777FC200B452DF /* LoadingBarReader.h in Headers */, + B2C59A5A19777FC200B452DF /* PageViewReader.h in Headers */, + B2C59A5B19777FC200B452DF /* ScrollViewReader.h in Headers */, + B2C59A5C19777FC200B452DF /* SliderReader.h in Headers */, + B2C59A5D19777FC200B452DF /* TextAtlasReader.h in Headers */, + B2C59A5E19777FC200B452DF /* TextBMFontReader.h in Headers */, + B2C59A5F19777FC200B452DF /* TextFieldReader.h in Headers */, + B2C59A6019777FC200B452DF /* TextReader.h in Headers */, + B2C59A6419777FD000B452DF /* TriggerBase.h in Headers */, + B2C59A6319777FD000B452DF /* TriggerObj.h in Headers */, + B2C59A6519777FD000B452DF /* TriggerMng.h in Headers */, + B2C59A6619777FD000B452DF /* CCActionFrame.h in Headers */, + B2C59A6719777FD000B452DF /* CCActionFrameEasing.h in Headers */, + B2C59A6819777FD000B452DF /* CCActionManagerEx.h in Headers */, + B2C59A6919777FD000B452DF /* CCActionNode.h in Headers */, + B2C59A6A19777FD000B452DF /* CCActionObject.h in Headers */, + B2C59A6B19777FD000B452DF /* CCArmature.h in Headers */, + B2C59A6C19777FD000B452DF /* CCArmatureAnimation.h in Headers */, + B2C59A6D19777FD000B452DF /* CCArmatureDataManager.h in Headers */, + B2C59A6E19777FD000B452DF /* CCArmatureDefine.h in Headers */, + B2C59A6F19777FD000B452DF /* CCBatchNode.h in Headers */, + B2C59A7019777FD000B452DF /* CCBone.h in Headers */, + B2C59A7119777FD000B452DF /* CCColliderDetector.h in Headers */, + B2C59A7219777FD000B452DF /* CCComBase.h in Headers */, + B2C59A7319777FD000B452DF /* CCComAttribute.h in Headers */, + B2C59A7419777FD000B452DF /* CCComAudio.h in Headers */, + B2C59A7519777FD000B452DF /* CCComController.h in Headers */, + B2C59A7619777FD000B452DF /* CCComRender.h in Headers */, + B2C59A7719777FD000B452DF /* CCDataReaderHelper.h in Headers */, + B2C59A7819777FD000B452DF /* CCDatas.h in Headers */, + B2C59A7919777FD000B452DF /* CCDecorativeDisplay.h in Headers */, + B2C59A7A19777FD000B452DF /* CCDisplayFactory.h in Headers */, + B2C59A7B19777FD000B452DF /* CCDisplayManager.h in Headers */, + B2C59A7C19777FD000B452DF /* CCInputDelegate.h in Headers */, + B2C59A7D19777FD000B452DF /* CCProcessBase.h in Headers */, + B2C59A7E19777FD100B452DF /* CCSGUIReader.h in Headers */, + B2C59A7F19777FD100B452DF /* CCSkin.h in Headers */, + B2C59A8019777FD100B452DF /* CCSpriteFrameCacheHelper.h in Headers */, + B2C59A8119777FD100B452DF /* CCSSceneReader.h in Headers */, + B2C59A8219777FD100B452DF /* CCTransformHelp.h in Headers */, + B2C59A8319777FD100B452DF /* CCTween.h in Headers */, + B2C59A8419777FD100B452DF /* CCUtilMath.h in Headers */, + B2C59A8519777FD100B452DF /* CocoStudio.h in Headers */, + B2C59A8619777FD100B452DF /* DictionaryHelper.h in Headers */, + B2C59A6119777FC200B452DF /* WidgetReader.h in Headers */, + B2C59A6219777FC200B452DF /* WidgetReaderProtocol.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + B24EEA7219775ECE004493CC /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + B2C599BF1977703300B452DF /* CCBAnimationManager.h in Headers */, + B2C599C01977703300B452DF /* CCBFileLoader.h in Headers */, + B2C599C11977703300B452DF /* CCBKeyframe.h in Headers */, + B2C599C21977703300B452DF /* CCBMemberVariableAssigner.h in Headers */, + B2C599C31977703300B452DF /* CCBReader.h in Headers */, + B2C599C41977703300B452DF /* CCBSelectorResolver.h in Headers */, + B2C599C51977703300B452DF /* CCBSequence.h in Headers */, + B2C599C61977703300B452DF /* CCBSequenceProperty.h in Headers */, + B2C599C71977703300B452DF /* CCControlButtonLoader.h in Headers */, + B2C599C81977703300B452DF /* CCControlLoader.h in Headers */, + B2C599C91977703300B452DF /* CCLabelBMFontLoader.h in Headers */, + B2C599CA1977703300B452DF /* CCLabelTTFLoader.h in Headers */, + B2C599CB1977703300B452DF /* CCLayerColorLoader.h in Headers */, + B2C599CC1977703300B452DF /* CCLayerGradientLoader.h in Headers */, + B2C599CD1977703300B452DF /* CCLayerLoader.h in Headers */, + B2C599CE1977703300B452DF /* CCMenuItemImageLoader.h in Headers */, + B2C599CF1977703300B452DF /* CCMenuItemLoader.h in Headers */, + B2C599D01977703300B452DF /* CCMenuLoader.h in Headers */, + B2C599D11977703300B452DF /* CCNode+CCBRelativePositioning.h in Headers */, + B2C599D21977703300B452DF /* CCNodeLoader.h in Headers */, + B2C599D31977703300B452DF /* CCNodeLoaderLibrary.h in Headers */, + B2C599D41977703300B452DF /* CCNodeLoaderListener.h in Headers */, + B2C599D51977703300B452DF /* CCParticleSystemQuadLoader.h in Headers */, + B2C599D61977703300B452DF /* CCScale9SpriteLoader.h in Headers */, + B2C599D71977703300B452DF /* CCScrollViewLoader.h in Headers */, + B2C599D81977703300B452DF /* CCSpriteLoader.h in Headers */, + B2C599D91977703300B452DF /* CocosBuilder.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + B24EEA7A19775EE1004493CC /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + B2CC504619776C0D0041958E /* SkeletonBounds.h in Headers */, + B2CC504719776C0D0041958E /* Event.h in Headers */, + B2CC504819776C0D0041958E /* EventData.h in Headers */, + B2CC504919776C0D0041958E /* BoundingBoxAttachment.h in Headers */, + B2CC504A19776C0D0041958E /* Animation.h in Headers */, + B2CC504B19776C0D0041958E /* AnimationState.h in Headers */, + B2CC504C19776C0D0041958E /* AnimationStateData.h in Headers */, + B2CC504D19776C0D0041958E /* Atlas.h in Headers */, + B2CC504E19776C0D0041958E /* AtlasAttachmentLoader.h in Headers */, + B2CC504F19776C0D0041958E /* Attachment.h in Headers */, + B2CC505019776C0D0041958E /* AttachmentLoader.h in Headers */, + B2CC505119776C0D0041958E /* Bone.h in Headers */, + B2CC505219776C0D0041958E /* BoneData.h in Headers */, + B2CC505319776C0E0041958E /* CCSkeleton.h in Headers */, + B2CC505419776C0E0041958E /* CCSkeletonAnimation.h in Headers */, + B2CC505519776C0E0041958E /* extension.h in Headers */, + B2CC505619776C0E0041958E /* Json.h in Headers */, + B2CC505719776C0E0041958E /* RegionAttachment.h in Headers */, + B2CC505819776C0E0041958E /* Skeleton.h in Headers */, + B2CC505919776C0E0041958E /* SkeletonData.h in Headers */, + B2CC505A19776C0E0041958E /* SkeletonJson.h in Headers */, + B2CC505B19776C0E0041958E /* Skin.h in Headers */, + B2CC505C19776C0E0041958E /* Slot.h in Headers */, + B2CC505D19776C0E0041958E /* SlotData.h in Headers */, + B2CC505E19776C0E0041958E /* spine-cocos2dx.h in Headers */, + B2CC505F19776C0E0041958E /* spine.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + B24EEA8219775EF3004493CC /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + B2CC502A1977635D0041958E /* WebSocket.h in Headers */, + B2CC502B1977635F0041958E /* SocketIO.h in Headers */, + B2CC5025197763350041958E /* HttpClient.h in Headers */, + B2CC50261977633B0041958E /* HttpRequest.h in Headers */, + B2CC50271977633D0041958E /* HttpResponse.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + B2DB47B6197669A100411E16 /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + B2DB47E919766E2A00411E16 /* CCBAnimationManager.h in Headers */, + B2DB47EA19766E2A00411E16 /* CCBFileLoader.h in Headers */, + B2DB47EB19766E2A00411E16 /* CCBKeyframe.h in Headers */, + B2DB47EC19766E2A00411E16 /* CCBMemberVariableAssigner.h in Headers */, + B2DB47ED19766E2A00411E16 /* CCBReader.h in Headers */, + B2DB47EE19766E2A00411E16 /* CCBSelectorResolver.h in Headers */, + B2DB47EF19766E2A00411E16 /* CCBSequence.h in Headers */, + B2DB47F019766E2A00411E16 /* CCBSequenceProperty.h in Headers */, + B2DB47F119766E2A00411E16 /* CCControlButtonLoader.h in Headers */, + B2DB47F219766E2A00411E16 /* CCControlLoader.h in Headers */, + B2DB47F319766E2A00411E16 /* CCLabelBMFontLoader.h in Headers */, + B2DB47F419766E2A00411E16 /* CCLabelTTFLoader.h in Headers */, + B2DB47F519766E2A00411E16 /* CCLayerColorLoader.h in Headers */, + B2DB47F619766E2A00411E16 /* CCLayerGradientLoader.h in Headers */, + B2DB47F719766E2A00411E16 /* CCLayerLoader.h in Headers */, + B2DB47F819766E2A00411E16 /* CCMenuItemImageLoader.h in Headers */, + B2DB47F919766E2A00411E16 /* CCMenuItemLoader.h in Headers */, + B2DB47FA19766E2A00411E16 /* CCMenuLoader.h in Headers */, + B2DB47FB19766E2A00411E16 /* CCNode+CCBRelativePositioning.h in Headers */, + B2DB47FC19766E2A00411E16 /* CCNodeLoader.h in Headers */, + B2DB47FD19766E2A00411E16 /* CCNodeLoaderLibrary.h in Headers */, + B2DB47FE19766E2A00411E16 /* CCNodeLoaderListener.h in Headers */, + B2DB47FF19766E2A00411E16 /* CCParticleSystemQuadLoader.h in Headers */, + B2DB480019766E2A00411E16 /* CCScale9SpriteLoader.h in Headers */, + B2DB480119766E2A00411E16 /* CCScrollViewLoader.h in Headers */, + B2DB480219766E2A00411E16 /* CCSpriteLoader.h in Headers */, + B2DB480319766E2A00411E16 /* CocosBuilder.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + B2DB48311976716E00411E16 /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + B2DB484E19767C7000411E16 /* TriggerObj.h in Headers */, + B2DB484F19767C7000411E16 /* TriggerBase.h in Headers */, + B2DB485019767C7000411E16 /* TriggerMng.h in Headers */, + B2DB485119767C7000411E16 /* CCActionFrame.h in Headers */, + B2DB488619767CBD00411E16 /* CheckBoxReader.h in Headers */, + B2DB488719767CBF00411E16 /* ButtonReader.h in Headers */, + B2DB488519767CBA00411E16 /* ImageViewReader.h in Headers */, + B2DB485219767C7000411E16 /* CCActionFrameEasing.h in Headers */, + B2DB488419767CB700411E16 /* LayoutReader.h in Headers */, + B2DB488319767CB500411E16 /* ListViewReader.h in Headers */, + B2DB487819767C7F00411E16 /* CocoLoader.h in Headers */, + B2DB488219767CB300411E16 /* LoadingBarReader.h in Headers */, + B2DB488119767CB000411E16 /* PageViewReader.h in Headers */, + B2DB487D19767CA500411E16 /* TextBMFontReader.h in Headers */, + B2DB488019767CAD00411E16 /* ScrollViewReader.h in Headers */, + B2DB485319767C7000411E16 /* CCActionManagerEx.h in Headers */, + B2DB487E19767CA800411E16 /* TextAtlasReader.h in Headers */, + B2DB485419767C7000411E16 /* CCActionNode.h in Headers */, + B2DB487F19767CAA00411E16 /* SliderReader.h in Headers */, + B2DB487C19767CA300411E16 /* TextFieldReader.h in Headers */, + B2DB487A19767C9E00411E16 /* WidgetReader.h in Headers */, + B2DB485519767C7000411E16 /* CCActionObject.h in Headers */, + B2DB485619767C7000411E16 /* CCArmature.h in Headers */, + B2DB487B19767CA100411E16 /* TextReader.h in Headers */, + B2DB485719767C7000411E16 /* CCArmatureAnimation.h in Headers */, + B2DB485819767C7000411E16 /* CCArmatureDataManager.h in Headers */, + B2DB487919767C9D00411E16 /* WidgetReaderProtocol.h in Headers */, + B2DB485919767C7000411E16 /* CCArmatureDefine.h in Headers */, + B2DB485A19767C7000411E16 /* CCBatchNode.h in Headers */, + B2DB485B19767C7000411E16 /* CCBone.h in Headers */, + B2DB485C19767C7000411E16 /* CCColliderDetector.h in Headers */, + B2DB485D19767C7000411E16 /* CCComBase.h in Headers */, + B2DB485E19767C7000411E16 /* CCComAttribute.h in Headers */, + B2DB485F19767C7000411E16 /* CCComAudio.h in Headers */, + B2DB486019767C7000411E16 /* CCComController.h in Headers */, + B2DB487219767C7C00411E16 /* CCActionTimeline.h in Headers */, + B2DB487319767C7C00411E16 /* CCActionTimelineCache.h in Headers */, + B2DB487419767C7C00411E16 /* CCFrame.h in Headers */, + B2DB487519767C7C00411E16 /* CCNodeReader.h in Headers */, + B2DB487619767C7C00411E16 /* CCTimeLine.h in Headers */, + B2DB487719767C7C00411E16 /* CCTimelineMacro.h in Headers */, + B2DB486119767C7000411E16 /* CCComRender.h in Headers */, + B2DB486219767C7000411E16 /* CCDataReaderHelper.h in Headers */, + B2DB486319767C7000411E16 /* CCDatas.h in Headers */, + B2DB486419767C7000411E16 /* CCDecorativeDisplay.h in Headers */, + B2DB486519767C7000411E16 /* CCDisplayFactory.h in Headers */, + B2DB486619767C7000411E16 /* CCDisplayManager.h in Headers */, + B2DB486719767C7000411E16 /* CCInputDelegate.h in Headers */, + B2DB486819767C7000411E16 /* CCProcessBase.h in Headers */, + B2DB486919767C7000411E16 /* CCSGUIReader.h in Headers */, + B2DB486A19767C7000411E16 /* CCSkin.h in Headers */, + B2DB486B19767C7000411E16 /* CCSpriteFrameCacheHelper.h in Headers */, + B2DB486C19767C7000411E16 /* CCSSceneReader.h in Headers */, + B2DB486D19767C7000411E16 /* CCTransformHelp.h in Headers */, + B2DB486E19767C7000411E16 /* CCTween.h in Headers */, + B2DB486F19767C7000411E16 /* CCUtilMath.h in Headers */, + B2DB487019767C7000411E16 /* CocoStudio.h in Headers */, + B2DB487119767C7000411E16 /* DictionaryHelper.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + B2DB48E519767F1F00411E16 /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + B2DB491B19767F7700411E16 /* SkeletonBounds.h in Headers */, + B2DB491C19767F7700411E16 /* Event.h in Headers */, + B2DB491D19767F7700411E16 /* EventData.h in Headers */, + B2DB491E19767F7700411E16 /* BoundingBoxAttachment.h in Headers */, + B2DB491F19767F7700411E16 /* Animation.h in Headers */, + B2DB492019767F7700411E16 /* AnimationState.h in Headers */, + B2DB492119767F7700411E16 /* AnimationStateData.h in Headers */, + B2DB492219767F7700411E16 /* Atlas.h in Headers */, + B2DB492319767F7700411E16 /* AtlasAttachmentLoader.h in Headers */, + B2DB492419767F7700411E16 /* Attachment.h in Headers */, + B2DB492519767F7700411E16 /* AttachmentLoader.h in Headers */, + B2DB492619767F7700411E16 /* Bone.h in Headers */, + B2DB492719767F7700411E16 /* BoneData.h in Headers */, + B2DB492819767F7700411E16 /* CCSkeleton.h in Headers */, + B2DB492919767F7700411E16 /* CCSkeletonAnimation.h in Headers */, + B2DB492A19767F7700411E16 /* extension.h in Headers */, + B2DB492B19767F7700411E16 /* Json.h in Headers */, + B2DB492C19767F7700411E16 /* RegionAttachment.h in Headers */, + B2DB492D19767F7700411E16 /* Skeleton.h in Headers */, + B2DB492E19767F7700411E16 /* SkeletonData.h in Headers */, + B2DB492F19767F7700411E16 /* SkeletonJson.h in Headers */, + B2DB493019767F7700411E16 /* Skin.h in Headers */, + B2DB493119767F7700411E16 /* Slot.h in Headers */, + B2DB493219767F7700411E16 /* SlotData.h in Headers */, + B2DB493319767F7700411E16 /* spine-cocos2dx.h in Headers */, + B2DB493419767F7700411E16 /* spine.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + B2DB49A8197686CB00411E16 /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + B244F30B1976873300ED1926 /* HttpRequest.h in Headers */, + B244F3071976871800ED1926 /* HttpClient.h in Headers */, + B244F3081976871C00ED1926 /* HttpResponse.h in Headers */, + B244F3091976871F00ED1926 /* SocketIO.h in Headers */, + B244F30A1976872C00ED1926 /* WebSocket.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ - 1551A33E158F2AB200E66CFE /* cocos2dx Mac */ = { + 15161E42199E7362006099B8 /* libcocos3d Mac */ = { isa = PBXNativeTarget; - buildConfigurationList = 1551A34C158F2AB200E66CFE /* Build configuration list for PBXNativeTarget "cocos2dx Mac" */; + buildConfigurationList = 15162008199E7363006099B8 /* Build configuration list for PBXNativeTarget "libcocos3d Mac" */; + buildPhases = ( + 15161E45199E7362006099B8 /* Sources */, + 15161F0B199E7362006099B8 /* Frameworks */, + 15161F1A199E7362006099B8 /* Headers */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = "libcocos3d Mac"; + productName = cocos2dx; + productReference = 1516200B199E7363006099B8 /* libcocos3d Mac.a */; + productType = "com.apple.product-type.library.static"; + }; + 15162030199E7810006099B8 /* libcocos3d iOS */ = { + isa = PBXNativeTarget; + buildConfigurationList = 151621FE199E7810006099B8 /* Build configuration list for PBXNativeTarget "libcocos3d iOS" */; + buildPhases = ( + 15162033199E7810006099B8 /* Sources */, + 15162101199E7810006099B8 /* Frameworks */, + 15162109199E7810006099B8 /* Headers */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = "libcocos3d iOS"; + productName = cocos2dx; + productReference = 15162201199E7810006099B8 /* libcocos3d iOS.a */; + productType = "com.apple.product-type.library.static"; + }; + 1551A33E158F2AB200E66CFE /* libcocos2d Mac */ = { + isa = PBXNativeTarget; + buildConfigurationList = 1551A34C158F2AB200E66CFE /* Build configuration list for PBXNativeTarget "libcocos2d Mac" */; buildPhases = ( 1551A33B158F2AB200E66CFE /* Sources */, 1551A33C158F2AB200E66CFE /* Frameworks */, @@ -6022,14 +6525,14 @@ dependencies = ( 460E44F41807E241000CDD6D /* PBXTargetDependency */, ); - name = "cocos2dx Mac"; + name = "libcocos2d Mac"; productName = cocos2dx; - productReference = 1551A33F158F2AB200E66CFE /* libcocos2dx Mac.a */; + productReference = 1551A33F158F2AB200E66CFE /* libcocos2d Mac.a */; productType = "com.apple.product-type.library.static"; }; - A03F2B781780BD04006731B9 /* chipmunk Mac */ = { + A03F2B781780BD04006731B9 /* libchipmunk Mac */ = { isa = PBXNativeTarget; - buildConfigurationList = A03F2CB51780BD04006731B9 /* Build configuration list for PBXNativeTarget "chipmunk Mac" */; + buildConfigurationList = A03F2CB51780BD04006731B9 /* Build configuration list for PBXNativeTarget "libchipmunk Mac" */; buildPhases = ( A03F2B791780BD04006731B9 /* Sources */, A03F2C011780BD04006731B9 /* Frameworks */, @@ -6039,14 +6542,14 @@ ); dependencies = ( ); - name = "chipmunk Mac"; + name = "libchipmunk Mac"; productName = cocos2dx; productReference = A03F2CB81780BD04006731B9 /* libchipmunk Mac.a */; productType = "com.apple.product-type.library.static"; }; - A03F2D5D1780BDF7006731B9 /* box2d Mac */ = { + A03F2D5D1780BDF7006731B9 /* libbox2d Mac */ = { isa = PBXNativeTarget; - buildConfigurationList = A03F2D981780BDF7006731B9 /* Build configuration list for PBXNativeTarget "box2d Mac" */; + buildConfigurationList = A03F2D981780BDF7006731B9 /* Build configuration list for PBXNativeTarget "libbox2d Mac" */; buildPhases = ( A03F2D5E1780BDF7006731B9 /* Sources */, A03F2D7C1780BDF7006731B9 /* Frameworks */, @@ -6056,14 +6559,14 @@ ); dependencies = ( ); - name = "box2d Mac"; + name = "libbox2d Mac"; productName = cocos2dx; productReference = A03F2D9B1780BDF7006731B9 /* libbox2d Mac.a */; productType = "com.apple.product-type.library.static"; }; - A03F2E9817814268006731B9 /* CocosDenshion Mac */ = { + A03F2E9817814268006731B9 /* libcocosdenshion Mac */ = { isa = PBXNativeTarget; - buildConfigurationList = A03F2ED317814268006731B9 /* Build configuration list for PBXNativeTarget "CocosDenshion Mac" */; + buildConfigurationList = A03F2ED317814268006731B9 /* Build configuration list for PBXNativeTarget "libcocosdenshion Mac" */; buildPhases = ( A03F2E9917814268006731B9 /* Sources */, A03F2EB717814268006731B9 /* Frameworks */, @@ -6073,14 +6576,14 @@ ); dependencies = ( ); - name = "CocosDenshion Mac"; + name = "libcocosdenshion Mac"; productName = cocos2dx; - productReference = A03F2ED617814268006731B9 /* libCocosDenshion Mac.a */; + productReference = A03F2ED617814268006731B9 /* libcocosdenshion Mac.a */; productType = "com.apple.product-type.library.static"; }; - A03F2FC117814595006731B9 /* cocos2dx-extensions Mac */ = { + A03F2FC117814595006731B9 /* libextension Mac */ = { isa = PBXNativeTarget; - buildConfigurationList = A03F2FD317814595006731B9 /* Build configuration list for PBXNativeTarget "cocos2dx-extensions Mac" */; + buildConfigurationList = A03F2FD317814595006731B9 /* Build configuration list for PBXNativeTarget "libextension Mac" */; buildPhases = ( A03F2FC217814595006731B9 /* Sources */, A03F2FC917814595006731B9 /* Frameworks */, @@ -6090,14 +6593,14 @@ ); dependencies = ( ); - name = "cocos2dx-extensions Mac"; + name = "libextension Mac"; productName = cocos2dx; - productReference = A03F2FD617814595006731B9 /* libcocos2dx-extensions Mac.a */; + productReference = A03F2FD617814595006731B9 /* libextension Mac.a */; productType = "com.apple.product-type.library.static"; }; - A07A4C241783777C0073F6A7 /* cocos2dx iOS */ = { + A07A4C241783777C0073F6A7 /* libcocos2d iOS */ = { isa = PBXNativeTarget; - buildConfigurationList = A07A4D611783777C0073F6A7 /* Build configuration list for PBXNativeTarget "cocos2dx iOS" */; + buildConfigurationList = A07A4D611783777C0073F6A7 /* Build configuration list for PBXNativeTarget "libcocos2d iOS" */; buildPhases = ( A07A4C251783777C0073F6A7 /* Sources */, A07A4CAD1783777C0073F6A7 /* Frameworks */, @@ -6108,14 +6611,14 @@ dependencies = ( 46A173D31807D330005B8026 /* PBXTargetDependency */, ); - name = "cocos2dx iOS"; + name = "libcocos2d iOS"; productName = cocos2dx; - productReference = A07A4D641783777C0073F6A7 /* libcocos2dx iOS.a */; + productReference = A07A4D641783777C0073F6A7 /* libcocos2d iOS.a */; productType = "com.apple.product-type.library.static"; }; - A07A4E111783867C0073F6A7 /* cocos2dx-extensions iOS */ = { + A07A4E111783867C0073F6A7 /* libextension iOS */ = { isa = PBXNativeTarget; - buildConfigurationList = A07A4EF91783867C0073F6A7 /* Build configuration list for PBXNativeTarget "cocos2dx-extensions iOS" */; + buildConfigurationList = A07A4EF91783867C0073F6A7 /* Build configuration list for PBXNativeTarget "libextension iOS" */; buildPhases = ( A07A4E121783867C0073F6A7 /* Sources */, A07A4E7B1783867C0073F6A7 /* Frameworks */, @@ -6125,14 +6628,14 @@ ); dependencies = ( ); - name = "cocos2dx-extensions iOS"; + name = "libextension iOS"; productName = cocos2dx; - productReference = A07A4EFC1783867C0073F6A7 /* libcocos2dx-extensions iOS.a */; + productReference = A07A4EFC1783867C0073F6A7 /* libextension iOS.a */; productType = "com.apple.product-type.library.static"; }; - A07A4EFD178387670073F6A7 /* chipmunk iOS */ = { + A07A4EFD178387670073F6A7 /* libchipmunk iOS */ = { isa = PBXNativeTarget; - buildConfigurationList = A07A4F38178387670073F6A7 /* Build configuration list for PBXNativeTarget "chipmunk iOS" */; + buildConfigurationList = A07A4F38178387670073F6A7 /* Build configuration list for PBXNativeTarget "libchipmunk iOS" */; buildPhases = ( A07A4EFE178387670073F6A7 /* Sources */, A07A4F1C178387670073F6A7 /* Frameworks */, @@ -6142,14 +6645,14 @@ ); dependencies = ( ); - name = "chipmunk iOS"; + name = "libchipmunk iOS"; productName = cocos2dx; productReference = A07A4F3B178387670073F6A7 /* libchipmunk iOS.a */; productType = "com.apple.product-type.library.static"; }; - A07A4F3C1783876B0073F6A7 /* box2d iOS */ = { + A07A4F3C1783876B0073F6A7 /* libbox2d iOS */ = { isa = PBXNativeTarget; - buildConfigurationList = A07A4F9B1783876B0073F6A7 /* Build configuration list for PBXNativeTarget "box2d iOS" */; + buildConfigurationList = A07A4F9B1783876B0073F6A7 /* Build configuration list for PBXNativeTarget "libbox2d iOS" */; buildPhases = ( A07A4F3D1783876B0073F6A7 /* Sources */, A07A4F6B1783876B0073F6A7 /* Frameworks */, @@ -6159,14 +6662,14 @@ ); dependencies = ( ); - name = "box2d iOS"; + name = "libbox2d iOS"; productName = cocos2dx; productReference = A07A4F9E1783876B0073F6A7 /* libbox2d iOS.a */; productType = "com.apple.product-type.library.static"; }; - A07A4F9F178387730073F6A7 /* CocosDenshion iOS */ = { + A07A4F9F178387730073F6A7 /* libcocosdenshion iOS */ = { isa = PBXNativeTarget; - buildConfigurationList = A07A4FB1178387730073F6A7 /* Build configuration list for PBXNativeTarget "CocosDenshion iOS" */; + buildConfigurationList = A07A4FB1178387730073F6A7 /* Build configuration list for PBXNativeTarget "libcocosdenshion iOS" */; buildPhases = ( A07A4FA0178387730073F6A7 /* Sources */, A07A4FA7178387730073F6A7 /* Frameworks */, @@ -6176,9 +6679,179 @@ ); dependencies = ( ); - name = "CocosDenshion iOS"; + name = "libcocosdenshion iOS"; productName = cocos2dx; - productReference = A07A4FB4178387730073F6A7 /* libCocosDenshion iOS.a */; + productReference = A07A4FB4178387730073F6A7 /* libcocosdenshion iOS.a */; + productType = "com.apple.product-type.library.static"; + }; + B245F10019766132001920FD /* libui Mac */ = { + isa = PBXNativeTarget; + buildConfigurationList = B245F13719766132001920FD /* Build configuration list for PBXNativeTarget "libui Mac" */; + buildPhases = ( + B245F10119766132001920FD /* Sources */, + B245F11A19766132001920FD /* Frameworks */, + B245F11B19766132001920FD /* Headers */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = "libui Mac"; + productName = cocos2dx; + productReference = B245F13A19766132001920FD /* libui Mac.a */; + productType = "com.apple.product-type.library.static"; + }; + B24EEA2C19775E92004493CC /* libui iOS */ = { + isa = PBXNativeTarget; + buildConfigurationList = B24EEA6319775E92004493CC /* Build configuration list for PBXNativeTarget "libui iOS" */; + buildPhases = ( + B24EEA2D19775E92004493CC /* Sources */, + B24EEA4619775E92004493CC /* Frameworks */, + B24EEA4719775E92004493CC /* Headers */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = "libui iOS"; + productName = cocos2dx; + productReference = B24EEA6619775E92004493CC /* libui iOS.a */; + productType = "com.apple.product-type.library.static"; + }; + B24EEA6719775EBB004493CC /* libcocostudio iOS */ = { + isa = PBXNativeTarget; + buildConfigurationList = B24EEA6B19775EBB004493CC /* Build configuration list for PBXNativeTarget "libcocostudio iOS" */; + buildPhases = ( + B24EEA6819775EBB004493CC /* Sources */, + B24EEA6919775EBB004493CC /* Frameworks */, + B24EEA6A19775EBB004493CC /* Headers */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = "libcocostudio iOS"; + productName = cocos2dx; + productReference = B24EEA6E19775EBB004493CC /* libcocostudio iOS.a */; + productType = "com.apple.product-type.library.static"; + }; + B24EEA6F19775ECE004493CC /* libcocosbuilder iOS */ = { + isa = PBXNativeTarget; + buildConfigurationList = B24EEA7319775ECE004493CC /* Build configuration list for PBXNativeTarget "libcocosbuilder iOS" */; + buildPhases = ( + B24EEA7019775ECE004493CC /* Sources */, + B24EEA7119775ECE004493CC /* Frameworks */, + B24EEA7219775ECE004493CC /* Headers */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = "libcocosbuilder iOS"; + productName = cocos2dx; + productReference = B24EEA7619775ECE004493CC /* libcocosbuilder iOS.a */; + productType = "com.apple.product-type.library.static"; + }; + B24EEA7719775EE1004493CC /* libspine iOS */ = { + isa = PBXNativeTarget; + buildConfigurationList = B24EEA7B19775EE1004493CC /* Build configuration list for PBXNativeTarget "libspine iOS" */; + buildPhases = ( + B24EEA7819775EE1004493CC /* Sources */, + B24EEA7919775EE1004493CC /* Frameworks */, + B24EEA7A19775EE1004493CC /* Headers */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = "libspine iOS"; + productName = cocos2dx; + productReference = B24EEA7E19775EE1004493CC /* libspine iOS.a */; + productType = "com.apple.product-type.library.static"; + }; + B24EEA7F19775EF3004493CC /* libnetwork iOS */ = { + isa = PBXNativeTarget; + buildConfigurationList = B24EEA8319775EF3004493CC /* Build configuration list for PBXNativeTarget "libnetwork iOS" */; + buildPhases = ( + B24EEA8019775EF3004493CC /* Sources */, + B24EEA8119775EF3004493CC /* Frameworks */, + B24EEA8219775EF3004493CC /* Headers */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = "libnetwork iOS"; + productName = cocos2dx; + productReference = B24EEA8619775EF3004493CC /* libnetwork iOS.a */; + productType = "com.apple.product-type.library.static"; + }; + B2DB479B197669A100411E16 /* libcocosbuilder Mac */ = { + isa = PBXNativeTarget; + buildConfigurationList = B2DB47CF197669A100411E16 /* Build configuration list for PBXNativeTarget "libcocosbuilder Mac" */; + buildPhases = ( + B2DB479C197669A100411E16 /* Sources */, + B2DB47B5197669A100411E16 /* Frameworks */, + B2DB47B6197669A100411E16 /* Headers */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = "libcocosbuilder Mac"; + productName = cocos2dx; + productReference = B2DB47D2197669A100411E16 /* libcocosbuilder Mac.a */; + productType = "com.apple.product-type.library.static"; + }; + B2DB48161976716E00411E16 /* libcocostudio Mac */ = { + isa = PBXNativeTarget; + buildConfigurationList = B2DB484A1976716E00411E16 /* Build configuration list for PBXNativeTarget "libcocostudio Mac" */; + buildPhases = ( + B2DB48171976716E00411E16 /* Sources */, + B2DB48301976716E00411E16 /* Frameworks */, + B2DB48311976716E00411E16 /* Headers */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = "libcocostudio Mac"; + productName = cocos2dx; + productReference = B2DB484D1976716E00411E16 /* libcocostudio Mac.a */; + productType = "com.apple.product-type.library.static"; + }; + B2DB48CA19767F1F00411E16 /* libspine Mac */ = { + isa = PBXNativeTarget; + buildConfigurationList = B2DB48FE19767F1F00411E16 /* Build configuration list for PBXNativeTarget "libspine Mac" */; + buildPhases = ( + B2DB48CB19767F1F00411E16 /* Sources */, + B2DB48E419767F1F00411E16 /* Frameworks */, + B2DB48E519767F1F00411E16 /* Headers */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = "libspine Mac"; + productName = cocos2dx; + productReference = B2DB490119767F1F00411E16 /* libspine Mac.a */; + productType = "com.apple.product-type.library.static"; + }; + B2DB498D197686CB00411E16 /* libnetwork Mac */ = { + isa = PBXNativeTarget; + buildConfigurationList = B2DB49C1197686CB00411E16 /* Build configuration list for PBXNativeTarget "libnetwork Mac" */; + buildPhases = ( + B2DB498E197686CB00411E16 /* Sources */, + B2DB49A7197686CB00411E16 /* Frameworks */, + B2DB49A8197686CB00411E16 /* Headers */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = "libnetwork Mac"; + productName = cocos2dx; + productReference = B2DB49C4197686CB00411E16 /* libnetwork Mac.a */; productType = "com.apple.product-type.library.static"; }; /* End PBXNativeTarget section */ @@ -6203,64 +6876,116 @@ projectRoot = ""; targets = ( A03F2E8E178141C1006731B9 /* build all libs Mac */, - 1551A33E158F2AB200E66CFE /* cocos2dx Mac */, - A03F2FC117814595006731B9 /* cocos2dx-extensions Mac */, - A03F2B781780BD04006731B9 /* chipmunk Mac */, - A03F2D5D1780BDF7006731B9 /* box2d Mac */, - A03F2E9817814268006731B9 /* CocosDenshion Mac */, + 1551A33E158F2AB200E66CFE /* libcocos2d Mac */, + A03F2FC117814595006731B9 /* libextension Mac */, + B245F10019766132001920FD /* libui Mac */, + B2DB48161976716E00411E16 /* libcocostudio Mac */, + B2DB479B197669A100411E16 /* libcocosbuilder Mac */, + B2DB48CA19767F1F00411E16 /* libspine Mac */, + B2DB498D197686CB00411E16 /* libnetwork Mac */, + A03F2B781780BD04006731B9 /* libchipmunk Mac */, + A03F2D5D1780BDF7006731B9 /* libbox2d Mac */, + A03F2E9817814268006731B9 /* libcocosdenshion Mac */, + 15161E42199E7362006099B8 /* libcocos3d Mac */, A07A4E0B178386390073F6A7 /* build all libs iOS */, - A07A4C241783777C0073F6A7 /* cocos2dx iOS */, - A07A4E111783867C0073F6A7 /* cocos2dx-extensions iOS */, - A07A4EFD178387670073F6A7 /* chipmunk iOS */, - A07A4F3C1783876B0073F6A7 /* box2d iOS */, - A07A4F9F178387730073F6A7 /* CocosDenshion iOS */, + A07A4C241783777C0073F6A7 /* libcocos2d iOS */, + A07A4E111783867C0073F6A7 /* libextension iOS */, + A07A4EFD178387670073F6A7 /* libchipmunk iOS */, + A07A4F3C1783876B0073F6A7 /* libbox2d iOS */, + A07A4F9F178387730073F6A7 /* libcocosdenshion iOS */, + B24EEA2C19775E92004493CC /* libui iOS */, + B24EEA6719775EBB004493CC /* libcocostudio iOS */, + B24EEA6F19775ECE004493CC /* libcocosbuilder iOS */, + B24EEA7719775EE1004493CC /* libspine iOS */, + B24EEA7F19775EF3004493CC /* libnetwork iOS */, + 15162030199E7810006099B8 /* libcocos3d iOS */, ); }; /* End PBXProject section */ /* Begin PBXSourcesBuildPhase section */ + 15161E45199E7362006099B8 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 1516200C199E75C2006099B8 /* CCAABB.cpp in Sources */, + 1516200D199E75C2006099B8 /* CCOBB.cpp in Sources */, + 1516200E199E75C2006099B8 /* CCRay.cpp in Sources */, + 1516200F199E75C2006099B8 /* CCSkeleton3D.cpp in Sources */, + 15162010199E75C2006099B8 /* CCAttachNode.cpp in Sources */, + 15162011199E75C2006099B8 /* CCSubMesh.cpp in Sources */, + 15162012199E75C2006099B8 /* CCSubMeshState.cpp in Sources */, + 15162013199E75C2006099B8 /* CCBundleReader.cpp in Sources */, + 15162014199E75C2006099B8 /* CCBundle3D.cpp in Sources */, + 15162015199E75C2006099B8 /* CCAnimate3D.cpp in Sources */, + 15162016199E75C2006099B8 /* CCMeshSkin.cpp in Sources */, + 15162017199E75C2006099B8 /* CCAnimation3D.cpp in Sources */, + 15162018199E75C2006099B8 /* CCMesh.cpp in Sources */, + 15162019199E75C2006099B8 /* CCObjLoader.cpp in Sources */, + 1516201A199E75C2006099B8 /* CCSprite3D.cpp in Sources */, + 1516201B199E75C2006099B8 /* CCSprite3DMaterial.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 15162033199E7810006099B8 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 15162202199E7874006099B8 /* CCAABB.cpp in Sources */, + 15162203199E7874006099B8 /* CCOBB.cpp in Sources */, + 15162204199E7874006099B8 /* CCRay.cpp in Sources */, + 15162205199E7874006099B8 /* CCSkeleton3D.cpp in Sources */, + 15162206199E7874006099B8 /* CCAttachNode.cpp in Sources */, + 15162207199E7874006099B8 /* CCSubMesh.cpp in Sources */, + 15162208199E7874006099B8 /* CCSubMeshState.cpp in Sources */, + 15162209199E7874006099B8 /* CCBundleReader.cpp in Sources */, + 1516220A199E7874006099B8 /* CCBundle3D.cpp in Sources */, + 1516220B199E7874006099B8 /* CCAnimate3D.cpp in Sources */, + 1516220C199E7874006099B8 /* CCMeshSkin.cpp in Sources */, + 1516220D199E7874006099B8 /* CCAnimation3D.cpp in Sources */, + 1516220E199E7874006099B8 /* CCMesh.cpp in Sources */, + 1516220F199E7874006099B8 /* CCObjLoader.cpp in Sources */, + 15162210199E7874006099B8 /* CCSprite3D.cpp in Sources */, + 15162211199E7874006099B8 /* CCSprite3DMaterial.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 1551A33B158F2AB200E66CFE /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 2AC795DB1862870F005EC8E1 /* SkeletonBounds.cpp in Sources */, 50ABBE2B1925AB6F00A911A9 /* ccCArray.cpp in Sources */, - 2AC795DC1862870F005EC8E1 /* Event.cpp in Sources */, + 3EA3EDBC1991CDFA00645534 /* CCCamera.cpp in Sources */, 1A01C68A18F57BE800EFE3A6 /* CCDeprecated.cpp in Sources */, 1A1645B0191B726C008C7C7F /* ConvertUTF.c in Sources */, - 2905FA5618CF08D100240AA3 /* UILayout.cpp in Sources */, - 2AC795DD1862870F005EC8E1 /* EventData.cpp in Sources */, - 2AC795DE1862870F005EC8E1 /* BoundingBoxAttachment.cpp in Sources */, 50ABBD581925AB0000A911A9 /* Vec2.cpp in Sources */, 50ABBE311925AB6F00A911A9 /* CCConfiguration.cpp in Sources */, 1A01C6A418F58F7500EFE3A6 /* CCNotificationCenter.cpp in Sources */, 46A170EA1807CECA005B8026 /* CCPhysicsJoint.cpp in Sources */, 5027253C190BF1B900AAF4ED /* cocos2d.cpp in Sources */, - 0634A4D4194B19E400E608AF /* CCActionTimelineCache.cpp in Sources */, 50ABC0611926664800A911A9 /* CCCommon.mm in Sources */, 50ABBDB11925AB4100A911A9 /* ccShaders.cpp in Sources */, 46A170EF1807CECA005B8026 /* CCPhysicsWorld.cpp in Sources */, 46A170ED1807CECA005B8026 /* CCPhysicsShape.cpp in Sources */, 50ABBE991925AB6F00A911A9 /* CCRef.cpp in Sources */, ED9C6A9418599AD8000A5232 /* CCNodeGrid.cpp in Sources */, - 06CAAACB186AD7F20012A414 /* TriggerMng.cpp in Sources */, 46A170E61807CECA005B8026 /* CCPhysicsBody.cpp in Sources */, - 29E99D1E1957BA7000046604 /* CocoLoader.cpp in Sources */, 50ABBDA71925AB4100A911A9 /* CCRenderCommand.cpp in Sources */, 50ABBD501925AB0000A911A9 /* Quaternion.cpp in Sources */, 50ABBEBB1925AB6F00A911A9 /* ccUtils.cpp in Sources */, + 15EFA211198A2BB5000C57D3 /* CCProtectedNode.cpp in Sources */, 50ABBEB71925AB6F00A911A9 /* ccUTF8.cpp in Sources */, 50ABBE271925AB6F00A911A9 /* CCAutoreleasePool.cpp in Sources */, 50ABBE8B1925AB6F00A911A9 /* CCNS.cpp in Sources */, 46A170E81807CECA005B8026 /* CCPhysicsContact.cpp in Sources */, 1A570061180BC5A10088DEC7 /* CCAction.cpp in Sources */, 50ABBEC51925AB6F00A911A9 /* etc1.cpp in Sources */, - 50FCEB9718C72017004AD434 /* CheckBoxReader.cpp in Sources */, 1A570065180BC5A10088DEC7 /* CCActionCamera.cpp in Sources */, 50ABBEAB1925AB6F00A911A9 /* ccTypes.cpp in Sources */, 1A570069180BC5A10088DEC7 /* CCActionCatmullRom.cpp in Sources */, + B257B44E1989D5E800D9A687 /* CCPrimitive.cpp in Sources */, + 299CF1FB19A434BC00C378C1 /* ccRandom.cpp in Sources */, 1A57006D180BC5A10088DEC7 /* CCActionEase.cpp in Sources */, - 2905FA4E18CF08D100240AA3 /* UIHelper.cpp in Sources */, 1A570071180BC5A10088DEC7 /* CCActionGrid.cpp in Sources */, B37510761823AC9F00B3BA6A /* CCPhysicsJointInfo_chipmunk.cpp in Sources */, 50ABBFFF1926664800A911A9 /* CCFileUtilsApple.mm in Sources */, @@ -6277,20 +7002,17 @@ 50ABBEBF1925AB6F00A911A9 /* CCValue.cpp in Sources */, 1A570098180BC5C10088DEC7 /* CCAtlasNode.cpp in Sources */, 1A57009E180BC5D20088DEC7 /* CCNode.cpp in Sources */, - 2905FA7418CF08D100240AA3 /* UIScrollView.cpp in Sources */, + B257B460198A353E00D9A687 /* CCPrimitiveCommand.cpp in Sources */, 50ABBE651925AB6F00A911A9 /* CCEventListenerCustom.cpp in Sources */, B37510781823AC9F00B3BA6A /* CCPhysicsShapeInfo_chipmunk.cpp in Sources */, - 50FCEBB718C72017004AD434 /* TextAtlasReader.cpp in Sources */, 50ABBE391925AB6F00A911A9 /* CCData.cpp in Sources */, + 46633BC4199DDB2F00F6E838 /* CCModuleManager.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 */, 1A570112180BC8EE0088DEC7 /* CCDrawNode.cpp in Sources */, 1A57011B180BC90D0088DEC7 /* CCGrabber.cpp in Sources */, 1A57011F180BC90D0088DEC7 /* CCGrid.cpp in Sources */, - 50FCEBA718C72017004AD434 /* LoadingBarReader.cpp in Sources */, 1A57019D180BCB590088DEC7 /* CCFont.cpp in Sources */, 1A5701A1180BCB590088DEC7 /* CCFontAtlas.cpp in Sources */, 1A5701A5180BCB590088DEC7 /* CCFontAtlasCache.cpp in Sources */, @@ -6320,17 +7042,16 @@ 1A1645B2191B726C008C7C7F /* ConvertUTFWrapper.cpp in Sources */, 1A5701FB180BCBAD0088DEC7 /* CCMenuItem.cpp in Sources */, 1A570202180BCBD40088DEC7 /* CCClippingNode.cpp in Sources */, - 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 */, + B276EF651988D1D500CD400F /* CCVertexIndexBuffer.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 */, - 50FCEB9B18C72017004AD434 /* ImageViewReader.cpp in Sources */, 1A57027E180BCC900088DEC7 /* CCSprite.cpp in Sources */, 1A570282180BCC900088DEC7 /* CCSpriteBatchNode.cpp in Sources */, 1A570286180BCC900088DEC7 /* CCSpriteFrame.cpp in Sources */, @@ -6339,26 +7060,18 @@ 1A57028A180BCC900088DEC7 /* CCSpriteFrameCache.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 */, - 50ABC0111926664800A911A9 /* CCGLViewProtocol.cpp in Sources */, - B29594C21926D61F003EEF37 /* CCMesh.cpp in Sources */, + 50ABC0111926664800A911A9 /* CCGLView.cpp in Sources */, 50ABBE3D1925AB6F00A911A9 /* CCDataVisitor.cpp in Sources */, 1A5702C8180BCE370088DEC7 /* CCTextFieldTTF.cpp in Sources */, 50ABBE7D1925AB6F00A911A9 /* CCEventTouch.cpp in Sources */, - 50FCEBAB18C72017004AD434 /* PageViewReader.cpp in Sources */, 1A5702EA180BCE750088DEC7 /* CCTileMapAtlas.cpp in Sources */, 50ABBD971925AB4100A911A9 /* CCGLProgramStateCache.cpp in Sources */, 1A5702EE180BCE750088DEC7 /* CCTMXLayer.cpp in Sources */, 50ABBE691925AB6F00A911A9 /* CCEventListenerFocus.cpp in Sources */, 1A5702F2180BCE750088DEC7 /* CCTMXObjectGroup.cpp in Sources */, - 0634A4DC194B19E400E608AF /* CCNodeReader.cpp in Sources */, 1A5702F6180BCE750088DEC7 /* CCTMXTiledMap.cpp in Sources */, 1A5702FA180BCE750088DEC7 /* CCTMXXMLParser.cpp in Sources */, 50ABBD5C1925AB0000A911A9 /* Vec3.cpp in Sources */, @@ -6369,170 +7082,60 @@ 1A01C69C18F57BE800EFE3A6 /* CCString.cpp in Sources */, 50ABBD3C1925AB0000A911A9 /* CCGeometry.cpp in Sources */, 50ABC0011926664800A911A9 /* CCLock.cpp in Sources */, - 50E6D30E18DADB5D0051CA34 /* CCProtectedNode.cpp in Sources */, 50ABBD931925AB4100A911A9 /* CCGLProgramState.cpp in Sources */, 1A57034B180BD09B0088DEC7 /* tinyxml2.cpp in Sources */, 1A570354180BD0B00088DEC7 /* ioapi.cpp in Sources */, 1A570358180BD0B00088DEC7 /* unzip.cpp in Sources */, - 3EA47870195478E00068D9D1 /* CCBundleReader.cpp in Sources */, - 1AD71DA9180E26E600808F54 /* CCBAnimationManager.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 */, 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 */, - 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 */, + 464AD6E5197EBB1400E502D8 /* pvr.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 */, - 1AD71E01180E26E600808F54 /* CCScale9SpriteLoader.cpp in Sources */, - 1AD71E05180E26E600808F54 /* CCScrollViewLoader.cpp in Sources */, - 1AD71E09180E26E600808F54 /* CCSpriteLoader.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 */, - 1AD71EA5180E26E600808F54 /* AtlasAttachmentLoader.cpp in Sources */, 50ABBD8F1925AB4100A911A9 /* CCGLProgramCache.cpp in Sources */, 50ABBD441925AB0000A911A9 /* CCVertex.cpp in Sources */, - 1AD71EA9180E26E600808F54 /* Attachment.cpp in Sources */, - 1AD71EAD180E26E600808F54 /* AttachmentLoader.cpp in Sources */, + B276EF611988D1D500CD400F /* CCVertexIndexData.cpp in Sources */, 503DD8F71926B0DB00CD74DD /* CCIMEDispatcher.cpp in Sources */, - 1AD71EB1180E26E600808F54 /* Bone.cpp in Sources */, - 1AD71EB5180E26E600808F54 /* BoneData.cpp in Sources */, - 29BDBA53195D597A003225C9 /* UIDeprecated.cpp in Sources */, - 1AD71EB9180E26E600808F54 /* CCSkeleton.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 /* UILayoutManager.cpp in Sources */, 50ABC0051926664800A911A9 /* CCThread.mm in Sources */, - 1AD71EC5180E26E600808F54 /* Json.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 */, - 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 */, - 0634A4E0194B19E400E608AF /* CCTimeLine.cpp in Sources */, - 1AAF5372180E3374000584C8 /* SocketIO.cpp in Sources */, 50ABBE1F1925AB6F00A911A9 /* atitc.cpp in Sources */, - 1AAF5376180E3374000584C8 /* WebSocket.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 */, 1A9DCA27180E6955007A3AD4 /* CCGLBufferedNode.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 */, - 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 */, - 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 /* CCSprite3DMaterial.cpp in Sources */, 299754F4193EC95400A54AC3 /* ObjectFactory.cpp in Sources */, - 2905FA7C18CF08D100240AA3 /* UIText.cpp in Sources */, - 50FCEB9F18C72017004AD434 /* LayoutReader.cpp in Sources */, - 50ABC0211926664800A911A9 /* CCGLView.cpp in Sources */, - 0634A4D8194B19E400E608AF /* CCFrame.cpp in Sources */, - 1A8C59C7180E930E00EF57C3 /* CCComRender.cpp in Sources */, + 50ABC0211926664800A911A9 /* CCGLViewImpl.cpp in Sources */, 50ABC00D1926664800A911A9 /* CCFileUtils.cpp in Sources */, - 1A8C59CB180E930E00EF57C3 /* CCDataReaderHelper.cpp in Sources */, - 1A8C59CF180E930E00EF57C3 /* CCDatas.cpp in Sources */, - 1A8C59D3180E930E00EF57C3 /* CCDecorativeDisplay.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 */, - 0634A4D0194B19E400E608AF /* CCActionTimeline.cpp in Sources */, - 2905FA6218CF08D100240AA3 /* UIListView.cpp in Sources */, - 1A8C59DF180E930E00EF57C3 /* CCInputDelegate.cpp in Sources */, - 1A8C59E3180E930E00EF57C3 /* CCProcessBase.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 */, - B6B26343193884D60088FE25 /* CCAnimation3D.cpp in Sources */, - B6ACD897193D6693005E0B8A /* CCMeshSkin.cpp in Sources */, - B6ACD89E193DC0CC005E0B8A /* CCAnimate3D.cpp in Sources */, - B6AAF84119404E0D0069DE01 /* CCBundle3D.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -6643,22 +7246,18 @@ buildActionMask = 2147483647; files = ( 460E477D18080902000CDD6D /* CCControl.cpp in Sources */, + B282B4811980E0A300666787 /* CCEditBoxImplMac.mm in Sources */, 460E47CB18080913000CDD6D /* CCScrollView.cpp in Sources */, 460E47D118080913000CDD6D /* CCTableViewCell.cpp in Sources */, 460E47CF18080913000CDD6D /* CCTableView.cpp in Sources */, 460E478618080902000CDD6D /* CCControlPotentiometer.cpp in Sources */, 460E478C18080902000CDD6D /* CCControlStepper.cpp in Sources */, - 460E47BB1808090B000CDD6D /* CCEditBoxImplWin.cpp in Sources */, - 460E47B21808090B000CDD6D /* CCEditBoxImplAndroid.cpp in Sources */, - 460E47B81808090B000CDD6D /* CCEditBoxImplNone.cpp in Sources */, 460E478418080902000CDD6D /* CCControlHuePicker.cpp in Sources */, 460E478A18080902000CDD6D /* CCControlSlider.cpp in Sources */, 460E478818080902000CDD6D /* CCControlSaturationBrightnessPicker.cpp in Sources */, - 460E47B51808090B000CDD6D /* CCEditBoxImplIOS.mm in Sources */, 460E478E18080902000CDD6D /* CCControlSwitch.cpp in Sources */, 460E479218080902000CDD6D /* CCInvocation.cpp in Sources */, 460E477F18080902000CDD6D /* CCControlButton.cpp in Sources */, - 460E47B71808090B000CDD6D /* CCEditBoxImplMac.mm in Sources */, 460E47AF1808090B000CDD6D /* CCEditBox.cpp in Sources */, 460E479418080902000CDD6D /* CCScale9Sprite.cpp in Sources */, 460E478118080902000CDD6D /* CCControlColourPicker.cpp in Sources */, @@ -6676,47 +7275,37 @@ 1A01C69918F57BE800EFE3A6 /* CCSet.cpp in Sources */, 1A01C69D18F57BE800EFE3A6 /* CCString.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 */, - 46A171001807CECB005B8026 /* CCPhysicsJoint.cpp in Sources */, 46A171051807CECB005B8026 /* CCPhysicsWorld.cpp in Sources */, 50ABBDA01925AB4100A911A9 /* CCGroupCommand.cpp in Sources */, 46A171031807CECB005B8026 /* CCPhysicsShape.cpp in Sources */, 50ABC0161926664800A911A9 /* CCImage.cpp in Sources */, 1A01C6A518F58F7500EFE3A6 /* CCNotificationCenter.cpp in Sources */, - 50E6D33918E174130051CA34 /* UIRelativeBox.cpp in Sources */, ED9C6A9518599AD8000A5232 /* CCNodeGrid.cpp in Sources */, 1A01C68F18F57BE800EFE3A6 /* CCDictionary.cpp in Sources */, + B276EF621988D1D500CD400F /* CCVertexIndexData.cpp in Sources */, 50ABBE561925AB6F00A911A9 /* CCEventFocus.cpp in Sources */, - 06CAAACC186AD7F50012A414 /* TriggerMng.cpp in Sources */, 503DD8E11926736A00CD74DD /* CCApplication.mm in Sources */, 50ABC01A1926664800A911A9 /* CCSAXParser.cpp in Sources */, + B2CC507C19776DD10041958E /* CCPhysicsJoint.cpp in Sources */, + B2165EEA19921124000BE3E6 /* CCPrimitiveCommand.cpp in Sources */, 503DD8EE1926736A00CD74DD /* CCImage.mm in Sources */, - 50FCEBC818C72017004AD434 /* WidgetReader.cpp in Sources */, - 3EA47871195478E00068D9D1 /* CCBundleReader.cpp in Sources */, + B37510811823ACA100B3BA6A /* CCPhysicsJointInfo_chipmunk.cpp in Sources */, 46A170FC1807CECB005B8026 /* CCPhysicsBody.cpp in Sources */, 50ABBD941925AB4100A911A9 /* CCGLProgramState.cpp in Sources */, + B257B44F1989D5E800D9A687 /* CCPrimitive.cpp in Sources */, 50ABBE281925AB6F00A911A9 /* CCAutoreleasePool.cpp in Sources */, 46A170FE1807CECB005B8026 /* CCPhysicsContact.cpp in Sources */, - 3EA0FB6C191C841D00B170C8 /* UIVideoPlayerIOS.mm in Sources */, 1A570062180BC5A10088DEC7 /* CCAction.cpp in Sources */, 1A570066180BC5A10088DEC7 /* CCActionCamera.cpp in Sources */, - 0634A4D9194B19E400E608AF /* CCFrame.cpp in Sources */, + B276EF661988D1D500CD400F /* CCVertexIndexBuffer.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 */, 3E6176681960F89B00DE83F5 /* CCController-iOS.mm in Sources */, - 2905FA8D18CF08D100240AA3 /* UIWidget.cpp in Sources */, - 29E99D1F1957BA7000046604 /* CocoLoader.cpp in Sources */, B29594B51926D5EC003EEF37 /* CCMeshCommand.cpp in Sources */, - 0634A4D5194B19E400E608AF /* CCActionTimelineCache.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 */, @@ -6734,8 +7323,6 @@ 1A570082180BC5A10088DEC7 /* CCActionManager.cpp in Sources */, 1A570086180BC5A10088DEC7 /* CCActionPageTurn3D.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 */, @@ -6744,7 +7331,6 @@ 50ABBE3E1925AB6F00A911A9 /* CCDataVisitor.cpp in Sources */, 1A57009F180BC5D20088DEC7 /* CCNode.cpp in Sources */, B37510831823ACA100B3BA6A /* CCPhysicsShapeInfo_chipmunk.cpp in Sources */, - B29594CF1926D61F003EEF37 /* CCSprite3DMaterial.cpp in Sources */, 1A57010F180BC8EE0088DEC7 /* CCDrawingPrimitives.cpp in Sources */, 1A570113180BC8EE0088DEC7 /* CCDrawNode.cpp in Sources */, 1A57011C180BC90D0088DEC7 /* CCGrabber.cpp in Sources */, @@ -6754,13 +7340,13 @@ 1A5701A2180BCB590088DEC7 /* CCFontAtlas.cpp in Sources */, 3E61781D1966A5A300DE83F5 /* CCController.cpp in Sources */, 50ABC00E1926664800A911A9 /* CCFileUtils.cpp in Sources */, + 299CF1FC19A434BC00C378C1 /* ccRandom.cpp in Sources */, 50ABBE241925AB6F00A911A9 /* base64.cpp in Sources */, 1A5701A6180BCB590088DEC7 /* CCFontAtlasCache.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 */, 1A087AE91860400400196EF5 /* edtaa3func.cpp in Sources */, @@ -6775,20 +7361,16 @@ 50ABBD9C1925AB4100A911A9 /* ccGLStateCache.cpp in Sources */, 1A5701E7180BCB8C0088DEC7 /* CCTransition.cpp in Sources */, 50ABC01E1926664800A911A9 /* CCThread.cpp in Sources */, - 0634A4D1194B19E400E608AF /* CCActionTimeline.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 */, + 503DD8ED1926736A00CD74DD /* CCGLViewImpl.mm in Sources */, 1A570215180BCBF40088DEC7 /* CCRenderTexture.cpp in Sources */, 1A570222180BCC1A0088DEC7 /* CCParticleBatchNode.cpp in Sources */, 1A570226180BCC1A0088DEC7 /* CCParticleExamples.cpp in Sources */, @@ -6797,17 +7379,13 @@ B24AA986195A675C007B4522 /* CCFastTMXLayer.cpp in Sources */, 1A57022E180BCC1A0088DEC7 /* CCParticleSystemQuad.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 */, 1A570283180BCC900088DEC7 /* CCSpriteBatchNode.cpp in Sources */, 1A570287180BCC900088DEC7 /* CCSpriteFrame.cpp in Sources */, 1A57028B180BCC900088DEC7 /* CCSpriteFrameCache.cpp in Sources */, 1A570293180BCCAB0088DEC7 /* CCAnimation.cpp in Sources */, + 3EA3EDBD1991CDFA00645534 /* CCCamera.cpp in Sources */, 1A570297180BCCAB0088DEC7 /* CCAnimationCache.cpp in Sources */, - 50FCEBC418C72017004AD434 /* TextReader.cpp in Sources */, - 50FCEB9418C72017004AD434 /* ButtonReader.cpp in Sources */, 50ABBE321925AB6F00A911A9 /* CCConfiguration.cpp in Sources */, 1A5702C9180BCE370088DEC7 /* CCTextFieldTTF.cpp in Sources */, 1A5702EB180BCE750088DEC7 /* CCTileMapAtlas.cpp in Sources */, @@ -6815,183 +7393,75 @@ 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 */, + 46633BC5199DDB2F00F6E838 /* CCModuleManager.cpp in Sources */, 1A5702FB180BCE750088DEC7 /* CCTMXXMLParser.cpp in Sources */, - 2905FA6B18CF08D100240AA3 /* UIPageView.cpp in Sources */, 1A570301180BCE890088DEC7 /* CCParallaxNode.cpp in Sources */, 1A57030D180BCF190088DEC7 /* CCComponent.cpp in Sources */, + 464AD6E6197EBB1400E502D8 /* pvr.cpp in Sources */, 1A570311180BCF190088DEC7 /* CCComponentContainer.cpp in Sources */, 50ABBE2C1925AB6F00A911A9 /* ccCArray.cpp in Sources */, 50ABC0061926664800A911A9 /* CCThread.mm in Sources */, B375107C1823ACA100B3BA6A /* CCPhysicsBodyInfo_chipmunk.cpp in Sources */, - 50FCEBB418C72017004AD434 /* SliderReader.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 */, - 0634A4E1194B19E400E608AF /* CCTimeLine.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 */, - 1AD71DBE180E26E600808F54 /* CCBSequence.cpp in Sources */, - 1AD71DC2180E26E600808F54 /* CCBSequenceProperty.cpp in Sources */, - 1AD71DCA180E26E600808F54 /* CCControlButtonLoader.cpp in Sources */, - 1AD71DCE180E26E600808F54 /* CCControlLoader.cpp in Sources */, - 1AD71DD2180E26E600808F54 /* CCLabelBMFontLoader.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 */, 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 */, - 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 */, - 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 */, - 50FCEBBC18C72017004AD434 /* TextBMFontReader.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 */, - 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 */, 3E6176761960F89B00DE83F5 /* CCEventListenerController.cpp in Sources */, 503DD8E71926736A00CD74DD /* CCEAGLView.mm in Sources */, - 1AD71EE6180E26E600808F54 /* spine-cocos2dx.cpp in Sources */, - 2905FA8518CF08D100240AA3 /* UITextBMFont.cpp in Sources */, - 1AAF536B180E3374000584C8 /* HttpClient.cpp in Sources */, - 1AAF5373180E3374000584C8 /* SocketIO.cpp in Sources */, - 1AAF5377180E3374000584C8 /* WebSocket.cpp in Sources */, 50ABBDA41925AB4100A911A9 /* CCQuadCommand.cpp in Sources */, 1AAF5850180E40B9000584C8 /* LocalStorage.cpp in Sources */, 1AAF5854180E40B9000584C8 /* LocalStorageAndroid.cpp in Sources */, 1A9DCA28180E6955007A3AD4 /* CCGLBufferedNode.cpp in Sources */, 50ABBE201925AB6F00A911A9 /* atitc.cpp in Sources */, - 50FCEBA018C72017004AD434 /* LayoutReader.cpp in Sources */, - 50E6D33518E174130051CA34 /* UIHBox.cpp in Sources */, - 50FCEBB018C72017004AD434 /* ScrollViewReader.cpp in Sources */, 50ABBE9A1925AB6F00A911A9 /* CCRef.cpp in Sources */, 3E6176741960F89B00DE83F5 /* CCEventController.cpp in Sources */, 50ABBE361925AB6F00A911A9 /* CCConsole.cpp in Sources */, 503DD8E51926736A00CD74DD /* CCDirectorCaller.mm in Sources */, 50ABBD5D1925AB0000A911A9 /* Vec3.cpp in Sources */, - 50ABC0121926664800A911A9 /* CCGLViewProtocol.cpp in Sources */, + 50ABC0121926664800A911A9 /* CCGLView.cpp in Sources */, 50ABC0021926664800A911A9 /* CCLock.cpp in Sources */, - 29BDBA54195D597A003225C9 /* UIDeprecated.cpp in Sources */, - 50FCEBAC18C72017004AD434 /* PageViewReader.cpp in Sources */, - 1A8C598C180E930E00EF57C3 /* CCActionFrame.cpp in Sources */, - 1A8C5990180E930E00EF57C3 /* CCActionFrameEasing.cpp in Sources */, - 29CB8F4D1929D1BB00C841D6 /* UILayoutManager.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 */, 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 */, 50ABBE4A1925AB6F00A911A9 /* CCEventAcceleration.cpp in Sources */, - 1A8C59C0180E930E00EF57C3 /* CCComAudio.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 */, - 1A8C59D8180E930E00EF57C3 /* CCDisplayFactory.cpp in Sources */, 46C02E0818E91123004B7456 /* xxhash.c in Sources */, 50ABBED01925AB6F00A911A9 /* TGAlib.cpp in Sources */, - 2905FA4118CF08D100240AA3 /* CocosGUI.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 */, - 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 */, - 1A8C5A04180E930E00EF57C3 /* CCUtilMath.cpp in Sources */, - 2905FA7518CF08D100240AA3 /* UIScrollView.cpp in Sources */, - 1A8C5A0E180E930E00EF57C3 /* DictionaryHelper.cpp in Sources */, 1ABA68AF1888D700007D1BB4 /* CCFontCharMap.cpp in Sources */, - 0634A4DD194B19E400E608AF /* CCNodeReader.cpp in Sources */, 50ABBE7A1925AB6F00A911A9 /* CCEventMouse.cpp in Sources */, + 15EFA212198A2BB5000C57D3 /* CCProtectedNode.cpp in Sources */, 50ABBD981925AB4100A911A9 /* CCGLProgramStateCache.cpp in Sources */, - B6B26344193884D60088FE25 /* CCAnimation3D.cpp in Sources */, - B6ACD898193D6693005E0B8A /* CCMeshSkin.cpp in Sources */, - B6ACD89F193DC0CC005E0B8A /* CCAnimate3D.cpp in Sources */, - B6AAF84219404E0D0069DE01 /* CCBundle3D.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -7010,7 +7480,6 @@ 460E47D718080914000CDD6D /* CCTableView.cpp in Sources */, 460E479F18080904000CDD6D /* CCControlPotentiometer.cpp in Sources */, 460E479818080904000CDD6D /* CCControlButton.cpp in Sources */, - 460E47C51808090D000CDD6D /* CCEditBoxImplMac.mm in Sources */, 460E479D18080904000CDD6D /* CCControlHuePicker.cpp in Sources */, 460E47A318080904000CDD6D /* CCControlSlider.cpp in Sources */, 460E47AB18080904000CDD6D /* CCInvocation.cpp in Sources */, @@ -7127,77 +7596,564 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + B245F10119766132001920FD /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + B2DB4764197661D500411E16 /* UIWidget.cpp in Sources */, + B2DB4765197661E400411E16 /* UIHBox.cpp in Sources */, + B2DB4766197661EE00411E16 /* UILayout.cpp in Sources */, + B2DB476B1976654800411E16 /* UILayoutManager.cpp in Sources */, + B2DB477F1976660000411E16 /* UIButton.cpp in Sources */, + B2DB476D1976655700411E16 /* UILayoutParameter.cpp in Sources */, + B2DB47811976660A00411E16 /* UICheckBox.cpp in Sources */, + B2DB476F1976656D00411E16 /* UIRelativeBox.cpp in Sources */, + B2DB47711976657A00411E16 /* UIVBox.cpp in Sources */, + B2DB47731976658E00411E16 /* CocosGUI.cpp in Sources */, + B2DB4775197665A500411E16 /* UIDeprecated.cpp in Sources */, + 2958244B19873D8E00F9746D /* UIScale9Sprite.cpp in Sources */, + B2DB47891976664200411E16 /* UISlider.cpp in Sources */, + B2DB4779197665CD00411E16 /* UIListView.cpp in Sources */, + B2DB47851976662B00411E16 /* UILoadingBar.cpp in Sources */, + B2DB478B1976665700411E16 /* UIText.cpp in Sources */, + B2DB478C1976665700411E16 /* UITextAtlas.cpp in Sources */, + B2DB478D1976665700411E16 /* UITextBMFont.cpp in Sources */, + B2DB478E1976665700411E16 /* UITextField.cpp in Sources */, + B2DB47871976663800411E16 /* UIRichText.cpp in Sources */, + B2DB47831976661800411E16 /* UIImageView.cpp in Sources */, + B2DB477B197665D900411E16 /* UIPageView.cpp in Sources */, + B2DB4777197665B400411E16 /* UIHelper.cpp in Sources */, + B2DB477D197665E500411E16 /* UIScrollView.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + B24EEA2D19775E92004493CC /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + B2C59A1C19777E7500B452DF /* UIListView.cpp in Sources */, + 2958244C19873D8E00F9746D /* UIScale9Sprite.cpp in Sources */, + B2C59A1D19777E7500B452DF /* UILoadingBar.cpp in Sources */, + B2C59A1E19777E7500B452DF /* UIPageView.cpp in Sources */, + B2C59A1F19777E7500B452DF /* UIRichText.cpp in Sources */, + B2C59A2019777E7500B452DF /* UIScrollView.cpp in Sources */, + B2C59A2119777E7500B452DF /* UISlider.cpp in Sources */, + B2C59A2219777E7500B452DF /* UIText.cpp in Sources */, + B2C59A2319777E7500B452DF /* UITextAtlas.cpp in Sources */, + B2C59A2419777E7500B452DF /* UITextBMFont.cpp in Sources */, + B2C59A2519777E7500B452DF /* UITextField.cpp in Sources */, + B2C59A2619777E7500B452DF /* UIButton.cpp in Sources */, + B2C59ACB197782FF00B452DF /* UIVideoPlayerIOS.mm in Sources */, + B2C59A2719777E7500B452DF /* UICheckBox.cpp in Sources */, + B2C59A2819777E7500B452DF /* UIImageView.cpp in Sources */, + B2C59A2A19777E8300B452DF /* UIDeprecated.cpp in Sources */, + B2C59A2B19777E8300B452DF /* UIWidget.cpp in Sources */, + B2C59A2D19777E8300B452DF /* UIHelper.cpp in Sources */, + B2C59A2E19777E8C00B452DF /* UIHBox.cpp in Sources */, + B2C59A2F19777E8C00B452DF /* UIRelativeBox.cpp in Sources */, + B2C59A3019777E8C00B452DF /* UIVBox.cpp in Sources */, + B2C59A3119777E8C00B452DF /* UILayout.cpp in Sources */, + B2C59A3219777E8C00B452DF /* UILayoutParameter.cpp in Sources */, + B2C59A3319777E8C00B452DF /* UILayoutManager.cpp in Sources */, + B2C59A2919777E7A00B452DF /* CocosGUI.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + B24EEA6819775EBB004493CC /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + B2C59A871977801A00B452DF /* CocoLoader.cpp in Sources */, + B2C59A881977802100B452DF /* CCActionTimeline.cpp in Sources */, + B2C59A891977802100B452DF /* CCActionTimelineCache.cpp in Sources */, + B2C59A8A1977802100B452DF /* CCFrame.cpp in Sources */, + B2C59A8B1977802100B452DF /* CCNodeReader.cpp in Sources */, + B2C59A8C1977802100B452DF /* CCTimeLine.cpp in Sources */, + B2C59A8D1977803400B452DF /* ButtonReader.cpp in Sources */, + B2C59A8E1977803400B452DF /* CheckBoxReader.cpp in Sources */, + B2C59A8F1977803400B452DF /* ImageViewReader.cpp in Sources */, + B2C59A901977803400B452DF /* LayoutReader.cpp in Sources */, + B2C59A911977803400B452DF /* ListViewReader.cpp in Sources */, + B2C59A921977803400B452DF /* LoadingBarReader.cpp in Sources */, + B2C59A931977803400B452DF /* PageViewReader.cpp in Sources */, + B2C59A941977803400B452DF /* ScrollViewReader.cpp in Sources */, + B2C59A951977803400B452DF /* SliderReader.cpp in Sources */, + B2C59A961977803400B452DF /* TextAtlasReader.cpp in Sources */, + B2C59A971977803400B452DF /* TextBMFontReader.cpp in Sources */, + B2C59A981977803400B452DF /* TextFieldReader.cpp in Sources */, + B2C59A991977803400B452DF /* TextReader.cpp in Sources */, + B2C59A9B1977804700B452DF /* TriggerBase.cpp in Sources */, + B2C59A9C1977804700B452DF /* TriggerMng.cpp in Sources */, + B2C59A9D1977804700B452DF /* TriggerObj.cpp in Sources */, + B2C59A9E1977804700B452DF /* CCActionFrame.cpp in Sources */, + B2C59A9F1977804700B452DF /* CCActionFrameEasing.cpp in Sources */, + B2C59AA01977804700B452DF /* CCActionManagerEx.cpp in Sources */, + B2C59AA11977804800B452DF /* CCActionNode.cpp in Sources */, + B2C59AA21977804800B452DF /* CCActionObject.cpp in Sources */, + B2C59AA31977804800B452DF /* CCArmature.cpp in Sources */, + B2C59AA41977804800B452DF /* CCArmatureAnimation.cpp in Sources */, + B2C59AA51977804800B452DF /* CCArmatureDataManager.cpp in Sources */, + B2C59AA61977804800B452DF /* CCArmatureDefine.cpp in Sources */, + B2C59AA71977804800B452DF /* CCBatchNode.cpp in Sources */, + B2C59AA81977804800B452DF /* CCBone.cpp in Sources */, + B2C59AA91977804800B452DF /* CCColliderDetector.cpp in Sources */, + B2C59AAA1977804800B452DF /* CCComAttribute.cpp in Sources */, + B2C59AAB1977804800B452DF /* CCComAudio.cpp in Sources */, + B2C59AAC1977804800B452DF /* CCComController.cpp in Sources */, + B2C59AAD1977804800B452DF /* CCComRender.cpp in Sources */, + B2C59AAE1977804800B452DF /* CCDataReaderHelper.cpp in Sources */, + B2C59AAF1977804800B452DF /* CCDatas.cpp in Sources */, + B2C59AB01977804800B452DF /* CCDecorativeDisplay.cpp in Sources */, + B2C59AB11977804800B452DF /* CCDisplayFactory.cpp in Sources */, + B2C59AB21977804800B452DF /* CCDisplayManager.cpp in Sources */, + B2C59AB31977804800B452DF /* CCInputDelegate.cpp in Sources */, + B2C59AB41977804800B452DF /* CCProcessBase.cpp in Sources */, + B2C59AB51977804800B452DF /* CCSGUIReader.cpp in Sources */, + B2C59AB61977804800B452DF /* CCSkin.cpp in Sources */, + B2C59AB71977804800B452DF /* CCSpriteFrameCacheHelper.cpp in Sources */, + B2C59AB81977804800B452DF /* CCSSceneReader.cpp in Sources */, + B2C59AB91977804800B452DF /* CCTransformHelp.cpp in Sources */, + B2C59ABA1977804800B452DF /* CCTween.cpp in Sources */, + B2C59ABB1977804800B452DF /* CCUtilMath.cpp in Sources */, + B2C59ABC1977804800B452DF /* DictionaryHelper.cpp in Sources */, + B2C59A9A1977803400B452DF /* WidgetReader.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + B24EEA7019775ECE004493CC /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + B2C59A061977706500B452DF /* CCBAnimationManager.cpp in Sources */, + B2C59A071977706500B452DF /* CCBFileLoader.cpp in Sources */, + B2C59A081977706500B452DF /* CCBKeyframe.cpp in Sources */, + B2C59A091977706500B452DF /* CCBReader.cpp in Sources */, + B2C59A0A1977706500B452DF /* CCBSequence.cpp in Sources */, + B2C59A0B1977706500B452DF /* CCBSequenceProperty.cpp in Sources */, + B2C59A0C1977706500B452DF /* CCControlButtonLoader.cpp in Sources */, + B2C59A0D1977706500B452DF /* CCControlLoader.cpp in Sources */, + B2C59A0E1977706500B452DF /* CCLabelBMFontLoader.cpp in Sources */, + B2C59A0F1977706500B452DF /* CCLabelTTFLoader.cpp in Sources */, + B2C59A101977706500B452DF /* CCLayerColorLoader.cpp in Sources */, + B2C59A111977706500B452DF /* CCLayerGradientLoader.cpp in Sources */, + B2C59A121977706500B452DF /* CCLayerLoader.cpp in Sources */, + B2C59A131977706500B452DF /* CCMenuItemImageLoader.cpp in Sources */, + B2C59A141977706500B452DF /* CCMenuItemLoader.cpp in Sources */, + B2C59A151977706500B452DF /* CCNode+CCBRelativePositioning.cpp in Sources */, + B2C59A161977706500B452DF /* CCNodeLoader.cpp in Sources */, + B2C59A171977706500B452DF /* CCNodeLoaderLibrary.cpp in Sources */, + B2C59A181977706500B452DF /* CCParticleSystemQuadLoader.cpp in Sources */, + B2C59A191977706500B452DF /* CCScale9SpriteLoader.cpp in Sources */, + B2C59A1A1977706500B452DF /* CCScrollViewLoader.cpp in Sources */, + B2C59A1B1977706500B452DF /* CCSpriteLoader.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + B24EEA7819775EE1004493CC /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + B2CC506019776C340041958E /* SkeletonBounds.cpp in Sources */, + B2CC506119776C340041958E /* Event.cpp in Sources */, + B2CC506219776C340041958E /* EventData.cpp in Sources */, + B2CC506319776C340041958E /* BoundingBoxAttachment.cpp in Sources */, + B2CC506419776C340041958E /* Animation.cpp in Sources */, + B2CC506519776C340041958E /* AnimationState.cpp in Sources */, + B2CC506619776C340041958E /* AnimationStateData.cpp in Sources */, + B2CC506719776C340041958E /* Atlas.cpp in Sources */, + B2CC506819776C340041958E /* AtlasAttachmentLoader.cpp in Sources */, + B2CC506919776C340041958E /* Attachment.cpp in Sources */, + B2CC506A19776C340041958E /* AttachmentLoader.cpp in Sources */, + B2CC506B19776C340041958E /* Bone.cpp in Sources */, + B2CC506C19776C340041958E /* BoneData.cpp in Sources */, + B2CC506D19776C340041958E /* CCSkeleton.cpp in Sources */, + B2CC506E19776C340041958E /* CCSkeletonAnimation.cpp in Sources */, + B2CC506F19776C340041958E /* extension.cpp in Sources */, + B2CC507019776C340041958E /* Json.cpp in Sources */, + B2CC507119776C340041958E /* RegionAttachment.cpp in Sources */, + B2CC507219776C340041958E /* Skeleton.cpp in Sources */, + B2CC507319776C340041958E /* SkeletonData.cpp in Sources */, + B2CC507419776C340041958E /* SkeletonJson.cpp in Sources */, + B2CC507519776C340041958E /* Skin.cpp in Sources */, + B2CC507619776C340041958E /* Slot.cpp in Sources */, + B2CC507719776C340041958E /* SlotData.cpp in Sources */, + B2CC507819776C340041958E /* spine-cocos2dx.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + B24EEA8019775EF3004493CC /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + B2CC50291977634A0041958E /* HttpClient.cpp in Sources */, + B2CC502C197763620041958E /* WebSocket.cpp in Sources */, + B2CC502D197763640041958E /* SocketIO.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + B2DB479C197669A100411E16 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + B2DB47D719766CE100411E16 /* CCBSequence.cpp in Sources */, + B2DB47D319766CD100411E16 /* CCBAnimationManager.cpp in Sources */, + B2DB47E719766DAE00411E16 /* CCScrollViewLoader.cpp in Sources */, + B2DB47E619766D9E00411E16 /* CCScale9SpriteLoader.cpp in Sources */, + B2DB47D419766CD300411E16 /* CCBFileLoader.cpp in Sources */, + B2DB47D519766CD600411E16 /* CCBKeyframe.cpp in Sources */, + B2DB47E119766D7600411E16 /* CCMenuItemImageLoader.cpp in Sources */, + B2DB47D619766CD900411E16 /* CCBReader.cpp in Sources */, + B2DB47E819766DBB00411E16 /* CCSpriteLoader.cpp in Sources */, + B2DB47DB19766D4400411E16 /* CCControlLoader.cpp in Sources */, + B2DB47E419766D8700411E16 /* CCNodeLoaderLibrary.cpp in Sources */, + B2DB47E219766D7800411E16 /* CCMenuItemLoader.cpp in Sources */, + B2DB47E319766D8600411E16 /* CCNodeLoader.cpp in Sources */, + B2DB47DA19766D4200411E16 /* CCControlButtonLoader.cpp in Sources */, + B2DB47DE19766D6700411E16 /* CCLayerColorLoader.cpp in Sources */, + B2DB47D819766CE500411E16 /* CCBSequenceProperty.cpp in Sources */, + B2DB47E519766D9400411E16 /* CCParticleSystemQuadLoader.cpp in Sources */, + B2DB47E019766D6A00411E16 /* CCLayerLoader.cpp in Sources */, + B2DB47DF19766D6900411E16 /* CCLayerGradientLoader.cpp in Sources */, + B2DB47DC19766D5600411E16 /* CCLabelBMFontLoader.cpp in Sources */, + B2DB47D919766CEA00411E16 /* CCNode+CCBRelativePositioning.cpp in Sources */, + B2DB47DD19766D5800411E16 /* CCLabelTTFLoader.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + B2DB48171976716E00411E16 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + B2DB488B19767CE000411E16 /* CCFrame.cpp in Sources */, + B2DB488E19767CEE00411E16 /* ButtonReader.cpp in Sources */, + B2DB488F19767CF200411E16 /* CheckBoxReader.cpp in Sources */, + B2DB488A19767CDD00411E16 /* CCActionTimelineCache.cpp in Sources */, + B2DB488C19767CE200411E16 /* CCNodeReader.cpp in Sources */, + B2DB489119767CF700411E16 /* LayoutReader.cpp in Sources */, + B2DB489719767D0800411E16 /* TextAtlasReader.cpp in Sources */, + B2DB489519767D0200411E16 /* ScrollViewReader.cpp in Sources */, + B2DB489C19767D2000411E16 /* TriggerBase.cpp in Sources */, + B2DB489D19767D2000411E16 /* TriggerMng.cpp in Sources */, + B2DB489E19767D2000411E16 /* TriggerObj.cpp in Sources */, + B2DB489F19767D2000411E16 /* CCActionFrame.cpp in Sources */, + B2DB48A019767D2000411E16 /* CCActionFrameEasing.cpp in Sources */, + B2DB48A119767D2000411E16 /* CCActionManagerEx.cpp in Sources */, + B2DB48A219767D2000411E16 /* CCActionNode.cpp in Sources */, + B2DB48A319767D2000411E16 /* CCActionObject.cpp in Sources */, + B2DB48A419767D2000411E16 /* CCArmature.cpp in Sources */, + B2DB48A519767D2000411E16 /* CCArmatureAnimation.cpp in Sources */, + B2DB48A619767D2000411E16 /* CCArmatureDataManager.cpp in Sources */, + B2DB48A719767D2000411E16 /* CCArmatureDefine.cpp in Sources */, + B2DB48A819767D2000411E16 /* CCBatchNode.cpp in Sources */, + B2DB48A919767D2000411E16 /* CCBone.cpp in Sources */, + B2DB48AA19767D2000411E16 /* CCColliderDetector.cpp in Sources */, + B2DB48AB19767D2000411E16 /* CCComAttribute.cpp in Sources */, + B2DB48AC19767D2000411E16 /* CCComAudio.cpp in Sources */, + B2DB48AD19767D2000411E16 /* CCComController.cpp in Sources */, + B2DB48AE19767D2000411E16 /* CCComRender.cpp in Sources */, + B2DB48AF19767D2000411E16 /* CCDataReaderHelper.cpp in Sources */, + B2DB48B019767D2000411E16 /* CCDatas.cpp in Sources */, + B2DB48B119767D2000411E16 /* CCDecorativeDisplay.cpp in Sources */, + B2DB48B219767D2000411E16 /* CCDisplayFactory.cpp in Sources */, + B2DB48B319767D2000411E16 /* CCDisplayManager.cpp in Sources */, + B2DB48B419767D2000411E16 /* CCInputDelegate.cpp in Sources */, + B2DB48B519767D2000411E16 /* CCProcessBase.cpp in Sources */, + B2DB48B619767D2000411E16 /* CCSGUIReader.cpp in Sources */, + B2DB48B719767D2000411E16 /* CCSkin.cpp in Sources */, + B2DB48B819767D2000411E16 /* CCSpriteFrameCacheHelper.cpp in Sources */, + B2DB48B919767D2000411E16 /* CCSSceneReader.cpp in Sources */, + B2DB48BA19767D2000411E16 /* CCTransformHelp.cpp in Sources */, + B2DB48BB19767D2000411E16 /* CCTween.cpp in Sources */, + B2DB48BC19767D2000411E16 /* CCUtilMath.cpp in Sources */, + B2DB48BD19767D2000411E16 /* DictionaryHelper.cpp in Sources */, + B2DB489A19767D1100411E16 /* TextReader.cpp in Sources */, + B2DB489B19767D1400411E16 /* WidgetReader.cpp in Sources */, + B2DB489819767D0B00411E16 /* TextBMFontReader.cpp in Sources */, + B2DB489919767D0E00411E16 /* TextFieldReader.cpp in Sources */, + B2DB489619767D0600411E16 /* SliderReader.cpp in Sources */, + B2DB489319767CFD00411E16 /* LoadingBarReader.cpp in Sources */, + B2DB489419767D0000411E16 /* PageViewReader.cpp in Sources */, + B2DB489219767CFA00411E16 /* ListViewReader.cpp in Sources */, + B2DB489019767CF400411E16 /* ImageViewReader.cpp in Sources */, + B2DB488819767CD900411E16 /* CocoLoader.cpp in Sources */, + B2DB488D19767CE300411E16 /* CCTimeLine.cpp in Sources */, + B2DB488919767CDC00411E16 /* CCActionTimeline.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + B2DB48CB19767F1F00411E16 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + B2DB490219767F5300411E16 /* SkeletonBounds.cpp in Sources */, + B2DB490319767F5300411E16 /* Event.cpp in Sources */, + B2DB490419767F5300411E16 /* EventData.cpp in Sources */, + B2DB490519767F5300411E16 /* BoundingBoxAttachment.cpp in Sources */, + B2DB490619767F5300411E16 /* Animation.cpp in Sources */, + B2DB490719767F5300411E16 /* AnimationState.cpp in Sources */, + B2DB490819767F5300411E16 /* AnimationStateData.cpp in Sources */, + B2DB490919767F5300411E16 /* Atlas.cpp in Sources */, + B2DB490A19767F5300411E16 /* AtlasAttachmentLoader.cpp in Sources */, + B2DB490B19767F5300411E16 /* Attachment.cpp in Sources */, + B2DB490C19767F5300411E16 /* AttachmentLoader.cpp in Sources */, + B2DB490D19767F5300411E16 /* Bone.cpp in Sources */, + B2DB490E19767F5300411E16 /* BoneData.cpp in Sources */, + B2DB490F19767F5300411E16 /* CCSkeleton.cpp in Sources */, + B2DB491019767F5300411E16 /* CCSkeletonAnimation.cpp in Sources */, + B2DB491119767F5300411E16 /* extension.cpp in Sources */, + B2DB491219767F5300411E16 /* Json.cpp in Sources */, + B2DB491319767F5300411E16 /* RegionAttachment.cpp in Sources */, + B2DB491419767F5300411E16 /* Skeleton.cpp in Sources */, + B2DB491519767F5300411E16 /* SkeletonData.cpp in Sources */, + B2DB491619767F5300411E16 /* SkeletonJson.cpp in Sources */, + B2DB491719767F5300411E16 /* Skin.cpp in Sources */, + B2DB491819767F5300411E16 /* Slot.cpp in Sources */, + B2DB491919767F5300411E16 /* SlotData.cpp in Sources */, + B2DB491A19767F5300411E16 /* spine-cocos2dx.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + B2DB498E197686CB00411E16 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + B244F30C1976874300ED1926 /* HttpClient.cpp in Sources */, + B244F30E1976875100ED1926 /* SocketIO.cpp in Sources */, + B244F30F1976875300ED1926 /* WebSocket.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ + 1516202F199E76D9006099B8 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 15161E42199E7362006099B8 /* libcocos3d Mac */; + targetProxy = 1516202E199E76D9006099B8 /* PBXContainerItemProxy */; + }; + 15162225199E7B9E006099B8 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 15162030199E7810006099B8 /* libcocos3d iOS */; + targetProxy = 15162224199E7B9E006099B8 /* PBXContainerItemProxy */; + }; 460E44F41807E241000CDD6D /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = A03F2B781780BD04006731B9 /* chipmunk Mac */; + target = A03F2B781780BD04006731B9 /* libchipmunk Mac */; targetProxy = 460E44F31807E241000CDD6D /* PBXContainerItemProxy */; }; 46A173D31807D330005B8026 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = A07A4EFD178387670073F6A7 /* chipmunk iOS */; + target = A07A4EFD178387670073F6A7 /* libchipmunk iOS */; targetProxy = 46A173D21807D330005B8026 /* PBXContainerItemProxy */; }; A03F2E93178141D1006731B9 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 1551A33E158F2AB200E66CFE /* cocos2dx Mac */; + target = 1551A33E158F2AB200E66CFE /* libcocos2d Mac */; targetProxy = A03F2E92178141D1006731B9 /* PBXContainerItemProxy */; }; A03F2E95178141D1006731B9 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = A03F2B781780BD04006731B9 /* chipmunk Mac */; + target = A03F2B781780BD04006731B9 /* libchipmunk Mac */; targetProxy = A03F2E94178141D1006731B9 /* PBXContainerItemProxy */; }; A03F2E97178141D1006731B9 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = A03F2D5D1780BDF7006731B9 /* box2d Mac */; + target = A03F2D5D1780BDF7006731B9 /* libbox2d Mac */; targetProxy = A03F2E96178141D1006731B9 /* PBXContainerItemProxy */; }; A03F2FC01781458C006731B9 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = A03F2E9817814268006731B9 /* CocosDenshion Mac */; + target = A03F2E9817814268006731B9 /* libcocosdenshion Mac */; targetProxy = A03F2FBF1781458C006731B9 /* PBXContainerItemProxy */; }; A03F31FF178147CB006731B9 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = A03F2FC117814595006731B9 /* cocos2dx-extensions Mac */; + target = A03F2FC117814595006731B9 /* libextension Mac */; targetProxy = A03F31FE178147CB006731B9 /* PBXContainerItemProxy */; }; A07A4E10178386520073F6A7 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = A07A4C241783777C0073F6A7 /* cocos2dx iOS */; + target = A07A4C241783777C0073F6A7 /* libcocos2d iOS */; targetProxy = A07A4E0F178386520073F6A7 /* PBXContainerItemProxy */; }; A07A5047178389710073F6A7 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = A07A4E111783867C0073F6A7 /* cocos2dx-extensions iOS */; + target = A07A4E111783867C0073F6A7 /* libextension iOS */; targetProxy = A07A5046178389710073F6A7 /* PBXContainerItemProxy */; }; A07A5049178389710073F6A7 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = A07A4EFD178387670073F6A7 /* chipmunk iOS */; + target = A07A4EFD178387670073F6A7 /* libchipmunk iOS */; targetProxy = A07A5048178389710073F6A7 /* PBXContainerItemProxy */; }; A07A504B178389710073F6A7 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = A07A4F3C1783876B0073F6A7 /* box2d iOS */; + target = A07A4F3C1783876B0073F6A7 /* libbox2d iOS */; targetProxy = A07A504A178389710073F6A7 /* PBXContainerItemProxy */; }; A07A504D178389710073F6A7 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = A07A4F9F178387730073F6A7 /* CocosDenshion iOS */; + target = A07A4F9F178387730073F6A7 /* libcocosdenshion iOS */; targetProxy = A07A504C178389710073F6A7 /* PBXContainerItemProxy */; }; + B2F0AFEC198794EE002FE562 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = B245F10019766132001920FD /* libui Mac */; + targetProxy = B2F0AFEB198794EE002FE562 /* PBXContainerItemProxy */; + }; + B2F0AFEE198794EE002FE562 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = B2DB48161976716E00411E16 /* libcocostudio Mac */; + targetProxy = B2F0AFED198794EE002FE562 /* PBXContainerItemProxy */; + }; + B2F0AFF0198794EE002FE562 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = B2DB479B197669A100411E16 /* libcocosbuilder Mac */; + targetProxy = B2F0AFEF198794EE002FE562 /* PBXContainerItemProxy */; + }; + B2F0AFF2198794EE002FE562 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = B2DB48CA19767F1F00411E16 /* libspine Mac */; + targetProxy = B2F0AFF1198794EE002FE562 /* PBXContainerItemProxy */; + }; + B2F0AFF4198794EE002FE562 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = B2DB498D197686CB00411E16 /* libnetwork Mac */; + targetProxy = B2F0AFF3198794EE002FE562 /* PBXContainerItemProxy */; + }; + B2F0AFF619879508002FE562 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = B24EEA2C19775E92004493CC /* libui iOS */; + targetProxy = B2F0AFF519879508002FE562 /* PBXContainerItemProxy */; + }; + B2F0AFF819879508002FE562 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = B24EEA6719775EBB004493CC /* libcocostudio iOS */; + targetProxy = B2F0AFF719879508002FE562 /* PBXContainerItemProxy */; + }; + B2F0AFFA19879508002FE562 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = B24EEA6F19775ECE004493CC /* libcocosbuilder iOS */; + targetProxy = B2F0AFF919879508002FE562 /* PBXContainerItemProxy */; + }; + B2F0AFFC19879508002FE562 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = B24EEA7719775EE1004493CC /* libspine iOS */; + targetProxy = B2F0AFFB19879508002FE562 /* PBXContainerItemProxy */; + }; + B2F0AFFE19879508002FE562 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = B24EEA7F19775EF3004493CC /* libnetwork iOS */; + targetProxy = B2F0AFFD19879508002FE562 /* PBXContainerItemProxy */; + }; /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ + 15162009199E7363006099B8 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = YES; + ARCHS = "$(ARCHS_STANDARD)"; + EXECUTABLE_EXTENSION = a; + EXECUTABLE_PREFIX = ""; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = "../cocos/cocos2d-prefix.pch"; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + CC_TARGET_OS_MAC, + CC_KEYBOARD_SUPPORT, + _USRDLL, + ); + GCC_TREAT_WARNINGS_AS_ERRORS = NO; + HEADER_SEARCH_PATHS = ""; + LD_DYLIB_INSTALL_NAME = ""; + LIBRARY_SEARCH_PATHS = "$(inherited)"; + MACH_O_TYPE = staticlib; + PRODUCT_NAME = "libcocos3d Mac"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../cocos/platform/desktop $(SRCROOT)/../external/glfw3/include/mac"; + }; + name = Debug; + }; + 1516200A199E7363006099B8 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = YES; + ARCHS = "$(ARCHS_STANDARD)"; + EXECUTABLE_EXTENSION = a; + EXECUTABLE_PREFIX = ""; + GCC_GENERATE_DEBUGGING_SYMBOLS = NO; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = "../cocos/cocos2d-prefix.pch"; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + CC_KEYBOARD_SUPPORT, + CC_TARGET_OS_MAC, + _USRDLL, + ); + GCC_TREAT_WARNINGS_AS_ERRORS = NO; + HEADER_SEARCH_PATHS = ""; + LD_DYLIB_INSTALL_NAME = ""; + LIBRARY_SEARCH_PATHS = "$(inherited)"; + MACH_O_TYPE = staticlib; + PRODUCT_NAME = "libcocos3d Mac"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../cocos/platform/desktop $(SRCROOT)/../external/glfw3/include/mac"; + }; + name = Release; + }; + 151621FF199E7810006099B8 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = YES; + ARCHS = "$(ARCHS_STANDARD)"; + EXECUTABLE_PREFIX = ""; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = "../cocos/cocos2d-prefix.pch"; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + CC_TARGET_OS_IPHONE, + ); + GCC_TREAT_WARNINGS_AS_ERRORS = NO; + GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES; + HEADER_SEARCH_PATHS = ""; + IPHONEOS_DEPLOYMENT_TARGET = 5.1.1; + LIBRARY_SEARCH_PATHS = ""; + PRODUCT_NAME = "libcocos3d iOS"; + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(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; + }; + 15162200199E7810006099B8 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = YES; + ARCHS = "$(ARCHS_STANDARD)"; + EXECUTABLE_PREFIX = ""; + GCC_GENERATE_DEBUGGING_SYMBOLS = NO; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = "../cocos/cocos2d-prefix.pch"; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + CC_TARGET_OS_IPHONE, + ); + GCC_TREAT_WARNINGS_AS_ERRORS = NO; + GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES; + HEADER_SEARCH_PATHS = ""; + IPHONEOS_DEPLOYMENT_TARGET = 5.1.1; + LIBRARY_SEARCH_PATHS = ""; + PRODUCT_NAME = "libcocos3d iOS"; + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(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; + }; 1551A34A158F2AB200E66CFE /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = YES; - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_WARN_BOOL_CONVERSION = YES; @@ -7235,7 +8191,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = YES; - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_WARN_BOOL_CONVERSION = YES; @@ -7270,15 +8226,20 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = YES; + ARCHS = "$(ARCHS_STANDARD)"; + EXECUTABLE_EXTENSION = a; + EXECUTABLE_PREFIX = ""; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "../cocos/cocos2d-prefix.pch"; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", CC_TARGET_OS_MAC, CC_KEYBOARD_SUPPORT, + _USRDLL, ); GCC_TREAT_WARNINGS_AS_ERRORS = NO; HEADER_SEARCH_PATHS = ""; + LD_DYLIB_INSTALL_NAME = ""; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "\"$(SRCROOT)/../external/glfw3/prebuilt/mac\"", @@ -7289,7 +8250,8 @@ "\"$(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"; + MACH_O_TYPE = staticlib; + 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/glfw3/include/mac"; }; name = Debug; }; @@ -7297,6 +8259,9 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = YES; + ARCHS = "$(ARCHS_STANDARD)"; + EXECUTABLE_EXTENSION = a; + EXECUTABLE_PREFIX = ""; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "../cocos/cocos2d-prefix.pch"; @@ -7304,9 +8269,11 @@ "$(inherited)", CC_KEYBOARD_SUPPORT, CC_TARGET_OS_MAC, + _USRDLL, ); GCC_TREAT_WARNINGS_AS_ERRORS = NO; HEADER_SEARCH_PATHS = ""; + LD_DYLIB_INSTALL_NAME = ""; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "\"$(SRCROOT)/../external/glfw3/prebuilt/mac\"", @@ -7317,13 +8284,16 @@ "\"$(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"; + MACH_O_TYPE = staticlib; + 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/glfw3/include/mac"; }; name = Release; }; A03F2CB61780BD04006731B9 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + ARCHS = "$(ARCHS_STANDARD)"; + EXECUTABLE_PREFIX = ""; GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO; HEADER_SEARCH_PATHS = ""; USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../external/chipmunk/include/chipmunk/"; @@ -7333,6 +8303,8 @@ A03F2CB71780BD04006731B9 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + ARCHS = "$(ARCHS_STANDARD)"; + EXECUTABLE_PREFIX = ""; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO; HEADER_SEARCH_PATHS = ""; @@ -7343,8 +8315,10 @@ A03F2D991780BDF7006731B9 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + ARCHS = "$(ARCHS_STANDARD)"; CLANG_WARN_BOOL_CONVERSION = NO; CLANG_WARN_CONSTANT_CONVERSION = NO; + EXECUTABLE_PREFIX = ""; GCC_WARN_64_TO_32_BIT_CONVERSION = NO; GCC_WARN_SHADOW = NO; GCC_WARN_UNUSED_VALUE = NO; @@ -7357,8 +8331,10 @@ A03F2D9A1780BDF7006731B9 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + ARCHS = "$(ARCHS_STANDARD)"; CLANG_WARN_BOOL_CONVERSION = NO; CLANG_WARN_CONSTANT_CONVERSION = NO; + EXECUTABLE_PREFIX = ""; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_WARN_64_TO_32_BIT_CONVERSION = NO; GCC_WARN_SHADOW = NO; @@ -7372,6 +8348,7 @@ A03F2E90178141C1006731B9 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + ARCHS = "$(ARCHS_STANDARD)"; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", "COCOS2D_DEBUG=1", @@ -7388,6 +8365,7 @@ A03F2E91178141C1006731B9 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + ARCHS = "$(ARCHS_STANDARD)"; HEADER_SEARCH_PATHS = ( "$(inherited)", "/Applications/Xcode\\ 2.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include", @@ -7399,6 +8377,8 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = YES; + ARCHS = "$(ARCHS_STANDARD)"; + EXECUTABLE_PREFIX = ""; GCC_PREPROCESSOR_DEFINITIONS = CC_TARGET_OS_MAC; GCC_TREAT_WARNINGS_AS_ERRORS = NO; HEADER_SEARCH_PATHS = ""; @@ -7410,6 +8390,8 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = YES; + ARCHS = "$(ARCHS_STANDARD)"; + EXECUTABLE_PREFIX = ""; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_PREPROCESSOR_DEFINITIONS = CC_TARGET_OS_MAC; GCC_TREAT_WARNINGS_AS_ERRORS = NO; @@ -7422,6 +8404,9 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = YES; + ARCHS = "$(ARCHS_STANDARD)"; + CODE_SIGN_IDENTITY = ""; + EXECUTABLE_PREFIX = ""; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", CC_TARGET_OS_MAC, @@ -7438,6 +8423,9 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = YES; + ARCHS = "$(ARCHS_STANDARD)"; + CODE_SIGN_IDENTITY = ""; + EXECUTABLE_PREFIX = ""; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", @@ -7456,6 +8444,7 @@ buildSettings = { ALWAYS_SEARCH_USER_PATHS = YES; ARCHS = "$(ARCHS_STANDARD)"; + EXECUTABLE_PREFIX = ""; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "../cocos/cocos2d-prefix.pch"; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -7472,12 +8461,11 @@ "\"$(SRCROOT)/../external/tiff/prebuilt/ios\"", "\"$(SRCROOT)/../external/webp/prebuilt/ios\"", "\"$(SRCROOT)/../external/freetype2/prebuilt/ios\"", - "\"$(SRCROOT)/../external/websockets/prebuilt/ios\"", "\"$(SRCROOT)/../external/curl/prebuilt/ios\"", ); SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(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)/../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; }; @@ -7486,6 +8474,7 @@ buildSettings = { ALWAYS_SEARCH_USER_PATHS = YES; ARCHS = "$(ARCHS_STANDARD)"; + EXECUTABLE_PREFIX = ""; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "../cocos/cocos2d-prefix.pch"; @@ -7503,12 +8492,11 @@ "\"$(SRCROOT)/../external/tiff/prebuilt/ios\"", "\"$(SRCROOT)/../external/webp/prebuilt/ios\"", "\"$(SRCROOT)/../external/freetype2/prebuilt/ios\"", - "\"$(SRCROOT)/../external/websockets/prebuilt/ios\"", "\"$(SRCROOT)/../external/curl/prebuilt/ios\"", ); SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(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)/../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; }; @@ -7537,6 +8525,7 @@ buildSettings = { ALWAYS_SEARCH_USER_PATHS = YES; ARCHS = "$(ARCHS_STANDARD)"; + EXECUTABLE_PREFIX = ""; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", CC_TARGET_OS_IPHONE, @@ -7544,7 +8533,10 @@ GCC_TREAT_WARNINGS_AS_ERRORS = NO; HEADER_SEARCH_PATHS = ""; IPHONEOS_DEPLOYMENT_TARGET = 5.1.1; - LIBRARY_SEARCH_PATHS = "$(inherited)"; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(SRCROOT)/../external/curl/prebuilt/ios", + ); SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../external/curl/include/ios"; @@ -7556,6 +8548,7 @@ buildSettings = { ALWAYS_SEARCH_USER_PATHS = YES; ARCHS = "$(ARCHS_STANDARD)"; + EXECUTABLE_PREFIX = ""; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", @@ -7564,7 +8557,10 @@ GCC_TREAT_WARNINGS_AS_ERRORS = NO; HEADER_SEARCH_PATHS = ""; IPHONEOS_DEPLOYMENT_TARGET = 5.1.1; - LIBRARY_SEARCH_PATHS = "$(inherited)"; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(SRCROOT)/../external/curl/prebuilt/ios", + ); SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../external/curl/include/ios"; @@ -7575,6 +8571,7 @@ isa = XCBuildConfiguration; buildSettings = { ARCHS = "$(ARCHS_STANDARD)"; + EXECUTABLE_PREFIX = ""; HEADER_SEARCH_PATHS = ""; IPHONEOS_DEPLOYMENT_TARGET = 5.1.1; SDKROOT = iphoneos; @@ -7587,6 +8584,7 @@ isa = XCBuildConfiguration; buildSettings = { ARCHS = "$(ARCHS_STANDARD)"; + EXECUTABLE_PREFIX = ""; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; HEADER_SEARCH_PATHS = ""; IPHONEOS_DEPLOYMENT_TARGET = 5.1.1; @@ -7602,6 +8600,7 @@ ARCHS = "$(ARCHS_STANDARD)"; CLANG_WARN_BOOL_CONVERSION = NO; CLANG_WARN_CONSTANT_CONVERSION = NO; + EXECUTABLE_PREFIX = ""; GCC_WARN_64_TO_32_BIT_CONVERSION = NO; GCC_WARN_SHADOW = NO; GCC_WARN_UNUSED_VALUE = NO; @@ -7620,6 +8619,7 @@ ARCHS = "$(ARCHS_STANDARD)"; CLANG_WARN_BOOL_CONVERSION = NO; CLANG_WARN_CONSTANT_CONVERSION = NO; + EXECUTABLE_PREFIX = ""; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_WARN_64_TO_32_BIT_CONVERSION = NO; GCC_WARN_SHADOW = NO; @@ -7638,6 +8638,7 @@ buildSettings = { ALWAYS_SEARCH_USER_PATHS = YES; ARCHS = "$(ARCHS_STANDARD)"; + EXECUTABLE_PREFIX = ""; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", CC_TARGET_OS_IPHONE, @@ -7656,6 +8657,7 @@ buildSettings = { ALWAYS_SEARCH_USER_PATHS = YES; ARCHS = "$(ARCHS_STANDARD)"; + EXECUTABLE_PREFIX = ""; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", @@ -7670,9 +8672,451 @@ }; name = Release; }; + B245F13819766132001920FD /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = YES; + ARCHS = "$(ARCHS_STANDARD)"; + EXECUTABLE_PREFIX = ""; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + CC_TARGET_OS_MAC, + CC_KEYBOARD_SUPPORT, + ); + GCC_TREAT_WARNINGS_AS_ERRORS = NO; + HEADER_SEARCH_PATHS = ""; + LIBRARY_SEARCH_PATHS = "$(inherited)"; + PRODUCT_NAME = "$(TARGET_NAME)"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../cocos/platform/desktop $(SRCROOT)/../external/glfw3/include/mac"; + }; + name = Debug; + }; + B245F13919766132001920FD /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = YES; + ARCHS = "$(ARCHS_STANDARD)"; + EXECUTABLE_PREFIX = ""; + GCC_GENERATE_DEBUGGING_SYMBOLS = NO; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + CC_TARGET_OS_MAC, + CC_KEYBOARD_SUPPORT, + ); + GCC_TREAT_WARNINGS_AS_ERRORS = NO; + HEADER_SEARCH_PATHS = ""; + LIBRARY_SEARCH_PATHS = "$(inherited)"; + PRODUCT_NAME = "$(TARGET_NAME)"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../cocos/platform/desktop $(SRCROOT)/../external/glfw3/include/mac"; + }; + name = Release; + }; + B24EEA6419775E92004493CC /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = YES; + ARCHS = "$(ARCHS_STANDARD)"; + EXECUTABLE_PREFIX = ""; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + CC_TARGET_OS_IPHONE, + ); + GCC_TREAT_WARNINGS_AS_ERRORS = NO; + HEADER_SEARCH_PATHS = ""; + IPHONEOS_DEPLOYMENT_TARGET = 5.1.1; + LIBRARY_SEARCH_PATHS = "$(inherited)"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../external/curl/include/ios"; + }; + name = Debug; + }; + B24EEA6519775E92004493CC /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = YES; + ARCHS = "$(ARCHS_STANDARD)"; + EXECUTABLE_PREFIX = ""; + GCC_GENERATE_DEBUGGING_SYMBOLS = NO; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + CC_TARGET_OS_IPHONE, + ); + GCC_TREAT_WARNINGS_AS_ERRORS = NO; + HEADER_SEARCH_PATHS = ""; + IPHONEOS_DEPLOYMENT_TARGET = 5.1.1; + LIBRARY_SEARCH_PATHS = "$(inherited)"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../external/curl/include/ios"; + }; + name = Release; + }; + B24EEA6C19775EBB004493CC /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = YES; + ARCHS = "$(ARCHS_STANDARD)"; + EXECUTABLE_PREFIX = ""; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + CC_TARGET_OS_IPHONE, + ); + GCC_TREAT_WARNINGS_AS_ERRORS = NO; + HEADER_SEARCH_PATHS = ""; + IPHONEOS_DEPLOYMENT_TARGET = 5.1.1; + LIBRARY_SEARCH_PATHS = "$(inherited)"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../external/curl/include/ios"; + }; + name = Debug; + }; + B24EEA6D19775EBB004493CC /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = YES; + ARCHS = "$(ARCHS_STANDARD)"; + EXECUTABLE_PREFIX = ""; + GCC_GENERATE_DEBUGGING_SYMBOLS = NO; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + CC_TARGET_OS_IPHONE, + ); + GCC_TREAT_WARNINGS_AS_ERRORS = NO; + HEADER_SEARCH_PATHS = ""; + IPHONEOS_DEPLOYMENT_TARGET = 5.1.1; + LIBRARY_SEARCH_PATHS = "$(inherited)"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../external/curl/include/ios"; + }; + name = Release; + }; + B24EEA7419775ECE004493CC /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = YES; + ARCHS = "$(ARCHS_STANDARD)"; + EXECUTABLE_PREFIX = ""; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + CC_TARGET_OS_IPHONE, + ); + GCC_TREAT_WARNINGS_AS_ERRORS = NO; + HEADER_SEARCH_PATHS = ""; + IPHONEOS_DEPLOYMENT_TARGET = 5.1.1; + LIBRARY_SEARCH_PATHS = "$(inherited)"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../external/curl/include/ios"; + }; + name = Debug; + }; + B24EEA7519775ECE004493CC /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = YES; + ARCHS = "$(ARCHS_STANDARD)"; + EXECUTABLE_PREFIX = ""; + GCC_GENERATE_DEBUGGING_SYMBOLS = NO; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + CC_TARGET_OS_IPHONE, + ); + GCC_TREAT_WARNINGS_AS_ERRORS = NO; + HEADER_SEARCH_PATHS = ""; + IPHONEOS_DEPLOYMENT_TARGET = 5.1.1; + LIBRARY_SEARCH_PATHS = "$(inherited)"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../external/curl/include/ios"; + }; + name = Release; + }; + B24EEA7C19775EE1004493CC /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = YES; + ARCHS = "$(ARCHS_STANDARD)"; + EXECUTABLE_PREFIX = ""; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + CC_TARGET_OS_IPHONE, + ); + GCC_TREAT_WARNINGS_AS_ERRORS = NO; + HEADER_SEARCH_PATHS = ""; + IPHONEOS_DEPLOYMENT_TARGET = 5.1.1; + LIBRARY_SEARCH_PATHS = "$(inherited)"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../external/curl/include/ios"; + }; + name = Debug; + }; + B24EEA7D19775EE1004493CC /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = YES; + ARCHS = "$(ARCHS_STANDARD)"; + EXECUTABLE_PREFIX = ""; + GCC_GENERATE_DEBUGGING_SYMBOLS = NO; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + CC_TARGET_OS_IPHONE, + ); + GCC_TREAT_WARNINGS_AS_ERRORS = NO; + HEADER_SEARCH_PATHS = ""; + IPHONEOS_DEPLOYMENT_TARGET = 5.1.1; + LIBRARY_SEARCH_PATHS = "$(inherited)"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../external/curl/include/ios"; + }; + name = Release; + }; + B24EEA8419775EF3004493CC /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = YES; + ARCHS = "$(ARCHS_STANDARD)"; + EXECUTABLE_PREFIX = ""; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + CC_TARGET_OS_IPHONE, + ); + GCC_TREAT_WARNINGS_AS_ERRORS = NO; + HEADER_SEARCH_PATHS = ""; + IPHONEOS_DEPLOYMENT_TARGET = 5.1.1; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "\"$(SRCROOT)/../external/websockets/prebuilt/ios\"", + "$(SRCROOT)/../external/curl/prebuilt/ios", + ); + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../external/curl/include/ios $(SRCROOT)/../external/websockets/include/ios"; + }; + name = Debug; + }; + B24EEA8519775EF3004493CC /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = YES; + ARCHS = "$(ARCHS_STANDARD)"; + EXECUTABLE_PREFIX = ""; + GCC_GENERATE_DEBUGGING_SYMBOLS = NO; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + CC_TARGET_OS_IPHONE, + ); + GCC_TREAT_WARNINGS_AS_ERRORS = NO; + HEADER_SEARCH_PATHS = ""; + IPHONEOS_DEPLOYMENT_TARGET = 5.1.1; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "\"$(SRCROOT)/../external/websockets/prebuilt/ios\"", + "$(SRCROOT)/../external/curl/prebuilt/ios", + ); + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../external/curl/include/ios $(SRCROOT)/../external/websockets/include/ios"; + }; + name = Release; + }; + B2DB47D0197669A100411E16 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = YES; + ARCHS = "$(ARCHS_STANDARD)"; + EXECUTABLE_PREFIX = ""; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + CC_TARGET_OS_MAC, + CC_KEYBOARD_SUPPORT, + ); + GCC_TREAT_WARNINGS_AS_ERRORS = NO; + HEADER_SEARCH_PATHS = ""; + LIBRARY_SEARCH_PATHS = "$(inherited)"; + PRODUCT_NAME = "$(TARGET_NAME)"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../cocos/platform/desktop $(SRCROOT)/../external/glfw3/include/mac"; + }; + name = Debug; + }; + B2DB47D1197669A100411E16 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = YES; + ARCHS = "$(ARCHS_STANDARD)"; + EXECUTABLE_PREFIX = ""; + GCC_GENERATE_DEBUGGING_SYMBOLS = NO; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + CC_TARGET_OS_MAC, + CC_KEYBOARD_SUPPORT, + ); + GCC_TREAT_WARNINGS_AS_ERRORS = NO; + HEADER_SEARCH_PATHS = ""; + LIBRARY_SEARCH_PATHS = "$(inherited)"; + PRODUCT_NAME = "$(TARGET_NAME)"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../cocos/platform/desktop $(SRCROOT)/../external/glfw3/include/mac"; + }; + name = Release; + }; + B2DB484B1976716E00411E16 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = YES; + ARCHS = "$(ARCHS_STANDARD)"; + EXECUTABLE_PREFIX = ""; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + CC_TARGET_OS_MAC, + CC_KEYBOARD_SUPPORT, + ); + GCC_TREAT_WARNINGS_AS_ERRORS = NO; + HEADER_SEARCH_PATHS = ""; + LIBRARY_SEARCH_PATHS = "$(inherited)"; + PRODUCT_NAME = "$(TARGET_NAME)"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../cocos/platform/desktop $(SRCROOT)/../external/glfw3/include/mac"; + }; + name = Debug; + }; + B2DB484C1976716E00411E16 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = YES; + ARCHS = "$(ARCHS_STANDARD)"; + EXECUTABLE_PREFIX = ""; + GCC_GENERATE_DEBUGGING_SYMBOLS = NO; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + CC_TARGET_OS_MAC, + CC_KEYBOARD_SUPPORT, + ); + GCC_TREAT_WARNINGS_AS_ERRORS = NO; + HEADER_SEARCH_PATHS = ""; + LIBRARY_SEARCH_PATHS = "$(inherited)"; + PRODUCT_NAME = "$(TARGET_NAME)"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../cocos/platform/desktop $(SRCROOT)/../external/glfw3/include/mac"; + }; + name = Release; + }; + B2DB48FF19767F1F00411E16 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = YES; + ARCHS = "$(ARCHS_STANDARD)"; + EXECUTABLE_PREFIX = ""; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + CC_TARGET_OS_MAC, + CC_KEYBOARD_SUPPORT, + ); + GCC_TREAT_WARNINGS_AS_ERRORS = NO; + HEADER_SEARCH_PATHS = ""; + LIBRARY_SEARCH_PATHS = "$(inherited)"; + PRODUCT_NAME = "$(TARGET_NAME)"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../cocos/platform/desktop $(SRCROOT)/../external/glfw3/include/mac"; + }; + name = Debug; + }; + B2DB490019767F1F00411E16 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = YES; + ARCHS = "$(ARCHS_STANDARD)"; + EXECUTABLE_PREFIX = ""; + GCC_GENERATE_DEBUGGING_SYMBOLS = NO; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + CC_TARGET_OS_MAC, + CC_KEYBOARD_SUPPORT, + ); + GCC_TREAT_WARNINGS_AS_ERRORS = NO; + HEADER_SEARCH_PATHS = ""; + LIBRARY_SEARCH_PATHS = "$(inherited)"; + PRODUCT_NAME = "$(TARGET_NAME)"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../cocos/platform/desktop $(SRCROOT)/../external/glfw3/include/mac"; + }; + name = Release; + }; + B2DB49C2197686CB00411E16 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = YES; + ARCHS = "$(ARCHS_STANDARD)"; + EXECUTABLE_PREFIX = ""; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + CC_TARGET_OS_MAC, + CC_KEYBOARD_SUPPORT, + ); + GCC_TREAT_WARNINGS_AS_ERRORS = NO; + HEADER_SEARCH_PATHS = ""; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(SRCROOT)/../external/websockets/prebuilt/mac", + ); + PRODUCT_NAME = "$(TARGET_NAME)"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../cocos/platform/desktop $(SRCROOT)/../external/glfw3/include/mac $(SRCROOT)/../external/websockets/include/mac"; + }; + name = Debug; + }; + B2DB49C3197686CB00411E16 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = YES; + ARCHS = "$(ARCHS_STANDARD)"; + EXECUTABLE_PREFIX = ""; + GCC_GENERATE_DEBUGGING_SYMBOLS = NO; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + CC_TARGET_OS_MAC, + CC_KEYBOARD_SUPPORT, + ); + GCC_TREAT_WARNINGS_AS_ERRORS = NO; + HEADER_SEARCH_PATHS = ""; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(SRCROOT)/../external/websockets/prebuilt/mac", + ); + PRODUCT_NAME = "$(TARGET_NAME)"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../cocos/platform/desktop $(SRCROOT)/../external/glfw3/include/mac $(SRCROOT)/../external/websockets/include/mac"; + }; + name = Release; + }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ + 15162008199E7363006099B8 /* Build configuration list for PBXNativeTarget "libcocos3d Mac" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 15162009199E7363006099B8 /* Debug */, + 1516200A199E7363006099B8 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 151621FE199E7810006099B8 /* Build configuration list for PBXNativeTarget "libcocos3d iOS" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 151621FF199E7810006099B8 /* Debug */, + 15162200199E7810006099B8 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; 1551A339158F2AB200E66CFE /* Build configuration list for PBXProject "cocos2d_libs" */ = { isa = XCConfigurationList; buildConfigurations = ( @@ -7682,7 +9126,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 1551A34C158F2AB200E66CFE /* Build configuration list for PBXNativeTarget "cocos2dx Mac" */ = { + 1551A34C158F2AB200E66CFE /* Build configuration list for PBXNativeTarget "libcocos2d Mac" */ = { isa = XCConfigurationList; buildConfigurations = ( 1551A34D158F2AB200E66CFE /* Debug */, @@ -7691,7 +9135,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - A03F2CB51780BD04006731B9 /* Build configuration list for PBXNativeTarget "chipmunk Mac" */ = { + A03F2CB51780BD04006731B9 /* Build configuration list for PBXNativeTarget "libchipmunk Mac" */ = { isa = XCConfigurationList; buildConfigurations = ( A03F2CB61780BD04006731B9 /* Debug */, @@ -7700,7 +9144,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - A03F2D981780BDF7006731B9 /* Build configuration list for PBXNativeTarget "box2d Mac" */ = { + A03F2D981780BDF7006731B9 /* Build configuration list for PBXNativeTarget "libbox2d Mac" */ = { isa = XCConfigurationList; buildConfigurations = ( A03F2D991780BDF7006731B9 /* Debug */, @@ -7718,7 +9162,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - A03F2ED317814268006731B9 /* Build configuration list for PBXNativeTarget "CocosDenshion Mac" */ = { + A03F2ED317814268006731B9 /* Build configuration list for PBXNativeTarget "libcocosdenshion Mac" */ = { isa = XCConfigurationList; buildConfigurations = ( A03F2ED417814268006731B9 /* Debug */, @@ -7727,7 +9171,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - A03F2FD317814595006731B9 /* Build configuration list for PBXNativeTarget "cocos2dx-extensions Mac" */ = { + A03F2FD317814595006731B9 /* Build configuration list for PBXNativeTarget "libextension Mac" */ = { isa = XCConfigurationList; buildConfigurations = ( A03F2FD417814595006731B9 /* Debug */, @@ -7736,7 +9180,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - A07A4D611783777C0073F6A7 /* Build configuration list for PBXNativeTarget "cocos2dx iOS" */ = { + A07A4D611783777C0073F6A7 /* Build configuration list for PBXNativeTarget "libcocos2d iOS" */ = { isa = XCConfigurationList; buildConfigurations = ( A07A4D621783777C0073F6A7 /* Debug */, @@ -7754,7 +9198,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - A07A4EF91783867C0073F6A7 /* Build configuration list for PBXNativeTarget "cocos2dx-extensions iOS" */ = { + A07A4EF91783867C0073F6A7 /* Build configuration list for PBXNativeTarget "libextension iOS" */ = { isa = XCConfigurationList; buildConfigurations = ( A07A4EFA1783867C0073F6A7 /* Debug */, @@ -7763,7 +9207,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - A07A4F38178387670073F6A7 /* Build configuration list for PBXNativeTarget "chipmunk iOS" */ = { + A07A4F38178387670073F6A7 /* Build configuration list for PBXNativeTarget "libchipmunk iOS" */ = { isa = XCConfigurationList; buildConfigurations = ( A07A4F39178387670073F6A7 /* Debug */, @@ -7772,7 +9216,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - A07A4F9B1783876B0073F6A7 /* Build configuration list for PBXNativeTarget "box2d iOS" */ = { + A07A4F9B1783876B0073F6A7 /* Build configuration list for PBXNativeTarget "libbox2d iOS" */ = { isa = XCConfigurationList; buildConfigurations = ( A07A4F9C1783876B0073F6A7 /* Debug */, @@ -7781,7 +9225,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - A07A4FB1178387730073F6A7 /* Build configuration list for PBXNativeTarget "CocosDenshion iOS" */ = { + A07A4FB1178387730073F6A7 /* Build configuration list for PBXNativeTarget "libcocosdenshion iOS" */ = { isa = XCConfigurationList; buildConfigurations = ( A07A4FB2178387730073F6A7 /* Debug */, @@ -7790,6 +9234,96 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; + B245F13719766132001920FD /* Build configuration list for PBXNativeTarget "libui Mac" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + B245F13819766132001920FD /* Debug */, + B245F13919766132001920FD /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + B24EEA6319775E92004493CC /* Build configuration list for PBXNativeTarget "libui iOS" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + B24EEA6419775E92004493CC /* Debug */, + B24EEA6519775E92004493CC /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + B24EEA6B19775EBB004493CC /* Build configuration list for PBXNativeTarget "libcocostudio iOS" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + B24EEA6C19775EBB004493CC /* Debug */, + B24EEA6D19775EBB004493CC /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + B24EEA7319775ECE004493CC /* Build configuration list for PBXNativeTarget "libcocosbuilder iOS" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + B24EEA7419775ECE004493CC /* Debug */, + B24EEA7519775ECE004493CC /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + B24EEA7B19775EE1004493CC /* Build configuration list for PBXNativeTarget "libspine iOS" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + B24EEA7C19775EE1004493CC /* Debug */, + B24EEA7D19775EE1004493CC /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + B24EEA8319775EF3004493CC /* Build configuration list for PBXNativeTarget "libnetwork iOS" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + B24EEA8419775EF3004493CC /* Debug */, + B24EEA8519775EF3004493CC /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + B2DB47CF197669A100411E16 /* Build configuration list for PBXNativeTarget "libcocosbuilder Mac" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + B2DB47D0197669A100411E16 /* Debug */, + B2DB47D1197669A100411E16 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + B2DB484A1976716E00411E16 /* Build configuration list for PBXNativeTarget "libcocostudio Mac" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + B2DB484B1976716E00411E16 /* Debug */, + B2DB484C1976716E00411E16 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + B2DB48FE19767F1F00411E16 /* Build configuration list for PBXNativeTarget "libspine Mac" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + B2DB48FF19767F1F00411E16 /* Debug */, + B2DB490019767F1F00411E16 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + B2DB49C1197686CB00411E16 /* Build configuration list for PBXNativeTarget "libnetwork Mac" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + B2DB49C2197686CB00411E16 /* Debug */, + B2DB49C3197686CB00411E16 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; /* End XCConfigurationList section */ }; rootObject = 1551A336158F2AB200E66CFE /* Project object */; diff --git a/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/CocosDenshion Mac.xcscheme b/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/CocosDenshion Mac.xcscheme deleted file mode 100644 index 8a9de3e3c5..0000000000 --- a/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/CocosDenshion Mac.xcscheme +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/CocosDenshion iOS.xcscheme b/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/CocosDenshion iOS.xcscheme deleted file mode 100644 index cf3f3de3c1..0000000000 --- a/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/CocosDenshion iOS.xcscheme +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/box2d Mac.xcscheme b/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/box2d Mac.xcscheme deleted file mode 100644 index 1d7292c24c..0000000000 --- a/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/box2d Mac.xcscheme +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/box2d iOS.xcscheme b/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/box2d iOS.xcscheme deleted file mode 100644 index 4955632930..0000000000 --- a/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/box2d iOS.xcscheme +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/build all libs Mac.xcscheme b/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/build all libs Mac.xcscheme deleted file mode 100644 index 25dbc11dbb..0000000000 --- a/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/build all libs Mac.xcscheme +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/build all libs iOS.xcscheme b/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/build all libs iOS.xcscheme deleted file mode 100644 index 170dc164b6..0000000000 --- a/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/build all libs iOS.xcscheme +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/chipmunk Mac.xcscheme b/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/chipmunk Mac.xcscheme deleted file mode 100644 index 47d4160634..0000000000 --- a/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/chipmunk Mac.xcscheme +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/chipmunk iOS.xcscheme b/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/chipmunk iOS.xcscheme deleted file mode 100644 index 01693d09de..0000000000 --- a/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/chipmunk iOS.xcscheme +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/cocos2dx Mac.xcscheme b/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/cocos2dx Mac.xcscheme deleted file mode 100644 index 4c1792021c..0000000000 --- a/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/cocos2dx Mac.xcscheme +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/cocos2dx iOS.xcscheme b/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/cocos2dx iOS.xcscheme deleted file mode 100644 index b98e514fc3..0000000000 --- a/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/cocos2dx iOS.xcscheme +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/cocos2dx-extensions Mac.xcscheme b/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/cocos2dx-extensions Mac.xcscheme deleted file mode 100644 index 3a52b29fbd..0000000000 --- a/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/cocos2dx-extensions Mac.xcscheme +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/cocos2dx-extensions iOS.xcscheme b/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/cocos2dx-extensions iOS.xcscheme deleted file mode 100644 index c57c7ea425..0000000000 --- a/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/cocos2dx-extensions iOS.xcscheme +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/cocos2d_tests.xcodeproj/project.pbxproj b/build/cocos2d_tests.xcodeproj/project.pbxproj index 0db024a45a..b75a2a309f 100644 --- a/build/cocos2d_tests.xcodeproj/project.pbxproj +++ b/build/cocos2d_tests.xcodeproj/project.pbxproj @@ -58,15 +58,19 @@ 1503FAC418DA8B6C00F6518C /* tp.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1503FAB118DA8B6C00F6518C /* tp.lua */; }; 1503FAC518DA8B6C00F6518C /* url.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1503FAB218DA8B6C00F6518C /* url.lua */; }; 1503FAC618DA8B6C00F6518C /* url.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1503FAB218DA8B6C00F6518C /* url.lua */; }; - 156229331973D400009C9067 /* bitExtend.lua in Resources */ = {isa = PBXBuildFile; fileRef = 156229321973D400009C9067 /* bitExtend.lua */; }; - 156229341973D400009C9067 /* bitExtend.lua in Resources */ = {isa = PBXBuildFile; fileRef = 156229321973D400009C9067 /* bitExtend.lua */; }; + 15162232199F95C6006099B8 /* libcocos3d Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1516222D199F95B2006099B8 /* libcocos3d Mac.a */; }; + 15162235199F97E1006099B8 /* libcocos3d iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1516222F199F95B2006099B8 /* libcocos3d iOS.a */; }; + 151622C819A0F689006099B8 /* libluacocos3d Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 151622C319A0F66B006099B8 /* libluacocos3d Mac.a */; }; + 151622C919A0F692006099B8 /* libcocos3d Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1516222D199F95B2006099B8 /* libcocos3d Mac.a */; }; + 15427B79198B879900DC375D /* libluacocos2d iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15EFA665198B33EE000C57D3 /* libluacocos2d iOS.a */; }; + 15427B7A198B87AA00DC375D /* libcocos2d iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FBE1807A4F9005B8026 /* libcocos2d iOS.a */; }; + 15427B7D198B880100DC375D /* lua_cocos2dx_controller_manual.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15427B7B198B880100DC375D /* lua_cocos2dx_controller_manual.cpp */; }; + 15427B7E198B896D00DC375D /* libcocosdenshion iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FC61807A4F9005B8026 /* libcocosdenshion iOS.a */; }; 156EAE071977D0BD00F53709 /* ActionTimeline in Resources */ = {isa = PBXBuildFile; fileRef = 38FA2E75194AECF800FF2BE4 /* ActionTimeline */; }; + 158C129419A0FC6400781A76 /* libcocos3d iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1516222F199F95B2006099B8 /* libcocos3d iOS.a */; }; + 158C129519A0FC6400781A76 /* libluacocos3d iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 151622C519A0F66B006099B8 /* libluacocos3d iOS.a */; }; 15AECE0B195C0F8A00907DB0 /* MediaPlayer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3EA0FB65191B933000B170C8 /* MediaPlayer.framework */; }; 15AECE0F195C1FDD00907DB0 /* cocosvideo.mp4 in Resources */ = {isa = PBXBuildFile; fileRef = 3EA0FB5D191B92F100B170C8 /* cocosvideo.mp4 */; }; - 15AECE1F195D0EC500907DB0 /* experimentalConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15AECE1E195D0EC500907DB0 /* experimentalConstants.lua */; }; - 15AECE22195D122400907DB0 /* experimentalConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15AECE1E195D0EC500907DB0 /* experimentalConstants.lua */; }; - 15AECE23195D122600907DB0 /* experimentalConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15AECE1E195D0EC500907DB0 /* experimentalConstants.lua */; }; - 15AECE24195D122700907DB0 /* experimentalConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15AECE1E195D0EC500907DB0 /* experimentalConstants.lua */; }; 15AECE25195D467D00907DB0 /* MediaPlayer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3EA0FB65191B933000B170C8 /* MediaPlayer.framework */; }; 15B0870D195AD52000D6F62B /* ActionTimeline in Resources */ = {isa = PBXBuildFile; fileRef = 38FA2E75194AECF800FF2BE4 /* ActionTimeline */; }; 15C64825165F3934007D4F18 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C64824165F3934007D4F18 /* OpenGL.framework */; }; @@ -96,12 +100,6 @@ 15C90B4A18E66C2B00D69802 /* tp.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1503FAB118DA8B6C00F6518C /* tp.lua */; }; 15C90B4B18E66C2F00D69802 /* url.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1503FAB218DA8B6C00F6518C /* url.lua */; }; 15C90B4C18E66C3100D69802 /* url.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1503FAB218DA8B6C00F6518C /* url.lua */; }; - 15CBA9A9196EE7FA005877BB /* Cocos2d.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36818CD9E180087CE3A /* Cocos2d.lua */; }; - 15CBA9AA196EE7FA005877BB /* Cocos2dConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36918CD9E180087CE3A /* Cocos2dConstants.lua */; }; - 15CBA9AB196EE7FA005877BB /* CocoStudio.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36A18CD9E180087CE3A /* CocoStudio.lua */; }; - 15CBA9AC196EE7FA005877BB /* Deprecated.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36B18CD9E180087CE3A /* Deprecated.lua */; }; - 15CBA9AD196EE7FA005877BB /* DeprecatedClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36C18CD9E180087CE3A /* DeprecatedClass.lua */; }; - 15CBA9AE196EE7FA005877BB /* DeprecatedEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36D18CD9E180087CE3A /* DeprecatedEnum.lua */; }; 15CBA9AF196EE80B005877BB /* fonts in Resources */ = {isa = PBXBuildFile; fileRef = 3E6177F01960FEFE00DE83F5 /* fonts */; }; 15CBA9B0196EE80B005877BB /* ipad in Resources */ = {isa = PBXBuildFile; fileRef = 3E6177F11960FEFE00DE83F5 /* ipad */; }; 15CBA9B1196EE80B005877BB /* ipadhd in Resources */ = {isa = PBXBuildFile; fileRef = 3E6177F21960FEFE00DE83F5 /* ipadhd */; }; @@ -111,10 +109,6 @@ 15CBA9B7196EE8D9005877BB /* AppController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 15CBA53F196EE671005877BB /* AppController.mm */; }; 15CBA9B8196EE8D9005877BB /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 15CBA54C196EE671005877BB /* main.m */; }; 15CBA9B9196EE8D9005877BB /* RootViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 15CBA54E196EE671005877BB /* RootViewController.mm */; }; - 15CBA9BB196EE910005877BB /* libchipmunk iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FC21807A4F9005B8026 /* libchipmunk iOS.a */; }; - 15CBA9BD196EE910005877BB /* libcocos2dx-extensions iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FC01807A4F9005B8026 /* libcocos2dx-extensions iOS.a */; }; - 15CBA9BE196EE910005877BB /* libCocosDenshion iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FC61807A4F9005B8026 /* libCocosDenshion iOS.a */; }; - 15CBA9BF196EE910005877BB /* libluabindings iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA28018CD90A50087CE3A /* libluabindings iOS.a */; }; 15CBA9CF196EE9FB005877BB /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15CBA9C2196EE951005877BB /* AVFoundation.framework */; }; 15CBA9D0196EEA05005877BB /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15CBA9C4196EE962005877BB /* UIKit.framework */; }; 15CBA9D1196EEA1D005877BB /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15CBA9C0196EE943005877BB /* Foundation.framework */; }; @@ -126,17 +120,170 @@ 15CBA9DB196EEA90005877BB /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15CBA9DA196EEA90005877BB /* CoreMotion.framework */; }; 15CBA9DD196EEAA6005877BB /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 15CBA9DC196EEAA6005877BB /* libz.dylib */; }; 15CBA9DE196EEAF8005877BB /* GameController.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3E61773C1960FBD100DE83F5 /* GameController.framework */; }; - 15CBA9DF196EEBB3005877BB /* libcocos2dx iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FBE1807A4F9005B8026 /* libcocos2dx iOS.a */; }; 15CBA9E0196EEBD4005877BB /* MediaPlayer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3EA0FB65191B933000B170C8 /* MediaPlayer.framework */; }; 15CBA9ED196F7BD8005877BB /* lua_cocos2dx_controller_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15CBA9EB196F7BD8005877BB /* lua_cocos2dx_controller_auto.cpp */; }; - 15CBA9F0196F7BEC005877BB /* lua_cocos2dx_controller_manual.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15CBA9EE196F7BEC005877BB /* lua_cocos2dx_controller_manual.cpp */; }; - 15CBA9F1196F865C005877BB /* json.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA37218CD9E180087CE3A /* json.lua */; }; - 15CBA9F2196F8718005877BB /* extern.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA37018CD9E180087CE3A /* extern.lua */; }; + 15D1FCEC1998637C00302043 /* bitExtend.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCDE1998637C00302043 /* bitExtend.lua */; }; + 15D1FCED1998637C00302043 /* bitExtend.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCDE1998637C00302043 /* bitExtend.lua */; }; + 15D1FCEE1998637C00302043 /* bitExtend.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCDE1998637C00302043 /* bitExtend.lua */; }; + 15D1FCEF1998637C00302043 /* bitExtend.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCDE1998637C00302043 /* bitExtend.lua */; }; + 15D1FCF01998637C00302043 /* bitExtend.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCDE1998637C00302043 /* bitExtend.lua */; }; + 15D1FCF11998637C00302043 /* Cocos2d.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCDF1998637C00302043 /* Cocos2d.lua */; }; + 15D1FCF21998637C00302043 /* Cocos2d.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCDF1998637C00302043 /* Cocos2d.lua */; }; + 15D1FCF31998637C00302043 /* Cocos2d.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCDF1998637C00302043 /* Cocos2d.lua */; }; + 15D1FCF41998637C00302043 /* Cocos2d.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCDF1998637C00302043 /* Cocos2d.lua */; }; + 15D1FCF51998637C00302043 /* Cocos2d.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCDF1998637C00302043 /* Cocos2d.lua */; }; + 15D1FCF61998637C00302043 /* Cocos2dConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE01998637C00302043 /* Cocos2dConstants.lua */; }; + 15D1FCF71998637C00302043 /* Cocos2dConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE01998637C00302043 /* Cocos2dConstants.lua */; }; + 15D1FCF81998637C00302043 /* Cocos2dConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE01998637C00302043 /* Cocos2dConstants.lua */; }; + 15D1FCF91998637C00302043 /* Cocos2dConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE01998637C00302043 /* Cocos2dConstants.lua */; }; + 15D1FCFA1998637C00302043 /* Cocos2dConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE01998637C00302043 /* Cocos2dConstants.lua */; }; + 15D1FCFB1998637C00302043 /* DeprecatedCocos2dClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE11998637C00302043 /* DeprecatedCocos2dClass.lua */; }; + 15D1FCFC1998637C00302043 /* DeprecatedCocos2dClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE11998637C00302043 /* DeprecatedCocos2dClass.lua */; }; + 15D1FCFD1998637C00302043 /* DeprecatedCocos2dClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE11998637C00302043 /* DeprecatedCocos2dClass.lua */; }; + 15D1FCFE1998637C00302043 /* DeprecatedCocos2dClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE11998637C00302043 /* DeprecatedCocos2dClass.lua */; }; + 15D1FCFF1998637C00302043 /* DeprecatedCocos2dClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE11998637C00302043 /* DeprecatedCocos2dClass.lua */; }; + 15D1FD001998637C00302043 /* DeprecatedCocos2dEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE21998637C00302043 /* DeprecatedCocos2dEnum.lua */; }; + 15D1FD011998637C00302043 /* DeprecatedCocos2dEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE21998637C00302043 /* DeprecatedCocos2dEnum.lua */; }; + 15D1FD021998637C00302043 /* DeprecatedCocos2dEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE21998637C00302043 /* DeprecatedCocos2dEnum.lua */; }; + 15D1FD031998637C00302043 /* DeprecatedCocos2dEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE21998637C00302043 /* DeprecatedCocos2dEnum.lua */; }; + 15D1FD041998637C00302043 /* DeprecatedCocos2dEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE21998637C00302043 /* DeprecatedCocos2dEnum.lua */; }; + 15D1FD051998637C00302043 /* DeprecatedCocos2dFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE31998637C00302043 /* DeprecatedCocos2dFunc.lua */; }; + 15D1FD061998637C00302043 /* DeprecatedCocos2dFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE31998637C00302043 /* DeprecatedCocos2dFunc.lua */; }; + 15D1FD071998637C00302043 /* DeprecatedCocos2dFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE31998637C00302043 /* DeprecatedCocos2dFunc.lua */; }; + 15D1FD081998637C00302043 /* DeprecatedCocos2dFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE31998637C00302043 /* DeprecatedCocos2dFunc.lua */; }; + 15D1FD091998637C00302043 /* DeprecatedCocos2dFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE31998637C00302043 /* DeprecatedCocos2dFunc.lua */; }; + 15D1FD0A1998637C00302043 /* DeprecatedOpenglEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE41998637C00302043 /* DeprecatedOpenglEnum.lua */; }; + 15D1FD0B1998637C00302043 /* DeprecatedOpenglEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE41998637C00302043 /* DeprecatedOpenglEnum.lua */; }; + 15D1FD0C1998637C00302043 /* DeprecatedOpenglEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE41998637C00302043 /* DeprecatedOpenglEnum.lua */; }; + 15D1FD0D1998637C00302043 /* DeprecatedOpenglEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE41998637C00302043 /* DeprecatedOpenglEnum.lua */; }; + 15D1FD0E1998637C00302043 /* DeprecatedOpenglEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE41998637C00302043 /* DeprecatedOpenglEnum.lua */; }; + 15D1FD0F1998637C00302043 /* DrawPrimitives.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE51998637C00302043 /* DrawPrimitives.lua */; }; + 15D1FD101998637C00302043 /* DrawPrimitives.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE51998637C00302043 /* DrawPrimitives.lua */; }; + 15D1FD111998637C00302043 /* DrawPrimitives.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE51998637C00302043 /* DrawPrimitives.lua */; }; + 15D1FD121998637C00302043 /* DrawPrimitives.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE51998637C00302043 /* DrawPrimitives.lua */; }; + 15D1FD131998637C00302043 /* DrawPrimitives.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE51998637C00302043 /* DrawPrimitives.lua */; }; + 15D1FD141998637C00302043 /* extern.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE61998637C00302043 /* extern.lua */; }; + 15D1FD151998637C00302043 /* extern.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE61998637C00302043 /* extern.lua */; }; + 15D1FD161998637C00302043 /* extern.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE61998637C00302043 /* extern.lua */; }; + 15D1FD171998637C00302043 /* extern.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE61998637C00302043 /* extern.lua */; }; + 15D1FD181998637C00302043 /* extern.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE61998637C00302043 /* extern.lua */; }; + 15D1FD191998637C00302043 /* json.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE71998637C00302043 /* json.lua */; }; + 15D1FD1A1998637C00302043 /* json.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE71998637C00302043 /* json.lua */; }; + 15D1FD1B1998637C00302043 /* json.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE71998637C00302043 /* json.lua */; }; + 15D1FD1C1998637C00302043 /* json.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE71998637C00302043 /* json.lua */; }; + 15D1FD1D1998637C00302043 /* json.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE71998637C00302043 /* json.lua */; }; + 15D1FD1E1998637C00302043 /* luaj.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE81998637C00302043 /* luaj.lua */; }; + 15D1FD1F1998637C00302043 /* luaj.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE81998637C00302043 /* luaj.lua */; }; + 15D1FD201998637C00302043 /* luaj.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE81998637C00302043 /* luaj.lua */; }; + 15D1FD211998637C00302043 /* luaj.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE81998637C00302043 /* luaj.lua */; }; + 15D1FD221998637C00302043 /* luaj.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE81998637C00302043 /* luaj.lua */; }; + 15D1FD231998637C00302043 /* luaoc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE91998637C00302043 /* luaoc.lua */; }; + 15D1FD241998637C00302043 /* luaoc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE91998637C00302043 /* luaoc.lua */; }; + 15D1FD251998637C00302043 /* luaoc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE91998637C00302043 /* luaoc.lua */; }; + 15D1FD261998637C00302043 /* luaoc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE91998637C00302043 /* luaoc.lua */; }; + 15D1FD271998637C00302043 /* luaoc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCE91998637C00302043 /* luaoc.lua */; }; + 15D1FD281998637C00302043 /* Opengl.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCEA1998637C00302043 /* Opengl.lua */; }; + 15D1FD291998637C00302043 /* Opengl.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCEA1998637C00302043 /* Opengl.lua */; }; + 15D1FD2A1998637C00302043 /* Opengl.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCEA1998637C00302043 /* Opengl.lua */; }; + 15D1FD2B1998637C00302043 /* Opengl.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCEA1998637C00302043 /* Opengl.lua */; }; + 15D1FD2C1998637C00302043 /* Opengl.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCEA1998637C00302043 /* Opengl.lua */; }; + 15D1FD2D1998637C00302043 /* OpenglConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCEB1998637C00302043 /* OpenglConstants.lua */; }; + 15D1FD2E1998637C00302043 /* OpenglConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCEB1998637C00302043 /* OpenglConstants.lua */; }; + 15D1FD2F1998637C00302043 /* OpenglConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCEB1998637C00302043 /* OpenglConstants.lua */; }; + 15D1FD301998637C00302043 /* OpenglConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCEB1998637C00302043 /* OpenglConstants.lua */; }; + 15D1FD311998637C00302043 /* OpenglConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FCEB1998637C00302043 /* OpenglConstants.lua */; }; + 15D1FD34199863BA00302043 /* CCBReaderLoad.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD32199863BA00302043 /* CCBReaderLoad.lua */; }; + 15D1FD35199863BA00302043 /* CCBReaderLoad.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD32199863BA00302043 /* CCBReaderLoad.lua */; }; + 15D1FD36199863BA00302043 /* DeprecatedCocosBuilderClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD33199863BA00302043 /* DeprecatedCocosBuilderClass.lua */; }; + 15D1FD37199863BA00302043 /* DeprecatedCocosBuilderClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD33199863BA00302043 /* DeprecatedCocosBuilderClass.lua */; }; + 15D1FD3B199863CA00302043 /* AudioEngine.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD38199863CA00302043 /* AudioEngine.lua */; }; + 15D1FD3C199863CA00302043 /* AudioEngine.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD38199863CA00302043 /* AudioEngine.lua */; }; + 15D1FD3D199863CA00302043 /* DeprecatedCocosDenshionClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD39199863CA00302043 /* DeprecatedCocosDenshionClass.lua */; }; + 15D1FD3E199863CA00302043 /* DeprecatedCocosDenshionClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD39199863CA00302043 /* DeprecatedCocosDenshionClass.lua */; }; + 15D1FD3F199863CA00302043 /* DeprecatedCocosDenshionFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD3A199863CA00302043 /* DeprecatedCocosDenshionFunc.lua */; }; + 15D1FD40199863CA00302043 /* DeprecatedCocosDenshionFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD3A199863CA00302043 /* DeprecatedCocosDenshionFunc.lua */; }; + 15D1FD45199863E800302043 /* CocoStudio.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD41199863E800302043 /* CocoStudio.lua */; }; + 15D1FD46199863E800302043 /* CocoStudio.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD41199863E800302043 /* CocoStudio.lua */; }; + 15D1FD47199863E800302043 /* DeprecatedCocoStudioClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD42199863E800302043 /* DeprecatedCocoStudioClass.lua */; }; + 15D1FD48199863E800302043 /* DeprecatedCocoStudioClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD42199863E800302043 /* DeprecatedCocoStudioClass.lua */; }; + 15D1FD49199863E800302043 /* DeprecatedCocoStudioFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD43199863E800302043 /* DeprecatedCocoStudioFunc.lua */; }; + 15D1FD4A199863E800302043 /* DeprecatedCocoStudioFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD43199863E800302043 /* DeprecatedCocoStudioFunc.lua */; }; + 15D1FD4B199863E800302043 /* StudioConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD44199863E800302043 /* StudioConstants.lua */; }; + 15D1FD4C199863E800302043 /* StudioConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD44199863E800302043 /* StudioConstants.lua */; }; + 15D1FD51199863F900302043 /* DeprecatedExtensionClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD4D199863F900302043 /* DeprecatedExtensionClass.lua */; }; + 15D1FD52199863F900302043 /* DeprecatedExtensionClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD4D199863F900302043 /* DeprecatedExtensionClass.lua */; }; + 15D1FD53199863F900302043 /* DeprecatedExtensionEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD4E199863F900302043 /* DeprecatedExtensionEnum.lua */; }; + 15D1FD54199863F900302043 /* DeprecatedExtensionEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD4E199863F900302043 /* DeprecatedExtensionEnum.lua */; }; + 15D1FD55199863F900302043 /* DeprecatedExtensionFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD4F199863F900302043 /* DeprecatedExtensionFunc.lua */; }; + 15D1FD56199863F900302043 /* DeprecatedExtensionFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD4F199863F900302043 /* DeprecatedExtensionFunc.lua */; }; + 15D1FD57199863F900302043 /* ExtensionConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD50199863F900302043 /* ExtensionConstants.lua */; }; + 15D1FD58199863F900302043 /* ExtensionConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD50199863F900302043 /* ExtensionConstants.lua */; }; + 15D1FD5D1998641200302043 /* DeprecatedNetworkClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD591998641200302043 /* DeprecatedNetworkClass.lua */; }; + 15D1FD5E1998641200302043 /* DeprecatedNetworkClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD591998641200302043 /* DeprecatedNetworkClass.lua */; }; + 15D1FD5F1998641200302043 /* DeprecatedNetworkClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD591998641200302043 /* DeprecatedNetworkClass.lua */; }; + 15D1FD601998641200302043 /* DeprecatedNetworkClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD591998641200302043 /* DeprecatedNetworkClass.lua */; }; + 15D1FD611998641200302043 /* DeprecatedNetworkEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD5A1998641200302043 /* DeprecatedNetworkEnum.lua */; }; + 15D1FD621998641200302043 /* DeprecatedNetworkEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD5A1998641200302043 /* DeprecatedNetworkEnum.lua */; }; + 15D1FD631998641200302043 /* DeprecatedNetworkEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD5A1998641200302043 /* DeprecatedNetworkEnum.lua */; }; + 15D1FD641998641200302043 /* DeprecatedNetworkEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD5A1998641200302043 /* DeprecatedNetworkEnum.lua */; }; + 15D1FD651998641200302043 /* DeprecatedNetworkFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD5B1998641200302043 /* DeprecatedNetworkFunc.lua */; }; + 15D1FD661998641200302043 /* DeprecatedNetworkFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD5B1998641200302043 /* DeprecatedNetworkFunc.lua */; }; + 15D1FD671998641200302043 /* DeprecatedNetworkFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD5B1998641200302043 /* DeprecatedNetworkFunc.lua */; }; + 15D1FD681998641200302043 /* DeprecatedNetworkFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD5B1998641200302043 /* DeprecatedNetworkFunc.lua */; }; + 15D1FD691998641200302043 /* NetworkConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD5C1998641200302043 /* NetworkConstants.lua */; }; + 15D1FD6A1998641200302043 /* NetworkConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD5C1998641200302043 /* NetworkConstants.lua */; }; + 15D1FD6B1998641200302043 /* NetworkConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD5C1998641200302043 /* NetworkConstants.lua */; }; + 15D1FD6C1998641200302043 /* NetworkConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD5C1998641200302043 /* NetworkConstants.lua */; }; + 15D1FD711998642800302043 /* DeprecatedUIEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD6D1998642800302043 /* DeprecatedUIEnum.lua */; }; + 15D1FD721998642800302043 /* DeprecatedUIEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD6D1998642800302043 /* DeprecatedUIEnum.lua */; }; + 15D1FD731998642800302043 /* DeprecatedUIFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD6E1998642800302043 /* DeprecatedUIFunc.lua */; }; + 15D1FD741998642800302043 /* DeprecatedUIFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD6E1998642800302043 /* DeprecatedUIFunc.lua */; }; + 15D1FD751998642800302043 /* experimentalUIConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD6F1998642800302043 /* experimentalUIConstants.lua */; }; + 15D1FD761998642800302043 /* experimentalUIConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD6F1998642800302043 /* experimentalUIConstants.lua */; }; + 15D1FD771998642800302043 /* GuiConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD701998642800302043 /* GuiConstants.lua */; }; + 15D1FD781998642800302043 /* GuiConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FD701998642800302043 /* GuiConstants.lua */; }; 15E66FC8192D957100C20A52 /* Sprite3DTest in Resources */ = {isa = PBXBuildFile; fileRef = 3E92EA841921A7720094CD21 /* Sprite3DTest */; }; 15E66FD6192DC8C700C20A52 /* Sprite3DTest in Resources */ = {isa = PBXBuildFile; fileRef = 3E92EA841921A7720094CD21 /* Sprite3DTest */; }; + 15EFA25B198A4A47000C57D3 /* libluacocos2d Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15EFA258198A4A24000C57D3 /* libluacocos2d Mac.a */; }; + 15EFA25C198A4A58000C57D3 /* libluacocosdenshion Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15EFA256198A4A24000C57D3 /* libluacocosdenshion Mac.a */; }; + 15EFA25D198A4A66000C57D3 /* libluanetwork Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15EFA254198A4A24000C57D3 /* libluanetwork Mac.a */; }; + 15EFA270198B25B9000C57D3 /* libcocos2d Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FB01807A4F9005B8026 /* libcocos2d Mac.a */; }; + 15EFA271198B25B9000C57D3 /* libcocosdenshion Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FB81807A4F9005B8026 /* libcocosdenshion Mac.a */; }; + 15EFA272198B25C3000C57D3 /* libnetwork Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B244F3161976878700ED1926 /* libnetwork Mac.a */; }; + 15EFA273198B265A000C57D3 /* libluacocos2d Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15EFA258198A4A24000C57D3 /* libluacocos2d Mac.a */; }; + 15EFA274198B265A000C57D3 /* libluacocosbuilder Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15EFA250198A4A24000C57D3 /* libluacocosbuilder Mac.a */; }; + 15EFA275198B265A000C57D3 /* libluacocosdenshion Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15EFA256198A4A24000C57D3 /* libluacocosdenshion Mac.a */; }; + 15EFA276198B265A000C57D3 /* libluacocostudio Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15EFA24E198A4A24000C57D3 /* libluacocostudio Mac.a */; }; + 15EFA277198B2666000C57D3 /* libluaui Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15EFA24C198A4A24000C57D3 /* libluaui Mac.a */; }; + 15EFA278198B2673000C57D3 /* libluaspine Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15EFA252198A4A24000C57D3 /* libluaspine Mac.a */; }; + 15EFA279198B268A000C57D3 /* libluanetwork Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15EFA254198A4A24000C57D3 /* libluanetwork Mac.a */; }; + 15EFA27A198B269E000C57D3 /* libluaextension Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15EFA24A198A4A24000C57D3 /* libluaextension Mac.a */; }; + 15EFA666198B34D7000C57D3 /* libcocos2d iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FBE1807A4F9005B8026 /* libcocos2d iOS.a */; }; + 15EFA667198B34D7000C57D3 /* libcocosbuilder iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B2CC503D197763A20041958E /* libcocosbuilder iOS.a */; }; + 15EFA668198B34D7000C57D3 /* libcocosdenshion iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FC61807A4F9005B8026 /* libcocosdenshion iOS.a */; }; + 15EFA669198B34D7000C57D3 /* libcocostudio iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B2CC503B197763A20041958E /* libcocostudio iOS.a */; }; + 15EFA66A198B34E1000C57D3 /* libui iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B2CC5039197763A20041958E /* libui iOS.a */; }; + 15EFA66B198B34EA000C57D3 /* libchipmunk iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FC21807A4F9005B8026 /* libchipmunk iOS.a */; }; + 15EFA66C198B3505000C57D3 /* libextension iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FC01807A4F9005B8026 /* libextension iOS.a */; }; + 15EFA66D198B354B000C57D3 /* libnetwork iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B2CC5041197763A20041958E /* libnetwork iOS.a */; }; + 15EFA66E198B354B000C57D3 /* libspine iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B2CC503F197763A20041958E /* libspine iOS.a */; }; + 15EFA66F198B356E000C57D3 /* libluacocos2d iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15EFA665198B33EE000C57D3 /* libluacocos2d iOS.a */; }; + 15EFA670198B356E000C57D3 /* libluacocosbuilder iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15EFA65D198B33EE000C57D3 /* libluacocosbuilder iOS.a */; }; + 15EFA671198B356E000C57D3 /* libluacocosdenshion iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15EFA663198B33EE000C57D3 /* libluacocosdenshion iOS.a */; }; + 15EFA672198B356E000C57D3 /* libluacocostudio iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15EFA65B198B33EE000C57D3 /* libluacocostudio iOS.a */; }; + 15EFA673198B356E000C57D3 /* libluaextension iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15EFA25A198A4A24000C57D3 /* libluaextension iOS.a */; }; + 15EFA674198B356E000C57D3 /* libluanetwork iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15EFA661198B33EE000C57D3 /* libluanetwork iOS.a */; }; + 15EFA675198B356E000C57D3 /* libluaspine iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15EFA65F198B33EE000C57D3 /* libluaspine iOS.a */; }; + 15EFA676198B356E000C57D3 /* libluaui iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15EFA659198B33EE000C57D3 /* libluaui iOS.a */; }; + 15EFA68B198B3AD8000C57D3 /* libcocos2d iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FBE1807A4F9005B8026 /* libcocos2d iOS.a */; }; + 15EFA68C198B3AD8000C57D3 /* libcocosdenshion iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FC61807A4F9005B8026 /* libcocosdenshion iOS.a */; }; + 15EFA68D198B3AD8000C57D3 /* libluacocos2d iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15EFA665198B33EE000C57D3 /* libluacocos2d iOS.a */; }; + 15EFA68E198B3AD8000C57D3 /* libluacocosdenshion iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15EFA663198B33EE000C57D3 /* libluacocosdenshion iOS.a */; }; + 15EFA68F198B3AD8000C57D3 /* libluanetwork iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15EFA661198B33EE000C57D3 /* libluanetwork iOS.a */; }; + 15EFA690198B3AD8000C57D3 /* libnetwork iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B2CC5041197763A20041958E /* libnetwork iOS.a */; }; 1A0EE2A118CDF6DA004CD58F /* libchipmunk Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FB41807A4F9005B8026 /* libchipmunk Mac.a */; }; - 1A0EE2A218CDF6DA004CD58F /* libcocos2dx Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FB01807A4F9005B8026 /* libcocos2dx Mac.a */; }; - 1A0EE2A418CDF6DA004CD58F /* libCocosDenshion Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FB81807A4F9005B8026 /* libCocosDenshion Mac.a */; }; + 1A0EE2A218CDF6DA004CD58F /* libcocos2d Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FB01807A4F9005B8026 /* libcocos2d Mac.a */; }; + 1A0EE2A418CDF6DA004CD58F /* libcocosdenshion Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FB81807A4F9005B8026 /* libcocosdenshion Mac.a */; }; 1A0EE2A518CDF6DA004CD58F /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EDCC747E17C455FD007B692C /* IOKit.framework */; }; 1A0EE2A618CDF6DA004CD58F /* libcurl.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A9F808C177E98A600D9A1CB /* libcurl.dylib */; }; 1A0EE2A718CDF6DA004CD58F /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C6482E165F399D007D4F18 /* libz.dylib */; }; @@ -157,14 +304,10 @@ 1A0EE2D018CDF733004CD58F /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA35618CD9A890087CE3A /* QuartzCore.framework */; }; 1A0EE2D118CDF733004CD58F /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA35418CD9A820087CE3A /* OpenGL.framework */; }; 1A0EE2D218CDF733004CD58F /* libchipmunk Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FB41807A4F9005B8026 /* libchipmunk Mac.a */; }; - 1A0EE2D318CDF733004CD58F /* libcocos2dx Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FB01807A4F9005B8026 /* libcocos2dx Mac.a */; }; - 1A0EE2D418CDF733004CD58F /* libcocos2dx-extensions Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FB21807A4F9005B8026 /* libcocos2dx-extensions Mac.a */; }; - 1A0EE2D518CDF733004CD58F /* libCocosDenshion Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FB81807A4F9005B8026 /* libCocosDenshion Mac.a */; }; - 1A0EE2D618CDF733004CD58F /* libluabindings Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA27E18CD90A50087CE3A /* libluabindings Mac.a */; }; 1A0EE2D718CDF733004CD58F /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C64822165F391E007D4F18 /* Cocoa.framework */; }; 1A0EE40218CDF775004CD58F /* libchipmunk iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FC21807A4F9005B8026 /* libchipmunk iOS.a */; }; - 1A0EE40318CDF775004CD58F /* libcocos2dx iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FBE1807A4F9005B8026 /* libcocos2dx iOS.a */; }; - 1A0EE40518CDF775004CD58F /* libCocosDenshion iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FC61807A4F9005B8026 /* libCocosDenshion iOS.a */; }; + 1A0EE40318CDF775004CD58F /* libcocos2d iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FBE1807A4F9005B8026 /* libcocos2d iOS.a */; }; + 1A0EE40518CDF775004CD58F /* libcocosdenshion iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FC61807A4F9005B8026 /* libcocosdenshion iOS.a */; }; 1A0EE40618CDF775004CD58F /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D60AE43317F7FFE100757E4B /* CoreMotion.framework */; }; 1A0EE40718CDF775004CD58F /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C6482E165F399D007D4F18 /* libz.dylib */; }; 1A0EE40818CDF775004CD58F /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C64832165F3AFD007D4F18 /* Foundation.framework */; }; @@ -185,47 +328,6 @@ 1A0EE43318CDF799004CD58F /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA39E18CD9EE50087CE3A /* UIKit.framework */; }; 1A0EE43418CDF799004CD58F /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA39C18CD9ED80087CE3A /* AVFoundation.framework */; }; 1A0EE43518CDF799004CD58F /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C64832165F3AFD007D4F18 /* Foundation.framework */; }; - 1A0EE43618CDF799004CD58F /* libchipmunk iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FC21807A4F9005B8026 /* libchipmunk iOS.a */; }; - 1A0EE43718CDF799004CD58F /* libcocos2dx iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FBE1807A4F9005B8026 /* libcocos2dx iOS.a */; }; - 1A0EE43818CDF799004CD58F /* libcocos2dx-extensions iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FC01807A4F9005B8026 /* libcocos2dx-extensions iOS.a */; }; - 1A0EE43918CDF799004CD58F /* libCocosDenshion iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FC61807A4F9005B8026 /* libCocosDenshion iOS.a */; }; - 1A0EE43A18CDF799004CD58F /* libluabindings iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA28018CD90A50087CE3A /* libluabindings iOS.a */; }; - 1A0EE55C18CDFBBD004CD58F /* AudioEngine.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36618CD9E180087CE3A /* AudioEngine.lua */; }; - 1A0EE55D18CDFBBD004CD58F /* CCBReaderLoad.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36718CD9E180087CE3A /* CCBReaderLoad.lua */; }; - 1A0EE55E18CDFBBD004CD58F /* Cocos2d.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36818CD9E180087CE3A /* Cocos2d.lua */; }; - 1A0EE55F18CDFBBD004CD58F /* Cocos2dConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36918CD9E180087CE3A /* Cocos2dConstants.lua */; }; - 1A0EE56018CDFBBD004CD58F /* CocoStudio.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36A18CD9E180087CE3A /* CocoStudio.lua */; }; - 1A0EE56118CDFBBD004CD58F /* Deprecated.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36B18CD9E180087CE3A /* Deprecated.lua */; }; - 1A0EE56218CDFBBD004CD58F /* DeprecatedClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36C18CD9E180087CE3A /* DeprecatedClass.lua */; }; - 1A0EE56318CDFBBD004CD58F /* DeprecatedEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36D18CD9E180087CE3A /* DeprecatedEnum.lua */; }; - 1A0EE56418CDFBBD004CD58F /* DeprecatedOpenglEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36E18CD9E180087CE3A /* DeprecatedOpenglEnum.lua */; }; - 1A0EE56518CDFBBD004CD58F /* DrawPrimitives.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36F18CD9E180087CE3A /* DrawPrimitives.lua */; }; - 1A0EE56618CDFBBD004CD58F /* extern.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA37018CD9E180087CE3A /* extern.lua */; }; - 1A0EE56718CDFBBD004CD58F /* GuiConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA37118CD9E180087CE3A /* GuiConstants.lua */; }; - 1A0EE56818CDFBBD004CD58F /* json.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA37218CD9E180087CE3A /* json.lua */; }; - 1A0EE56918CDFBBD004CD58F /* luaj.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA37318CD9E180087CE3A /* luaj.lua */; }; - 1A0EE56A18CDFBBD004CD58F /* luaoc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA37418CD9E180087CE3A /* luaoc.lua */; }; - 1A0EE56B18CDFBBD004CD58F /* Opengl.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA37518CD9E180087CE3A /* Opengl.lua */; }; - 1A0EE56C18CDFBBD004CD58F /* OpenglConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA37618CD9E180087CE3A /* OpenglConstants.lua */; }; - 1A0EE56D18CDFBBD004CD58F /* StudioConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA37718CD9E180087CE3A /* StudioConstants.lua */; }; - 1A0EE56E18CDFBBE004CD58F /* AudioEngine.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36618CD9E180087CE3A /* AudioEngine.lua */; }; - 1A0EE56F18CDFBBE004CD58F /* CCBReaderLoad.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36718CD9E180087CE3A /* CCBReaderLoad.lua */; }; - 1A0EE57018CDFBBE004CD58F /* Cocos2d.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36818CD9E180087CE3A /* Cocos2d.lua */; }; - 1A0EE57118CDFBBE004CD58F /* Cocos2dConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36918CD9E180087CE3A /* Cocos2dConstants.lua */; }; - 1A0EE57218CDFBBE004CD58F /* CocoStudio.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36A18CD9E180087CE3A /* CocoStudio.lua */; }; - 1A0EE57318CDFBBE004CD58F /* Deprecated.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36B18CD9E180087CE3A /* Deprecated.lua */; }; - 1A0EE57418CDFBBE004CD58F /* DeprecatedClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36C18CD9E180087CE3A /* DeprecatedClass.lua */; }; - 1A0EE57518CDFBBE004CD58F /* DeprecatedEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36D18CD9E180087CE3A /* DeprecatedEnum.lua */; }; - 1A0EE57618CDFBBE004CD58F /* DeprecatedOpenglEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36E18CD9E180087CE3A /* DeprecatedOpenglEnum.lua */; }; - 1A0EE57718CDFBBE004CD58F /* DrawPrimitives.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36F18CD9E180087CE3A /* DrawPrimitives.lua */; }; - 1A0EE57818CDFBBE004CD58F /* extern.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA37018CD9E180087CE3A /* extern.lua */; }; - 1A0EE57918CDFBBE004CD58F /* GuiConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA37118CD9E180087CE3A /* GuiConstants.lua */; }; - 1A0EE57A18CDFBBE004CD58F /* json.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA37218CD9E180087CE3A /* json.lua */; }; - 1A0EE57B18CDFBBE004CD58F /* luaj.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA37318CD9E180087CE3A /* luaj.lua */; }; - 1A0EE57C18CDFBBE004CD58F /* luaoc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA37418CD9E180087CE3A /* luaoc.lua */; }; - 1A0EE57D18CDFBBE004CD58F /* Opengl.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA37518CD9E180087CE3A /* Opengl.lua */; }; - 1A0EE57E18CDFBBE004CD58F /* OpenglConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA37618CD9E180087CE3A /* OpenglConstants.lua */; }; - 1A0EE57F18CDFBBE004CD58F /* StudioConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA37718CD9E180087CE3A /* StudioConstants.lua */; }; 1A1645A6191B6281008C7C7F /* ccs-res in Resources */ = {isa = PBXBuildFile; fileRef = 1A221C9B191771E300FD2BE4 /* ccs-res */; }; 1A1645A9191B6283008C7C7F /* ccs-res in Resources */ = {isa = PBXBuildFile; fileRef = 1A221C9B191771E300FD2BE4 /* ccs-res */; }; 1A221C9C191771E300FD2BE4 /* ccs-res in Resources */ = {isa = PBXBuildFile; fileRef = 1A221C9B191771E300FD2BE4 /* ccs-res */; }; @@ -233,26 +335,20 @@ 1A9F808D177E98A600D9A1CB /* libcurl.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A9F808C177E98A600D9A1CB /* libcurl.dylib */; }; 1AAF534B180E2F4E000584C8 /* libbox2d Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FB61807A4F9005B8026 /* libbox2d Mac.a */; }; 1AAF534C180E2F4E000584C8 /* libchipmunk Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FB41807A4F9005B8026 /* libchipmunk Mac.a */; }; - 1AAF534D180E2F4E000584C8 /* libcocos2dx Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FB01807A4F9005B8026 /* libcocos2dx Mac.a */; }; - 1AAF534E180E2F4E000584C8 /* libcocos2dx-extensions Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FB21807A4F9005B8026 /* libcocos2dx-extensions Mac.a */; }; - 1AAF534F180E2F4E000584C8 /* libCocosDenshion Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FB81807A4F9005B8026 /* libCocosDenshion Mac.a */; }; + 1AAF534D180E2F4E000584C8 /* libcocos2d Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FB01807A4F9005B8026 /* libcocos2d Mac.a */; }; + 1AAF534E180E2F4E000584C8 /* libextension Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FB21807A4F9005B8026 /* libextension Mac.a */; }; + 1AAF534F180E2F4E000584C8 /* libcocosdenshion Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FB81807A4F9005B8026 /* libcocosdenshion Mac.a */; }; 1AAF53FE180E39D4000584C8 /* libbox2d iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FC41807A4F9005B8026 /* libbox2d iOS.a */; }; 1AAF53FF180E39D4000584C8 /* libchipmunk iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FC21807A4F9005B8026 /* libchipmunk iOS.a */; }; - 1AAF5400180E39D4000584C8 /* libcocos2dx iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FBE1807A4F9005B8026 /* libcocos2dx iOS.a */; }; - 1AAF5401180E39D4000584C8 /* libcocos2dx-extensions iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FC01807A4F9005B8026 /* libcocos2dx-extensions iOS.a */; }; - 1AAF5402180E39D4000584C8 /* libCocosDenshion iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FC61807A4F9005B8026 /* libCocosDenshion iOS.a */; }; + 1AAF5400180E39D4000584C8 /* libcocos2d iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FBE1807A4F9005B8026 /* libcocos2d iOS.a */; }; + 1AAF5401180E39D4000584C8 /* libextension iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FC01807A4F9005B8026 /* libextension iOS.a */; }; + 1AAF5402180E39D4000584C8 /* libcocosdenshion iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FC61807A4F9005B8026 /* libcocosdenshion iOS.a */; }; 1ABCA28718CD91510087CE3A /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C64822165F391E007D4F18 /* Cocoa.framework */; }; 1ABCA2C218CD92420087CE3A /* libchipmunk Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FB41807A4F9005B8026 /* libchipmunk Mac.a */; }; - 1ABCA2C318CD92420087CE3A /* libcocos2dx Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FB01807A4F9005B8026 /* libcocos2dx Mac.a */; }; - 1ABCA2C418CD92420087CE3A /* libcocos2dx-extensions Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FB21807A4F9005B8026 /* libcocos2dx-extensions Mac.a */; }; - 1ABCA2C518CD92420087CE3A /* libCocosDenshion Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FB81807A4F9005B8026 /* libCocosDenshion Mac.a */; }; - 1ABCA2C618CD92420087CE3A /* libluabindings Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA27E18CD90A50087CE3A /* libluabindings Mac.a */; }; + 1ABCA2C318CD92420087CE3A /* libcocos2d Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FB01807A4F9005B8026 /* libcocos2d Mac.a */; }; + 1ABCA2C418CD92420087CE3A /* libextension Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FB21807A4F9005B8026 /* libextension Mac.a */; }; + 1ABCA2C518CD92420087CE3A /* libcocosdenshion Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FB81807A4F9005B8026 /* libcocosdenshion Mac.a */; }; 1ABCA2CE18CD93580087CE3A /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C64832165F3AFD007D4F18 /* Foundation.framework */; }; - 1ABCA30118CD93940087CE3A /* libchipmunk iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FC21807A4F9005B8026 /* libchipmunk iOS.a */; }; - 1ABCA30218CD93940087CE3A /* libcocos2dx iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FBE1807A4F9005B8026 /* libcocos2dx iOS.a */; }; - 1ABCA30318CD93940087CE3A /* libcocos2dx-extensions iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FC01807A4F9005B8026 /* libcocos2dx-extensions iOS.a */; }; - 1ABCA30418CD93940087CE3A /* libCocosDenshion iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FC61807A4F9005B8026 /* libCocosDenshion iOS.a */; }; - 1ABCA30518CD93940087CE3A /* libluabindings iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA28018CD90A50087CE3A /* libluabindings iOS.a */; }; 1ABCA35518CD9A820087CE3A /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA35418CD9A820087CE3A /* OpenGL.framework */; }; 1ABCA35718CD9A890087CE3A /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA35618CD9A890087CE3A /* QuartzCore.framework */; }; 1ABCA35918CD9A8F0087CE3A /* OpenAL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA35818CD9A8F0087CE3A /* OpenAL.framework */; }; @@ -262,42 +358,6 @@ 1ABCA35F18CD9AAE0087CE3A /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EDCC747E17C455FD007B692C /* IOKit.framework */; }; 1ABCA36118CD9AC00087CE3A /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA36018CD9AC00087CE3A /* libz.dylib */; }; 1ABCA36218CD9AC60087CE3A /* libcurl.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A9F808C177E98A600D9A1CB /* libcurl.dylib */; }; - 1ABCA37818CD9E180087CE3A /* AudioEngine.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36618CD9E180087CE3A /* AudioEngine.lua */; }; - 1ABCA37918CD9E180087CE3A /* AudioEngine.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36618CD9E180087CE3A /* AudioEngine.lua */; }; - 1ABCA37A18CD9E180087CE3A /* CCBReaderLoad.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36718CD9E180087CE3A /* CCBReaderLoad.lua */; }; - 1ABCA37B18CD9E180087CE3A /* CCBReaderLoad.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36718CD9E180087CE3A /* CCBReaderLoad.lua */; }; - 1ABCA37C18CD9E180087CE3A /* Cocos2d.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36818CD9E180087CE3A /* Cocos2d.lua */; }; - 1ABCA37D18CD9E180087CE3A /* Cocos2d.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36818CD9E180087CE3A /* Cocos2d.lua */; }; - 1ABCA37E18CD9E180087CE3A /* Cocos2dConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36918CD9E180087CE3A /* Cocos2dConstants.lua */; }; - 1ABCA37F18CD9E180087CE3A /* Cocos2dConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36918CD9E180087CE3A /* Cocos2dConstants.lua */; }; - 1ABCA38018CD9E180087CE3A /* CocoStudio.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36A18CD9E180087CE3A /* CocoStudio.lua */; }; - 1ABCA38118CD9E180087CE3A /* CocoStudio.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36A18CD9E180087CE3A /* CocoStudio.lua */; }; - 1ABCA38218CD9E180087CE3A /* Deprecated.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36B18CD9E180087CE3A /* Deprecated.lua */; }; - 1ABCA38318CD9E180087CE3A /* Deprecated.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36B18CD9E180087CE3A /* Deprecated.lua */; }; - 1ABCA38418CD9E180087CE3A /* DeprecatedClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36C18CD9E180087CE3A /* DeprecatedClass.lua */; }; - 1ABCA38518CD9E180087CE3A /* DeprecatedClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36C18CD9E180087CE3A /* DeprecatedClass.lua */; }; - 1ABCA38618CD9E180087CE3A /* DeprecatedEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36D18CD9E180087CE3A /* DeprecatedEnum.lua */; }; - 1ABCA38718CD9E180087CE3A /* DeprecatedEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36D18CD9E180087CE3A /* DeprecatedEnum.lua */; }; - 1ABCA38818CD9E180087CE3A /* DeprecatedOpenglEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36E18CD9E180087CE3A /* DeprecatedOpenglEnum.lua */; }; - 1ABCA38918CD9E180087CE3A /* DeprecatedOpenglEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36E18CD9E180087CE3A /* DeprecatedOpenglEnum.lua */; }; - 1ABCA38A18CD9E180087CE3A /* DrawPrimitives.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36F18CD9E180087CE3A /* DrawPrimitives.lua */; }; - 1ABCA38B18CD9E180087CE3A /* DrawPrimitives.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA36F18CD9E180087CE3A /* DrawPrimitives.lua */; }; - 1ABCA38C18CD9E180087CE3A /* extern.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA37018CD9E180087CE3A /* extern.lua */; }; - 1ABCA38D18CD9E180087CE3A /* extern.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA37018CD9E180087CE3A /* extern.lua */; }; - 1ABCA38E18CD9E180087CE3A /* GuiConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA37118CD9E180087CE3A /* GuiConstants.lua */; }; - 1ABCA38F18CD9E180087CE3A /* GuiConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA37118CD9E180087CE3A /* GuiConstants.lua */; }; - 1ABCA39018CD9E180087CE3A /* json.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA37218CD9E180087CE3A /* json.lua */; }; - 1ABCA39118CD9E180087CE3A /* json.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA37218CD9E180087CE3A /* json.lua */; }; - 1ABCA39218CD9E180087CE3A /* luaj.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA37318CD9E180087CE3A /* luaj.lua */; }; - 1ABCA39318CD9E180087CE3A /* luaj.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA37318CD9E180087CE3A /* luaj.lua */; }; - 1ABCA39418CD9E180087CE3A /* luaoc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA37418CD9E180087CE3A /* luaoc.lua */; }; - 1ABCA39518CD9E180087CE3A /* luaoc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA37418CD9E180087CE3A /* luaoc.lua */; }; - 1ABCA39618CD9E180087CE3A /* Opengl.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA37518CD9E180087CE3A /* Opengl.lua */; }; - 1ABCA39718CD9E180087CE3A /* Opengl.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA37518CD9E180087CE3A /* Opengl.lua */; }; - 1ABCA39818CD9E180087CE3A /* OpenglConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA37618CD9E180087CE3A /* OpenglConstants.lua */; }; - 1ABCA39918CD9E180087CE3A /* OpenglConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA37618CD9E180087CE3A /* OpenglConstants.lua */; }; - 1ABCA39A18CD9E180087CE3A /* StudioConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA37718CD9E180087CE3A /* StudioConstants.lua */; }; - 1ABCA39B18CD9E180087CE3A /* StudioConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ABCA37718CD9E180087CE3A /* StudioConstants.lua */; }; 1ABCA39D18CD9ED80087CE3A /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA39C18CD9ED80087CE3A /* AVFoundation.framework */; }; 1ABCA39F18CD9EE50087CE3A /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA39E18CD9EE50087CE3A /* UIKit.framework */; }; 1ABCA3A118CD9EF60087CE3A /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA3A018CD9EF60087CE3A /* OpenGLES.framework */; }; @@ -853,6 +913,8 @@ 29080DE6191B595E0066F8DF /* UIWidgetAddNodeTest_Editor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29080D8B191B595E0066F8DF /* UIWidgetAddNodeTest_Editor.cpp */; }; 290E94B5196FC16900694919 /* CocostudioParserTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 290E94B3196FC16900694919 /* CocostudioParserTest.cpp */; }; 290E94B6196FC16900694919 /* CocostudioParserTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 290E94B3196FC16900694919 /* CocostudioParserTest.cpp */; }; + 295824591987415900F9746D /* UIScale9SpriteTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 295824571987415900F9746D /* UIScale9SpriteTest.cpp */; }; + 2958245A1987415900F9746D /* UIScale9SpriteTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 295824571987415900F9746D /* UIScale9SpriteTest.cpp */; }; 29FBBBFE196A9ECD00E65826 /* CocostudioParserJsonTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29FBBBFC196A9ECD00E65826 /* CocostudioParserJsonTest.cpp */; }; 29FBBBFF196A9ECD00E65826 /* CocostudioParserJsonTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29FBBBFC196A9ECD00E65826 /* CocostudioParserJsonTest.cpp */; }; 38FA2E73194AEBE100FF2BE4 /* ActionTimelineTestScene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38FA2E71194AEBE100FF2BE4 /* ActionTimelineTestScene.cpp */; }; @@ -860,8 +922,7 @@ 38FA2E76194AECF800FF2BE4 /* ActionTimeline in Resources */ = {isa = PBXBuildFile; fileRef = 38FA2E75194AECF800FF2BE4 /* ActionTimeline */; }; 38FA2E77194AECF800FF2BE4 /* ActionTimeline in Resources */ = {isa = PBXBuildFile; fileRef = 38FA2E75194AECF800FF2BE4 /* ActionTimeline */; }; 3E6177211960FAED00DE83F5 /* libchipmunk iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FC21807A4F9005B8026 /* libchipmunk iOS.a */; }; - 3E6177221960FAED00DE83F5 /* libcocos2dx iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FBE1807A4F9005B8026 /* libcocos2dx iOS.a */; }; - 3E6177231960FAED00DE83F5 /* libCocosDenshion iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FC61807A4F9005B8026 /* libCocosDenshion iOS.a */; }; + 3E6177221960FAED00DE83F5 /* libcocos2d iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FBE1807A4F9005B8026 /* libcocos2d iOS.a */; }; 3E6177241960FAED00DE83F5 /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D60AE43317F7FFE100757E4B /* CoreMotion.framework */; }; 3E6177251960FAED00DE83F5 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C6482E165F399D007D4F18 /* libz.dylib */; }; 3E6177261960FAED00DE83F5 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C64832165F3AFD007D4F18 /* Foundation.framework */; }; @@ -900,11 +961,15 @@ 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 */; }; + 3E9E75D0199324CB005B7047 /* Camera3DTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E9E75CE199324CB005B7047 /* Camera3DTest.cpp */; }; + 3E9E75D1199324CB005B7047 /* Camera3DTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E9E75CE199324CB005B7047 /* Camera3DTest.cpp */; }; 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 */; }; 59620E8F1921E5CF002021B6 /* Bug-Child.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 59620E8D1921E5CF002021B6 /* Bug-Child.cpp */; }; 59620E901921E5CF002021B6 /* Bug-Child.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 59620E8D1921E5CF002021B6 /* Bug-Child.cpp */; }; + 5EBEECB01995247000429821 /* DrawNode3D.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5EBEECAE1995247000429821 /* DrawNode3D.cpp */; }; + 5EBEECB11995247000429821 /* DrawNode3D.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5EBEECAE1995247000429821 /* DrawNode3D.cpp */; }; A05FCACA177C124500BE600E /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C64822165F391E007D4F18 /* Cocoa.framework */; }; A07A521E1783A1D20073F6A7 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C6482E165F399D007D4F18 /* libz.dylib */; }; A07A521F1783A1D20073F6A7 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C64832165F3AFD007D4F18 /* Foundation.framework */; }; @@ -915,8 +980,23 @@ 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 */; }; + B244F3171976878E00ED1926 /* libnetwork Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B244F3161976878700ED1926 /* libnetwork Mac.a */; }; B2507B6B192589AF00FA4972 /* Shaders3D in Resources */ = {isa = PBXBuildFile; fileRef = B2507B6A192589AF00FA4972 /* Shaders3D */; }; B2507B6C192589AF00FA4972 /* Shaders3D in Resources */ = {isa = PBXBuildFile; fileRef = B2507B6A192589AF00FA4972 /* Shaders3D */; }; + B27AEE0719768950008BD575 /* libnetwork Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B244F3161976878700ED1926 /* libnetwork Mac.a */; }; + B2C59AC8197782B900B452DF /* libcocosbuilder iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B2CC503D197763A20041958E /* libcocosbuilder iOS.a */; }; + B2C59AC9197782B900B452DF /* libui iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B2CC5039197763A20041958E /* libui iOS.a */; }; + B2C59ACA197782B900B452DF /* libcocostudio iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B2CC503B197763A20041958E /* libcocostudio iOS.a */; }; + B2CC5045197766F70041958E /* libnetwork iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B2CC5041197763A20041958E /* libnetwork iOS.a */; }; + B2CC507B19776D8B0041958E /* libspine iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B2CC503F197763A20041958E /* libspine iOS.a */; }; + B2DB479A197668D500411E16 /* libui Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B2DB4799197668CA00411E16 /* libui Mac.a */; }; + B2DB480919766E4800411E16 /* libcocosbuilder Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B2DB480819766E3C00411E16 /* libcocosbuilder Mac.a */; }; + B2DB48141976711A00411E16 /* libcocosbuilder Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B2DB480819766E3C00411E16 /* libcocosbuilder Mac.a */; }; + B2DB48151976711A00411E16 /* libui Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B2DB4799197668CA00411E16 /* libui Mac.a */; }; + B2DB48C319767D3D00411E16 /* libcocostudio Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B2DB48C219767D3600411E16 /* libcocostudio Mac.a */; }; + B2DB48C619767DAC00411E16 /* libcocostudio Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B2DB48C219767D3600411E16 /* libcocostudio Mac.a */; }; + B2DB493A197681E500411E16 /* libspine Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B2DB49391976819900411E16 /* libspine Mac.a */; }; + B2DB49401976826000411E16 /* libspine Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B2DB49391976819900411E16 /* libspine Mac.a */; }; C04F935A1941B05400E9FEAB /* TileMapTest2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C04F93581941B05400E9FEAB /* TileMapTest2.cpp */; }; C04F935B1941B05400E9FEAB /* TileMapTest2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C04F93581941B05400E9FEAB /* TileMapTest2.cpp */; }; C08689C118D370C90093E810 /* background.caf in Resources */ = {isa = PBXBuildFile; fileRef = C08689C018D370C90093E810 /* background.caf */; }; @@ -928,6 +1008,265 @@ /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ + 15162226199F95B2006099B8 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 15161E42199E7362006099B8; + remoteInfo = "libcocos3d Mac"; + }; + 1516222C199F95B2006099B8 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 1516200B199E7363006099B8; + remoteInfo = "libcocos3d Mac"; + }; + 1516222E199F95B2006099B8 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 15162201199E7810006099B8; + remoteInfo = "libcocos3d iOS"; + }; + 15162233199F97D1006099B8 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 15162030199E7810006099B8; + remoteInfo = "libcocos3d iOS"; + }; + 151622BE19A0F66B006099B8 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1ABCA27618CD90A40087CE3A /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 1516224519A0F32D006099B8; + remoteInfo = "libluacocos3d Mac"; + }; + 151622C219A0F66B006099B8 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1ABCA27618CD90A40087CE3A /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 1516227C19A0F32D006099B8; + remoteInfo = "libluacocos3d Mac"; + }; + 151622C419A0F66B006099B8 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1ABCA27618CD90A40087CE3A /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 151622BB19A0F45E006099B8; + remoteInfo = "libluacocos3d iOS"; + }; + 151622C619A0F679006099B8 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 15161E42199E7362006099B8; + remoteInfo = "libcocos3d Mac"; + }; + 15427B80198B8ACB00DC375D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1ABCA27618CD90A40087CE3A /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 15EFA486198B2B9B000C57D3; + remoteInfo = "libluanetwork iOS"; + }; + 15427B82198B8ACB00DC375D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1ABCA27618CD90A40087CE3A /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 15EFA523198B2D13000C57D3; + remoteInfo = "libluacocosdenshion iOS"; + }; + 15427B84198B8ACB00DC375D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1ABCA27618CD90A40087CE3A /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 15EFA59E198B2DAA000C57D3; + remoteInfo = "libluacocos2d iOS"; + }; + 15427B86198B8BB400DC375D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1ABCA27618CD90A40087CE3A /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 155CA2C71988C494006E0A08; + remoteInfo = "libluaextension iOS"; + }; + 15427B88198B8BB400DC375D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1ABCA27618CD90A40087CE3A /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 15EFA300198B28A8000C57D3; + remoteInfo = "libluaui iOS"; + }; + 15427B8A198B8BB400DC375D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1ABCA27618CD90A40087CE3A /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 15EFA381198B2934000C57D3; + remoteInfo = "libluacocostudio iOS"; + }; + 15427B8C198B8BB400DC375D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1ABCA27618CD90A40087CE3A /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 15EFA27F198B2791000C57D3; + remoteInfo = "libluacocosbuilder iOS"; + }; + 15427B8E198B8BB400DC375D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1ABCA27618CD90A40087CE3A /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 15EFA407198B2AFD000C57D3; + remoteInfo = "libluaspine iOS"; + }; + 15427B90198B8BB400DC375D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1ABCA27618CD90A40087CE3A /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 15EFA486198B2B9B000C57D3; + remoteInfo = "libluanetwork iOS"; + }; + 15427B92198B8BB400DC375D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1ABCA27618CD90A40087CE3A /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 15EFA523198B2D13000C57D3; + remoteInfo = "libluacocosdenshion iOS"; + }; + 15427B94198B8BB400DC375D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1ABCA27618CD90A40087CE3A /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 15EFA59E198B2DAA000C57D3; + remoteInfo = "libluacocos2d iOS"; + }; + 15427B96198B8BBF00DC375D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = B24EEA7F19775EF3004493CC; + remoteInfo = "libnetwork iOS"; + }; + 15427B98198B8BDE00DC375D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = A07A4C241783777C0073F6A7; + remoteInfo = "libcocos2d iOS"; + }; + 15427B9A198B8BDE00DC375D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = A07A4F9F178387730073F6A7; + remoteInfo = "libcocosdenshion iOS"; + }; + 15427B9C198B8C0500DC375D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1ABCA27618CD90A40087CE3A /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 15EFA59E198B2DAA000C57D3; + remoteInfo = "libluacocos2d iOS"; + }; + 15427B9E198B8C1300DC375D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = A07A4F9F178387730073F6A7; + remoteInfo = "libcocosdenshion iOS"; + }; + 15427BA0198B8C2E00DC375D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1ABCA27618CD90A40087CE3A /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 15C1C1061987340C00A46ACC; + remoteInfo = "libluanetwork Mac"; + }; + 15427BA2198B8C2E00DC375D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1ABCA27618CD90A40087CE3A /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 15C1BEEE19865A0600A46ACC; + remoteInfo = "libluacocosdenshion Mac"; + }; + 15427BA4198B8C2E00DC375D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1ABCA27618CD90A40087CE3A /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 15C1C255198748D200A46ACC; + remoteInfo = "libluacocos2d Mac"; + }; + 15427BA6198B8C5000DC375D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1ABCA27618CD90A40087CE3A /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 15C1BD5F1986538000A46ACC; + remoteInfo = "libluaextension Mac"; + }; + 15427BA8198B8C5000DC375D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1ABCA27618CD90A40087CE3A /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 15C1C0801987328E00A46ACC; + remoteInfo = "libluaui Mac"; + }; + 15427BAA198B8C5000DC375D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1ABCA27618CD90A40087CE3A /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 15C1BF7219865C2000A46ACC; + remoteInfo = "libluacocostudio Mac"; + }; + 15427BAC198B8C5000DC375D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1ABCA27618CD90A40087CE3A /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 15C1BE66198654BE00A46ACC; + remoteInfo = "libluacocosbuilder Mac"; + }; + 15427BAE198B8C5000DC375D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1ABCA27618CD90A40087CE3A /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 15C1BFF819865E5F00A46ACC; + remoteInfo = "libluaspine Mac"; + }; + 15427BB0198B8C5000DC375D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1ABCA27618CD90A40087CE3A /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 15C1C1061987340C00A46ACC; + remoteInfo = "libluanetwork Mac"; + }; + 15427BB2198B8C5000DC375D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1ABCA27618CD90A40087CE3A /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 15C1BEEE19865A0600A46ACC; + remoteInfo = "libluacocosdenshion Mac"; + }; + 15427BB4198B8C5000DC375D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1ABCA27618CD90A40087CE3A /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 15C1C255198748D200A46ACC; + remoteInfo = "libluacocos2d Mac"; + }; + 158C128B19A0FC4700781A76 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 15162030199E7810006099B8; + remoteInfo = "libcocos3d iOS"; + }; + 158C129219A0FC5300781A76 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1ABCA27618CD90A40087CE3A /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 1516228319A0F45E006099B8; + remoteInfo = "libluacocos3d iOS"; + }; 15CBA017196EE56C005877BB /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; @@ -935,33 +1274,117 @@ remoteGlobalIDString = A07A4C241783777C0073F6A7; remoteInfo = "cocos2dx iOS"; }; - 15CBA019196EE56C005877BB /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = A07A4E111783867C0073F6A7; - remoteInfo = "cocos2dx-extensions iOS"; - }; - 15CBA01B196EE56C005877BB /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = A07A4EFD178387670073F6A7; - remoteInfo = "chipmunk iOS"; - }; - 15CBA01D196EE56C005877BB /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = A07A4F9F178387730073F6A7; - remoteInfo = "CocosDenshion iOS"; - }; - 15CBA01F196EE56C005877BB /* PBXContainerItemProxy */ = { + 15EFA249198A4A24000C57D3 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 1ABCA27618CD90A40087CE3A /* cocos2d_lua_bindings.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 1A119716178526AA00D62A44; - remoteInfo = "luabindings iOS"; + proxyType = 2; + remoteGlobalIDString = 15C1BDDA1986538000A46ACC; + remoteInfo = "libluaextension Mac"; + }; + 15EFA24B198A4A24000C57D3 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1ABCA27618CD90A40087CE3A /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 15C1C0FB1987328E00A46ACC; + remoteInfo = "libluaui Mac"; + }; + 15EFA24D198A4A24000C57D3 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1ABCA27618CD90A40087CE3A /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 15C1BFED19865C2000A46ACC; + remoteInfo = "libluacocostudio Mac"; + }; + 15EFA24F198A4A24000C57D3 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1ABCA27618CD90A40087CE3A /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 15C1BEE1198654BE00A46ACC; + remoteInfo = "libluacocosbuilder Mac"; + }; + 15EFA251198A4A24000C57D3 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1ABCA27618CD90A40087CE3A /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 15C1C07319865E5F00A46ACC; + remoteInfo = "libluaspine Mac"; + }; + 15EFA253198A4A24000C57D3 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1ABCA27618CD90A40087CE3A /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 15C1C1811987340C00A46ACC; + remoteInfo = "libluanetwork Mac"; + }; + 15EFA255198A4A24000C57D3 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1ABCA27618CD90A40087CE3A /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 15C1BF6919865A0600A46ACC; + remoteInfo = "libluacocosdenshion Mac"; + }; + 15EFA257198A4A24000C57D3 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1ABCA27618CD90A40087CE3A /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 15C1C2CC198748D200A46ACC; + remoteInfo = "libluacocos2d Mac"; + }; + 15EFA259198A4A24000C57D3 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1ABCA27618CD90A40087CE3A /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 155CA3431988C494006E0A08; + remoteInfo = "libluaextension iOS"; + }; + 15EFA658198B33EE000C57D3 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1ABCA27618CD90A40087CE3A /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 15EFA37A198B28A8000C57D3; + remoteInfo = "libluaui iOS"; + }; + 15EFA65A198B33EE000C57D3 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1ABCA27618CD90A40087CE3A /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 15EFA3FB198B2934000C57D3; + remoteInfo = "libluacocostudio iOS"; + }; + 15EFA65C198B33EE000C57D3 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1ABCA27618CD90A40087CE3A /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 15EFA2F9198B2791000C57D3; + remoteInfo = "libluacocosbuilder iOS"; + }; + 15EFA65E198B33EE000C57D3 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1ABCA27618CD90A40087CE3A /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 15EFA47F198B2AFD000C57D3; + remoteInfo = "libluaspine iOS"; + }; + 15EFA660198B33EE000C57D3 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1ABCA27618CD90A40087CE3A /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 15EFA4FE198B2B9B000C57D3; + remoteInfo = "libluanetwork iOS"; + }; + 15EFA662198B33EE000C57D3 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1ABCA27618CD90A40087CE3A /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 15EFA59B198B2D13000C57D3; + remoteInfo = "libluacocosdenshion iOS"; + }; + 15EFA664198B33EE000C57D3 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1ABCA27618CD90A40087CE3A /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 15EFA616198B2DAA000C57D3; + remoteInfo = "libluacocos2d iOS"; }; 1A0EE1C818CDF6DA004CD58F /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; @@ -984,13 +1407,6 @@ remoteGlobalIDString = A03F2E9817814268006731B9; remoteInfo = "CocosDenshion Mac"; }; - 1A0EE2BA18CDF733004CD58F /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 1ABCA27618CD90A40087CE3A /* cocos2d_lua_bindings.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 1A6FB50417854BC200CDF010; - remoteInfo = "luabindings Mac"; - }; 1A0EE2BC18CDF733004CD58F /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; @@ -998,20 +1414,6 @@ remoteGlobalIDString = 1551A33E158F2AB200E66CFE; remoteInfo = "cocos2dx Mac"; }; - 1A0EE2BE18CDF733004CD58F /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = A03F2FC117814595006731B9; - remoteInfo = "cocos2dx-extensions Mac"; - }; - 1A0EE2C018CDF733004CD58F /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = A03F2B781780BD04006731B9; - remoteInfo = "chipmunk Mac"; - }; 1A0EE2C218CDF733004CD58F /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; @@ -1040,41 +1442,6 @@ remoteGlobalIDString = A07A4F9F178387730073F6A7; remoteInfo = "CocosDenshion iOS"; }; - 1A0EE41B18CDF799004CD58F /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = A07A4C241783777C0073F6A7; - remoteInfo = "cocos2dx iOS"; - }; - 1A0EE41D18CDF799004CD58F /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = A07A4E111783867C0073F6A7; - remoteInfo = "cocos2dx-extensions iOS"; - }; - 1A0EE41F18CDF799004CD58F /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = A07A4EFD178387670073F6A7; - remoteInfo = "chipmunk iOS"; - }; - 1A0EE42118CDF799004CD58F /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = A07A4F9F178387730073F6A7; - remoteInfo = "CocosDenshion iOS"; - }; - 1A0EE42318CDF799004CD58F /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 1ABCA27618CD90A40087CE3A /* cocos2d_lua_bindings.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 1A119716178526AA00D62A44; - remoteInfo = "luabindings iOS"; - }; 1AAF5341180E2F41000584C8 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; @@ -1145,20 +1512,6 @@ remoteGlobalIDString = A07A4F9F178387730073F6A7; remoteInfo = "CocosDenshion iOS"; }; - 1ABCA27D18CD90A50087CE3A /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 1ABCA27618CD90A40087CE3A /* cocos2d_lua_bindings.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 1AACE74618BC45A000215002; - remoteInfo = "luabindings Mac"; - }; - 1ABCA27F18CD90A50087CE3A /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 1ABCA27618CD90A40087CE3A /* cocos2d_lua_bindings.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 1AACE74718BC45A000215002; - remoteInfo = "luabindings iOS"; - }; 1ABCA2B818CD92230087CE3A /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; @@ -1187,13 +1540,6 @@ remoteGlobalIDString = A03F2E9817814268006731B9; remoteInfo = "CocosDenshion Mac"; }; - 1ABCA2C018CD92280087CE3A /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 1ABCA27618CD90A40087CE3A /* cocos2d_lua_bindings.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 1A6FB50417854BC200CDF010; - remoteInfo = "luabindings Mac"; - }; 1ABCA2F718CD93850087CE3A /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; @@ -1222,13 +1568,6 @@ remoteGlobalIDString = A07A4F9F178387730073F6A7; remoteInfo = "CocosDenshion iOS"; }; - 1ABCA2FF18CD93850087CE3A /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 1ABCA27618CD90A40087CE3A /* cocos2d_lua_bindings.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 1A119716178526AA00D62A44; - remoteInfo = "luabindings iOS"; - }; 1ADA8BA318CF277400AE24B9 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */; @@ -1285,20 +1624,6 @@ remoteGlobalIDString = A07A4EFD178387670073F6A7; remoteInfo = "chipmunk iOS"; }; - 3E6177051960FAED00DE83F5 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = A07A4F9F178387730073F6A7; - remoteInfo = "CocosDenshion iOS"; - }; - 3E6177441960FE1E00DE83F5 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = A07A4E111783867C0073F6A7; - remoteInfo = "cocos2dx-extensions iOS"; - }; 46A15FAF1807A4F9005B8026 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; @@ -1383,6 +1708,223 @@ remoteGlobalIDString = A07A517F1783A1D20073F6A7; remoteInfo = "Test cpp iOS"; }; + B244F3101976878700ED1926 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = B2DB498D197686CB00411E16; + remoteInfo = "cocosNetwork Mac"; + }; + B244F3151976878700ED1926 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = B2DB49C4197686CB00411E16; + remoteInfo = "cocosNetwork Mac"; + }; + B27AEE031976894C008BD575 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = B2DB498D197686CB00411E16; + remoteInfo = "cocosNetwork Mac"; + }; + B27AEE0819768965008BD575 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = B2DB498D197686CB00411E16; + remoteInfo = "cocosNetwork Mac"; + }; + B2C59ABD197782AC00B452DF /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = B24EEA2C19775E92004493CC; + remoteInfo = "cocosGUI iOS"; + }; + B2C59ABF197782AC00B452DF /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = B24EEA6719775EBB004493CC; + remoteInfo = "cocosStudio iOS"; + }; + B2C59AC1197782AC00B452DF /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = B24EEA6F19775ECE004493CC; + remoteInfo = "cocosBuilder iOS"; + }; + B2C59ADB19779D5400B452DF /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = B24EEA2C19775E92004493CC; + remoteInfo = "cocosGUI iOS"; + }; + B2C59ADD19779D5400B452DF /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = B24EEA6719775EBB004493CC; + remoteInfo = "cocosStudio iOS"; + }; + B2C59ADF19779D5400B452DF /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = B24EEA6F19775ECE004493CC; + remoteInfo = "cocosBuilder iOS"; + }; + B2C59AE119779D5400B452DF /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = B24EEA7719775EE1004493CC; + remoteInfo = "cocosSpine iOS"; + }; + B2C59AE319779D5400B452DF /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = B24EEA7F19775EF3004493CC; + remoteInfo = "cocosNetwork iOS"; + }; + B2CC5038197763A20041958E /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = B24EEA6619775E92004493CC; + remoteInfo = "cocosGUI iOS"; + }; + B2CC503A197763A20041958E /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = B24EEA6E19775EBB004493CC; + remoteInfo = "cocosStudio iOS"; + }; + B2CC503C197763A20041958E /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = B24EEA7619775ECE004493CC; + remoteInfo = "cocosBuilder iOS"; + }; + B2CC503E197763A20041958E /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = B24EEA7E19775EE1004493CC; + remoteInfo = "cocosSpine iOS"; + }; + B2CC5040197763A20041958E /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = B24EEA8619775EF3004493CC; + remoteInfo = "cocosNetwork iOS"; + }; + B2CC5043197766EB0041958E /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = B24EEA7F19775EF3004493CC; + remoteInfo = "cocosNetwork iOS"; + }; + B2CC507919776D830041958E /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = B24EEA7719775EE1004493CC; + remoteInfo = "cocosSpine iOS"; + }; + B2DB4793197668CA00411E16 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = B245F10019766132001920FD; + remoteInfo = "cocosGUI Mac"; + }; + B2DB4798197668CA00411E16 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = B245F13A19766132001920FD; + remoteInfo = "cocosGUI Mac"; + }; + B2DB480419766E3C00411E16 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = B2DB479B197669A100411E16; + remoteInfo = "cocosBuilder Mac"; + }; + B2DB480719766E3C00411E16 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = B2DB47D2197669A100411E16; + remoteInfo = "cocosBuilder Mac"; + }; + B2DB48101976711200411E16 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = B245F10019766132001920FD; + remoteInfo = "cocosGUI Mac"; + }; + B2DB48121976711200411E16 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = B2DB479B197669A100411E16; + remoteInfo = "cocosBuilder Mac"; + }; + B2DB48BE19767D3600411E16 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = B2DB48161976716E00411E16; + remoteInfo = "cocosStudio Mac"; + }; + B2DB48C119767D3600411E16 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = B2DB484D1976716E00411E16; + remoteInfo = "cocosStudio Mac"; + }; + B2DB48C419767DA500411E16 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = B2DB48161976716E00411E16; + remoteInfo = "cocosStudio Mac"; + }; + B2DB49351976819900411E16 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = B2DB48CA19767F1F00411E16; + remoteInfo = "cocosSpine Mac"; + }; + B2DB49381976819900411E16 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = B2DB490119767F1F00411E16; + remoteInfo = "cocosSpine Mac"; + }; + B2DB493E1976825800411E16 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = B2DB48CA19767F1F00411E16; + remoteInfo = "cocosSpine Mac"; + }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ @@ -1396,8 +1938,10 @@ 1503FAB018DA8B6C00F6518C /* socket.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = socket.lua; path = ../external/lua/luasocket/socket.lua; sourceTree = ""; }; 1503FAB118DA8B6C00F6518C /* tp.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = tp.lua; path = ../external/lua/luasocket/tp.lua; sourceTree = ""; }; 1503FAB218DA8B6C00F6518C /* url.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = url.lua; path = ../external/lua/luasocket/url.lua; sourceTree = ""; }; - 156229321973D400009C9067 /* bitExtend.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = bitExtend.lua; path = "../cocos/scripting/lua-bindings/script/bitExtend.lua"; sourceTree = ""; }; - 15AECE1E195D0EC500907DB0 /* experimentalConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = experimentalConstants.lua; path = "../cocos/scripting/lua-bindings/script/experimentalConstants.lua"; sourceTree = ""; }; + 15427B76198B750300DC375D /* lua_module_register.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lua_module_register.h; sourceTree = ""; }; + 15427B77198B843300DC375D /* lua_module_register.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lua_module_register.h; sourceTree = ""; }; + 15427B7B198B880100DC375D /* lua_cocos2dx_controller_manual.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = lua_cocos2dx_controller_manual.cpp; path = "../../../../cocos/scripting/lua-bindings/manual/controller/lua_cocos2dx_controller_manual.cpp"; sourceTree = ""; }; + 15427B7C198B880100DC375D /* lua_cocos2dx_controller_manual.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = lua_cocos2dx_controller_manual.hpp; path = "../../../../cocos/scripting/lua-bindings/manual/controller/lua_cocos2dx_controller_manual.hpp"; sourceTree = ""; }; 15C64822165F391E007D4F18 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Cocoa.framework; sourceTree = DEVELOPER_DIR; }; 15C64824165F3934007D4F18 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/OpenGL.framework; sourceTree = DEVELOPER_DIR; }; 15C64826165F394E007D4F18 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/QuartzCore.framework; sourceTree = DEVELOPER_DIR; }; @@ -2521,8 +3065,41 @@ 15CBA9DC196EEAA6005877BB /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.1.sdk/usr/lib/libz.dylib; sourceTree = DEVELOPER_DIR; }; 15CBA9EB196F7BD8005877BB /* lua_cocos2dx_controller_auto.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = lua_cocos2dx_controller_auto.cpp; path = "../../../../cocos/scripting/lua-bindings/auto/lua_cocos2dx_controller_auto.cpp"; sourceTree = ""; }; 15CBA9EC196F7BD8005877BB /* lua_cocos2dx_controller_auto.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = lua_cocos2dx_controller_auto.hpp; path = "../../../../cocos/scripting/lua-bindings/auto/lua_cocos2dx_controller_auto.hpp"; sourceTree = ""; }; - 15CBA9EE196F7BEC005877BB /* lua_cocos2dx_controller_manual.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = lua_cocos2dx_controller_manual.cpp; path = "../../../../cocos/scripting/lua-bindings/manual/lua_cocos2dx_controller_manual.cpp"; sourceTree = ""; }; - 15CBA9EF196F7BEC005877BB /* lua_cocos2dx_controller_manual.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = lua_cocos2dx_controller_manual.hpp; path = "../../../../cocos/scripting/lua-bindings/manual/lua_cocos2dx_controller_manual.hpp"; sourceTree = ""; }; + 15D1FCDE1998637C00302043 /* bitExtend.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = bitExtend.lua; path = "../cocos/scripting/lua-bindings/script/cocos2d/bitExtend.lua"; sourceTree = ""; }; + 15D1FCDF1998637C00302043 /* Cocos2d.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Cocos2d.lua; path = "../cocos/scripting/lua-bindings/script/cocos2d/Cocos2d.lua"; sourceTree = ""; }; + 15D1FCE01998637C00302043 /* Cocos2dConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Cocos2dConstants.lua; path = "../cocos/scripting/lua-bindings/script/cocos2d/Cocos2dConstants.lua"; sourceTree = ""; }; + 15D1FCE11998637C00302043 /* DeprecatedCocos2dClass.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedCocos2dClass.lua; path = "../cocos/scripting/lua-bindings/script/cocos2d/DeprecatedCocos2dClass.lua"; sourceTree = ""; }; + 15D1FCE21998637C00302043 /* DeprecatedCocos2dEnum.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedCocos2dEnum.lua; path = "../cocos/scripting/lua-bindings/script/cocos2d/DeprecatedCocos2dEnum.lua"; sourceTree = ""; }; + 15D1FCE31998637C00302043 /* DeprecatedCocos2dFunc.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedCocos2dFunc.lua; path = "../cocos/scripting/lua-bindings/script/cocos2d/DeprecatedCocos2dFunc.lua"; sourceTree = ""; }; + 15D1FCE41998637C00302043 /* DeprecatedOpenglEnum.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedOpenglEnum.lua; path = "../cocos/scripting/lua-bindings/script/cocos2d/DeprecatedOpenglEnum.lua"; sourceTree = ""; }; + 15D1FCE51998637C00302043 /* DrawPrimitives.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DrawPrimitives.lua; path = "../cocos/scripting/lua-bindings/script/cocos2d/DrawPrimitives.lua"; sourceTree = ""; }; + 15D1FCE61998637C00302043 /* extern.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = extern.lua; path = "../cocos/scripting/lua-bindings/script/cocos2d/extern.lua"; sourceTree = ""; }; + 15D1FCE71998637C00302043 /* json.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = json.lua; path = "../cocos/scripting/lua-bindings/script/cocos2d/json.lua"; sourceTree = ""; }; + 15D1FCE81998637C00302043 /* luaj.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = luaj.lua; path = "../cocos/scripting/lua-bindings/script/cocos2d/luaj.lua"; sourceTree = ""; }; + 15D1FCE91998637C00302043 /* luaoc.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = luaoc.lua; path = "../cocos/scripting/lua-bindings/script/cocos2d/luaoc.lua"; sourceTree = ""; }; + 15D1FCEA1998637C00302043 /* Opengl.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Opengl.lua; path = "../cocos/scripting/lua-bindings/script/cocos2d/Opengl.lua"; sourceTree = ""; }; + 15D1FCEB1998637C00302043 /* OpenglConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = OpenglConstants.lua; path = "../cocos/scripting/lua-bindings/script/cocos2d/OpenglConstants.lua"; sourceTree = ""; }; + 15D1FD32199863BA00302043 /* CCBReaderLoad.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CCBReaderLoad.lua; path = "../cocos/scripting/lua-bindings/script/cocosbuilder/CCBReaderLoad.lua"; sourceTree = ""; }; + 15D1FD33199863BA00302043 /* DeprecatedCocosBuilderClass.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedCocosBuilderClass.lua; path = "../cocos/scripting/lua-bindings/script/cocosbuilder/DeprecatedCocosBuilderClass.lua"; sourceTree = ""; }; + 15D1FD38199863CA00302043 /* AudioEngine.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = AudioEngine.lua; path = "../cocos/scripting/lua-bindings/script/cocosdenshion/AudioEngine.lua"; sourceTree = ""; }; + 15D1FD39199863CA00302043 /* DeprecatedCocosDenshionClass.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedCocosDenshionClass.lua; path = "../cocos/scripting/lua-bindings/script/cocosdenshion/DeprecatedCocosDenshionClass.lua"; sourceTree = ""; }; + 15D1FD3A199863CA00302043 /* DeprecatedCocosDenshionFunc.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedCocosDenshionFunc.lua; path = "../cocos/scripting/lua-bindings/script/cocosdenshion/DeprecatedCocosDenshionFunc.lua"; sourceTree = ""; }; + 15D1FD41199863E800302043 /* CocoStudio.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CocoStudio.lua; path = "../cocos/scripting/lua-bindings/script/cocostudio/CocoStudio.lua"; sourceTree = ""; }; + 15D1FD42199863E800302043 /* DeprecatedCocoStudioClass.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedCocoStudioClass.lua; path = "../cocos/scripting/lua-bindings/script/cocostudio/DeprecatedCocoStudioClass.lua"; sourceTree = ""; }; + 15D1FD43199863E800302043 /* DeprecatedCocoStudioFunc.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedCocoStudioFunc.lua; path = "../cocos/scripting/lua-bindings/script/cocostudio/DeprecatedCocoStudioFunc.lua"; sourceTree = ""; }; + 15D1FD44199863E800302043 /* StudioConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = StudioConstants.lua; path = "../cocos/scripting/lua-bindings/script/cocostudio/StudioConstants.lua"; sourceTree = ""; }; + 15D1FD4D199863F900302043 /* DeprecatedExtensionClass.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedExtensionClass.lua; path = "../cocos/scripting/lua-bindings/script/extension/DeprecatedExtensionClass.lua"; sourceTree = ""; }; + 15D1FD4E199863F900302043 /* DeprecatedExtensionEnum.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedExtensionEnum.lua; path = "../cocos/scripting/lua-bindings/script/extension/DeprecatedExtensionEnum.lua"; sourceTree = ""; }; + 15D1FD4F199863F900302043 /* DeprecatedExtensionFunc.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedExtensionFunc.lua; path = "../cocos/scripting/lua-bindings/script/extension/DeprecatedExtensionFunc.lua"; sourceTree = ""; }; + 15D1FD50199863F900302043 /* ExtensionConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = ExtensionConstants.lua; path = "../cocos/scripting/lua-bindings/script/extension/ExtensionConstants.lua"; sourceTree = ""; }; + 15D1FD591998641200302043 /* DeprecatedNetworkClass.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedNetworkClass.lua; path = "../cocos/scripting/lua-bindings/script/network/DeprecatedNetworkClass.lua"; sourceTree = ""; }; + 15D1FD5A1998641200302043 /* DeprecatedNetworkEnum.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedNetworkEnum.lua; path = "../cocos/scripting/lua-bindings/script/network/DeprecatedNetworkEnum.lua"; sourceTree = ""; }; + 15D1FD5B1998641200302043 /* DeprecatedNetworkFunc.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedNetworkFunc.lua; path = "../cocos/scripting/lua-bindings/script/network/DeprecatedNetworkFunc.lua"; sourceTree = ""; }; + 15D1FD5C1998641200302043 /* NetworkConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = NetworkConstants.lua; path = "../cocos/scripting/lua-bindings/script/network/NetworkConstants.lua"; sourceTree = ""; }; + 15D1FD6D1998642800302043 /* DeprecatedUIEnum.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedUIEnum.lua; path = "../cocos/scripting/lua-bindings/script/ui/DeprecatedUIEnum.lua"; sourceTree = ""; }; + 15D1FD6E1998642800302043 /* DeprecatedUIFunc.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedUIFunc.lua; path = "../cocos/scripting/lua-bindings/script/ui/DeprecatedUIFunc.lua"; sourceTree = ""; }; + 15D1FD6F1998642800302043 /* experimentalUIConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = experimentalUIConstants.lua; path = "../cocos/scripting/lua-bindings/script/ui/experimentalUIConstants.lua"; sourceTree = ""; }; + 15D1FD701998642800302043 /* GuiConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = GuiConstants.lua; path = "../cocos/scripting/lua-bindings/script/ui/GuiConstants.lua"; sourceTree = ""; }; 1A0EE2B218CDF6DA004CD58F /* cpp-empty-test Mac.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "cpp-empty-test Mac.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 1A0EE31418CDF733004CD58F /* lua-empty-test Mac.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "lua-empty-test Mac.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 1A0EE41318CDF775004CD58F /* cpp-empty-test iOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "cpp-empty-test iOS.app"; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -2542,24 +3119,6 @@ 1ABCA35A18CD9A950087CE3A /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = System/Library/Frameworks/ApplicationServices.framework; sourceTree = SDKROOT; }; 1ABCA35C18CD9A9E0087CE3A /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; }; 1ABCA36018CD9AC00087CE3A /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; }; - 1ABCA36618CD9E180087CE3A /* AudioEngine.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = AudioEngine.lua; path = "../cocos/scripting/lua-bindings/script/AudioEngine.lua"; sourceTree = ""; }; - 1ABCA36718CD9E180087CE3A /* CCBReaderLoad.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CCBReaderLoad.lua; path = "../cocos/scripting/lua-bindings/script/CCBReaderLoad.lua"; sourceTree = ""; }; - 1ABCA36818CD9E180087CE3A /* Cocos2d.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Cocos2d.lua; path = "../cocos/scripting/lua-bindings/script/Cocos2d.lua"; sourceTree = ""; }; - 1ABCA36918CD9E180087CE3A /* Cocos2dConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Cocos2dConstants.lua; path = "../cocos/scripting/lua-bindings/script/Cocos2dConstants.lua"; sourceTree = ""; }; - 1ABCA36A18CD9E180087CE3A /* CocoStudio.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CocoStudio.lua; path = "../cocos/scripting/lua-bindings/script/CocoStudio.lua"; sourceTree = ""; }; - 1ABCA36B18CD9E180087CE3A /* Deprecated.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Deprecated.lua; path = "../cocos/scripting/lua-bindings/script/Deprecated.lua"; sourceTree = ""; }; - 1ABCA36C18CD9E180087CE3A /* DeprecatedClass.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedClass.lua; path = "../cocos/scripting/lua-bindings/script/DeprecatedClass.lua"; sourceTree = ""; }; - 1ABCA36D18CD9E180087CE3A /* DeprecatedEnum.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedEnum.lua; path = "../cocos/scripting/lua-bindings/script/DeprecatedEnum.lua"; sourceTree = ""; }; - 1ABCA36E18CD9E180087CE3A /* DeprecatedOpenglEnum.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedOpenglEnum.lua; path = "../cocos/scripting/lua-bindings/script/DeprecatedOpenglEnum.lua"; sourceTree = ""; }; - 1ABCA36F18CD9E180087CE3A /* DrawPrimitives.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DrawPrimitives.lua; path = "../cocos/scripting/lua-bindings/script/DrawPrimitives.lua"; sourceTree = ""; }; - 1ABCA37018CD9E180087CE3A /* extern.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = extern.lua; path = "../cocos/scripting/lua-bindings/script/extern.lua"; sourceTree = ""; }; - 1ABCA37118CD9E180087CE3A /* GuiConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = GuiConstants.lua; path = "../cocos/scripting/lua-bindings/script/GuiConstants.lua"; sourceTree = ""; }; - 1ABCA37218CD9E180087CE3A /* json.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = json.lua; path = "../cocos/scripting/lua-bindings/script/json.lua"; sourceTree = ""; }; - 1ABCA37318CD9E180087CE3A /* luaj.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = luaj.lua; path = "../cocos/scripting/lua-bindings/script/luaj.lua"; sourceTree = ""; }; - 1ABCA37418CD9E180087CE3A /* luaoc.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = luaoc.lua; path = "../cocos/scripting/lua-bindings/script/luaoc.lua"; sourceTree = ""; }; - 1ABCA37518CD9E180087CE3A /* Opengl.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Opengl.lua; path = "../cocos/scripting/lua-bindings/script/Opengl.lua"; sourceTree = ""; }; - 1ABCA37618CD9E180087CE3A /* OpenglConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = OpenglConstants.lua; path = "../cocos/scripting/lua-bindings/script/OpenglConstants.lua"; sourceTree = ""; }; - 1ABCA37718CD9E180087CE3A /* StudioConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = StudioConstants.lua; path = "../cocos/scripting/lua-bindings/script/StudioConstants.lua"; sourceTree = ""; }; 1ABCA39C18CD9ED80087CE3A /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.0.sdk/System/Library/Frameworks/AVFoundation.framework; sourceTree = DEVELOPER_DIR; }; 1ABCA39E18CD9EE50087CE3A /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.0.sdk/System/Library/Frameworks/UIKit.framework; sourceTree = DEVELOPER_DIR; }; 1ABCA3A018CD9EF60087CE3A /* OpenGLES.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.0.sdk/System/Library/Frameworks/OpenGLES.framework; sourceTree = DEVELOPER_DIR; }; @@ -3118,6 +3677,8 @@ 29080D8C191B595E0066F8DF /* UIWidgetAddNodeTest_Editor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIWidgetAddNodeTest_Editor.h; sourceTree = ""; }; 290E94B3196FC16900694919 /* CocostudioParserTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CocostudioParserTest.cpp; path = ../CocostudioParserTest.cpp; sourceTree = ""; }; 290E94B4196FC16900694919 /* CocostudioParserTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CocostudioParserTest.h; path = ../CocostudioParserTest.h; sourceTree = ""; }; + 295824571987415900F9746D /* UIScale9SpriteTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UIScale9SpriteTest.cpp; sourceTree = ""; }; + 295824581987415900F9746D /* UIScale9SpriteTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIScale9SpriteTest.h; sourceTree = ""; }; 29FBBBFC196A9ECD00E65826 /* CocostudioParserJsonTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CocostudioParserJsonTest.cpp; sourceTree = ""; }; 29FBBBFD196A9ECD00E65826 /* CocostudioParserJsonTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CocostudioParserJsonTest.h; sourceTree = ""; }; 38FA2E71194AEBE100FF2BE4 /* ActionTimelineTestScene.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ActionTimelineTestScene.cpp; sourceTree = ""; }; @@ -3159,6 +3720,8 @@ 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 = ""; }; + 3E9E75CE199324CB005B7047 /* Camera3DTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Camera3DTest.cpp; path = Camera3DTest/Camera3DTest.cpp; sourceTree = ""; }; + 3E9E75CF199324CB005B7047 /* Camera3DTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Camera3DTest.h; path = Camera3DTest/Camera3DTest.h; 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 = ""; }; @@ -3166,6 +3729,8 @@ 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; path = cocos2d_libs.xcodeproj; sourceTree = ""; }; 59620E8D1921E5CF002021B6 /* Bug-Child.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "Bug-Child.cpp"; sourceTree = ""; }; 59620E8E1921E5CF002021B6 /* Bug-Child.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Bug-Child.h"; sourceTree = ""; }; + 5EBEECAE1995247000429821 /* DrawNode3D.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DrawNode3D.cpp; path = Sprite3DTest/DrawNode3D.cpp; sourceTree = ""; }; + 5EBEECAF1995247000429821 /* DrawNode3D.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DrawNode3D.h; path = Sprite3DTest/DrawNode3D.h; sourceTree = ""; }; 70A7F72D191D3E4900F0F206 /* shaderTest.psh.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = shaderTest.psh.h; sourceTree = ""; }; 70A7F730191D421B00F0F206 /* ShaderTest.vsh.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ShaderTest.vsh.h; sourceTree = ""; }; A035A71117822E9E00987F6C /* libsqlite3.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libsqlite3.dylib; path = usr/lib/libsqlite3.dylib; sourceTree = SDKROOT; }; @@ -3187,6 +3752,9 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 15427B7E198B896D00DC375D /* libcocosdenshion iOS.a in Frameworks */, + 15427B7A198B87AA00DC375D /* libcocos2d iOS.a in Frameworks */, + 15427B79198B879900DC375D /* libluacocos2d iOS.a in Frameworks */, 15CBA9E0196EEBD4005877BB /* MediaPlayer.framework in Frameworks */, 15CBA9DE196EEAF8005877BB /* GameController.framework in Frameworks */, 15CBA9DD196EEAA6005877BB /* libz.dylib in Frameworks */, @@ -3199,11 +3767,6 @@ 15CBA9D0196EEA05005877BB /* UIKit.framework in Frameworks */, 15CBA9CF196EE9FB005877BB /* AVFoundation.framework in Frameworks */, 15CBA9D1196EEA1D005877BB /* Foundation.framework in Frameworks */, - 15CBA9BB196EE910005877BB /* libchipmunk iOS.a in Frameworks */, - 15CBA9DF196EEBB3005877BB /* libcocos2dx iOS.a in Frameworks */, - 15CBA9BD196EE910005877BB /* libcocos2dx-extensions iOS.a in Frameworks */, - 15CBA9BE196EE910005877BB /* libCocosDenshion iOS.a in Frameworks */, - 15CBA9BF196EE910005877BB /* libluabindings iOS.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3212,8 +3775,8 @@ buildActionMask = 2147483647; files = ( 1A0EE2A118CDF6DA004CD58F /* libchipmunk Mac.a in Frameworks */, - 1A0EE2A218CDF6DA004CD58F /* libcocos2dx Mac.a in Frameworks */, - 1A0EE2A418CDF6DA004CD58F /* libCocosDenshion Mac.a in Frameworks */, + 1A0EE2A218CDF6DA004CD58F /* libcocos2d Mac.a in Frameworks */, + 1A0EE2A418CDF6DA004CD58F /* libcocosdenshion Mac.a in Frameworks */, 1A0EE2A518CDF6DA004CD58F /* IOKit.framework in Frameworks */, 1A0EE2A618CDF6DA004CD58F /* libcurl.dylib in Frameworks */, 1A0EE2A718CDF6DA004CD58F /* libz.dylib in Frameworks */, @@ -3231,6 +3794,12 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 15EFA272198B25C3000C57D3 /* libnetwork Mac.a in Frameworks */, + 15EFA270198B25B9000C57D3 /* libcocos2d Mac.a in Frameworks */, + 15EFA271198B25B9000C57D3 /* libcocosdenshion Mac.a in Frameworks */, + 15EFA25D198A4A66000C57D3 /* libluanetwork Mac.a in Frameworks */, + 15EFA25C198A4A58000C57D3 /* libluacocosdenshion Mac.a in Frameworks */, + 15EFA25B198A4A47000C57D3 /* libluacocos2d Mac.a in Frameworks */, 1A0EE2C918CDF733004CD58F /* libcurl.dylib in Frameworks */, 1A0EE2CA18CDF733004CD58F /* libz.dylib in Frameworks */, 1A0EE2CB18CDF733004CD58F /* IOKit.framework in Frameworks */, @@ -3241,10 +3810,6 @@ 1A0EE2D018CDF733004CD58F /* QuartzCore.framework in Frameworks */, 1A0EE2D118CDF733004CD58F /* OpenGL.framework in Frameworks */, 1A0EE2D218CDF733004CD58F /* libchipmunk Mac.a in Frameworks */, - 1A0EE2D318CDF733004CD58F /* libcocos2dx Mac.a in Frameworks */, - 1A0EE2D418CDF733004CD58F /* libcocos2dx-extensions Mac.a in Frameworks */, - 1A0EE2D518CDF733004CD58F /* libCocosDenshion Mac.a in Frameworks */, - 1A0EE2D618CDF733004CD58F /* libluabindings Mac.a in Frameworks */, 1A0EE2D718CDF733004CD58F /* Cocoa.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -3254,8 +3819,8 @@ buildActionMask = 2147483647; files = ( 1A0EE40218CDF775004CD58F /* libchipmunk iOS.a in Frameworks */, - 1A0EE40318CDF775004CD58F /* libcocos2dx iOS.a in Frameworks */, - 1A0EE40518CDF775004CD58F /* libCocosDenshion iOS.a in Frameworks */, + 1A0EE40318CDF775004CD58F /* libcocos2d iOS.a in Frameworks */, + 1A0EE40518CDF775004CD58F /* libcocosdenshion iOS.a in Frameworks */, 1A0EE40618CDF775004CD58F /* CoreMotion.framework in Frameworks */, 1A0EE40718CDF775004CD58F /* libz.dylib in Frameworks */, 1A0EE40818CDF775004CD58F /* Foundation.framework in Frameworks */, @@ -3273,6 +3838,12 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 15EFA68B198B3AD8000C57D3 /* libcocos2d iOS.a in Frameworks */, + 15EFA68C198B3AD8000C57D3 /* libcocosdenshion iOS.a in Frameworks */, + 15EFA68D198B3AD8000C57D3 /* libluacocos2d iOS.a in Frameworks */, + 15EFA68E198B3AD8000C57D3 /* libluacocosdenshion iOS.a in Frameworks */, + 15EFA68F198B3AD8000C57D3 /* libluanetwork iOS.a in Frameworks */, + 15EFA690198B3AD8000C57D3 /* libnetwork iOS.a in Frameworks */, 15AECE25195D467D00907DB0 /* MediaPlayer.framework in Frameworks */, 1A0EE42C18CDF799004CD58F /* libz.dylib in Frameworks */, 1A0EE42D18CDF799004CD58F /* CoreMotion.framework in Frameworks */, @@ -3284,11 +3855,6 @@ 1A0EE43318CDF799004CD58F /* UIKit.framework in Frameworks */, 1A0EE43418CDF799004CD58F /* AVFoundation.framework in Frameworks */, 1A0EE43518CDF799004CD58F /* Foundation.framework in Frameworks */, - 1A0EE43618CDF799004CD58F /* libchipmunk iOS.a in Frameworks */, - 1A0EE43718CDF799004CD58F /* libcocos2dx iOS.a in Frameworks */, - 1A0EE43818CDF799004CD58F /* libcocos2dx-extensions iOS.a in Frameworks */, - 1A0EE43918CDF799004CD58F /* libCocosDenshion iOS.a in Frameworks */, - 1A0EE43A18CDF799004CD58F /* libluabindings iOS.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3296,6 +3862,25 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 151622C919A0F692006099B8 /* libcocos3d Mac.a in Frameworks */, + 151622C819A0F689006099B8 /* libluacocos3d Mac.a in Frameworks */, + 15EFA27A198B269E000C57D3 /* libluaextension Mac.a in Frameworks */, + 15EFA279198B268A000C57D3 /* libluanetwork Mac.a in Frameworks */, + 15EFA278198B2673000C57D3 /* libluaspine Mac.a in Frameworks */, + 15EFA277198B2666000C57D3 /* libluaui Mac.a in Frameworks */, + 15EFA273198B265A000C57D3 /* libluacocos2d Mac.a in Frameworks */, + 15EFA274198B265A000C57D3 /* libluacocosbuilder Mac.a in Frameworks */, + 15EFA275198B265A000C57D3 /* libluacocosdenshion Mac.a in Frameworks */, + 15EFA276198B265A000C57D3 /* libluacocostudio Mac.a in Frameworks */, + B27AEE0719768950008BD575 /* libnetwork Mac.a in Frameworks */, + B2DB49401976826000411E16 /* libspine Mac.a in Frameworks */, + B2DB48C319767D3D00411E16 /* libcocostudio Mac.a in Frameworks */, + B2DB48141976711A00411E16 /* libcocosbuilder Mac.a in Frameworks */, + B2DB48151976711A00411E16 /* libui Mac.a in Frameworks */, + 1ABCA2C218CD92420087CE3A /* libchipmunk Mac.a in Frameworks */, + 1ABCA2C318CD92420087CE3A /* libcocos2d Mac.a in Frameworks */, + 1ABCA2C418CD92420087CE3A /* libextension Mac.a in Frameworks */, + 1ABCA2C518CD92420087CE3A /* libcocosdenshion Mac.a in Frameworks */, 1ABCA36218CD9AC60087CE3A /* libcurl.dylib in Frameworks */, 1ABCA36118CD9AC00087CE3A /* libz.dylib in Frameworks */, 1ABCA35F18CD9AAE0087CE3A /* IOKit.framework in Frameworks */, @@ -3305,11 +3890,6 @@ 1ABCA35918CD9A8F0087CE3A /* OpenAL.framework in Frameworks */, 1ABCA35718CD9A890087CE3A /* QuartzCore.framework in Frameworks */, 1ABCA35518CD9A820087CE3A /* OpenGL.framework in Frameworks */, - 1ABCA2C218CD92420087CE3A /* libchipmunk Mac.a in Frameworks */, - 1ABCA2C318CD92420087CE3A /* libcocos2dx Mac.a in Frameworks */, - 1ABCA2C418CD92420087CE3A /* libcocos2dx-extensions Mac.a in Frameworks */, - 1ABCA2C518CD92420087CE3A /* libCocosDenshion Mac.a in Frameworks */, - 1ABCA2C618CD92420087CE3A /* libluabindings Mac.a in Frameworks */, 1ABCA28718CD91510087CE3A /* Cocoa.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -3318,6 +3898,25 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 158C129419A0FC6400781A76 /* libcocos3d iOS.a in Frameworks */, + 158C129519A0FC6400781A76 /* libluacocos3d iOS.a in Frameworks */, + 15EFA66F198B356E000C57D3 /* libluacocos2d iOS.a in Frameworks */, + 15EFA670198B356E000C57D3 /* libluacocosbuilder iOS.a in Frameworks */, + 15EFA671198B356E000C57D3 /* libluacocosdenshion iOS.a in Frameworks */, + 15EFA672198B356E000C57D3 /* libluacocostudio iOS.a in Frameworks */, + 15EFA673198B356E000C57D3 /* libluaextension iOS.a in Frameworks */, + 15EFA674198B356E000C57D3 /* libluanetwork iOS.a in Frameworks */, + 15EFA675198B356E000C57D3 /* libluaspine iOS.a in Frameworks */, + 15EFA676198B356E000C57D3 /* libluaui iOS.a in Frameworks */, + 15EFA66D198B354B000C57D3 /* libnetwork iOS.a in Frameworks */, + 15EFA66E198B354B000C57D3 /* libspine iOS.a in Frameworks */, + 15EFA66C198B3505000C57D3 /* libextension iOS.a in Frameworks */, + 15EFA66B198B34EA000C57D3 /* libchipmunk iOS.a in Frameworks */, + 15EFA66A198B34E1000C57D3 /* libui iOS.a in Frameworks */, + 15EFA666198B34D7000C57D3 /* libcocos2d iOS.a in Frameworks */, + 15EFA667198B34D7000C57D3 /* libcocosbuilder iOS.a in Frameworks */, + 15EFA668198B34D7000C57D3 /* libcocosdenshion iOS.a in Frameworks */, + 15EFA669198B34D7000C57D3 /* libcocostudio iOS.a in Frameworks */, 15AECE0B195C0F8A00907DB0 /* MediaPlayer.framework in Frameworks */, 1ABCA3B018CDA06D0087CE3A /* libz.dylib in Frameworks */, 1ABCA3AA18CD9F1A0087CE3A /* CoreMotion.framework in Frameworks */, @@ -3329,11 +3928,6 @@ 1ABCA39F18CD9EE50087CE3A /* UIKit.framework in Frameworks */, 1ABCA39D18CD9ED80087CE3A /* AVFoundation.framework in Frameworks */, 1ABCA2CE18CD93580087CE3A /* Foundation.framework in Frameworks */, - 1ABCA30118CD93940087CE3A /* libchipmunk iOS.a in Frameworks */, - 1ABCA30218CD93940087CE3A /* libcocos2dx iOS.a in Frameworks */, - 1ABCA30318CD93940087CE3A /* libcocos2dx-extensions iOS.a in Frameworks */, - 1ABCA30418CD93940087CE3A /* libCocosDenshion iOS.a in Frameworks */, - 1ABCA30518CD93940087CE3A /* libluabindings iOS.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3341,11 +3935,17 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 15162232199F95C6006099B8 /* libcocos3d Mac.a in Frameworks */, + B244F3171976878E00ED1926 /* libnetwork Mac.a in Frameworks */, + B2DB493A197681E500411E16 /* libspine Mac.a in Frameworks */, + B2DB48C619767DAC00411E16 /* libcocostudio Mac.a in Frameworks */, + B2DB480919766E4800411E16 /* libcocosbuilder Mac.a in Frameworks */, + B2DB479A197668D500411E16 /* libui Mac.a in Frameworks */, 1AAF534B180E2F4E000584C8 /* libbox2d Mac.a in Frameworks */, 1AAF534C180E2F4E000584C8 /* libchipmunk Mac.a in Frameworks */, - 1AAF534D180E2F4E000584C8 /* libcocos2dx Mac.a in Frameworks */, - 1AAF534E180E2F4E000584C8 /* libcocos2dx-extensions Mac.a in Frameworks */, - 1AAF534F180E2F4E000584C8 /* libCocosDenshion Mac.a in Frameworks */, + 1AAF534D180E2F4E000584C8 /* libcocos2d Mac.a in Frameworks */, + 1AAF534E180E2F4E000584C8 /* libextension Mac.a in Frameworks */, + 1AAF534F180E2F4E000584C8 /* libcocosdenshion Mac.a in Frameworks */, EDCC747F17C455FD007B692C /* IOKit.framework in Frameworks */, 1A9F808D177E98A600D9A1CB /* libcurl.dylib in Frameworks */, 15C6482F165F399D007D4F18 /* libz.dylib in Frameworks */, @@ -3365,8 +3965,7 @@ files = ( 3E61773D1960FBD200DE83F5 /* GameController.framework in Frameworks */, 3E6177211960FAED00DE83F5 /* libchipmunk iOS.a in Frameworks */, - 3E6177221960FAED00DE83F5 /* libcocos2dx iOS.a in Frameworks */, - 3E6177231960FAED00DE83F5 /* libCocosDenshion iOS.a in Frameworks */, + 3E6177221960FAED00DE83F5 /* libcocos2d iOS.a in Frameworks */, 3E6177241960FAED00DE83F5 /* CoreMotion.framework in Frameworks */, 3E6177251960FAED00DE83F5 /* libz.dylib in Frameworks */, 3E6177261960FAED00DE83F5 /* Foundation.framework in Frameworks */, @@ -3384,12 +3983,18 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 15162235199F97E1006099B8 /* libcocos3d iOS.a in Frameworks */, + B2C59AC8197782B900B452DF /* libcocosbuilder iOS.a in Frameworks */, + B2C59AC9197782B900B452DF /* libui iOS.a in Frameworks */, + B2C59ACA197782B900B452DF /* libcocostudio iOS.a in Frameworks */, + B2CC507B19776D8B0041958E /* libspine iOS.a in Frameworks */, + B2CC5045197766F70041958E /* libnetwork iOS.a in Frameworks */, 3EA0FB66191B933000B170C8 /* MediaPlayer.framework in Frameworks */, 1AAF53FE180E39D4000584C8 /* libbox2d iOS.a in Frameworks */, 1AAF53FF180E39D4000584C8 /* libchipmunk iOS.a in Frameworks */, - 1AAF5400180E39D4000584C8 /* libcocos2dx iOS.a in Frameworks */, - 1AAF5401180E39D4000584C8 /* libcocos2dx-extensions iOS.a in Frameworks */, - 1AAF5402180E39D4000584C8 /* libCocosDenshion iOS.a in Frameworks */, + 1AAF5400180E39D4000584C8 /* libcocos2d iOS.a in Frameworks */, + 1AAF5401180E39D4000584C8 /* libextension iOS.a in Frameworks */, + 1AAF5402180E39D4000584C8 /* libcocosdenshion iOS.a in Frameworks */, D60AE43417F7FFE100757E4B /* CoreMotion.framework in Frameworks */, A07A521E1783A1D20073F6A7 /* libz.dylib in Frameworks */, A07A521F1783A1D20073F6A7 /* Foundation.framework in Frameworks */, @@ -3430,8 +4035,8 @@ 15CBA08A196EE66D005877BB /* Classes */ = { isa = PBXGroup; children = ( - 15CBA9EE196F7BEC005877BB /* lua_cocos2dx_controller_manual.cpp */, - 15CBA9EF196F7BEC005877BB /* lua_cocos2dx_controller_manual.hpp */, + 15427B7B198B880100DC375D /* lua_cocos2dx_controller_manual.cpp */, + 15427B7C198B880100DC375D /* lua_cocos2dx_controller_manual.hpp */, 15CBA9EB196F7BD8005877BB /* lua_cocos2dx_controller_auto.cpp */, 15CBA9EC196F7BD8005877BB /* lua_cocos2dx_controller_auto.hpp */, 15CBA08B196EE66D005877BB /* AppDelegate.cpp */, @@ -5516,8 +6121,24 @@ 1ABCA27718CD90A40087CE3A /* Products */ = { isa = PBXGroup; children = ( - 1ABCA27E18CD90A50087CE3A /* libluabindings Mac.a */, - 1ABCA28018CD90A50087CE3A /* libluabindings iOS.a */, + 15EFA24A198A4A24000C57D3 /* libluaextension Mac.a */, + 15EFA24C198A4A24000C57D3 /* libluaui Mac.a */, + 15EFA24E198A4A24000C57D3 /* libluacocostudio Mac.a */, + 15EFA250198A4A24000C57D3 /* libluacocosbuilder Mac.a */, + 15EFA252198A4A24000C57D3 /* libluaspine Mac.a */, + 15EFA254198A4A24000C57D3 /* libluanetwork Mac.a */, + 15EFA256198A4A24000C57D3 /* libluacocosdenshion Mac.a */, + 151622C319A0F66B006099B8 /* libluacocos3d Mac.a */, + 15EFA258198A4A24000C57D3 /* libluacocos2d Mac.a */, + 15EFA25A198A4A24000C57D3 /* libluaextension iOS.a */, + 15EFA659198B33EE000C57D3 /* libluaui iOS.a */, + 15EFA65B198B33EE000C57D3 /* libluacocostudio iOS.a */, + 15EFA65D198B33EE000C57D3 /* libluacocosbuilder iOS.a */, + 15EFA65F198B33EE000C57D3 /* libluaspine iOS.a */, + 15EFA661198B33EE000C57D3 /* libluanetwork iOS.a */, + 15EFA663198B33EE000C57D3 /* libluacocosdenshion iOS.a */, + 151622C519A0F66B006099B8 /* libluacocos3d iOS.a */, + 15EFA665198B33EE000C57D3 /* libluacocos2d iOS.a */, ); name = Products; sourceTree = ""; @@ -5535,8 +6156,41 @@ 1ABCA36418CD9E060087CE3A /* Lua Common */ = { isa = PBXGroup; children = ( - 156229321973D400009C9067 /* bitExtend.lua */, - 15AECE1E195D0EC500907DB0 /* experimentalConstants.lua */, + 15D1FD6D1998642800302043 /* DeprecatedUIEnum.lua */, + 15D1FD6E1998642800302043 /* DeprecatedUIFunc.lua */, + 15D1FD6F1998642800302043 /* experimentalUIConstants.lua */, + 15D1FD701998642800302043 /* GuiConstants.lua */, + 15D1FD591998641200302043 /* DeprecatedNetworkClass.lua */, + 15D1FD5A1998641200302043 /* DeprecatedNetworkEnum.lua */, + 15D1FD5B1998641200302043 /* DeprecatedNetworkFunc.lua */, + 15D1FD5C1998641200302043 /* NetworkConstants.lua */, + 15D1FD4D199863F900302043 /* DeprecatedExtensionClass.lua */, + 15D1FD4E199863F900302043 /* DeprecatedExtensionEnum.lua */, + 15D1FD4F199863F900302043 /* DeprecatedExtensionFunc.lua */, + 15D1FD50199863F900302043 /* ExtensionConstants.lua */, + 15D1FD41199863E800302043 /* CocoStudio.lua */, + 15D1FD42199863E800302043 /* DeprecatedCocoStudioClass.lua */, + 15D1FD43199863E800302043 /* DeprecatedCocoStudioFunc.lua */, + 15D1FD44199863E800302043 /* StudioConstants.lua */, + 15D1FD38199863CA00302043 /* AudioEngine.lua */, + 15D1FD39199863CA00302043 /* DeprecatedCocosDenshionClass.lua */, + 15D1FD3A199863CA00302043 /* DeprecatedCocosDenshionFunc.lua */, + 15D1FD32199863BA00302043 /* CCBReaderLoad.lua */, + 15D1FD33199863BA00302043 /* DeprecatedCocosBuilderClass.lua */, + 15D1FCDE1998637C00302043 /* bitExtend.lua */, + 15D1FCDF1998637C00302043 /* Cocos2d.lua */, + 15D1FCE01998637C00302043 /* Cocos2dConstants.lua */, + 15D1FCE11998637C00302043 /* DeprecatedCocos2dClass.lua */, + 15D1FCE21998637C00302043 /* DeprecatedCocos2dEnum.lua */, + 15D1FCE31998637C00302043 /* DeprecatedCocos2dFunc.lua */, + 15D1FCE41998637C00302043 /* DeprecatedOpenglEnum.lua */, + 15D1FCE51998637C00302043 /* DrawPrimitives.lua */, + 15D1FCE61998637C00302043 /* extern.lua */, + 15D1FCE71998637C00302043 /* json.lua */, + 15D1FCE81998637C00302043 /* luaj.lua */, + 15D1FCE91998637C00302043 /* luaoc.lua */, + 15D1FCEA1998637C00302043 /* Opengl.lua */, + 15D1FCEB1998637C00302043 /* OpenglConstants.lua */, 1503FAA918DA8B6C00F6518C /* ftp.lua */, 1503FAAA18DA8B6C00F6518C /* headers.lua */, 1503FAAB18DA8B6C00F6518C /* http.lua */, @@ -5547,24 +6201,6 @@ 1503FAB018DA8B6C00F6518C /* socket.lua */, 1503FAB118DA8B6C00F6518C /* tp.lua */, 1503FAB218DA8B6C00F6518C /* url.lua */, - 1ABCA36618CD9E180087CE3A /* AudioEngine.lua */, - 1ABCA36718CD9E180087CE3A /* CCBReaderLoad.lua */, - 1ABCA36818CD9E180087CE3A /* Cocos2d.lua */, - 1ABCA36918CD9E180087CE3A /* Cocos2dConstants.lua */, - 1ABCA36A18CD9E180087CE3A /* CocoStudio.lua */, - 1ABCA36B18CD9E180087CE3A /* Deprecated.lua */, - 1ABCA36C18CD9E180087CE3A /* DeprecatedClass.lua */, - 1ABCA36D18CD9E180087CE3A /* DeprecatedEnum.lua */, - 1ABCA36E18CD9E180087CE3A /* DeprecatedOpenglEnum.lua */, - 1ABCA36F18CD9E180087CE3A /* DrawPrimitives.lua */, - 1ABCA37018CD9E180087CE3A /* extern.lua */, - 1ABCA37118CD9E180087CE3A /* GuiConstants.lua */, - 1ABCA37218CD9E180087CE3A /* json.lua */, - 1ABCA37318CD9E180087CE3A /* luaj.lua */, - 1ABCA37418CD9E180087CE3A /* luaoc.lua */, - 1ABCA37518CD9E180087CE3A /* Opengl.lua */, - 1ABCA37618CD9E180087CE3A /* OpenglConstants.lua */, - 1ABCA37718CD9E180087CE3A /* StudioConstants.lua */, ); name = "Lua Common"; sourceTree = ""; @@ -5660,6 +6296,7 @@ 1AC3592418CECF0A00F37B72 /* Classes */ = { isa = PBXGroup; children = ( + 3E9E75CB199324A8005B7047 /* Camera3DTest */, 1AC3592818CECF0A00F37B72 /* ActionManagerTest */, 1AC3592B18CECF0A00F37B72 /* ActionsEaseTest */, 1AC3592E18CECF0A00F37B72 /* ActionsProgressTest */, @@ -6760,6 +7397,7 @@ 1AC35D2E18CEDE8B00F37B72 /* Classes */ = { isa = PBXGroup; children = ( + 15427B77198B843300DC375D /* lua_module_register.h */, 1AC35D2F18CEDE8B00F37B72 /* AppDelegate.cpp */, 1AC35D3018CEDE8B00F37B72 /* AppDelegate.h */, ); @@ -6837,6 +7475,7 @@ 1AC35D7C18CEE5B100F37B72 /* Classes */ = { isa = PBXGroup; children = ( + 15427B76198B750300DC375D /* lua_module_register.h */, 1AC35D7D18CEE5B100F37B72 /* AppDelegate.cpp */, 1AC35D7E18CEE5B100F37B72 /* AppDelegate.h */, 1AC35D7F18CEE5B100F37B72 /* lua_assetsmanager_test_sample.cpp */, @@ -7223,6 +7862,8 @@ 29FBBC00196A9F0D00E65826 /* UIAndEditorTests */ = { isa = PBXGroup; children = ( + 295824571987415900F9746D /* UIScale9SpriteTest.cpp */, + 295824581987415900F9746D /* UIScale9SpriteTest.h */, 29080D1F191B595E0066F8DF /* CocosGUIScene.cpp */, 29080D20191B595E0066F8DF /* CocosGUIScene.h */, 29080D37191B595E0066F8DF /* GUIEditorTest.cpp */, @@ -7329,12 +7970,23 @@ 3E92EA7D1921A0C60094CD21 /* Sprite3DTest */ = { isa = PBXGroup; children = ( + 5EBEECAE1995247000429821 /* DrawNode3D.cpp */, + 5EBEECAF1995247000429821 /* DrawNode3D.h */, 3E92EA801921A1400094CD21 /* Sprite3DTest.cpp */, 3E92EA811921A1400094CD21 /* Sprite3DTest.h */, ); name = Sprite3DTest; sourceTree = ""; }; + 3E9E75CB199324A8005B7047 /* Camera3DTest */ = { + isa = PBXGroup; + children = ( + 3E9E75CE199324CB005B7047 /* Camera3DTest.cpp */, + 3E9E75CF199324CB005B7047 /* Camera3DTest.h */, + ); + name = Camera3DTest; + sourceTree = ""; + }; 3EA0FB6F191C844400B170C8 /* UIVideoPlayerTest */ = { isa = PBXGroup; children = ( @@ -7347,16 +7999,28 @@ 46A15F9D1807A4F8005B8026 /* Products */ = { isa = PBXGroup; children = ( - 46A15FB01807A4F9005B8026 /* libcocos2dx Mac.a */, - 46A15FB21807A4F9005B8026 /* libcocos2dx-extensions Mac.a */, + 46A15FB01807A4F9005B8026 /* libcocos2d Mac.a */, + 46A15FB21807A4F9005B8026 /* libextension Mac.a */, + B2DB4799197668CA00411E16 /* libui Mac.a */, + B2DB48C219767D3600411E16 /* libcocostudio Mac.a */, + B2DB480819766E3C00411E16 /* libcocosbuilder Mac.a */, + B2DB49391976819900411E16 /* libspine Mac.a */, + B244F3161976878700ED1926 /* libnetwork Mac.a */, 46A15FB41807A4F9005B8026 /* libchipmunk Mac.a */, 46A15FB61807A4F9005B8026 /* libbox2d Mac.a */, - 46A15FB81807A4F9005B8026 /* libCocosDenshion Mac.a */, - 46A15FBE1807A4F9005B8026 /* libcocos2dx iOS.a */, - 46A15FC01807A4F9005B8026 /* libcocos2dx-extensions iOS.a */, + 46A15FB81807A4F9005B8026 /* libcocosdenshion Mac.a */, + 1516222D199F95B2006099B8 /* libcocos3d Mac.a */, + 46A15FBE1807A4F9005B8026 /* libcocos2d iOS.a */, + 46A15FC01807A4F9005B8026 /* libextension iOS.a */, 46A15FC21807A4F9005B8026 /* libchipmunk iOS.a */, 46A15FC41807A4F9005B8026 /* libbox2d iOS.a */, - 46A15FC61807A4F9005B8026 /* libCocosDenshion iOS.a */, + 46A15FC61807A4F9005B8026 /* libcocosdenshion iOS.a */, + B2CC5039197763A20041958E /* libui iOS.a */, + B2CC503B197763A20041958E /* libcocostudio iOS.a */, + B2CC503D197763A20041958E /* libcocosbuilder iOS.a */, + B2CC503F197763A20041958E /* libspine iOS.a */, + B2CC5041197763A20041958E /* libnetwork iOS.a */, + 1516222F199F95B2006099B8 /* libcocos3d iOS.a */, ); name = Products; sourceTree = ""; @@ -7375,11 +8039,9 @@ buildRules = ( ); dependencies = ( + 15427B9D198B8C0500DC375D /* PBXTargetDependency */, + 15427B9F198B8C1300DC375D /* PBXTargetDependency */, 15CBA016196EE56C005877BB /* PBXTargetDependency */, - 15CBA018196EE56C005877BB /* PBXTargetDependency */, - 15CBA01A196EE56C005877BB /* PBXTargetDependency */, - 15CBA01C196EE56C005877BB /* PBXTargetDependency */, - 15CBA01E196EE56C005877BB /* PBXTargetDependency */, ); name = "lua-game-controller-test iOS"; productName = "Test lua iOS"; @@ -7417,10 +8079,11 @@ buildRules = ( ); dependencies = ( - 1A0EE2B918CDF733004CD58F /* PBXTargetDependency */, + 15427BA1198B8C2E00DC375D /* PBXTargetDependency */, + 15427BA3198B8C2E00DC375D /* PBXTargetDependency */, + 15427BA5198B8C2E00DC375D /* PBXTargetDependency */, + B27AEE0919768965008BD575 /* PBXTargetDependency */, 1A0EE2BB18CDF733004CD58F /* PBXTargetDependency */, - 1A0EE2BD18CDF733004CD58F /* PBXTargetDependency */, - 1A0EE2BF18CDF733004CD58F /* PBXTargetDependency */, 1A0EE2C118CDF733004CD58F /* PBXTargetDependency */, ); name = "lua-empty-test Mac"; @@ -7459,11 +8122,12 @@ buildRules = ( ); dependencies = ( - 1A0EE41A18CDF799004CD58F /* PBXTargetDependency */, - 1A0EE41C18CDF799004CD58F /* PBXTargetDependency */, - 1A0EE41E18CDF799004CD58F /* PBXTargetDependency */, - 1A0EE42018CDF799004CD58F /* PBXTargetDependency */, - 1A0EE42218CDF799004CD58F /* PBXTargetDependency */, + 15427B97198B8BBF00DC375D /* PBXTargetDependency */, + 15427B9B198B8BDE00DC375D /* PBXTargetDependency */, + 15427B99198B8BDE00DC375D /* PBXTargetDependency */, + 15427B81198B8ACB00DC375D /* PBXTargetDependency */, + 15427B83198B8ACB00DC375D /* PBXTargetDependency */, + 15427B85198B8ACB00DC375D /* PBXTargetDependency */, ); name = "lua-empty-test iOS"; productName = "Test lua iOS"; @@ -7481,7 +8145,21 @@ buildRules = ( ); dependencies = ( - 1ABCA2C118CD92280087CE3A /* PBXTargetDependency */, + 151622C719A0F679006099B8 /* PBXTargetDependency */, + 151622BF19A0F66B006099B8 /* PBXTargetDependency */, + 15427BA7198B8C5000DC375D /* PBXTargetDependency */, + 15427BA9198B8C5000DC375D /* PBXTargetDependency */, + 15427BAB198B8C5000DC375D /* PBXTargetDependency */, + 15427BAD198B8C5000DC375D /* PBXTargetDependency */, + 15427BAF198B8C5000DC375D /* PBXTargetDependency */, + 15427BB1198B8C5000DC375D /* PBXTargetDependency */, + 15427BB3198B8C5000DC375D /* PBXTargetDependency */, + 15427BB5198B8C5000DC375D /* PBXTargetDependency */, + B27AEE041976894C008BD575 /* PBXTargetDependency */, + B2DB493F1976825800411E16 /* PBXTargetDependency */, + B2DB48BF19767D3600411E16 /* PBXTargetDependency */, + B2DB48111976711200411E16 /* PBXTargetDependency */, + B2DB48131976711200411E16 /* PBXTargetDependency */, 1ABCA2B918CD92230087CE3A /* PBXTargetDependency */, 1ABCA2BB18CD92230087CE3A /* PBXTargetDependency */, 1ABCA2BD18CD92230087CE3A /* PBXTargetDependency */, @@ -7503,11 +8181,25 @@ buildRules = ( ); dependencies = ( + 158C129319A0FC5300781A76 /* PBXTargetDependency */, + 158C128C19A0FC4700781A76 /* PBXTargetDependency */, + 15427B87198B8BB400DC375D /* PBXTargetDependency */, + 15427B89198B8BB400DC375D /* PBXTargetDependency */, + 15427B8B198B8BB400DC375D /* PBXTargetDependency */, + 15427B8D198B8BB400DC375D /* PBXTargetDependency */, + 15427B8F198B8BB400DC375D /* PBXTargetDependency */, + 15427B91198B8BB400DC375D /* PBXTargetDependency */, + 15427B93198B8BB400DC375D /* PBXTargetDependency */, + 15427B95198B8BB400DC375D /* PBXTargetDependency */, + B2C59ADC19779D5400B452DF /* PBXTargetDependency */, + B2C59ADE19779D5400B452DF /* PBXTargetDependency */, + B2C59AE019779D5400B452DF /* PBXTargetDependency */, + B2C59AE219779D5400B452DF /* PBXTargetDependency */, + B2C59AE419779D5400B452DF /* PBXTargetDependency */, 1ABCA2F818CD93850087CE3A /* PBXTargetDependency */, 1ABCA2FA18CD93850087CE3A /* PBXTargetDependency */, 1ABCA2FC18CD93850087CE3A /* PBXTargetDependency */, 1ABCA2FE18CD93850087CE3A /* PBXTargetDependency */, - 1ABCA30018CD93850087CE3A /* PBXTargetDependency */, ); name = "lua-tests iOS"; productName = "Test lua iOS"; @@ -7525,6 +8217,12 @@ buildRules = ( ); dependencies = ( + 15162227199F95B2006099B8 /* PBXTargetDependency */, + B244F3111976878700ED1926 /* PBXTargetDependency */, + B2DB49361976819900411E16 /* PBXTargetDependency */, + B2DB48C519767DA500411E16 /* PBXTargetDependency */, + B2DB480519766E3C00411E16 /* PBXTargetDependency */, + B2DB4794197668CA00411E16 /* PBXTargetDependency */, 1AAF5342180E2F41000584C8 /* PBXTargetDependency */, 1AAF5344180E2F41000584C8 /* PBXTargetDependency */, 1AAF5346180E2F41000584C8 /* PBXTargetDependency */, @@ -7547,10 +8245,8 @@ buildRules = ( ); dependencies = ( - 3E6177451960FE1E00DE83F5 /* PBXTargetDependency */, 3E6177001960FAED00DE83F5 /* PBXTargetDependency */, 3E6177021960FAED00DE83F5 /* PBXTargetDependency */, - 3E6177041960FAED00DE83F5 /* PBXTargetDependency */, ); name = "game-controller-test IOS"; productName = iphone; @@ -7568,6 +8264,12 @@ buildRules = ( ); dependencies = ( + 15162234199F97D1006099B8 /* PBXTargetDependency */, + B2C59ABE197782AC00B452DF /* PBXTargetDependency */, + B2C59AC0197782AC00B452DF /* PBXTargetDependency */, + B2C59AC2197782AC00B452DF /* PBXTargetDependency */, + B2CC507A19776D830041958E /* PBXTargetDependency */, + B2CC5044197766EB0041958E /* PBXTargetDependency */, 1AAF53F5180E39C6000584C8 /* PBXTargetDependency */, 1AAF53F7180E39C6000584C8 /* PBXTargetDependency */, 1AAF53F9180E39C6000584C8 /* PBXTargetDependency */, @@ -7630,31 +8332,157 @@ /* End PBXProject section */ /* Begin PBXReferenceProxy section */ - 1ABCA27E18CD90A50087CE3A /* libluabindings Mac.a */ = { + 1516222D199F95B2006099B8 /* libcocos3d Mac.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; - path = "libluabindings Mac.a"; - remoteRef = 1ABCA27D18CD90A50087CE3A /* PBXContainerItemProxy */; + path = "libcocos3d Mac.a"; + remoteRef = 1516222C199F95B2006099B8 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 1ABCA28018CD90A50087CE3A /* libluabindings iOS.a */ = { + 1516222F199F95B2006099B8 /* libcocos3d iOS.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; - path = "libluabindings iOS.a"; - remoteRef = 1ABCA27F18CD90A50087CE3A /* PBXContainerItemProxy */; + path = "libcocos3d iOS.a"; + remoteRef = 1516222E199F95B2006099B8 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 46A15FB01807A4F9005B8026 /* libcocos2dx Mac.a */ = { + 151622C319A0F66B006099B8 /* libluacocos3d Mac.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; - path = "libcocos2dx Mac.a"; + path = "libluacocos3d Mac.a"; + remoteRef = 151622C219A0F66B006099B8 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 151622C519A0F66B006099B8 /* libluacocos3d iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libluacocos3d iOS.a"; + remoteRef = 151622C419A0F66B006099B8 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15EFA24A198A4A24000C57D3 /* libluaextension Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libluaextension Mac.a"; + remoteRef = 15EFA249198A4A24000C57D3 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15EFA24C198A4A24000C57D3 /* libluaui Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libluaui Mac.a"; + remoteRef = 15EFA24B198A4A24000C57D3 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15EFA24E198A4A24000C57D3 /* libluacocostudio Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libluacocostudio Mac.a"; + remoteRef = 15EFA24D198A4A24000C57D3 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15EFA250198A4A24000C57D3 /* libluacocosbuilder Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libluacocosbuilder Mac.a"; + remoteRef = 15EFA24F198A4A24000C57D3 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15EFA252198A4A24000C57D3 /* libluaspine Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libluaspine Mac.a"; + remoteRef = 15EFA251198A4A24000C57D3 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15EFA254198A4A24000C57D3 /* libluanetwork Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libluanetwork Mac.a"; + remoteRef = 15EFA253198A4A24000C57D3 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15EFA256198A4A24000C57D3 /* libluacocosdenshion Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libluacocosdenshion Mac.a"; + remoteRef = 15EFA255198A4A24000C57D3 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15EFA258198A4A24000C57D3 /* libluacocos2d Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libluacocos2d Mac.a"; + remoteRef = 15EFA257198A4A24000C57D3 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15EFA25A198A4A24000C57D3 /* libluaextension iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libluaextension iOS.a"; + remoteRef = 15EFA259198A4A24000C57D3 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15EFA659198B33EE000C57D3 /* libluaui iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libluaui iOS.a"; + remoteRef = 15EFA658198B33EE000C57D3 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15EFA65B198B33EE000C57D3 /* libluacocostudio iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libluacocostudio iOS.a"; + remoteRef = 15EFA65A198B33EE000C57D3 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15EFA65D198B33EE000C57D3 /* libluacocosbuilder iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libluacocosbuilder iOS.a"; + remoteRef = 15EFA65C198B33EE000C57D3 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15EFA65F198B33EE000C57D3 /* libluaspine iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libluaspine iOS.a"; + remoteRef = 15EFA65E198B33EE000C57D3 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15EFA661198B33EE000C57D3 /* libluanetwork iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libluanetwork iOS.a"; + remoteRef = 15EFA660198B33EE000C57D3 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15EFA663198B33EE000C57D3 /* libluacocosdenshion iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libluacocosdenshion iOS.a"; + remoteRef = 15EFA662198B33EE000C57D3 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15EFA665198B33EE000C57D3 /* libluacocos2d iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libluacocos2d iOS.a"; + remoteRef = 15EFA664198B33EE000C57D3 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 46A15FB01807A4F9005B8026 /* libcocos2d Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libcocos2d Mac.a"; remoteRef = 46A15FAF1807A4F9005B8026 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 46A15FB21807A4F9005B8026 /* libcocos2dx-extensions Mac.a */ = { + 46A15FB21807A4F9005B8026 /* libextension Mac.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; - path = "libcocos2dx-extensions Mac.a"; + path = "libextension Mac.a"; remoteRef = 46A15FB11807A4F9005B8026 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -7672,24 +8500,24 @@ remoteRef = 46A15FB51807A4F9005B8026 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 46A15FB81807A4F9005B8026 /* libCocosDenshion Mac.a */ = { + 46A15FB81807A4F9005B8026 /* libcocosdenshion Mac.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; - path = "libCocosDenshion Mac.a"; + path = "libcocosdenshion Mac.a"; remoteRef = 46A15FB71807A4F9005B8026 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 46A15FBE1807A4F9005B8026 /* libcocos2dx iOS.a */ = { + 46A15FBE1807A4F9005B8026 /* libcocos2d iOS.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; - path = "libcocos2dx iOS.a"; + path = "libcocos2d iOS.a"; remoteRef = 46A15FBD1807A4F9005B8026 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 46A15FC01807A4F9005B8026 /* libcocos2dx-extensions iOS.a */ = { + 46A15FC01807A4F9005B8026 /* libextension iOS.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; - path = "libcocos2dx-extensions iOS.a"; + path = "libextension iOS.a"; remoteRef = 46A15FBF1807A4F9005B8026 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -7707,13 +8535,83 @@ remoteRef = 46A15FC31807A4F9005B8026 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 46A15FC61807A4F9005B8026 /* libCocosDenshion iOS.a */ = { + 46A15FC61807A4F9005B8026 /* libcocosdenshion iOS.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; - path = "libCocosDenshion iOS.a"; + path = "libcocosdenshion iOS.a"; remoteRef = 46A15FC51807A4F9005B8026 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; + B244F3161976878700ED1926 /* libnetwork Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libnetwork Mac.a"; + remoteRef = B244F3151976878700ED1926 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + B2CC5039197763A20041958E /* libui iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libui iOS.a"; + remoteRef = B2CC5038197763A20041958E /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + B2CC503B197763A20041958E /* libcocostudio iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libcocostudio iOS.a"; + remoteRef = B2CC503A197763A20041958E /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + B2CC503D197763A20041958E /* libcocosbuilder iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libcocosbuilder iOS.a"; + remoteRef = B2CC503C197763A20041958E /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + B2CC503F197763A20041958E /* libspine iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libspine iOS.a"; + remoteRef = B2CC503E197763A20041958E /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + B2CC5041197763A20041958E /* libnetwork iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libnetwork iOS.a"; + remoteRef = B2CC5040197763A20041958E /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + B2DB4799197668CA00411E16 /* libui Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libui Mac.a"; + remoteRef = B2DB4798197668CA00411E16 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + B2DB480819766E3C00411E16 /* libcocosbuilder Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libcocosbuilder Mac.a"; + remoteRef = B2DB480719766E3C00411E16 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + B2DB48C219767D3600411E16 /* libcocostudio Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libcocostudio Mac.a"; + remoteRef = B2DB48C119767D3600411E16 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + B2DB49391976819900411E16 /* libspine Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libspine Mac.a"; + remoteRef = B2DB49381976819900411E16 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; /* End PBXReferenceProxy section */ /* Begin PBXResourcesBuildPhase section */ @@ -7722,18 +8620,24 @@ buildActionMask = 2147483647; files = ( 15CBA9B3196EE824005877BB /* src in Resources */, + 15D1FD311998637C00302043 /* OpenglConstants.lua in Resources */, + 15D1FD131998637C00302043 /* DrawPrimitives.lua in Resources */, 15CBA9AF196EE80B005877BB /* fonts in Resources */, + 15D1FD2C1998637C00302043 /* Opengl.lua in Resources */, 15CBA9B0196EE80B005877BB /* ipad in Resources */, + 15D1FD221998637C00302043 /* luaj.lua in Resources */, + 15D1FD0E1998637C00302043 /* DeprecatedOpenglEnum.lua in Resources */, 15CBA9B1196EE80B005877BB /* ipadhd in Resources */, + 15D1FD091998637C00302043 /* DeprecatedCocos2dFunc.lua in Resources */, + 15D1FCFF1998637C00302043 /* DeprecatedCocos2dClass.lua in Resources */, + 15D1FCF01998637C00302043 /* bitExtend.lua in Resources */, + 15D1FD041998637C00302043 /* DeprecatedCocos2dEnum.lua in Resources */, + 15D1FD1D1998637C00302043 /* json.lua in Resources */, + 15D1FD181998637C00302043 /* extern.lua in Resources */, 15CBA9B2196EE80B005877BB /* iphone in Resources */, - 15CBA9F2196F8718005877BB /* extern.lua in Resources */, - 15CBA9F1196F865C005877BB /* json.lua in Resources */, - 15CBA9A9196EE7FA005877BB /* Cocos2d.lua in Resources */, - 15CBA9AA196EE7FA005877BB /* Cocos2dConstants.lua in Resources */, - 15CBA9AB196EE7FA005877BB /* CocoStudio.lua in Resources */, - 15CBA9AC196EE7FA005877BB /* Deprecated.lua in Resources */, - 15CBA9AD196EE7FA005877BB /* DeprecatedClass.lua in Resources */, - 15CBA9AE196EE7FA005877BB /* DeprecatedEnum.lua in Resources */, + 15D1FD271998637C00302043 /* luaoc.lua in Resources */, + 15D1FCFA1998637C00302043 /* Cocos2dConstants.lua in Resources */, + 15D1FCF51998637C00302043 /* Cocos2d.lua in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -7756,39 +8660,38 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 1A0EE57518CDFBBE004CD58F /* DeprecatedEnum.lua in Resources */, 1AC35D5C18CEDE9E00F37B72 /* InfoPlist.strings in Resources */, - 1A0EE57118CDFBBE004CD58F /* Cocos2dConstants.lua in Resources */, 1AC35D5D18CEDE9E00F37B72 /* MainMenu.xib in Resources */, + 15D1FD621998641200302043 /* DeprecatedNetworkEnum.lua in Resources */, 1503FABD18DA8B6C00F6518C /* mime.lua in Resources */, - 1A0EE56F18CDFBBE004CD58F /* CCBReaderLoad.lua in Resources */, - 15AECE23195D122600907DB0 /* experimentalConstants.lua in Resources */, - 1A0EE57018CDFBBE004CD58F /* Cocos2d.lua in Resources */, - 1A0EE57B18CDFBBE004CD58F /* luaj.lua in Resources */, - 1A0EE57918CDFBBE004CD58F /* GuiConstants.lua in Resources */, + 15D1FD2E1998637C00302043 /* OpenglConstants.lua in Resources */, 1503FAC518DA8B6C00F6518C /* url.lua in Resources */, - 1A0EE57E18CDFBBE004CD58F /* OpenglConstants.lua in Resources */, + 15D1FD1F1998637C00302043 /* luaj.lua in Resources */, + 15D1FCED1998637C00302043 /* bitExtend.lua in Resources */, 1503FABF18DA8B6C00F6518C /* smtp.lua in Resources */, + 15D1FD291998637C00302043 /* Opengl.lua in Resources */, 1503FAB318DA8B6C00F6518C /* ftp.lua in Resources */, 1503FAB718DA8B6C00F6518C /* http.lua in Resources */, - 1A0EE56E18CDFBBE004CD58F /* AudioEngine.lua in Resources */, - 1A0EE57F18CDFBBE004CD58F /* StudioConstants.lua in Resources */, + 15D1FCF71998637C00302043 /* Cocos2dConstants.lua in Resources */, 1503FAC118DA8B6C00F6518C /* socket.lua in Resources */, 1503FAB918DA8B6C00F6518C /* ltn12.lua in Resources */, - 1A0EE57718CDFBBE004CD58F /* DrawPrimitives.lua in Resources */, - 1A0EE57A18CDFBBE004CD58F /* json.lua in Resources */, + 15D1FD0B1998637C00302043 /* DeprecatedOpenglEnum.lua in Resources */, + 15D1FD661998641200302043 /* DeprecatedNetworkFunc.lua in Resources */, + 15D1FD241998637C00302043 /* luaoc.lua in Resources */, 1AC35D5E18CEDE9E00F37B72 /* Icon.icns in Resources */, - 1A0EE57318CDFBBE004CD58F /* Deprecated.lua in Resources */, + 15D1FCF21998637C00302043 /* Cocos2d.lua in Resources */, + 15D1FD061998637C00302043 /* DeprecatedCocos2dFunc.lua in Resources */, 1503FABB18DA8B6C00F6518C /* mbox.lua in Resources */, - 1A0EE57418CDFBBE004CD58F /* DeprecatedClass.lua in Resources */, - 1A0EE57818CDFBBE004CD58F /* extern.lua in Resources */, + 15D1FD151998637C00302043 /* extern.lua in Resources */, 1503FAB518DA8B6C00F6518C /* headers.lua in Resources */, - 1A0EE57618CDFBBE004CD58F /* DeprecatedOpenglEnum.lua in Resources */, 1503FAC318DA8B6C00F6518C /* tp.lua in Resources */, - 1A0EE57218CDFBBE004CD58F /* CocoStudio.lua in Resources */, - 1A0EE57C18CDFBBE004CD58F /* luaoc.lua in Resources */, - 1A0EE57D18CDFBBE004CD58F /* Opengl.lua in Resources */, + 15D1FD5E1998641200302043 /* DeprecatedNetworkClass.lua in Resources */, + 15D1FD6A1998641200302043 /* NetworkConstants.lua in Resources */, + 15D1FD011998637C00302043 /* DeprecatedCocos2dEnum.lua in Resources */, + 15D1FD1A1998637C00302043 /* json.lua in Resources */, + 15D1FD101998637C00302043 /* DrawPrimitives.lua in Resources */, 1AC35D2918CEDE7200F37B72 /* res in Resources */, + 15D1FCFC1998637C00302043 /* DeprecatedCocos2dClass.lua in Resources */, 1AC35D2B18CEDE7200F37B72 /* src in Resources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -7823,47 +8726,46 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 1A0EE56B18CDFBBD004CD58F /* Opengl.lua in Resources */, - 1A0EE55E18CDFBBD004CD58F /* Cocos2d.lua in Resources */, - 1A0EE55D18CDFBBD004CD58F /* CCBReaderLoad.lua in Resources */, + 15D1FD171998637C00302043 /* extern.lua in Resources */, + 15D1FD641998641200302043 /* DeprecatedNetworkEnum.lua in Resources */, + 15D1FCF41998637C00302043 /* Cocos2d.lua in Resources */, 1AC35D4A18CEDE9400F37B72 /* Icon-120.png in Resources */, 1503FAC018DA8B6C00F6518C /* smtp.lua in Resources */, + 15D1FD681998641200302043 /* DeprecatedNetworkFunc.lua in Resources */, 1AC35D4D18CEDE9400F37B72 /* Icon-57.png in Resources */, - 1A0EE56018CDFBBD004CD58F /* CocoStudio.lua in Resources */, - 1A0EE56318CDFBBD004CD58F /* DeprecatedEnum.lua in Resources */, + 15D1FD121998637C00302043 /* DrawPrimitives.lua in Resources */, 1503FAB818DA8B6C00F6518C /* http.lua in Resources */, - 15AECE22195D122400907DB0 /* experimentalConstants.lua in Resources */, 1AC35D4B18CEDE9400F37B72 /* Icon-144.png in Resources */, 1503FAC618DA8B6C00F6518C /* url.lua in Resources */, 1AC35D4618CEDE9400F37B72 /* Default-568h@2x.png in Resources */, 1AC35D4818CEDE9400F37B72 /* Default@2x.png in Resources */, - 1A0EE56118CDFBBD004CD58F /* Deprecated.lua in Resources */, 1503FAC418DA8B6C00F6518C /* tp.lua in Resources */, 1503FABA18DA8B6C00F6518C /* ltn12.lua in Resources */, - 1A0EE56518CDFBBD004CD58F /* DrawPrimitives.lua in Resources */, - 1A0EE56218CDFBBD004CD58F /* DeprecatedClass.lua in Resources */, - 1A0EE56418CDFBBD004CD58F /* DeprecatedOpenglEnum.lua in Resources */, 1503FABE18DA8B6C00F6518C /* mime.lua in Resources */, - 1A0EE55F18CDFBBD004CD58F /* Cocos2dConstants.lua in Resources */, - 1A0EE56718CDFBBD004CD58F /* GuiConstants.lua in Resources */, + 15D1FD601998641200302043 /* DeprecatedNetworkClass.lua in Resources */, + 15D1FD2B1998637C00302043 /* Opengl.lua in Resources */, 1AC35D4E18CEDE9400F37B72 /* Icon-72.png in Resources */, 1AC35D4F18CEDE9400F37B72 /* Icon-76.png in Resources */, - 1A0EE56A18CDFBBD004CD58F /* luaoc.lua in Resources */, 1503FAC218DA8B6C00F6518C /* socket.lua in Resources */, - 1A0EE56918CDFBBD004CD58F /* luaj.lua in Resources */, - 1A0EE56618CDFBBD004CD58F /* extern.lua in Resources */, - 1A0EE56C18CDFBBD004CD58F /* OpenglConstants.lua in Resources */, - 1A0EE56D18CDFBBD004CD58F /* StudioConstants.lua in Resources */, 1503FABC18DA8B6C00F6518C /* mbox.lua in Resources */, + 15D1FD1C1998637C00302043 /* json.lua in Resources */, + 15D1FCF91998637C00302043 /* Cocos2dConstants.lua in Resources */, + 15D1FD301998637C00302043 /* OpenglConstants.lua in Resources */, 1503FAB618DA8B6C00F6518C /* headers.lua in Resources */, - 1A0EE56818CDFBBD004CD58F /* json.lua in Resources */, 1AC35D4918CEDE9400F37B72 /* Icon-114.png in Resources */, - 1A0EE55C18CDFBBD004CD58F /* AudioEngine.lua in Resources */, 1503FAB418DA8B6C00F6518C /* ftp.lua in Resources */, + 15D1FCEF1998637C00302043 /* bitExtend.lua in Resources */, 1AC35D2A18CEDE7200F37B72 /* res in Resources */, 1AC35D2C18CEDE7200F37B72 /* src in Resources */, 1AC35D4C18CEDE9400F37B72 /* Icon-152.png in Resources */, + 15D1FD031998637C00302043 /* DeprecatedCocos2dEnum.lua in Resources */, + 15D1FD211998637C00302043 /* luaj.lua in Resources */, + 15D1FCFE1998637C00302043 /* DeprecatedCocos2dClass.lua in Resources */, + 15D1FD6C1998641200302043 /* NetworkConstants.lua in Resources */, 1AC35D4718CEDE9400F37B72 /* Default.png in Resources */, + 15D1FD261998637C00302043 /* luaoc.lua in Resources */, + 15D1FD081998637C00302043 /* DeprecatedCocos2dFunc.lua in Resources */, + 15D1FD0D1998637C00302043 /* DeprecatedOpenglEnum.lua in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -7871,70 +8773,85 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + 15D1FD751998642800302043 /* experimentalUIConstants.lua in Resources */, 156EAE071977D0BD00F53709 /* ActionTimeline in Resources */, 15E66FD6192DC8C700C20A52 /* Sprite3DTest in Resources */, + 15D1FD001998637C00302043 /* DeprecatedCocos2dEnum.lua in Resources */, + 15D1FD2D1998637C00302043 /* OpenglConstants.lua in Resources */, + 15D1FCF11998637C00302043 /* Cocos2d.lua in Resources */, + 15D1FD47199863E800302043 /* DeprecatedCocoStudioClass.lua in Resources */, 1AC35DC318CEE65100F37B72 /* Misc in Resources */, 1AC35DC618CEE65100F37B72 /* Shaders in Resources */, + 15D1FD141998637C00302043 /* extern.lua in Resources */, 1AC35DBB18CEE65100F37B72 /* components in Resources */, 1AC35DE218CEE65900F37B72 /* effect2.ogg in Resources */, - 1ABCA39A18CD9E180087CE3A /* StudioConstants.lua in Resources */, - 15AECE24195D122700907DB0 /* experimentalConstants.lua in Resources */, 15C90B4318E66C1700D69802 /* mime.lua in Resources */, + 15D1FD651998641200302043 /* DeprecatedNetworkFunc.lua in Resources */, 1AC35DB118CEE5DA00F37B72 /* InfoPlist.strings in Resources */, 1AC35DDD18CEE65900F37B72 /* CocosBuilderExample.ccbproj in Resources */, - 1ABCA39218CD9E180087CE3A /* luaj.lua in Resources */, 1AC35DB218CEE5DA00F37B72 /* MainMenu.xib in Resources */, + 15D1FD53199863F900302043 /* DeprecatedExtensionEnum.lua in Resources */, 1AC35DBF18CEE65100F37B72 /* hd in Resources */, - 1ABCA38018CD9E180087CE3A /* CocoStudio.lua in Resources */, 1AC35DC818CEE65100F37B72 /* TileMaps in Resources */, - 1ABCA37C18CD9E180087CE3A /* Cocos2d.lua in Resources */, 1AC35DBE18CEE65100F37B72 /* fonts in Resources */, + 15D1FD691998641200302043 /* NetworkConstants.lua in Resources */, 1AC35DDE18CEE65900F37B72 /* CocosBuilderExample.ccbresourcelog in Resources */, + 15D1FD34199863BA00302043 /* CCBReaderLoad.lua in Resources */, 1AC35DBC18CEE65100F37B72 /* configs in Resources */, - 1ABCA38818CD9E180087CE3A /* DeprecatedOpenglEnum.lua in Resources */, + 15D1FD611998641200302043 /* DeprecatedNetworkEnum.lua in Resources */, 1AC35DE118CEE65900F37B72 /* background.ogg in Resources */, 15C90B4B18E66C2F00D69802 /* url.lua in Resources */, - 1ABCA37A18CD9E180087CE3A /* CCBReaderLoad.lua in Resources */, 1AC35DDF18CEE65900F37B72 /* music.mid in Resources */, 1AC35D7518CEE58500F37B72 /* src in Resources */, 1AC35DE018CEE65900F37B72 /* background.mp3 in Resources */, 1A1645A6191B6281008C7C7F /* ccs-res in Resources */, C08689C218D370C90093E810 /* background.caf in Resources */, + 15D1FD0A1998637C00302043 /* DeprecatedOpenglEnum.lua in Resources */, 15C90B4918E66C2A00D69802 /* tp.lua in Resources */, + 15D1FD281998637C00302043 /* Opengl.lua in Resources */, 1AC35DE918CEE65900F37B72 /* effect1.wav in Resources */, - 1ABCA38E18CD9E180087CE3A /* GuiConstants.lua in Resources */, - 156229331973D400009C9067 /* bitExtend.lua in Resources */, 15C90B3F18E66C0C00D69802 /* ltn12.lua in Resources */, 15C90B4718E66C2400D69802 /* socket.lua in Resources */, 15C90B3A18E66BE200D69802 /* ftp.lua in Resources */, - 1ABCA37E18CD9E180087CE3A /* Cocos2dConstants.lua in Resources */, + 15D1FD57199863F900302043 /* ExtensionConstants.lua in Resources */, 1AC35DE518CEE65900F37B72 /* Hello.png in Resources */, - 1ABCA38618CD9E180087CE3A /* DeprecatedEnum.lua in Resources */, 1AC35DEA18CEE65900F37B72 /* pew-pew-lei.wav in Resources */, 1AC35DC418CEE65100F37B72 /* Particles in Resources */, + 15D1FD3F199863CA00302043 /* DeprecatedCocosDenshionFunc.lua in Resources */, + 15D1FD191998637C00302043 /* json.lua in Resources */, + 15D1FD4B199863E800302043 /* StudioConstants.lua in Resources */, 1AC35DB918CEE65100F37B72 /* ccb in Resources */, + 15D1FD49199863E800302043 /* DeprecatedCocoStudioFunc.lua in Resources */, 15C90B4118E66C1100D69802 /* mbox.lua in Resources */, - 1ABCA38A18CD9E180087CE3A /* DrawPrimitives.lua in Resources */, + 15D1FD55199863F900302043 /* DeprecatedExtensionFunc.lua in Resources */, + 15D1FD3B199863CA00302043 /* AudioEngine.lua in Resources */, + 15D1FD231998637C00302043 /* luaoc.lua in Resources */, 1AC35DB318CEE5DA00F37B72 /* Icon.icns in Resources */, + 15D1FD051998637C00302043 /* DeprecatedCocos2dFunc.lua in Resources */, + 15D1FD3D199863CA00302043 /* DeprecatedCocosDenshionClass.lua in Resources */, + 15D1FD731998642800302043 /* DeprecatedUIFunc.lua in Resources */, 1AC35DE318CEE65900F37B72 /* fileLookup.plist in Resources */, + 15D1FD36199863BA00302043 /* DeprecatedCocosBuilderClass.lua in Resources */, 15C90B3D18E66BF100D69802 /* http.lua in Resources */, + 15D1FCF61998637C00302043 /* Cocos2dConstants.lua in Resources */, + 15D1FD0F1998637C00302043 /* DrawPrimitives.lua in Resources */, + 15D1FD711998642800302043 /* DeprecatedUIEnum.lua in Resources */, 1AC35DE618CEE65900F37B72 /* effect1.raw in Resources */, - 1ABCA39818CD9E180087CE3A /* OpenglConstants.lua in Resources */, 1AC35DC018CEE65100F37B72 /* Images in Resources */, - 1ABCA37818CD9E180087CE3A /* AudioEngine.lua in Resources */, - 1ABCA39418CD9E180087CE3A /* luaoc.lua in Resources */, - 1ABCA39018CD9E180087CE3A /* json.lua in Resources */, + 15D1FD5D1998641200302043 /* DeprecatedNetworkClass.lua in Resources */, 1AC35D7918CEE59900F37B72 /* cocosbuilderRes in Resources */, 15C90B3B18E66BEB00D69802 /* headers.lua in Resources */, - 1ABCA38218CD9E180087CE3A /* Deprecated.lua in Resources */, - 1ABCA38C18CD9E180087CE3A /* extern.lua in Resources */, 1AC35DC918CEE65100F37B72 /* zwoptex in Resources */, + 15D1FCEC1998637C00302043 /* bitExtend.lua in Resources */, + 15D1FD51199863F900302043 /* DeprecatedExtensionClass.lua in Resources */, 1AC35DBD18CEE65100F37B72 /* extensions in Resources */, + 15D1FD771998642800302043 /* GuiConstants.lua in Resources */, + 15D1FD45199863E800302043 /* CocoStudio.lua in Resources */, + 15D1FD1E1998637C00302043 /* luaj.lua in Resources */, 1AC35DC718CEE65100F37B72 /* spine in Resources */, 15C90B4518E66C1E00D69802 /* smtp.lua in Resources */, + 15D1FCFB1998637C00302043 /* DeprecatedCocos2dClass.lua in Resources */, 1AC35DB718CEE65100F37B72 /* animations in Resources */, - 1ABCA38418CD9E180087CE3A /* DeprecatedClass.lua in Resources */, - 1ABCA39618CD9E180087CE3A /* Opengl.lua in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -7945,72 +8862,87 @@ 15AECE0F195C1FDD00907DB0 /* cocosvideo.mp4 in Resources */, 15B0870D195AD52000D6F62B /* ActionTimeline in Resources */, 15E66FC8192D957100C20A52 /* Sprite3DTest in Resources */, + 15D1FD58199863F900302043 /* ExtensionConstants.lua in Resources */, 15C90B4418E66C1800D69802 /* mime.lua in Resources */, - 156229341973D400009C9067 /* bitExtend.lua in Resources */, + 15D1FD111998637C00302043 /* DrawPrimitives.lua in Resources */, 15C90B4C18E66C3100D69802 /* url.lua in Resources */, + 15D1FD1B1998637C00302043 /* json.lua in Resources */, 1AC35DD618CEE65200F37B72 /* Misc in Resources */, - 1ABCA37B18CD9E180087CE3A /* CCBReaderLoad.lua in Resources */, + 15D1FD3E199863CA00302043 /* DeprecatedCocosDenshionClass.lua in Resources */, 1AC35DF718CEE65B00F37B72 /* effect1.wav in Resources */, - 1ABCA38518CD9E180087CE3A /* DeprecatedClass.lua in Resources */, - 1ABCA39318CD9E180087CE3A /* luaj.lua in Resources */, C08689C418D370C90093E810 /* background.caf in Resources */, 1AC35DD118CEE65200F37B72 /* fonts in Resources */, + 15D1FD4C199863E800302043 /* StudioConstants.lua in Resources */, 1AC35DCC18CEE65200F37B72 /* ccb in Resources */, 1AC35DD218CEE65200F37B72 /* hd in Resources */, + 15D1FD251998637C00302043 /* luaoc.lua in Resources */, 1AC35DD718CEE65200F37B72 /* Particles in Resources */, + 15D1FD761998642800302043 /* experimentalUIConstants.lua in Resources */, 1AC35D9D18CEE5D100F37B72 /* Icon-120.png in Resources */, + 15D1FD781998642800302043 /* GuiConstants.lua in Resources */, 15C90B3E18E66BF200D69802 /* http.lua in Resources */, - 15AECE1F195D0EC500907DB0 /* experimentalConstants.lua in Resources */, 1AC35DA018CEE5D100F37B72 /* Icon-57.png in Resources */, - 1ABCA37F18CD9E180087CE3A /* Cocos2dConstants.lua in Resources */, 1AC35DF118CEE65B00F37B72 /* fileLookup.plist in Resources */, - 1ABCA39518CD9E180087CE3A /* luaoc.lua in Resources */, 1AC35DEF18CEE65B00F37B72 /* background.ogg in Resources */, 1AC35D9E18CEE5D100F37B72 /* Icon-144.png in Resources */, + 15D1FD021998637C00302043 /* DeprecatedCocos2dEnum.lua in Resources */, 1AC35DF818CEE65B00F37B72 /* pew-pew-lei.wav in Resources */, 1AC35D9918CEE5D100F37B72 /* Default-568h@2x.png in Resources */, + 15D1FD4A199863E800302043 /* DeprecatedCocoStudioFunc.lua in Resources */, + 15D1FD071998637C00302043 /* DeprecatedCocos2dFunc.lua in Resources */, 15C90B4218E66C1200D69802 /* mbox.lua in Resources */, + 15D1FD201998637C00302043 /* luaj.lua in Resources */, 1AC35D9B18CEE5D100F37B72 /* Default@2x.png in Resources */, 15C90B3718E66BE000D69802 /* ftp.lua in Resources */, - 1ABCA38318CD9E180087CE3A /* Deprecated.lua in Resources */, 1AC35DCE18CEE65200F37B72 /* components in Resources */, + 15D1FD631998641200302043 /* DeprecatedNetworkEnum.lua in Resources */, 1AC35D7618CEE58500F37B72 /* src in Resources */, 15C90B4A18E66C2B00D69802 /* tp.lua in Resources */, 1AC35DDC18CEE65200F37B72 /* zwoptex in Resources */, - 1ABCA38918CD9E180087CE3A /* DeprecatedOpenglEnum.lua in Resources */, 1AC35DEC18CEE65B00F37B72 /* CocosBuilderExample.ccbresourcelog in Resources */, 15C90B4618E66C1F00D69802 /* smtp.lua in Resources */, + 15D1FD3C199863CA00302043 /* AudioEngine.lua in Resources */, + 15D1FD35199863BA00302043 /* CCBReaderLoad.lua in Resources */, 1AC35DED18CEE65B00F37B72 /* music.mid in Resources */, + 15D1FCFD1998637C00302043 /* DeprecatedCocos2dClass.lua in Resources */, + 15D1FD721998642800302043 /* DeprecatedUIEnum.lua in Resources */, + 15D1FD5F1998641200302043 /* DeprecatedNetworkClass.lua in Resources */, + 15D1FD0C1998637C00302043 /* DeprecatedOpenglEnum.lua in Resources */, + 15D1FD6B1998641200302043 /* NetworkConstants.lua in Resources */, 1AC35DD018CEE65200F37B72 /* extensions in Resources */, + 15D1FD2A1998637C00302043 /* Opengl.lua in Resources */, + 15D1FCF81998637C00302043 /* Cocos2dConstants.lua in Resources */, 1AC35DD318CEE65200F37B72 /* Images in Resources */, 1AC35DF018CEE65B00F37B72 /* effect2.ogg in Resources */, - 1ABCA37D18CD9E180087CE3A /* Cocos2d.lua in Resources */, - 1ABCA39B18CD9E180087CE3A /* StudioConstants.lua in Resources */, - 1ABCA38D18CD9E180087CE3A /* extern.lua in Resources */, 1AC35DEB18CEE65B00F37B72 /* CocosBuilderExample.ccbproj in Resources */, + 15D1FD56199863F900302043 /* DeprecatedExtensionFunc.lua in Resources */, 1AC35DCA18CEE65200F37B72 /* animations in Resources */, + 15D1FD54199863F900302043 /* DeprecatedExtensionEnum.lua in Resources */, + 15D1FD2F1998637C00302043 /* OpenglConstants.lua in Resources */, + 15D1FD671998641200302043 /* DeprecatedNetworkFunc.lua in Resources */, 1A1645A9191B6283008C7C7F /* ccs-res in Resources */, + 15D1FD46199863E800302043 /* CocoStudio.lua in Resources */, + 15D1FD37199863BA00302043 /* DeprecatedCocosBuilderClass.lua in Resources */, 1AC35DA118CEE5D100F37B72 /* Icon-72.png in Resources */, 15C90B4018E66C0D00D69802 /* ltn12.lua in Resources */, + 15D1FD48199863E800302043 /* DeprecatedCocoStudioClass.lua in Resources */, + 15D1FD161998637C00302043 /* extern.lua in Resources */, 1AC35DA218CEE5D100F37B72 /* Icon-76.png in Resources */, 15C90B4818E66C2500D69802 /* socket.lua in Resources */, - 1ABCA38718CD9E180087CE3A /* DeprecatedEnum.lua in Resources */, + 15D1FD40199863CA00302043 /* DeprecatedCocosDenshionFunc.lua in Resources */, 15C90B3C18E66BEC00D69802 /* headers.lua in Resources */, 1AC35DF418CEE65B00F37B72 /* effect1.raw in Resources */, 1AC35DD918CEE65200F37B72 /* Shaders in Resources */, 1AC35DCF18CEE65200F37B72 /* configs in Resources */, - 1ABCA38F18CD9E180087CE3A /* GuiConstants.lua in Resources */, - 1ABCA39118CD9E180087CE3A /* json.lua in Resources */, 1AC35DDA18CEE65200F37B72 /* spine in Resources */, - 1ABCA39718CD9E180087CE3A /* Opengl.lua in Resources */, + 15D1FD741998642800302043 /* DeprecatedUIFunc.lua in Resources */, 1AC35DDB18CEE65200F37B72 /* TileMaps in Resources */, + 15D1FCEE1998637C00302043 /* bitExtend.lua in Resources */, 1AC35DF318CEE65B00F37B72 /* Hello.png in Resources */, + 15D1FCF31998637C00302043 /* Cocos2d.lua in Resources */, 1AC35D7A18CEE59900F37B72 /* cocosbuilderRes in Resources */, - 1ABCA38118CD9E180087CE3A /* CocoStudio.lua in Resources */, 1AC35D9C18CEE5D100F37B72 /* Icon-114.png in Resources */, - 1ABCA38B18CD9E180087CE3A /* DrawPrimitives.lua in Resources */, - 1ABCA39918CD9E180087CE3A /* OpenglConstants.lua in Resources */, - 1ABCA37918CD9E180087CE3A /* AudioEngine.lua in Resources */, + 15D1FD52199863F900302043 /* DeprecatedExtensionClass.lua in Resources */, 1AC35D9F18CEE5D100F37B72 /* Icon-152.png in Resources */, 1AC35DEE18CEE65B00F37B72 /* background.mp3 in Resources */, 1AC35D9A18CEE5D100F37B72 /* Default.png in Resources */, @@ -8146,7 +9078,7 @@ 15CBA9B7196EE8D9005877BB /* AppController.mm in Sources */, 15CBA9B8196EE8D9005877BB /* main.m in Sources */, 15CBA9B9196EE8D9005877BB /* RootViewController.mm in Sources */, - 15CBA9F0196F7BEC005877BB /* lua_cocos2dx_controller_manual.cpp in Sources */, + 15427B7D198B880100DC375D /* lua_cocos2dx_controller_manual.cpp in Sources */, 15CBA9ED196F7BD8005877BB /* lua_cocos2dx_controller_auto.cpp in Sources */, 15CBA9B4196EE8A0005877BB /* AppDelegate.cpp in Sources */, ); @@ -8299,6 +9231,7 @@ 1AC35C2718CECF0C00F37B72 /* PerformanceContainerTest.cpp in Sources */, 1AC35BEF18CECF0C00F37B72 /* CCControlSwitchTest.cpp in Sources */, 29080D91191B595E0066F8DF /* CustomGUIScene.cpp in Sources */, + 3E9E75D0199324CB005B7047 /* Camera3DTest.cpp in Sources */, 29080DC1191B595E0066F8DF /* UIRichTextTest.cpp in Sources */, 1AC35B2B18CECF0C00F37B72 /* BaseTest.cpp in Sources */, 1AC35B7D18CECF0C00F37B72 /* PlayerController.cpp in Sources */, @@ -8331,6 +9264,7 @@ 29080DC3191B595E0066F8DF /* UIScene.cpp in Sources */, 29080D9B191B595E0066F8DF /* CustomParticleWidget.cpp in Sources */, 29080D8D191B595E0066F8DF /* CocosGUIScene.cpp in Sources */, + 5EBEECB01995247000429821 /* DrawNode3D.cpp in Sources */, 1AC35BED18CECF0C00F37B72 /* CCControlStepperTest.cpp in Sources */, 1AC35C3318CECF0C00F37B72 /* PerformanceScenarioTest.cpp in Sources */, 1AC35C5918CECF0C00F37B72 /* TextureAtlasEncryptionTest.cpp in Sources */, @@ -8347,6 +9281,7 @@ 1AC35B8118CECF0C00F37B72 /* SceneController.cpp in Sources */, 1AC35B3318CECF0C00F37B72 /* Test.cpp in Sources */, 1AC35C2318CECF0C00F37B72 /* ParticleTest.cpp in Sources */, + 295824591987415900F9746D /* UIScale9SpriteTest.cpp in Sources */, 1AC35C6118CECF0C00F37B72 /* TouchesTest.cpp in Sources */, 1AC35C6318CECF0C00F37B72 /* TransitionsTest.cpp in Sources */, 29080DB3191B595E0066F8DF /* UILayoutTest_Editor.cpp in Sources */, @@ -8424,11 +9359,13 @@ 29080DB4191B595E0066F8DF /* UILayoutTest_Editor.cpp in Sources */, 1AC35C4E18CECF0C00F37B72 /* SpineTest.cpp in Sources */, 1AC35C1E18CECF0C00F37B72 /* NewRendererTest.cpp in Sources */, + 5EBEECB11995247000429821 /* DrawNode3D.cpp in Sources */, 1AC35B6818CECF0C00F37B72 /* AnimationsTestLayer.cpp in Sources */, 29080D8E191B595E0066F8DF /* CocosGUIScene.cpp in Sources */, 1AC35BFA18CECF0C00F37B72 /* WebSocketTest.cpp in Sources */, 1AC35BF218CECF0C00F37B72 /* EditBoxTest.cpp in Sources */, 38FA2E74194AEBE100FF2BE4 /* ActionTimelineTestScene.cpp in Sources */, + 2958245A1987415900F9746D /* UIScale9SpriteTest.cpp in Sources */, 1AC35B3A18CECF0C00F37B72 /* Bug-1174.cpp in Sources */, 1AC35BE418CECF0C00F37B72 /* CCControlColourPickerTest.cpp in Sources */, 29080DD4191B595E0066F8DF /* UITextAtlasTest.cpp in Sources */, @@ -8456,6 +9393,7 @@ 1AC35C1618CECF0C00F37B72 /* MenuTest.cpp in Sources */, 1AC35C6818CECF0C00F37B72 /* UserDefaultTest.cpp in Sources */, 29080D1D191B574B0066F8DF /* UITest.cpp in Sources */, + 3E9E75D1199324CB005B7047 /* Camera3DTest.cpp in Sources */, 1AF152DA18FD252A00A52F3D /* PerformanceCallbackTest.cpp in Sources */, 29080DA0191B595E0066F8DF /* CustomReader.cpp in Sources */, 1AC35C2218CECF0C00F37B72 /* ParallaxTest.cpp in Sources */, @@ -8600,31 +9538,176 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ + 15162227199F95B2006099B8 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libcocos3d Mac"; + targetProxy = 15162226199F95B2006099B8 /* PBXContainerItemProxy */; + }; + 15162234199F97D1006099B8 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libcocos3d iOS"; + targetProxy = 15162233199F97D1006099B8 /* PBXContainerItemProxy */; + }; + 151622BF19A0F66B006099B8 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libluacocos3d Mac"; + targetProxy = 151622BE19A0F66B006099B8 /* PBXContainerItemProxy */; + }; + 151622C719A0F679006099B8 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libcocos3d Mac"; + targetProxy = 151622C619A0F679006099B8 /* PBXContainerItemProxy */; + }; + 15427B81198B8ACB00DC375D /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libluanetwork iOS"; + targetProxy = 15427B80198B8ACB00DC375D /* PBXContainerItemProxy */; + }; + 15427B83198B8ACB00DC375D /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libluacocosdenshion iOS"; + targetProxy = 15427B82198B8ACB00DC375D /* PBXContainerItemProxy */; + }; + 15427B85198B8ACB00DC375D /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libluacocos2d iOS"; + targetProxy = 15427B84198B8ACB00DC375D /* PBXContainerItemProxy */; + }; + 15427B87198B8BB400DC375D /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libluaextension iOS"; + targetProxy = 15427B86198B8BB400DC375D /* PBXContainerItemProxy */; + }; + 15427B89198B8BB400DC375D /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libluaui iOS"; + targetProxy = 15427B88198B8BB400DC375D /* PBXContainerItemProxy */; + }; + 15427B8B198B8BB400DC375D /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libluacocostudio iOS"; + targetProxy = 15427B8A198B8BB400DC375D /* PBXContainerItemProxy */; + }; + 15427B8D198B8BB400DC375D /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libluacocosbuilder iOS"; + targetProxy = 15427B8C198B8BB400DC375D /* PBXContainerItemProxy */; + }; + 15427B8F198B8BB400DC375D /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libluaspine iOS"; + targetProxy = 15427B8E198B8BB400DC375D /* PBXContainerItemProxy */; + }; + 15427B91198B8BB400DC375D /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libluanetwork iOS"; + targetProxy = 15427B90198B8BB400DC375D /* PBXContainerItemProxy */; + }; + 15427B93198B8BB400DC375D /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libluacocosdenshion iOS"; + targetProxy = 15427B92198B8BB400DC375D /* PBXContainerItemProxy */; + }; + 15427B95198B8BB400DC375D /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libluacocos2d iOS"; + targetProxy = 15427B94198B8BB400DC375D /* PBXContainerItemProxy */; + }; + 15427B97198B8BBF00DC375D /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libnetwork iOS"; + targetProxy = 15427B96198B8BBF00DC375D /* PBXContainerItemProxy */; + }; + 15427B99198B8BDE00DC375D /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libcocos2d iOS"; + targetProxy = 15427B98198B8BDE00DC375D /* PBXContainerItemProxy */; + }; + 15427B9B198B8BDE00DC375D /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libcocosdenshion iOS"; + targetProxy = 15427B9A198B8BDE00DC375D /* PBXContainerItemProxy */; + }; + 15427B9D198B8C0500DC375D /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libluacocos2d iOS"; + targetProxy = 15427B9C198B8C0500DC375D /* PBXContainerItemProxy */; + }; + 15427B9F198B8C1300DC375D /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libcocosdenshion iOS"; + targetProxy = 15427B9E198B8C1300DC375D /* PBXContainerItemProxy */; + }; + 15427BA1198B8C2E00DC375D /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libluanetwork Mac"; + targetProxy = 15427BA0198B8C2E00DC375D /* PBXContainerItemProxy */; + }; + 15427BA3198B8C2E00DC375D /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libluacocosdenshion Mac"; + targetProxy = 15427BA2198B8C2E00DC375D /* PBXContainerItemProxy */; + }; + 15427BA5198B8C2E00DC375D /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libluacocos2d Mac"; + targetProxy = 15427BA4198B8C2E00DC375D /* PBXContainerItemProxy */; + }; + 15427BA7198B8C5000DC375D /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libluaextension Mac"; + targetProxy = 15427BA6198B8C5000DC375D /* PBXContainerItemProxy */; + }; + 15427BA9198B8C5000DC375D /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libluaui Mac"; + targetProxy = 15427BA8198B8C5000DC375D /* PBXContainerItemProxy */; + }; + 15427BAB198B8C5000DC375D /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libluacocostudio Mac"; + targetProxy = 15427BAA198B8C5000DC375D /* PBXContainerItemProxy */; + }; + 15427BAD198B8C5000DC375D /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libluacocosbuilder Mac"; + targetProxy = 15427BAC198B8C5000DC375D /* PBXContainerItemProxy */; + }; + 15427BAF198B8C5000DC375D /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libluaspine Mac"; + targetProxy = 15427BAE198B8C5000DC375D /* PBXContainerItemProxy */; + }; + 15427BB1198B8C5000DC375D /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libluanetwork Mac"; + targetProxy = 15427BB0198B8C5000DC375D /* PBXContainerItemProxy */; + }; + 15427BB3198B8C5000DC375D /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libluacocosdenshion Mac"; + targetProxy = 15427BB2198B8C5000DC375D /* PBXContainerItemProxy */; + }; + 15427BB5198B8C5000DC375D /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libluacocos2d Mac"; + targetProxy = 15427BB4198B8C5000DC375D /* PBXContainerItemProxy */; + }; + 158C128C19A0FC4700781A76 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libcocos3d iOS"; + targetProxy = 158C128B19A0FC4700781A76 /* PBXContainerItemProxy */; + }; + 158C129319A0FC5300781A76 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libluacocos3d iOS"; + targetProxy = 158C129219A0FC5300781A76 /* PBXContainerItemProxy */; + }; 15CBA016196EE56C005877BB /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = "cocos2dx iOS"; targetProxy = 15CBA017196EE56C005877BB /* PBXContainerItemProxy */; }; - 15CBA018196EE56C005877BB /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "cocos2dx-extensions iOS"; - targetProxy = 15CBA019196EE56C005877BB /* PBXContainerItemProxy */; - }; - 15CBA01A196EE56C005877BB /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "chipmunk iOS"; - targetProxy = 15CBA01B196EE56C005877BB /* PBXContainerItemProxy */; - }; - 15CBA01C196EE56C005877BB /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "CocosDenshion iOS"; - targetProxy = 15CBA01D196EE56C005877BB /* PBXContainerItemProxy */; - }; - 15CBA01E196EE56C005877BB /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "luabindings iOS"; - targetProxy = 15CBA01F196EE56C005877BB /* PBXContainerItemProxy */; - }; 1A0EE1C718CDF6DA004CD58F /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = "cocos2dx Mac"; @@ -8640,26 +9723,11 @@ name = "CocosDenshion Mac"; targetProxy = 1A0EE1D018CDF6DA004CD58F /* PBXContainerItemProxy */; }; - 1A0EE2B918CDF733004CD58F /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "luabindings Mac"; - targetProxy = 1A0EE2BA18CDF733004CD58F /* PBXContainerItemProxy */; - }; 1A0EE2BB18CDF733004CD58F /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = "cocos2dx Mac"; targetProxy = 1A0EE2BC18CDF733004CD58F /* PBXContainerItemProxy */; }; - 1A0EE2BD18CDF733004CD58F /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "cocos2dx-extensions Mac"; - targetProxy = 1A0EE2BE18CDF733004CD58F /* PBXContainerItemProxy */; - }; - 1A0EE2BF18CDF733004CD58F /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "chipmunk Mac"; - targetProxy = 1A0EE2C018CDF733004CD58F /* PBXContainerItemProxy */; - }; 1A0EE2C118CDF733004CD58F /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = "CocosDenshion Mac"; @@ -8680,31 +9748,6 @@ name = "CocosDenshion iOS"; targetProxy = 1A0EE32218CDF775004CD58F /* PBXContainerItemProxy */; }; - 1A0EE41A18CDF799004CD58F /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "cocos2dx iOS"; - targetProxy = 1A0EE41B18CDF799004CD58F /* PBXContainerItemProxy */; - }; - 1A0EE41C18CDF799004CD58F /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "cocos2dx-extensions iOS"; - targetProxy = 1A0EE41D18CDF799004CD58F /* PBXContainerItemProxy */; - }; - 1A0EE41E18CDF799004CD58F /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "chipmunk iOS"; - targetProxy = 1A0EE41F18CDF799004CD58F /* PBXContainerItemProxy */; - }; - 1A0EE42018CDF799004CD58F /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "CocosDenshion iOS"; - targetProxy = 1A0EE42118CDF799004CD58F /* PBXContainerItemProxy */; - }; - 1A0EE42218CDF799004CD58F /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "luabindings iOS"; - targetProxy = 1A0EE42318CDF799004CD58F /* PBXContainerItemProxy */; - }; 1AAF5342180E2F41000584C8 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = "cocos2dx Mac"; @@ -8775,11 +9818,6 @@ name = "CocosDenshion Mac"; targetProxy = 1ABCA2BE18CD92230087CE3A /* PBXContainerItemProxy */; }; - 1ABCA2C118CD92280087CE3A /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "luabindings Mac"; - targetProxy = 1ABCA2C018CD92280087CE3A /* PBXContainerItemProxy */; - }; 1ABCA2F818CD93850087CE3A /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = "cocos2dx iOS"; @@ -8800,11 +9838,6 @@ name = "CocosDenshion iOS"; targetProxy = 1ABCA2FD18CD93850087CE3A /* PBXContainerItemProxy */; }; - 1ABCA30018CD93850087CE3A /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "luabindings iOS"; - targetProxy = 1ABCA2FF18CD93850087CE3A /* PBXContainerItemProxy */; - }; 1ADA8BA418CF277400AE24B9 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 1A0EE1C618CDF6DA004CD58F /* cpp-empty-test Mac */; @@ -8845,16 +9878,6 @@ name = "chipmunk iOS"; targetProxy = 3E6177031960FAED00DE83F5 /* PBXContainerItemProxy */; }; - 3E6177041960FAED00DE83F5 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "CocosDenshion iOS"; - targetProxy = 3E6177051960FAED00DE83F5 /* PBXContainerItemProxy */; - }; - 3E6177451960FE1E00DE83F5 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "cocos2dx-extensions iOS"; - targetProxy = 3E6177441960FE1E00DE83F5 /* PBXContainerItemProxy */; - }; A035ACC0178246BD00987F6C /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 1D6058900D05DD3D006BFB54 /* cpp-tests Mac */; @@ -8865,6 +9888,111 @@ target = A07A517F1783A1D20073F6A7 /* cpp-tests iOS */; targetProxy = A07A526C1783AB980073F6A7 /* PBXContainerItemProxy */; }; + B244F3111976878700ED1926 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "cocosNetwork Mac"; + targetProxy = B244F3101976878700ED1926 /* PBXContainerItemProxy */; + }; + B27AEE041976894C008BD575 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "cocosNetwork Mac"; + targetProxy = B27AEE031976894C008BD575 /* PBXContainerItemProxy */; + }; + B27AEE0919768965008BD575 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "cocosNetwork Mac"; + targetProxy = B27AEE0819768965008BD575 /* PBXContainerItemProxy */; + }; + B2C59ABE197782AC00B452DF /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "cocosGUI iOS"; + targetProxy = B2C59ABD197782AC00B452DF /* PBXContainerItemProxy */; + }; + B2C59AC0197782AC00B452DF /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "cocosStudio iOS"; + targetProxy = B2C59ABF197782AC00B452DF /* PBXContainerItemProxy */; + }; + B2C59AC2197782AC00B452DF /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "cocosBuilder iOS"; + targetProxy = B2C59AC1197782AC00B452DF /* PBXContainerItemProxy */; + }; + B2C59ADC19779D5400B452DF /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "cocosGUI iOS"; + targetProxy = B2C59ADB19779D5400B452DF /* PBXContainerItemProxy */; + }; + B2C59ADE19779D5400B452DF /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "cocosStudio iOS"; + targetProxy = B2C59ADD19779D5400B452DF /* PBXContainerItemProxy */; + }; + B2C59AE019779D5400B452DF /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "cocosBuilder iOS"; + targetProxy = B2C59ADF19779D5400B452DF /* PBXContainerItemProxy */; + }; + B2C59AE219779D5400B452DF /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "cocosSpine iOS"; + targetProxy = B2C59AE119779D5400B452DF /* PBXContainerItemProxy */; + }; + B2C59AE419779D5400B452DF /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "cocosNetwork iOS"; + targetProxy = B2C59AE319779D5400B452DF /* PBXContainerItemProxy */; + }; + B2CC5044197766EB0041958E /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "cocosNetwork iOS"; + targetProxy = B2CC5043197766EB0041958E /* PBXContainerItemProxy */; + }; + B2CC507A19776D830041958E /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "cocosSpine iOS"; + targetProxy = B2CC507919776D830041958E /* PBXContainerItemProxy */; + }; + B2DB4794197668CA00411E16 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "cocosGUI Mac"; + targetProxy = B2DB4793197668CA00411E16 /* PBXContainerItemProxy */; + }; + B2DB480519766E3C00411E16 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "cocosBuilder Mac"; + targetProxy = B2DB480419766E3C00411E16 /* PBXContainerItemProxy */; + }; + B2DB48111976711200411E16 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "cocosGUI Mac"; + targetProxy = B2DB48101976711200411E16 /* PBXContainerItemProxy */; + }; + B2DB48131976711200411E16 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "cocosBuilder Mac"; + targetProxy = B2DB48121976711200411E16 /* PBXContainerItemProxy */; + }; + B2DB48BF19767D3600411E16 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "cocosStudio Mac"; + targetProxy = B2DB48BE19767D3600411E16 /* PBXContainerItemProxy */; + }; + B2DB48C519767DA500411E16 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "cocosStudio Mac"; + targetProxy = B2DB48C419767DA500411E16 /* PBXContainerItemProxy */; + }; + B2DB49361976819900411E16 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "cocosSpine Mac"; + targetProxy = B2DB49351976819900411E16 /* PBXContainerItemProxy */; + }; + B2DB493F1976825800411E16 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "cocosSpine Mac"; + targetProxy = B2DB493E1976825800411E16 /* PBXContainerItemProxy */; + }; /* End PBXTargetDependency section */ /* Begin PBXVariantGroup section */ @@ -8951,7 +10079,6 @@ IPHONEOS_DEPLOYMENT_TARGET = 5.1.1; LIBRARY_SEARCH_PATHS = ( "$(inherited)", - "/Users/cocos2d/MyWork/cocos2d-x-develop/tests/lua-game-controller-test/project/proj.android/obj/local/armeabi", "$(DEVELOPER_DIR)/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.0.sdk/usr/lib", ); PRODUCT_NAME = "lua-game-controller-test iOS"; @@ -8977,7 +10104,6 @@ IPHONEOS_DEPLOYMENT_TARGET = 5.1.1; LIBRARY_SEARCH_PATHS = ( "$(inherited)", - "/Users/cocos2d/MyWork/cocos2d-x-develop/tests/lua-game-controller-test/project/proj.android/obj/local/armeabi", "$(DEVELOPER_DIR)/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.0.sdk/usr/lib", ); PRODUCT_NAME = "lua-game-controller-test iOS"; @@ -8991,13 +10117,14 @@ 1A0EE2B018CDF6DA004CD58F /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + ARCHS = "$(ARCHS_STANDARD)"; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", CC_TARGET_OS_MAC, ); INFOPLIST_FILE = "$(SRCROOT)/../tests/cpp-empty-test/proj.mac/Info.plist"; + LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks"; USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../external/glfw3/include/mac"; }; name = Debug; @@ -9005,13 +10132,14 @@ 1A0EE2B118CDF6DA004CD58F /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + ARCHS = "$(ARCHS_STANDARD)"; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", CC_TARGET_OS_MAC, ); INFOPLIST_FILE = "$(SRCROOT)/../tests/cpp-empty-test/proj.mac/Info.plist"; + LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks"; USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../external/glfw3/include/mac"; VALIDATE_PRODUCT = YES; }; @@ -9020,12 +10148,13 @@ 1A0EE31218CDF733004CD58F /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + ARCHS = "$(ARCHS_STANDARD)"; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", CC_TARGET_OS_MAC, ); INFOPLIST_FILE = "$(SRCROOT)/../tests/lua-empty-test/project/proj.mac/Info.plist"; + LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks"; OTHER_LDFLAGS = ( "-pagezero_size", 10000, @@ -9039,12 +10168,13 @@ 1A0EE31318CDF733004CD58F /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + ARCHS = "$(ARCHS_STANDARD)"; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", CC_TARGET_OS_MAC, ); INFOPLIST_FILE = "$(SRCROOT)/../tests/lua-empty-test/project/proj.mac/Info.plist"; + LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks"; OTHER_LDFLAGS = ( "-pagezero_size", 10000, @@ -9125,12 +10255,13 @@ 1ABCA2B318CD91520087CE3A /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + ARCHS = "$(ARCHS_STANDARD)"; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", CC_TARGET_OS_MAC, ); INFOPLIST_FILE = "$(SRCROOT)/../tests/lua-tests/project/proj.ios_mac/mac/Info.plist"; + LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks"; OTHER_LDFLAGS = ( "-pagezero_size", 10000, @@ -9144,12 +10275,13 @@ 1ABCA2B418CD91520087CE3A /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + ARCHS = "$(ARCHS_STANDARD)"; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", CC_TARGET_OS_MAC, ); INFOPLIST_FILE = "$(SRCROOT)/../tests/lua-tests/project/proj.ios_mac/mac/Info.plist"; + LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks"; OTHER_LDFLAGS = ( "-pagezero_size", 10000, @@ -9197,12 +10329,13 @@ 1D6058940D05DD3E006BFB54 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + ARCHS = "$(ARCHS_STANDARD)"; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", CC_TARGET_OS_MAC, ); INFOPLIST_FILE = "$(SRCROOT)/../tests/cpp-tests/proj.mac/Info.plist"; + LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks"; USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../external/glfw3/include/mac"; }; name = Debug; @@ -9210,12 +10343,13 @@ 1D6058950D05DD3E006BFB54 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + ARCHS = "$(ARCHS_STANDARD)"; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", CC_TARGET_OS_MAC, ); INFOPLIST_FILE = "$(SRCROOT)/../tests/cpp-tests/proj.mac/Info.plist"; + LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks"; USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../external/glfw3/include/mac"; VALIDATE_PRODUCT = YES; }; diff --git a/build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/build all tests Mac.xcscheme b/build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/build all tests Mac.xcscheme index 2937783395..784723fab8 100644 --- a/build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/build all tests Mac.xcscheme +++ b/build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/build all tests Mac.xcscheme @@ -1,6 +1,6 @@ + + + + @@ -48,6 +57,15 @@ useCustomWorkingDirectory = "NO" buildConfiguration = "Release" debugDocumentVersioning = "YES"> + + + + diff --git a/build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/build all tests iOS.xcscheme b/build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/build all tests iOS.xcscheme index ecc2fd2528..ccac8c68e7 100644 --- a/build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/build all tests iOS.xcscheme +++ b/build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/build all tests iOS.xcscheme @@ -1,6 +1,6 @@ + + + + @@ -48,6 +57,15 @@ useCustomWorkingDirectory = "NO" buildConfiguration = "Release" debugDocumentVersioning = "YES"> + + + + diff --git a/build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/cpp-empty-test Mac.xcscheme b/build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/cpp-empty-test Mac.xcscheme index 17cd1fc940..2695cf3b5b 100644 --- a/build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/cpp-empty-test Mac.xcscheme +++ b/build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/cpp-empty-test Mac.xcscheme @@ -1,6 +1,6 @@ { public: - /** creates the action with the callback of type std::function. - This is the preferred way to create the callback. + /** creates the action with the callback of type std::function. + This is the preferred way to create the callback. * When this funtion bound in js or lua ,the input param will be changed * In js: var create(var func, var this, var [data]) or var create(var func) * In lua:local create(local funcID) - */ + */ static CallFunc * create(const std::function& func); /** creates the action with the callback typedef void (Ref::*SEL_CallFunc)(); - @deprecated Use the std::function API instead. + @deprecated Use the std::function API instead. * @js NA * @lua NA */ @@ -296,8 +306,8 @@ public: // Overrides // virtual void update(float time) override; - virtual CallFunc* reverse() const override; - virtual CallFunc* clone() const override; + virtual CallFunc* reverse() const override; + virtual CallFunc* clone() const override; CC_CONSTRUCTOR_ACCESS: CallFunc() @@ -308,16 +318,16 @@ CC_CONSTRUCTOR_ACCESS: } virtual ~CallFunc(); - /** initializes the action with the callback + /** initializes the action with the callback typedef void (Ref::*SEL_CallFunc)(); @deprecated Use the std::function API instead. */ CC_DEPRECATED_ATTRIBUTE bool initWithTarget(Ref* target); - /** initializes the action with the std::function + /** initializes the action with the std::function * @js NA * @lua NA - */ + */ bool initWithFunction(const std::function& func); protected: @@ -331,7 +341,7 @@ protected: }; /** function that will be called */ - std::function _function; + std::function _function; private: CC_DISALLOW_COPY_AND_ASSIGN(CallFunc); @@ -345,8 +355,8 @@ class CC_DLL CallFuncN : public CallFunc { public: /** creates the action with the callback of type std::function. - This is the preferred way to create the callback. - */ + This is the preferred way to create the callback. + */ static CallFuncN * create(const std::function& func); /** creates the action with the callback @@ -359,7 +369,7 @@ public: // // Overrides // - virtual CallFuncN* clone() const override; + virtual CallFuncN* clone() const override; virtual void execute() override; CC_CONSTRUCTOR_ACCESS: @@ -399,7 +409,7 @@ public: // // Overrides // - virtual __CCCallFuncND* clone() const override; + virtual __CCCallFuncND* clone() const override; virtual void execute() override; CC_CONSTRUCTOR_ACCESS: @@ -436,7 +446,7 @@ public: // // Overrides // - virtual __CCCallFuncO* clone() const override; + virtual __CCCallFuncO* clone() const override; virtual void execute() override; Ref* getObject() const; diff --git a/cocos/2d/CCActionInterval.cpp b/cocos/2d/CCActionInterval.cpp index 0c2fa35146..ac6fbdade3 100644 --- a/cocos/2d/CCActionInterval.cpp +++ b/cocos/2d/CCActionInterval.cpp @@ -724,41 +724,57 @@ Spawn* Spawn::reverse() const // RotateTo // -RotateTo* RotateTo::create(float duration, float deltaAngle) +RotateTo* RotateTo::create(float duration, float dstAngle) { RotateTo* rotateTo = new RotateTo(); - rotateTo->initWithDuration(duration, deltaAngle); + rotateTo->initWithDuration(duration, dstAngle, dstAngle); rotateTo->autorelease(); return rotateTo; } -bool RotateTo::initWithDuration(float duration, float deltaAngle) -{ - if (ActionInterval::initWithDuration(duration)) - { - _dstAngleX = _dstAngleY = deltaAngle; - return true; - } - - return false; -} - -RotateTo* RotateTo::create(float duration, float deltaAngleX, float deltaAngleY) +RotateTo* RotateTo::create(float duration, float dstAngleX, float dstAngleY) { RotateTo* rotateTo = new RotateTo(); - rotateTo->initWithDuration(duration, deltaAngleX, deltaAngleY); + rotateTo->initWithDuration(duration, dstAngleX, dstAngleY); rotateTo->autorelease(); return rotateTo; } -bool RotateTo::initWithDuration(float duration, float deltaAngleX, float deltaAngleY) +RotateTo* RotateTo::create(float duration, const Vec3& dstAngle3D) +{ + RotateTo* rotateTo = new RotateTo(); + rotateTo->initWithDuration(duration, dstAngle3D); + rotateTo->autorelease(); + + return rotateTo; +} + +RotateTo::RotateTo() +: _is3D(false) +{ +} + +bool RotateTo::initWithDuration(float duration, float dstAngleX, float dstAngleY) { if (ActionInterval::initWithDuration(duration)) { - _dstAngleX = deltaAngleX; - _dstAngleY = deltaAngleY; + _dstAngle.x = dstAngleX; + _dstAngle.y = dstAngleY; + + return true; + } + + return false; +} + +bool RotateTo::initWithDuration(float duration, const Vec3& dstAngle3D) +{ + if (ActionInterval::initWithDuration(duration)) + { + _dstAngle = dstAngle3D; + _is3D = true; return true; } @@ -770,84 +786,90 @@ RotateTo* RotateTo::clone(void) const { // no copy constructor auto a = new RotateTo(); - a->initWithDuration(_duration, _dstAngleX, _dstAngleY); + if(_is3D) + a->initWithDuration(_duration, _dstAngle); + else + a->initWithDuration(_duration, _dstAngle.x, _dstAngle.y); a->autorelease(); return a; } +void RotateTo::calculateAngles(float &startAngle, float &diffAngle, float dstAngle) +{ + if (startAngle > 0) + { + startAngle = fmodf(startAngle, 360.0f); + } + else + { + startAngle = fmodf(startAngle, -360.0f); + } + + diffAngle = dstAngle - startAngle; + if (diffAngle > 180) + { + diffAngle -= 360; + } + if (diffAngle < -180) + { + diffAngle += 360; + } +} + void RotateTo::startWithTarget(Node *target) { ActionInterval::startWithTarget(target); - // Calculate X - _startAngleX = target->getRotationSkewX(); - if (_startAngleX > 0) + if (_is3D) { - _startAngleX = fmodf(_startAngleX, 360.0f); + _startAngle = _target->getRotation3D(); } else { - _startAngleX = fmodf(_startAngleX, -360.0f); + _startAngle.x = _target->getRotationSkewX(); + _startAngle.y = _target->getRotationSkewY(); } - _diffAngleX = _dstAngleX - _startAngleX; - if (_diffAngleX > 180) - { - _diffAngleX -= 360; - } - if (_diffAngleX < -180) - { - _diffAngleX += 360; - } - - //Calculate Y: It's duplicated from calculating X since the rotation wrap should be the same - _startAngleY = _target->getRotationSkewY(); - - if (_startAngleY > 0) - { - _startAngleY = fmodf(_startAngleY, 360.0f); - } - else - { - _startAngleY = fmodf(_startAngleY, -360.0f); - } - - _diffAngleY = _dstAngleY - _startAngleY; - if (_diffAngleY > 180) - { - _diffAngleY -= 360; - } - - if (_diffAngleY < -180) - { - _diffAngleY += 360; - } + calculateAngles(_startAngle.x, _diffAngle.x, _dstAngle.x); + calculateAngles(_startAngle.y, _diffAngle.y, _dstAngle.y); + calculateAngles(_startAngle.z, _diffAngle.z, _dstAngle.z); } void RotateTo::update(float time) { if (_target) { -#if CC_USE_PHYSICS - if (_startAngleX == _startAngleY && _diffAngleX == _diffAngleY) + if(_is3D) { - _target->setRotation(_startAngleX + _diffAngleX * time); + _target->setRotation3D(Vec3( + _startAngle.x + _diffAngle.x * time, + _startAngle.y + _diffAngle.y * time, + _startAngle.z + _diffAngle.z * time + )); } else { - // _startAngleX != _startAngleY || _diffAngleX != _diffAngleY - if (_target->getPhysicsBody() != nullptr) +#if CC_USE_PHYSICS + if (_startAngle.x == _startAngle.y && _diffAngle.x == _diffAngle.y) { - CCLOG("RotateTo WARNING: PhysicsBody doesn't support skew rotation"); + _target->setRotation(_startAngle.x + _diffAngle.x * time); + } + else + { + // _startAngle.x != _startAngle.y || _diffAngle.x != _diffAngle.y + if (_target->getPhysicsBody() != nullptr) + { + CCLOG("RotateTo WARNING: PhysicsBody doesn't support skew rotation"); + } + + _target->setRotationSkewX(_startAngle.x + _diffAngle.x * time); + _target->setRotationSkewY(_startAngle.y + _diffAngle.y * time); } - - _target->setRotationSkewX(_startAngleX + _diffAngleX * time); - _target->setRotationSkewY(_startAngleY + _diffAngleY * time); - } #else - _target->setRotationSkewX(_startAngleX + _diffAngleX * time); - _target->setRotationSkewY(_startAngleY + _diffAngleY * time); + _target->setRotationSkewX(_startAngle.x + _diffAngle.x * time); + _target->setRotationSkewY(_startAngle.y + _diffAngle.y * time); #endif // CC_USE_PHYSICS + } } } @@ -897,7 +919,7 @@ bool RotateBy::initWithDuration(float duration, float deltaAngle) { if (ActionInterval::initWithDuration(duration)) { - _angleZ_X = _angleZ_Y = deltaAngle; + _deltaAngle.x = _deltaAngle.y = deltaAngle; return true; } @@ -908,8 +930,8 @@ bool RotateBy::initWithDuration(float duration, float deltaAngleX, float deltaAn { if (ActionInterval::initWithDuration(duration)) { - _angleZ_X = deltaAngleX; - _angleZ_Y = deltaAngleY; + _deltaAngle.x = deltaAngleX; + _deltaAngle.y = deltaAngleY; return true; } @@ -920,7 +942,7 @@ bool RotateBy::initWithDuration(float duration, const Vec3& deltaAngle3D) { if (ActionInterval::initWithDuration(duration)) { - _angle3D = deltaAngle3D; + _deltaAngle = deltaAngle3D; _is3D = true; return true; } @@ -934,9 +956,9 @@ RotateBy* RotateBy::clone() const // no copy constructor auto a = new RotateBy(); if(_is3D) - a->initWithDuration(_duration, _angle3D); + a->initWithDuration(_duration, _deltaAngle); else - a->initWithDuration(_duration, _angleZ_X, _angleZ_Y); + a->initWithDuration(_duration, _deltaAngle.x, _deltaAngle.y); a->autorelease(); return a; } @@ -946,12 +968,12 @@ void RotateBy::startWithTarget(Node *target) ActionInterval::startWithTarget(target); if(_is3D) { - _startAngle3D = target->getRotation3D(); + _startAngle = target->getRotation3D(); } else { - _startAngleZ_X = target->getRotationSkewX(); - _startAngleZ_Y = target->getRotationSkewY(); + _startAngle.x = target->getRotationSkewX(); + _startAngle.y = target->getRotationSkewY(); } } @@ -963,32 +985,32 @@ void RotateBy::update(float time) if(_is3D) { Vec3 v; - v.x = _startAngle3D.x + _angle3D.x * time; - v.y = _startAngle3D.y + _angle3D.y * time; - v.z = _startAngle3D.z + _angle3D.z * time; + v.x = _startAngle.x + _deltaAngle.x * time; + v.y = _startAngle.y + _deltaAngle.y * time; + v.z = _startAngle.z + _deltaAngle.z * time; _target->setRotation3D(v); } else { #if CC_USE_PHYSICS - if (_startAngleZ_X == _startAngleZ_Y && _angleZ_X == _angleZ_Y) + if (_startAngle.x == _startAngle.y && _deltaAngle.x == _deltaAngle.y) { - _target->setRotation(_startAngleZ_X + _angleZ_X * time); + _target->setRotation(_startAngle.x + _deltaAngle.x * time); } else { - // _startAngleZ_X != _startAngleZ_Y || _angleZ_X != _angleZ_Y + // _startAngle.x != _startAngle.y || _deltaAngle.x != _deltaAngle.y if (_target->getPhysicsBody() != nullptr) { CCLOG("RotateBy WARNING: PhysicsBody doesn't support skew rotation"); } - _target->setRotationSkewX(_startAngleZ_X + _angleZ_X * time); - _target->setRotationSkewY(_startAngleZ_Y + _angleZ_Y * time); + _target->setRotationSkewX(_startAngle.x + _deltaAngle.x * time); + _target->setRotationSkewY(_startAngle.y + _deltaAngle.y * time); } #else - _target->setRotationSkewX(_startAngleZ_X + _angleZ_X * time); - _target->setRotationSkewY(_startAngleZ_Y + _angleZ_Y * time); + _target->setRotationSkewX(_startAngle.x + _deltaAngle.x * time); + _target->setRotationSkewY(_startAngle.y + _deltaAngle.y * time); #endif // CC_USE_PHYSICS } } @@ -999,12 +1021,15 @@ RotateBy* RotateBy::reverse() const if(_is3D) { Vec3 v; - v.x = - _angle3D.x; - v.y = - _angle3D.y; - v.z = - _angle3D.z; + v.x = - _deltaAngle.x; + v.y = - _deltaAngle.y; + v.z = - _deltaAngle.z; return RotateBy::create(_duration, v); } - return RotateBy::create(_duration, -_angleZ_X, -_angleZ_Y); + else + { + return RotateBy::create(_duration, -_deltaAngle.x, -_deltaAngle.y); + } } // diff --git a/cocos/2d/CCActionInterval.h b/cocos/2d/CCActionInterval.h index fa538483be..8bf306a761 100644 --- a/cocos/2d/CCActionInterval.h +++ b/cocos/2d/CCActionInterval.h @@ -77,8 +77,17 @@ public: virtual bool isDone(void) const override; virtual void step(float dt) override; virtual void startWithTarget(Node *target) override; - virtual ActionInterval* reverse() const override = 0; - virtual ActionInterval *clone() const override = 0; + virtual ActionInterval* reverse() const override + { + CC_ASSERT(0); + return nullptr; + } + + virtual ActionInterval *clone() const override + { + CC_ASSERT(0); + return nullptr; + } CC_CONSTRUCTOR_ACCESS: /** initializes the action */ @@ -132,7 +141,7 @@ public: // Overrides // virtual Sequence* clone() const override; - virtual Sequence* reverse() const override; + virtual Sequence* reverse() const override; virtual void startWithTarget(Node *target) override; virtual void stop(void) override; virtual void update(float t) override; @@ -181,7 +190,7 @@ public: // Overrides // virtual Repeat* clone() const override; - virtual Repeat* reverse() const override; + virtual Repeat* reverse() const override; virtual void startWithTarget(Node *target) override; virtual void stop(void) override; virtual void update(float dt) override; @@ -235,7 +244,7 @@ public: // Overrides // virtual RepeatForever* clone() const override; - virtual RepeatForever* reverse(void) const override; + virtual RepeatForever* reverse(void) const override; virtual void startWithTarget(Node* target) override; virtual void step(float dt) override; virtual bool isDone(void) const override; @@ -302,7 +311,7 @@ public: // Overrides // virtual Spawn* clone() const override; - virtual Spawn* reverse(void) const override; + virtual Spawn* reverse(void) const override; virtual void startWithTarget(Node *target) override; virtual void stop(void) override; virtual void update(float time) override; @@ -330,10 +339,13 @@ class CC_DLL RotateTo : public ActionInterval { public: /** creates the action with separate rotation angles */ - static RotateTo* create(float duration, float deltaAngleX, float deltaAngleY); + static RotateTo* create(float duration, float dstAngleX, float dstAngleY); /** creates the action */ - static RotateTo* create(float duration, float deltaAngle); + static RotateTo* create(float duration, float dstAngle); + + /** creates the action with 3D rotation angles */ + static RotateTo* create(float duration, const Vec3& dstAngle3D); // // Overrides @@ -344,21 +356,21 @@ public: virtual void update(float time) override; CC_CONSTRUCTOR_ACCESS: - RotateTo() {} + RotateTo(); virtual ~RotateTo() {} /** initializes the action */ - bool initWithDuration(float duration, float deltaAngle); - bool initWithDuration(float duration, float deltaAngleX, float deltaAngleY); + bool initWithDuration(float duration, float dstAngleX, float dstAngleY); + bool initWithDuration(float duration, const Vec3& dstAngle3D); + + /** calculates the start and diff angles */ + void calculateAngles(float &startAngle, float &diffAngle, float dstAngle); protected: - float _dstAngleX; - float _startAngleX; - float _diffAngleX; - - float _dstAngleY; - float _startAngleY; - float _diffAngleY; + bool _is3D; + Vec3 _dstAngle; + Vec3 _startAngle; + Vec3 _diffAngle; private: CC_DISALLOW_COPY_AND_ASSIGN(RotateTo); @@ -379,7 +391,7 @@ public: // Override // virtual RotateBy* clone() const override; - virtual RotateBy* reverse(void) const override; + virtual RotateBy* reverse(void) const override; virtual void startWithTarget(Node *target) override; virtual void update(float time) override; @@ -394,14 +406,9 @@ CC_CONSTRUCTOR_ACCESS: bool initWithDuration(float duration, const Vec3& deltaAngle3D); protected: - float _angleZ_X; - float _startAngleZ_X; - float _angleZ_Y; - float _startAngleZ_Y; - bool _is3D; - Vec3 _angle3D; - Vec3 _startAngle3D; + Vec3 _deltaAngle; + Vec3 _startAngle; private: CC_DISALLOW_COPY_AND_ASSIGN(RotateBy); @@ -423,7 +430,7 @@ public: // Overrides // virtual MoveBy* clone() const override; - virtual MoveBy* reverse(void) const override; + virtual MoveBy* reverse(void) const override; virtual void startWithTarget(Node *target) override; virtual void update(float time) override; @@ -487,7 +494,7 @@ public: // Overrides // virtual SkewTo* clone() const override; - virtual SkewTo* reverse(void) const override; + virtual SkewTo* reverse(void) const override; virtual void startWithTarget(Node *target) override; virtual void update(float time) override; @@ -525,7 +532,7 @@ public: // virtual void startWithTarget(Node *target) override; virtual SkewBy* clone() const override; - virtual SkewBy* reverse(void) const override; + virtual SkewBy* reverse(void) const override; CC_CONSTRUCTOR_ACCESS: SkewBy() {} @@ -549,7 +556,7 @@ public: // Overrides // virtual JumpBy* clone() const override; - virtual JumpBy* reverse(void) const override; + virtual JumpBy* reverse(void) const override; virtual void startWithTarget(Node *target) override; virtual void update(float time) override; @@ -584,7 +591,7 @@ public: // virtual void startWithTarget(Node *target) override; virtual JumpTo* clone() const override; - virtual JumpTo* reverse(void) const override; + virtual JumpTo* reverse(void) const override; CC_CONSTRUCTOR_ACCESS: JumpTo() {} @@ -623,7 +630,7 @@ public: // Overrides // virtual BezierBy* clone() const override; - virtual BezierBy* reverse(void) const override; + virtual BezierBy* reverse(void) const override; virtual void startWithTarget(Node *target) override; virtual void update(float time) override; @@ -663,7 +670,7 @@ public: // virtual void startWithTarget(Node *target) override; virtual BezierTo* clone() const override; - virtual BezierTo* reverse(void) const override; + virtual BezierTo* reverse(void) const override; CC_CONSTRUCTOR_ACCESS: BezierTo() {} @@ -698,7 +705,7 @@ public: // Overrides // virtual ScaleTo* clone() const override; - virtual ScaleTo* reverse(void) const override; + virtual ScaleTo* reverse(void) const override; virtual void startWithTarget(Node *target) override; virtual void update(float time) override; @@ -751,7 +758,7 @@ public: // virtual void startWithTarget(Node *target) override; virtual ScaleBy* clone() const override; - virtual ScaleBy* reverse(void) const override; + virtual ScaleBy* reverse(void) const override; CC_CONSTRUCTOR_ACCESS: ScaleBy() {} @@ -773,7 +780,7 @@ public: // Overrides // virtual Blink* clone() const override; - virtual Blink* reverse() const override; + virtual Blink* reverse() const override; virtual void update(float time) override; virtual void startWithTarget(Node *target) override; virtual void stop() override; @@ -807,7 +814,7 @@ public: // Overrides // virtual FadeTo* clone() const override; - virtual FadeTo* reverse(void) const override; + virtual FadeTo* reverse(void) const override; virtual void startWithTarget(Node *target) override; virtual void update(float time) override; @@ -841,7 +848,7 @@ public: // virtual void startWithTarget(Node *target) override; virtual FadeIn* clone() const override; - virtual FadeTo* reverse(void) const override; + virtual FadeTo* reverse(void) const override; void setReverseAction(FadeTo* ac); @@ -868,7 +875,7 @@ public: // virtual void startWithTarget(Node *target) override; virtual FadeOut* clone() const override; - virtual FadeTo* reverse(void) const override; + virtual FadeTo* reverse(void) const override; void setReverseAction(FadeTo* ac); @@ -893,7 +900,7 @@ public: // Overrides // virtual TintTo* clone() const override; - virtual TintTo* reverse(void) const override; + virtual TintTo* reverse(void) const override; virtual void startWithTarget(Node *target) override; virtual void update(float time) override; @@ -925,7 +932,7 @@ public: // Overrides // virtual TintBy* clone() const override; - virtual TintBy* reverse() const override; + virtual TintBy* reverse() const override; virtual void startWithTarget(Node *target) override; virtual void update(float time) override; @@ -988,7 +995,7 @@ public: // // Overrides // - virtual ReverseTime* reverse() const override; + virtual ReverseTime* reverse() const override; virtual ReverseTime* clone() const override; virtual void startWithTarget(Node *target) override; virtual void stop(void) override; diff --git a/cocos/2d/CCAnimationCache.h b/cocos/2d/CCAnimationCache.h index 255e1ad8dc..1a8aba4c87 100644 --- a/cocos/2d/CCAnimationCache.h +++ b/cocos/2d/CCAnimationCache.h @@ -30,6 +30,7 @@ THE SOFTWARE. #include "base/CCRef.h" #include "base/CCMap.h" #include "base/CCValue.h" +#include "2d/CCAnimation.h" #include diff --git a/cocos/2d/CCClippingNode.cpp b/cocos/2d/CCClippingNode.cpp index fba3c00deb..8a307f69df 100644 --- a/cocos/2d/CCClippingNode.cpp +++ b/cocos/2d/CCClippingNode.cpp @@ -261,6 +261,7 @@ void ClippingNode::visit(Renderer *renderer, const Mat4 &parentTransform, uint32 renderer->addCommand(&_afterDrawStencilCmd); int i = 0; + bool visibleByCamera = isVisitableByVisitingCamera(); if(!_children.empty()) { @@ -276,12 +277,13 @@ void ClippingNode::visit(Renderer *renderer, const Mat4 &parentTransform, uint32 break; } // self draw - this->draw(renderer, _modelViewTransform, flags); + if (visibleByCamera) + this->draw(renderer, _modelViewTransform, flags); for(auto it=_children.cbegin()+i; it != _children.cend(); ++it) (*it)->visit(renderer, _modelViewTransform, flags); } - else + else if (visibleByCamera) { this->draw(renderer, _modelViewTransform, flags); } diff --git a/cocos/2d/CCComponentContainer.cpp b/cocos/2d/CCComponentContainer.cpp index 64b76aa915..a309329011 100644 --- a/cocos/2d/CCComponentContainer.cpp +++ b/cocos/2d/CCComponentContainer.cpp @@ -89,12 +89,33 @@ bool ComponentContainer::remove(const std::string& name) com->setOwner(nullptr); _components->erase(iter); - ret = true; } while(0); return ret; } +bool ComponentContainer::remove(Component *com) +{ + bool ret = false; + do + { + CC_BREAK_IF(!_components); + + for (auto iter = _components->begin(); iter != _components->end(); ++iter) + { + if (iter->second == com) + { + com->onExit(); + com->setOwner(nullptr); + _components->erase(iter); + break; + } + } + ret = true; + } while(0); + return ret; +} + void ComponentContainer::removeAll() { if (_components != nullptr) diff --git a/cocos/2d/CCComponentContainer.h b/cocos/2d/CCComponentContainer.h index e924c35f25..94677c73f0 100644 --- a/cocos/2d/CCComponentContainer.h +++ b/cocos/2d/CCComponentContainer.h @@ -50,6 +50,7 @@ public: virtual Component* get(const std::string& name) const; virtual bool add(Component *com); virtual bool remove(const std::string& name); + virtual bool remove(Component *com); virtual void removeAll(); virtual void visit(float delta); public: diff --git a/cocos/2d/CCDrawNode.h b/cocos/2d/CCDrawNode.h index 7a1a10b9bf..35a7835328 100644 --- a/cocos/2d/CCDrawNode.h +++ b/cocos/2d/CCDrawNode.h @@ -39,7 +39,7 @@ NS_CC_BEGIN /** DrawNode Node that draws dots, segments and polygons. - Faster than the "drawing primitives" since they it draws everything in one single batch. + Faster than the "drawing primitives" since they draws everything in one single batch. @since v2.1 */ diff --git a/cocos/2d/CCDrawingPrimitives.h b/cocos/2d/CCDrawingPrimitives.h index deecf32f0f..c90b6b8a1c 100644 --- a/cocos/2d/CCDrawingPrimitives.h +++ b/cocos/2d/CCDrawingPrimitives.h @@ -79,85 +79,85 @@ class PointArray; namespace DrawPrimitives { /** Initializes the drawing primitives */ - void init(); + void CC_DLL init(); /** Frees allocated resources by the drawing primitives */ - void free(); + void CC_DLL free(); /** draws a point given x and y coordinate measured in points */ - void drawPoint(const Vec2& point); + void CC_DLL drawPoint(const Vec2& point); /** draws an array of points. @since v0.7.2 */ - void drawPoints(const Vec2 *points, unsigned int numberOfPoints); + void CC_DLL drawPoints(const Vec2 *points, unsigned int numberOfPoints); /** draws a line given the origin and destination point measured in points */ - void drawLine(const Vec2& origin, const Vec2& destination); + void CC_DLL drawLine(const Vec2& origin, const Vec2& destination); /** draws a rectangle given the origin and destination point measured in points. */ - void drawRect(Vec2 origin, Vec2 destination); + void CC_DLL drawRect(Vec2 origin, Vec2 destination); /** draws a solid rectangle given the origin and destination point measured in points. @since 1.1 */ - void drawSolidRect(Vec2 origin, Vec2 destination, Color4F color); + void CC_DLL drawSolidRect(Vec2 origin, Vec2 destination, Color4F color); /** draws a polygon given a pointer to point coordinates and the number of vertices measured in points. The polygon can be closed or open */ - void drawPoly(const Vec2 *vertices, unsigned int numOfVertices, bool closePolygon); + void CC_DLL drawPoly(const Vec2 *vertices, unsigned int numOfVertices, bool closePolygon); /** draws a solid polygon given a pointer to CGPoint coordinates, the number of vertices measured in points, and a color. */ - void drawSolidPoly(const Vec2 *poli, unsigned int numberOfPoints, Color4F color); + void CC_DLL drawSolidPoly(const Vec2 *poli, unsigned int numberOfPoints, Color4F color); /** draws a circle given the center, radius and number of segments. */ - void drawCircle(const Vec2& center, float radius, float angle, unsigned int segments, bool drawLineToCenter, float scaleX, float scaleY); - void drawCircle(const Vec2& center, float radius, float angle, unsigned int segments, bool drawLineToCenter); + void CC_DLL drawCircle(const Vec2& center, float radius, float angle, unsigned int segments, bool drawLineToCenter, float scaleX, float scaleY); + void CC_DLL drawCircle(const Vec2& center, float radius, float angle, unsigned int segments, bool drawLineToCenter); /** draws a solid circle given the center, radius and number of segments. */ - void drawSolidCircle(const Vec2& center, float radius, float angle, unsigned int segments, float scaleX, float scaleY); - void drawSolidCircle(const Vec2& center, float radius, float angle, unsigned int segments); + void CC_DLL drawSolidCircle(const Vec2& center, float radius, float angle, unsigned int segments, float scaleX, float scaleY); + void CC_DLL drawSolidCircle(const Vec2& center, float radius, float angle, unsigned int segments); /** draws a quad bezier path @warning This function could be pretty slow. Use it only for debugging purposes. @since v0.8 */ - void drawQuadBezier(const Vec2& origin, const Vec2& control, const Vec2& destination, unsigned int segments); + void CC_DLL drawQuadBezier(const Vec2& origin, const Vec2& control, const Vec2& destination, unsigned int segments); /** draws a cubic bezier path @warning This function could be pretty slow. Use it only for debugging purposes. @since v0.8 */ - void drawCubicBezier(const Vec2& origin, const Vec2& control1, const Vec2& control2, const Vec2& destination, unsigned int segments); + void CC_DLL drawCubicBezier(const Vec2& origin, const Vec2& control1, const Vec2& control2, const Vec2& destination, unsigned int segments); /** draws a Catmull Rom path. @warning This function could be pretty slow. Use it only for debugging purposes. @since v2.0 */ - void drawCatmullRom(PointArray *arrayOfControlPoints, unsigned int segments); + void CC_DLL drawCatmullRom(PointArray *arrayOfControlPoints, unsigned int segments); /** draws a Cardinal Spline path. @warning This function could be pretty slow. Use it only for debugging purposes. @since v2.0 */ - void drawCardinalSpline(PointArray *config, float tension, unsigned int segments); + void CC_DLL drawCardinalSpline(PointArray *config, float tension, unsigned int segments); /** set the drawing color with 4 unsigned bytes @since v2.0 */ - void setDrawColor4B(GLubyte r, GLubyte g, GLubyte b, GLubyte a); + void CC_DLL setDrawColor4B(GLubyte r, GLubyte g, GLubyte b, GLubyte a); /** set the drawing color with 4 floats @since v2.0 */ - void setDrawColor4F(GLfloat r, GLfloat g, GLfloat b, GLfloat a); + void CC_DLL setDrawColor4F(GLfloat r, GLfloat g, GLfloat b, GLfloat a); /** set the point size in points. Default 1. @since v2.0 */ - void setPointSize(GLfloat pointSize); + void CC_DLL setPointSize(GLfloat pointSize); }; diff --git a/cocos/2d/CCFastTMXLayer.cpp b/cocos/2d/CCFastTMXLayer.cpp index 7b422e766a..e2646aa42a 100644 --- a/cocos/2d/CCFastTMXLayer.cpp +++ b/cocos/2d/CCFastTMXLayer.cpp @@ -121,8 +121,10 @@ TMXLayer::TMXLayer() , _useAutomaticVertexZ(false) , _dirty(true) , _quadsDirty(true) +, _vertexBuffer(nullptr) +, _vData(nullptr) +, _indexBuffer(nullptr) { - _buffersVBO[0] = _buffersVBO[1] = 0; } TMXLayer::~TMXLayer() @@ -130,15 +132,10 @@ TMXLayer::~TMXLayer() CC_SAFE_RELEASE(_tileSet); CC_SAFE_RELEASE(_texture); CC_SAFE_DELETE_ARRAY(_tiles); - if(glIsBuffer(_buffersVBO[0])) - { - glDeleteBuffers(1, &_buffersVBO[0]); - } + CC_SAFE_RELEASE(_vData); + CC_SAFE_RELEASE(_vertexBuffer); + CC_SAFE_RELEASE(_indexBuffer); - if(glIsBuffer(_buffersVBO[1])) - { - glDeleteBuffers(1, &_buffersVBO[1]); - } } void TMXLayer::draw(Renderer *renderer, const Mat4& transform, uint32_t flags) @@ -156,43 +153,37 @@ void TMXLayer::draw(Renderer *renderer, const Mat4& transform, uint32_t flags) updateTiles(rect); updateIndexBuffer(); + updatePrimitives(); _dirty = false; } - if(_renderCommands.size() < _indicesVertexZNumber.size()) + if(_renderCommands.size() < _primitives.size()) { - _renderCommands.resize(_indicesVertexZNumber.size()); + _renderCommands.resize(_primitives.size()); } int index = 0; - for(const auto& iter : _indicesVertexZNumber) + for(const auto& iter : _primitives) { - auto& cmd = _renderCommands[index++]; - - cmd.init(iter.first); - cmd.func = CC_CALLBACK_0(TMXLayer::onDraw, this, _indicesVertexZOffsets[iter.first], iter.second); - renderer->addCommand(&cmd); + if(iter.second->getCount() > 0) + { + auto& cmd = _renderCommands[index++]; + cmd.init(iter.first, _texture->getName(), getGLProgramState(), BlendFunc::ALPHA_NON_PREMULTIPLIED, iter.second, _modelViewTransform); + renderer->addCommand(&cmd); + } } - } -void TMXLayer::onDraw(int offset, int count) +void TMXLayer::onDraw(Primitive *primitive) { GL::bindTexture2D(_texture->getName()); getGLProgramState()->apply(_modelViewTransform); GL::bindVAO(0); - glBindBuffer(GL_ARRAY_BUFFER, _buffersVBO[0]); - glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, _buffersVBO[1]); - - GL::enableVertexAttribs(GL::VERTEX_ATTRIB_FLAG_POS_COLOR_TEX); - glVertexAttribPointer(GLProgram::VERTEX_ATTRIB_POSITION, 3, GL_FLOAT, GL_FALSE, sizeof(V3F_C4B_T2F), (GLvoid*)0); - glVertexAttribPointer(GLProgram::VERTEX_ATTRIB_COLOR, 4, GL_UNSIGNED_BYTE, GL_TRUE, sizeof(V3F_C4B_T2F), (GLvoid*)offsetof(V3F_C4B_T2F, colors)); - glVertexAttribPointer(GLProgram::VERTEX_ATTRIB_TEX_COORD, 2, GL_FLOAT, GL_FALSE, sizeof(V3F_C4B_T2F), (GLvoid*)offsetof(V3F_C4B_T2F, texCoords)); - glDrawElements(GL_TRIANGLES, (GLsizei)count * 6, GL_UNSIGNED_INT, (GLvoid*)(offset * 6 * sizeof(int))); + primitive->draw(); glBindBuffer(GL_ARRAY_BUFFER, 0); glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0); - CC_INCREMENT_GL_DRAWN_BATCHES_AND_VERTICES(1, count * 4); + CC_INCREMENT_GL_DRAWN_BATCHES_AND_VERTICES(1, primitive->getCount() * 4); } void TMXLayer::updateTiles(const Rect& culledRect) @@ -291,25 +282,32 @@ void TMXLayer::updateTiles(const Rect& culledRect) void TMXLayer::updateVertexBuffer() { GL::bindVAO(0); - if(!glIsBuffer(_buffersVBO[0])) + if(nullptr == _vData) { - glGenBuffers(1, &_buffersVBO[0]); + _vertexBuffer = VertexBuffer::create(sizeof(V3F_C4B_T2F), (int)_totalQuads.size() * 4); + _vData = VertexData::create(); + _vData->setStream(_vertexBuffer, VertexStreamAttribute(0, GLProgram::VERTEX_ATTRIB_POSITION, GL_FLOAT, 3)); + _vData->setStream(_vertexBuffer, VertexStreamAttribute(offsetof(V3F_C4B_T2F, colors), GLProgram::VERTEX_ATTRIB_COLOR, GL_UNSIGNED_BYTE, 4, true)); + _vData->setStream(_vertexBuffer, VertexStreamAttribute(offsetof(V3F_C4B_T2F, texCoords), GLProgram::VERTEX_ATTRIB_TEX_COORD, GL_FLOAT, 2)); + CC_SAFE_RETAIN(_vData); + CC_SAFE_RETAIN(_vertexBuffer); + } + if(_vertexBuffer) + { + _vertexBuffer->updateVertices((void*)&_totalQuads[0], (int)_totalQuads.size() * 4, 0); } - glBindBuffer(GL_ARRAY_BUFFER, _buffersVBO[0]); - glBufferData(GL_ARRAY_BUFFER, sizeof(V3F_C4B_T2F_Quad) * _totalQuads.size(), (GLvoid*)&_totalQuads[0], GL_STATIC_DRAW); - glBindBuffer(GL_ARRAY_BUFFER, 0); } void TMXLayer::updateIndexBuffer() { - if(!glIsBuffer(_buffersVBO[1])) + if(nullptr == _indexBuffer) { - glGenBuffers(1, &_buffersVBO[1]); + _indexBuffer = IndexBuffer::create(IndexBuffer::IndexType::INDEX_TYPE_UINT_32, (int)_indices.size()); + CC_SAFE_RETAIN(_indexBuffer); } - glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, _buffersVBO[1]); - glBufferData(GL_ELEMENT_ARRAY_BUFFER, sizeof(int) * _indices.size(), &_indices[0], GL_DYNAMIC_DRAW); - glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0); + _indexBuffer->updateIndices(&_indices[0], (int)_indices.size(), 0); + } // FastTMXLayer - setup Tiles @@ -405,6 +403,29 @@ Mat4 TMXLayer::tileToNodeTransform() } +void TMXLayer::updatePrimitives() +{ + for(const auto& iter : _indicesVertexZNumber) + { + int start = _indicesVertexZOffsets.at(iter.first); + + auto primitiveIter= _primitives.find(iter.first); + if(primitiveIter == _primitives.end()) + { + auto primitive = Primitive::create(_vData, _indexBuffer, GL_TRIANGLES); + primitive->setCount(iter.second * 6); + primitive->setStart(start * 6); + + _primitives.insert(iter.first, primitive); + } + else + { + primitiveIter->second->setCount(iter.second * 6); + primitiveIter->second->setStart(start * 6); + } + } +} + void TMXLayer::updateTotalQuads() { if(_quadsDirty) diff --git a/cocos/2d/CCFastTMXLayer.h b/cocos/2d/CCFastTMXLayer.h index f148eccc19..db1e0b7e3a 100644 --- a/cocos/2d/CCFastTMXLayer.h +++ b/cocos/2d/CCFastTMXLayer.h @@ -32,6 +32,7 @@ THE SOFTWARE. #include "CCNode.h" #include "renderer/CCCustomCommand.h" #include "renderer/CCQuadCommand.h" +#include "renderer/CCPrimitiveCommand.h" #include #include @@ -199,12 +200,12 @@ protected: // void updateTotalQuads(); - void onDraw(int offset, int count); - + void onDraw(Primitive* primitive); inline int getTileIndexByPos(int x, int y) const { return x + y * (int) _layerSize.width; } void updateVertexBuffer(); void updateIndexBuffer(); + void updatePrimitives(); protected: //! name of the layer @@ -228,7 +229,7 @@ protected: /** container for sprite children. map > */ std::map > _spriteContainer; - GLuint _buffersVBO[2]; //0: vertex, 1: indices + //GLuint _buffersVBO; //0: vertex, 1: indices Size _screenGridSize; Rect _screenGridRect; @@ -246,9 +247,17 @@ protected: std::vector _indices; std::map _indicesVertexZOffsets; std::unordered_map _indicesVertexZNumber; - std::vector _renderCommands; + std::vector _renderCommands; bool _dirty; + VertexBuffer* _vertexBuffer; + + VertexData* _vData; + + IndexBuffer* _indexBuffer; + + Map _primitives; + public: /** Possible orientations of the TMX map */ static const int FAST_TMX_ORIENTATION_ORTHO; diff --git a/cocos/2d/CCFontAtlasCache.cpp b/cocos/2d/CCFontAtlasCache.cpp index f088da6319..4708744221 100644 --- a/cocos/2d/CCFontAtlasCache.cpp +++ b/cocos/2d/CCFontAtlasCache.cpp @@ -178,7 +178,10 @@ FontAtlas * FontAtlasCache::getFontAtlasCharMap(Texture2D* texture, int itemWidt FontAtlas * FontAtlasCache::getFontAtlasCharMap(const std::string& charMapFile, int itemWidth, int itemHeight, int startCharMap) { - std::string atlasName = generateFontName(charMapFile, 0, GlyphCollection::CUSTOM,false); + char tmp[255]; + snprintf(tmp,250,"name:%s_%d_%d_%d",charMapFile.c_str(),itemWidth,itemHeight,startCharMap); + + std::string atlasName = generateFontName(tmp, 0, GlyphCollection::CUSTOM,false); auto it = _atlasMap.find(atlasName); if ( it == _atlasMap.end() ) diff --git a/cocos/2d/CCFontFNT.h b/cocos/2d/CCFontFNT.h index 945f81c0ac..78413fcf53 100644 --- a/cocos/2d/CCFontFNT.h +++ b/cocos/2d/CCFontFNT.h @@ -32,7 +32,7 @@ NS_CC_BEGIN class BMFontConfiguration; -class FontFNT : public Font +class CC_DLL FontFNT : public Font { public: diff --git a/cocos/2d/CCFontFreeType.cpp b/cocos/2d/CCFontFreeType.cpp index 9e462e7bdf..6a4623d392 100644 --- a/cocos/2d/CCFontFreeType.cpp +++ b/cocos/2d/CCFontFreeType.cpp @@ -267,7 +267,7 @@ unsigned char* FontFreeType::getGlyphBitmap(unsigned short theChar, long &outWid } else { - if (FT_Load_Glyph(_fontRef,glyphIndex,FT_LOAD_RENDER)) + if (FT_Load_Glyph(_fontRef,glyphIndex,FT_LOAD_RENDER | FT_LOAD_NO_AUTOHINT)) break; } diff --git a/cocos/2d/CCLabel.cpp b/cocos/2d/CCLabel.cpp index 6071882ea9..3ad34b2acf 100644 --- a/cocos/2d/CCLabel.cpp +++ b/cocos/2d/CCLabel.cpp @@ -881,11 +881,12 @@ void Label::drawShadowWithoutBlur() void Label::draw(Renderer *renderer, const Mat4 &transform, uint32_t flags) { // Don't do calculate the culling if the transform was not updated - _insideBounds = (flags & FLAGS_TRANSFORM_DIRTY) ? renderer->checkVisibility(transform, _contentSize) : _insideBounds; + bool transformUpdated = flags & FLAGS_TRANSFORM_DIRTY; + _insideBounds = transformUpdated ? renderer->checkVisibility(transform, _contentSize) : _insideBounds; if(_insideBounds) { _customCommand.init(_globalZOrder); - _customCommand.func = CC_CALLBACK_0(Label::onDraw, this, transform, flags); + _customCommand.func = CC_CALLBACK_0(Label::onDraw, this, transform, transformUpdated); renderer->addCommand(&_customCommand); } } @@ -1022,7 +1023,8 @@ void Label::updateFont() void Label::drawTextSprite(Renderer *renderer, uint32_t parentFlags) { - if (_fontDefinition._fontFillColor != _textColor) + if (_fontDefinition._fontFillColor.r != _textColor.r || _fontDefinition._fontFillColor.g != _textColor.g + || _fontDefinition._fontFillColor.b != _textColor.b) { updateContent(); } @@ -1052,7 +1054,7 @@ void Label::drawTextSprite(Renderer *renderer, uint32_t parentFlags) void Label::visit(Renderer *renderer, const Mat4 &parentTransform, uint32_t parentFlags) { - if (! _visible || _originalUTF8String.empty()) + if (! _visible || _originalUTF8String.empty() || !isVisitableByVisitingCamera()) { return; } diff --git a/cocos/2d/CCLabelBMFont.cpp b/cocos/2d/CCLabelBMFont.cpp index e62cb35e33..bd6826f1b7 100644 --- a/cocos/2d/CCLabelBMFont.cpp +++ b/cocos/2d/CCLabelBMFont.cpp @@ -204,7 +204,7 @@ const Size& LabelBMFont::getContentSize() const Rect LabelBMFont::getBoundingBox() const { - return _label->getBoundingBox(); + return Node::getBoundingBox(); } #if CC_LABELBMFONT_DEBUG_DRAW void LabelBMFont::draw(Renderer *renderer, const Mat4 &transform, uint32_t flags) diff --git a/cocos/2d/CCLabelTTF.cpp b/cocos/2d/CCLabelTTF.cpp index 63acc40e11..e55a957768 100644 --- a/cocos/2d/CCLabelTTF.cpp +++ b/cocos/2d/CCLabelTTF.cpp @@ -280,7 +280,8 @@ const Size& LabelTTF::getContentSize() const Rect LabelTTF::getBoundingBox() const { - return _renderLabel->getBoundingBox(); + const_cast(this)->setContentSize(_renderLabel->getContentSize()); + return Node::getBoundingBox(); } #if defined(__GNUC__) && ((__GNUC__ >= 4) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 1))) diff --git a/cocos/2d/CCLayer.h b/cocos/2d/CCLayer.h index 46d40c3df5..08abcb3201 100644 --- a/cocos/2d/CCLayer.h +++ b/cocos/2d/CCLayer.h @@ -173,9 +173,9 @@ CC_CONSTRUCTOR_ACCESS: protected: //add the api for avoid use deprecated api - void _addTouchListener(); + CC_DEPRECATED_ATTRIBUTE void _addTouchListener() {} - CC_DEPRECATED_ATTRIBUTE void addTouchListener() { _addTouchListener();}; + CC_DEPRECATED_ATTRIBUTE void addTouchListener() {} CC_DEPRECATED_ATTRIBUTE int executeScriptTouchHandler(EventTouch::EventCode eventType, Touch* touch, Event* event); CC_DEPRECATED_ATTRIBUTE int executeScriptTouchesHandler(EventTouch::EventCode eventType, const std::vector& touches, Event* event); diff --git a/cocos/2d/CCNode.cpp b/cocos/2d/CCNode.cpp index 2a52bd1a2d..fb42ac4ea2 100644 --- a/cocos/2d/CCNode.cpp +++ b/cocos/2d/CCNode.cpp @@ -39,6 +39,7 @@ THE SOFTWARE. #include "base/CCEvent.h" #include "base/CCEventTouch.h" #include "base/ccCArray.h" +#include "base/CCCamera.h" #include "2d/CCGrid.h" #include "2d/CCActionManager.h" #include "base/CCScriptSupport.h" @@ -128,6 +129,7 @@ Node::Node(void) , _usingNormalizedPosition(false) , _name("") , _hashOfName(0) +, _cameraMask(1) { // set default scheduler and actionManager Director *director = Director::getInstance(); @@ -1223,6 +1225,13 @@ uint32_t Node::processParentFlags(const Mat4& parentTransform, uint32_t parentFl return flags; } +bool Node::isVisitableByVisitingCamera() const +{ + auto camera = Camera::getVisitingCamera(); + bool visibleByCamera = camera ? (unsigned short)camera->getCameraFlag() & _cameraMask : true; + return visibleByCamera; +} + void Node::visit(Renderer* renderer, const Mat4 &parentTransform, uint32_t parentFlags) { // quick return if not visible. children won't be drawn. @@ -1239,6 +1248,8 @@ void Node::visit(Renderer* renderer, const Mat4 &parentTransform, uint32_t paren Director* director = Director::getInstance(); director->pushMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_MODELVIEW); director->loadMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_MODELVIEW, _modelViewTransform); + + bool visibleByCamera = isVisitableByVisitingCamera(); int i = 0; @@ -1256,12 +1267,13 @@ void Node::visit(Renderer* renderer, const Mat4 &parentTransform, uint32_t paren break; } // self draw - this->draw(renderer, _modelViewTransform, flags); + if (visibleByCamera) + this->draw(renderer, _modelViewTransform, flags); for(auto it=_children.cbegin()+i; it != _children.cend(); ++it) (*it)->visit(renderer, _modelViewTransform, flags); } - else + else if (visibleByCamera) { this->draw(renderer, _modelViewTransform, flags); } @@ -1850,6 +1862,14 @@ bool Node::removeComponent(const std::string& name) return false; } +bool Node::removeComponent(Component *component) +{ + if (_componentContainer) { + return _componentContainer->remove(component); + } + return false; +} + void Node::removeAllComponents() { if( _componentContainer ) @@ -2159,6 +2179,17 @@ void Node::disableCascadeColor() } } +void Node::setCameraMask(unsigned short mask, bool applyChildren) +{ + _cameraMask = mask; + if (applyChildren) + { + for (auto child : _children) { + child->setCameraMask(mask, applyChildren); + } + } +} + __NodeRGBA::__NodeRGBA() { CCLOG("NodeRGBA deprecated."); diff --git a/cocos/2d/CCNode.h b/cocos/2d/CCNode.h index e0b881e464..3d4d7500b4 100644 --- a/cocos/2d/CCNode.h +++ b/cocos/2d/CCNode.h @@ -71,7 +71,7 @@ enum { kNodeOnCleanup }; -bool nodeComparisonLess(Node* n1, Node* n2); +bool CC_DLL nodeComparisonLess(Node* n1, Node* n2); class EventListener; @@ -1284,12 +1284,12 @@ public: * Resumes all scheduled selectors, actions and event listeners. * This method is called internally by onEnter */ - void resume(void); + virtual void resume(void); /** * Pauses all scheduled selectors, actions and event listeners.. * This method is called internally by onExit */ - void pause(void); + virtual void pause(void); /** * Resumes all scheduled selectors, actions and event listeners. @@ -1433,6 +1433,10 @@ public: */ virtual bool removeComponent(const std::string& name); + /** + * removes a component by its pointer + */ + virtual bool removeComponent(Component *component); /** * removes all components */ @@ -1479,7 +1483,11 @@ public: void setonEnterTransitionDidFinishCallback(const std::function& callback) { _onEnterTransitionDidFinishCallback = callback; } const std::function& getonEnterTransitionDidFinishCallback() const { return _onEnterTransitionDidFinishCallback; } void setonExitTransitionDidStartCallback(const std::function& callback) { _onExitTransitionDidStartCallback = callback; } - const std::function& getonExitTransitionDidStartCallback() const { return _onExitTransitionDidStartCallback; } + const std::function& getonExitTransitionDidStartCallback() const { return _onExitTransitionDidStartCallback; } + + /** get & set camera mask, the node is visible by the camera whose camera flag & node's camera mask is true */ + unsigned short getCameraMask() const { return _cameraMask; } + void setCameraMask(unsigned short mask, bool applyChildren = true); CC_CONSTRUCTOR_ACCESS: // Nodes should be created using create(); @@ -1513,6 +1521,9 @@ protected: bool doEnumerate(std::string name, std::function callback) const; bool doEnumerateRecursive(const Node* node, const std::string &name, std::function callback) const; + //check whether this camera mask is visible by the current visiting camera + bool isVisitableByVisitingCamera() const; + #if CC_USE_PHYSICS void updatePhysicsBodyTransform(Scene* layer); virtual void updatePhysicsBodyPosition(Scene* layer); @@ -1619,6 +1630,9 @@ protected: static int s_globalOrderOfArrival; + // camera mask, it is visible only when _cameraMask & current camera' camera flag is true + unsigned short _cameraMask; + std::function _onEnterCallback; std::function _onExitCallback; std::function _onEnterTransitionDidFinishCallback; diff --git a/cocos/2d/CCNodeGrid.cpp b/cocos/2d/CCNodeGrid.cpp index b2ed64a5c7..a2e5c263c2 100644 --- a/cocos/2d/CCNodeGrid.cpp +++ b/cocos/2d/CCNodeGrid.cpp @@ -126,6 +126,7 @@ void NodeGrid::visit(Renderer *renderer, const Mat4 &parentTransform, uint32_t p } int i = 0; + bool visibleByCamera = isVisitableByVisitingCamera(); if(!_children.empty()) { @@ -141,13 +142,14 @@ void NodeGrid::visit(Renderer *renderer, const Mat4 &parentTransform, uint32_t p break; } // self draw,currently we have nothing to draw on NodeGrid, so there is no need to add render command - this->draw(renderer, _modelViewTransform, dirty); + if (visibleByCamera) + this->draw(renderer, _modelViewTransform, dirty); for(auto it=_children.cbegin()+i; it != _children.cend(); ++it) { (*it)->visit(renderer, _modelViewTransform, dirty); } } - else + else if (visibleByCamera) { this->draw(renderer, _modelViewTransform, dirty); } diff --git a/cocos/2d/CCNodeGrid.h b/cocos/2d/CCNodeGrid.h index 46ec7e389a..6465d5a8e3 100644 --- a/cocos/2d/CCNodeGrid.h +++ b/cocos/2d/CCNodeGrid.h @@ -33,7 +33,7 @@ NS_CC_BEGIN class GridBase; -class NodeGrid : public Node +class CC_DLL NodeGrid : public Node { public: static NodeGrid* create(); diff --git a/cocos/2d/CCParticleBatchNode.cpp b/cocos/2d/CCParticleBatchNode.cpp index 72a0646284..b717205f82 100644 --- a/cocos/2d/CCParticleBatchNode.cpp +++ b/cocos/2d/CCParticleBatchNode.cpp @@ -130,7 +130,7 @@ void ParticleBatchNode::visit(Renderer *renderer, const Mat4 &parentTransform, u // The alternative is to have a void Sprite#visit, but // although this is less maintainable, is faster // - if (!_visible) + if (!_visible || !isVisitableByVisitingCamera()) { return; } diff --git a/cocos/2d/CCParticleSystem.cpp b/cocos/2d/CCParticleSystem.cpp index 25c1066098..1dc57a04f2 100644 --- a/cocos/2d/CCParticleSystem.cpp +++ b/cocos/2d/CCParticleSystem.cpp @@ -771,7 +771,12 @@ void ParticleSystem::update(float dt) Vec2 newPos; - if (_positionType == PositionType::FREE || _positionType == PositionType::RELATIVE) + if (_positionType == PositionType::FREE) + { + Vec2 diff = convertToNodeSpace(currentPosition) - convertToNodeSpace(p-> startPos); + newPos = p->pos - diff; + } + else if(_positionType == PositionType::RELATIVE) { Vec2 diff = currentPosition - p->startPos; newPos = p->pos - diff; diff --git a/cocos/2d/CCParticleSystemQuad.cpp b/cocos/2d/CCParticleSystemQuad.cpp index 44f707a46f..3773ad668f 100644 --- a/cocos/2d/CCParticleSystemQuad.cpp +++ b/cocos/2d/CCParticleSystemQuad.cpp @@ -449,6 +449,10 @@ void ParticleSystemQuad::setTotalParticles(int tp) _totalParticles = tp; } + // fixed issue #5762 + // reset the emission rate + setEmissionRate(_totalParticles / _life); + resetSystem(); } diff --git a/cocos/ui/CCProtectedNode.cpp b/cocos/2d/CCProtectedNode.cpp similarity index 97% rename from cocos/ui/CCProtectedNode.cpp rename to cocos/2d/CCProtectedNode.cpp index ddfaabbc3f..4eae3d0b5a 100644 --- a/cocos/ui/CCProtectedNode.cpp +++ b/cocos/2d/CCProtectedNode.cpp @@ -318,7 +318,8 @@ void ProtectedNode::visit(Renderer* renderer, const Mat4 &parentTransform, uint3 // // draw self // - this->draw(renderer, _modelViewTransform, flags); + if (isVisitableByVisitingCamera()) + this->draw(renderer, _modelViewTransform, flags); // // draw children and protectedChildren zOrder >= 0 @@ -381,9 +382,10 @@ void ProtectedNode::updateDisplayedOpacity(GLubyte parentOpacity) for(auto child : _children){ child->updateDisplayedOpacity(_displayedOpacity); } - for(auto child : _protectedChildren){ - child->updateDisplayedOpacity(_displayedOpacity); - } + } + + for(auto child : _protectedChildren){ + child->updateDisplayedOpacity(_displayedOpacity); } } @@ -399,9 +401,9 @@ void ProtectedNode::updateDisplayedColor(const Color3B& parentColor) for(const auto &child : _children){ child->updateDisplayedColor(_displayedColor); } - for(const auto &child : _protectedChildren){ - child->updateDisplayedColor(_displayedColor); - } + } + for(const auto &child : _protectedChildren){ + child->updateDisplayedColor(_displayedColor); } } diff --git a/cocos/ui/CCProtectedNode.h b/cocos/2d/CCProtectedNode.h similarity index 99% rename from cocos/ui/CCProtectedNode.h rename to cocos/2d/CCProtectedNode.h index c950c5da2b..dcc3ff5463 100644 --- a/cocos/ui/CCProtectedNode.h +++ b/cocos/2d/CCProtectedNode.h @@ -33,8 +33,8 @@ #include "2d/CCNode.h" NS_CC_BEGIN - -class CC_DLL ProtectedNode : public Node + +class CC_DLL ProtectedNode : public Node { public: static ProtectedNode * create(void); diff --git a/cocos/2d/CCRenderTexture.cpp b/cocos/2d/CCRenderTexture.cpp index b5f16595b6..036d7583b4 100644 --- a/cocos/2d/CCRenderTexture.cpp +++ b/cocos/2d/CCRenderTexture.cpp @@ -67,6 +67,7 @@ RenderTexture::RenderTexture() , _rtTextureRect(Rect::ZERO) , _fullRect(Rect::ZERO) , _fullviewPort(Rect::ZERO) +, _saveFileCallback(nullptr) { #if CC_ENABLE_CACHE_TEXTURE_DATA // Listen this event to save render texture before come to background. @@ -393,7 +394,7 @@ void RenderTexture::visit(Renderer *renderer, const Mat4 &parentTransform, uint3 { // override visit. // Don't call visit on its children - if (!_visible) + if (!_visible || !isVisitableByVisitingCamera()) { return; } @@ -415,33 +416,36 @@ void RenderTexture::visit(Renderer *renderer, const Mat4 &parentTransform, uint3 _orderOfArrival = 0; } -bool RenderTexture::saveToFile(const std::string& filename, bool isRGBA) +bool RenderTexture::saveToFile(const std::string& filename, bool isRGBA, std::function callback) { std::string basename(filename); std::transform(basename.begin(), basename.end(), basename.begin(), ::tolower); if (basename.find(".png") != std::string::npos) { - return saveToFile(filename, Image::Format::PNG, isRGBA); + return saveToFile(filename, Image::Format::PNG, isRGBA, callback); } else if (basename.find(".jpg") != std::string::npos) { if (isRGBA) CCLOG("RGBA is not supported for JPG format."); - return saveToFile(filename, Image::Format::JPG, false); + return saveToFile(filename, Image::Format::JPG, false, callback); } else { CCLOG("Only PNG and JPG format are supported now!"); } - return saveToFile(filename, Image::Format::JPG, false); + return saveToFile(filename, Image::Format::JPG, false, callback); } -bool RenderTexture::saveToFile(const std::string& fileName, Image::Format format, bool isRGBA) + +bool RenderTexture::saveToFile(const std::string& fileName, Image::Format format, bool isRGBA, std::function callback) { CCASSERT(format == Image::Format::JPG || format == Image::Format::PNG, "the image can only be saved as JPG or PNG format"); if (isRGBA && format == Image::Format::JPG) CCLOG("RGBA is not supported for JPG format"); + _saveFileCallback = callback; + std::string fullpath = FileUtils::getInstance()->getWritablePath() + fileName; _saveToFileCommand.init(_globalZOrder); _saveToFileCommand.func = CC_CALLBACK_0(RenderTexture::onSaveToFile, this, fullpath, isRGBA); @@ -457,7 +461,10 @@ void RenderTexture::onSaveToFile(const std::string& filename, bool isRGBA) { image->saveToFile(filename.c_str(), !isRGBA); } - + if(_saveFileCallback) + { + _saveFileCallback(this, filename); + } CC_SAFE_DELETE(image); } @@ -555,7 +562,7 @@ void RenderTexture::onBegin() #if CC_TARGET_PLATFORM == CC_PLATFORM_WP8 Mat4 modifiedProjection = director->getMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_PROJECTION); - modifiedProjection = CCEGLView::sharedOpenGLView()->getReverseOrientationMatrix() * modifiedProjection; + modifiedProjection = GLViewImpl::sharedOpenGLView()->getReverseOrientationMatrix() * modifiedProjection; director->loadMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_PROJECTION,modifiedProjection); #endif @@ -574,7 +581,7 @@ void RenderTexture::onBegin() { #if CC_TARGET_PLATFORM == CC_PLATFORM_WP8 Mat4 modifiedProjection = director->getMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_PROJECTION); - modifiedProjection = CCEGLView::sharedOpenGLView()->getReverseOrientationMatrix() * modifiedProjection; + modifiedProjection = GLViewImpl::sharedOpenGLView()->getReverseOrientationMatrix() * modifiedProjection; director->loadMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_PROJECTION, modifiedProjection); #endif } diff --git a/cocos/2d/CCRenderTexture.h b/cocos/2d/CCRenderTexture.h index 187acc18b3..384a466bb6 100644 --- a/cocos/2d/CCRenderTexture.h +++ b/cocos/2d/CCRenderTexture.h @@ -103,12 +103,12 @@ public: /** saves the texture into a file using JPEG format. The file will be saved in the Documents folder. Returns true if the operation is successful. */ - bool saveToFile(const std::string& filename, bool isRGBA = true); + bool saveToFile(const std::string& filename, bool isRGBA = true, std::function callback = nullptr); /** saves the texture into a file. The format could be JPG or PNG. The file will be saved in the Documents folder. Returns true if the operation is successful. */ - bool saveToFile(const std::string& filename, Image::Format format, bool isRGBA = true); + bool saveToFile(const std::string& filename, Image::Format format, bool isRGBA = true, std::function callback = nullptr); /** Listen "come to background" message, and save render texture. It only has effect on Android. @@ -213,7 +213,12 @@ protected: CustomCommand _clearCommand; CustomCommand _beginCommand; CustomCommand _endCommand; + /*this command is used to encapsulate saveToFile, + call saveToFile twice will overwrite this command and callback + and the command and callback will be executed twice. + */ CustomCommand _saveToFileCommand; + std::function _saveFileCallback; protected: //renderer caches and callbacks void onBegin(); diff --git a/cocos/2d/CCScene.cpp b/cocos/2d/CCScene.cpp index 25a63f4be2..9d5fa4cfdc 100644 --- a/cocos/2d/CCScene.cpp +++ b/cocos/2d/CCScene.cpp @@ -27,6 +27,9 @@ THE SOFTWARE. #include "2d/CCScene.h" #include "base/CCDirector.h" +#include "base/CCCamera.h" +#include "base/CCEventDispatcher.h" +#include "base/CCEventListenerCustom.h" #include "2d/CCLayer.h" #include "2d/CCSprite.h" #include "2d/CCSpriteBatchNode.h" @@ -42,6 +45,13 @@ Scene::Scene() { _ignoreAnchorPointForPosition = true; setAnchorPoint(Vec2(0.5f, 0.5f)); + + //create default camera + _defaultCamera = Camera::create(); + addChild(_defaultCamera); + + _event = Director::getInstance()->getEventDispatcher()->addCustomEventListener(Director::EVENT_PROJECTION_CHANGED, std::bind(&Scene::onProjectionChanged, this, std::placeholders::_1)); + _event->retain(); } Scene::~Scene() @@ -49,6 +59,8 @@ Scene::~Scene() #if CC_USE_PHYSICS CC_SAFE_DELETE(_physicsWorld); #endif + Director::getInstance()->getEventDispatcher()->removeEventListener(_event); + CC_SAFE_RELEASE(_event); } bool Scene::init() @@ -120,7 +132,7 @@ void Scene::addChild(Node* child, int zOrder, const std::string &name) void Scene::update(float delta) { Node::update(delta); - if (nullptr != _physicsWorld) + if (nullptr != _physicsWorld && _physicsWorld->isAutoStep()) { _physicsWorld->update(delta); } @@ -148,6 +160,7 @@ bool Scene::initWithPhysics() { Director * director; CC_BREAK_IF( ! (director = Director::getInstance()) ); + this->setContentSize(director->getWinSize()); CC_BREAK_IF(! (_physicsWorld = PhysicsWorld::construct(*this))); @@ -179,6 +192,15 @@ void Scene::addChildToPhysicsWorld(Node* child) addToPhysicsWorldFunc(child); } } + +void Scene::onProjectionChanged(EventCustom* event) +{ + if (_defaultCamera) + { + _defaultCamera->initDefault(); + } +} + #endif NS_CC_END diff --git a/cocos/2d/CCScene.h b/cocos/2d/CCScene.h index f7a99e9e58..7630111cc9 100644 --- a/cocos/2d/CCScene.h +++ b/cocos/2d/CCScene.h @@ -34,6 +34,7 @@ THE SOFTWARE. NS_CC_BEGIN +class Camera; /** * @addtogroup scene * @{ @@ -64,17 +65,28 @@ public: using Node::addChild; virtual std::string getDescription() const override; + /** get all cameras */ + const std::vector& getCameras() const { return _cameras; } + CC_CONSTRUCTOR_ACCESS: Scene(); virtual ~Scene(); bool init(); bool initWithSize(const Size& size); + + void onProjectionChanged(EventCustom* event); protected: friend class Node; friend class ProtectedNode; friend class SpriteBatchNode; + friend class Camera; + friend class Director; + + std::vector _cameras; //weak ref to Camera + Camera* _defaultCamera; //weak ref, default camera created by scene, _cameras[0], Caution that the default camera can not be added to _cameras before onEnter is called + EventListenerCustom* _event; private: CC_DISALLOW_COPY_AND_ASSIGN(Scene); diff --git a/cocos/2d/CCSpriteBatchNode.cpp b/cocos/2d/CCSpriteBatchNode.cpp index 0ca9b2bded..a2e48bddca 100644 --- a/cocos/2d/CCSpriteBatchNode.cpp +++ b/cocos/2d/CCSpriteBatchNode.cpp @@ -85,7 +85,7 @@ bool SpriteBatchNode::initWithTexture(Texture2D *tex, ssize_t capacity) CCASSERT(capacity>=0, "Capacity must be >= 0"); _blendFunc = BlendFunc::ALPHA_PREMULTIPLIED; - if(tex->hasPremultipliedAlpha()) + if(!tex->hasPremultipliedAlpha()) { _blendFunc = BlendFunc::ALPHA_NON_PREMULTIPLIED; } @@ -147,7 +147,7 @@ void SpriteBatchNode::visit(Renderer *renderer, const Mat4 &parentTransform, uin // The alternative is to have a void Sprite#visit, but // although this is less maintainable, is faster // - if (! _visible) + if (! _visible || !isVisitableByVisitingCamera()) { return; } diff --git a/cocos/2d/CCSpriteFrameCache.cpp b/cocos/2d/CCSpriteFrameCache.cpp index 94fc0fe559..b86d6054c8 100644 --- a/cocos/2d/CCSpriteFrameCache.cpp +++ b/cocos/2d/CCSpriteFrameCache.cpp @@ -210,6 +210,12 @@ void SpriteFrameCache::addSpriteFramesWithFile(const std::string& plist, Texture _loadedFileNames->insert(plist); } +void SpriteFrameCache::addSpriteFramesWithFileContent(const std::string& plist_content, Texture2D *texture) +{ + ValueMap dict = FileUtils::getInstance()->getValueMapFromData(plist_content.c_str(), plist_content.size()); + addSpriteFramesWithDictionary(dict, texture); +} + void SpriteFrameCache::addSpriteFramesWithFile(const std::string& plist, const std::string& textureFileName) { CCASSERT(textureFileName.size()>0, "texture name should not be null"); @@ -357,6 +363,17 @@ void SpriteFrameCache::removeSpriteFramesFromFile(const std::string& plist) } } +void SpriteFrameCache::removeSpriteFramesFromFileContent(const std::string& plist_content) +{ + ValueMap dict = FileUtils::getInstance()->getValueMapFromData(plist_content.data(), plist_content.size()); + if (dict.empty()) + { + CCLOG("cocos2d:SpriteFrameCache:removeSpriteFramesFromFileContent: create dict by fail."); + return; + } + removeSpriteFramesFromDictionary(dict); +} + void SpriteFrameCache::removeSpriteFramesFromDictionary(ValueMap& dictionary) { ValueMap framesDict = dictionary["frames"].asValueMap(); diff --git a/cocos/2d/CCSpriteFrameCache.h b/cocos/2d/CCSpriteFrameCache.h index b9eaa2973c..b0e5b1f391 100644 --- a/cocos/2d/CCSpriteFrameCache.h +++ b/cocos/2d/CCSpriteFrameCache.h @@ -106,6 +106,12 @@ public: */ void addSpriteFramesWithFile(const std::string&plist, Texture2D *texture); + /** Adds multiple Sprite Frames from a plist file content. The texture will be associated with the created sprite frames. + * @js addSpriteFrames + * @lua addSpriteFrames + */ + void addSpriteFramesWithFileContent(const std::string& plist_content, Texture2D *texture); + /** Adds an sprite frame with a given name. If the name already exists, then the contents of the old name will be replaced with the new one. */ @@ -135,6 +141,12 @@ public: */ void removeSpriteFramesFromFile(const std::string& plist); + /** Removes multiple Sprite Frames from a plist file content. + * Sprite Frames stored in this file will be removed. + * It is convenient to call this method when a specific texture needs to be removed. + */ + void removeSpriteFramesFromFileContent(const std::string& plist_content); + /** Removes all Sprite Frames associated with the specified textures. * It is convenient to call this method when a specific texture needs to be removed. * @since v0.995. diff --git a/cocos/2d/CCTextFieldTTF.cpp b/cocos/2d/CCTextFieldTTF.cpp index fb2b1171ac..fef8b66e66 100644 --- a/cocos/2d/CCTextFieldTTF.cpp +++ b/cocos/2d/CCTextFieldTTF.cpp @@ -26,7 +26,6 @@ THE SOFTWARE. #include "CCTextFieldTTF.h" #include "base/CCDirector.h" -#include "CCGLView.h" NS_CC_BEGIN @@ -140,7 +139,7 @@ bool TextFieldTTF::attachWithIME() if (ret) { // open keyboard - GLView * pGlView = Director::getInstance()->getOpenGLView(); + auto pGlView = Director::getInstance()->getOpenGLView(); if (pGlView) { pGlView->setIMEKeyboardState(true); @@ -155,7 +154,7 @@ bool TextFieldTTF::detachWithIME() if (ret) { // close keyboard - GLView * glView = Director::getInstance()->getOpenGLView(); + auto glView = Director::getInstance()->getOpenGLView(); if (glView) { glView->setIMEKeyboardState(false); @@ -260,7 +259,9 @@ const std::string& TextFieldTTF::getContentText() void TextFieldTTF::setTextColor(const Color4B &color) { _colorText = color; - Label::setTextColor(_colorText); + if (_inputText.length() > 0) { + Label::setTextColor(_colorText); + } } void TextFieldTTF::visit(Renderer *renderer, const Mat4 &parentTransform, uint32_t parentFlags) @@ -283,11 +284,18 @@ void TextFieldTTF::setColorSpaceHolder(const Color3B& color) _colorSpaceHolder.g = color.g; _colorSpaceHolder.b = color.b; _colorSpaceHolder.a = 255; + if (0 == _inputText.length()) + { + Label::setTextColor(_colorSpaceHolder); + } } void TextFieldTTF::setColorSpaceHolder(const Color4B& color) { _colorSpaceHolder = color; + if (0 == _inputText.length()) { + Label::setTextColor(_colorSpaceHolder); + } } ////////////////////////////////////////////////////////////////////////// @@ -322,7 +330,7 @@ void TextFieldTTF::setString(const std::string &text) } // if there is no input text, display placeholder instead - if (! _inputText.length()) + if (0 == _inputText.length()) { Label::setTextColor(_colorSpaceHolder); Label::setString(_placeHolder); @@ -344,7 +352,7 @@ const std::string& TextFieldTTF::getString() const void TextFieldTTF::setPlaceHolder(const std::string& text) { _placeHolder = text; - if (! _inputText.length()) + if (0 == _inputText.length()) { Label::setTextColor(_colorSpaceHolder); Label::setString(_placeHolder); diff --git a/cocos/2d/CCTweenFunction.h b/cocos/2d/CCTweenFunction.h index acf8e17afb..e9bf6e21c5 100644 --- a/cocos/2d/CCTweenFunction.h +++ b/cocos/2d/CCTweenFunction.h @@ -84,63 +84,63 @@ namespace tweenfunc { //tween functions for CCActionEase - float easeIn(float time, float rate); - float easeOut(float time, float rate); - float easeInOut(float time, float rate); + float CC_DLL easeIn(float time, float rate); + float CC_DLL easeOut(float time, float rate); + float CC_DLL easeInOut(float time, float rate); - float bezieratFunction( float a, float b, float c, float d, float t ); + float CC_DLL bezieratFunction( float a, float b, float c, float d, float t ); - float quadraticIn(float time); - float quadraticOut(float time); - float quadraticInOut(float time); + float CC_DLL quadraticIn(float time); + float CC_DLL quadraticOut(float time); + float CC_DLL quadraticInOut(float time); - float tweenTo(float time, TweenType type, float *easingParam); + float CC_DLL tweenTo(float time, TweenType type, float *easingParam); - float linear(float time); + float CC_DLL linear(float time); - float sineEaseIn(float time); - float sineEaseOut(float time); - float sineEaseInOut(float time); + float CC_DLL sineEaseIn(float time); + float CC_DLL sineEaseOut(float time); + float CC_DLL sineEaseInOut(float time); - float quadEaseIn(float time); - float quadEaseOut(float time); - float quadEaseInOut(float time); + float CC_DLL quadEaseIn(float time); + float CC_DLL quadEaseOut(float time); + float CC_DLL quadEaseInOut(float time); - float cubicEaseIn(float time); - float cubicEaseOut(float time); - float cubicEaseInOut(float time); + float CC_DLL cubicEaseIn(float time); + float CC_DLL cubicEaseOut(float time); + float CC_DLL cubicEaseInOut(float time); - float quartEaseIn(float time); - float quartEaseOut(float time); - float quartEaseInOut(float time); + float CC_DLL quartEaseIn(float time); + float CC_DLL quartEaseOut(float time); + float CC_DLL quartEaseInOut(float time); - float quintEaseIn(float time); - float quintEaseOut(float time); - float quintEaseInOut(float time); + float CC_DLL quintEaseIn(float time); + float CC_DLL quintEaseOut(float time); + float CC_DLL quintEaseInOut(float time); - float expoEaseIn(float time); - float expoEaseOut(float time); - float expoEaseInOut(float time); + float CC_DLL expoEaseIn(float time); + float CC_DLL expoEaseOut(float time); + float CC_DLL expoEaseInOut(float time); - float circEaseIn(float time); - float circEaseOut(float time); - float circEaseInOut(float time); + float CC_DLL circEaseIn(float time); + float CC_DLL circEaseOut(float time); + float CC_DLL circEaseInOut(float time); - float elasticEaseIn(float time, float period); - float elasticEaseOut(float time, float period); - float elasticEaseInOut(float time, float period); + float CC_DLL elasticEaseIn(float time, float period); + float CC_DLL elasticEaseOut(float time, float period); + float CC_DLL elasticEaseInOut(float time, float period); - float backEaseIn(float time); - float backEaseOut(float time); - float backEaseInOut(float time); + float CC_DLL backEaseIn(float time); + float CC_DLL backEaseOut(float time); + float CC_DLL backEaseInOut(float time); - float bounceEaseIn(float time); - float bounceEaseOut(float time); - float bounceEaseInOut(float time); + float CC_DLL bounceEaseIn(float time); + float CC_DLL bounceEaseOut(float time); + float CC_DLL bounceEaseInOut(float time); - float customEase(float time, float *easingParam); + float CC_DLL customEase(float time, float *easingParam); } NS_CC_END diff --git a/cocos/2d/CMakeLists.txt b/cocos/2d/CMakeLists.txt index df2077e60e..dbe25302c9 100644 --- a/cocos/2d/CMakeLists.txt +++ b/cocos/2d/CMakeLists.txt @@ -1,9 +1,3 @@ -if(WIN32) - -ADD_DEFINITIONS(-DUNICODE -D_UNICODE) - -endif() - include_directories( ../external/ConvertUTF ) @@ -58,6 +52,7 @@ set(COCOS_2D_SRC 2d/CCParticleSystem.cpp 2d/CCParticleSystemQuad.cpp 2d/CCProgressTimer.cpp + 2d/CCProtectedNode.cpp 2d/CCRenderTexture.cpp 2d/CCScene.cpp 2d/CCSpriteBatchNode.cpp @@ -75,4 +70,3 @@ set(COCOS_2D_SRC 2d/CCTransitionProgress.cpp 2d/CCTweenFunction.cpp ) - diff --git a/cocos/2d/cocos2d.def b/cocos/2d/cocos2d.def new file mode 100644 index 0000000000..31666e8001 --- /dev/null +++ b/cocos/2d/cocos2d.def @@ -0,0 +1,3 @@ +LIBRARY +EXPORTS + XXH32 \ No newline at end of file diff --git a/cocos/2d/cocos2d_winrt.vcxproj b/cocos/2d/cocos2d_winrt.vcxproj index 54bec1007c..61a777d5a6 100644 --- a/cocos/2d/cocos2d_winrt.vcxproj +++ b/cocos/2d/cocos2d_winrt.vcxproj @@ -315,6 +315,7 @@ + @@ -345,6 +346,7 @@ CompileAsCpp + @@ -357,6 +359,7 @@ + @@ -388,7 +391,7 @@ - + @@ -397,7 +400,7 @@ - + @@ -422,6 +425,8 @@ + + @@ -429,6 +434,8 @@ + + @@ -506,6 +513,7 @@ + @@ -534,6 +542,7 @@ + @@ -552,6 +561,7 @@ + @@ -595,7 +605,7 @@ - + @@ -603,7 +613,7 @@ - + @@ -625,6 +635,8 @@ + + @@ -633,6 +645,8 @@ + + diff --git a/cocos/2d/cocos2d_winrt.vcxproj.filters b/cocos/2d/cocos2d_winrt.vcxproj.filters index e90211419a..c49292bf34 100644 --- a/cocos/2d/cocos2d_winrt.vcxproj.filters +++ b/cocos/2d/cocos2d_winrt.vcxproj.filters @@ -71,9 +71,6 @@ platform\winrt - - platform\winrt - platform\winrt @@ -98,9 +95,6 @@ platform - - platform - platform @@ -410,9 +404,6 @@ base - - base - base @@ -581,6 +572,33 @@ physics + + platform + + + platform\winrt + + + base + + + base + + + base + + + renderer + + + renderer + + + renderer + + + renderer + @@ -600,9 +618,6 @@ platform\winrt - - platform\winrt - platform\winrt @@ -645,9 +660,6 @@ platform - - platform - platform @@ -1185,6 +1197,33 @@ physics + + platform + + + platform\winrt + + + base + + + base + + + base + + + renderer + + + renderer + + + renderer + + + renderer + diff --git a/cocos/2d/cocos2d_wp8.vcxproj b/cocos/2d/cocos2d_wp8.vcxproj index f6416d1bca..07a0aefc46 100644 --- a/cocos/2d/cocos2d_wp8.vcxproj +++ b/cocos/2d/cocos2d_wp8.vcxproj @@ -222,18 +222,26 @@ NotUsing NotUsing + + + + + + + + @@ -272,8 +280,10 @@ NotUsing + + @@ -285,6 +295,7 @@ + @@ -316,7 +327,7 @@ - + @@ -332,7 +343,7 @@ - + @@ -350,6 +361,8 @@ + + @@ -357,6 +370,8 @@ + + @@ -406,6 +421,7 @@ + @@ -430,20 +446,28 @@ + + + + + + + + @@ -472,11 +496,13 @@ + + @@ -491,6 +517,7 @@ + @@ -533,7 +560,7 @@ - + @@ -552,7 +579,7 @@ - + @@ -565,6 +592,8 @@ + + @@ -573,6 +602,8 @@ + + @@ -622,6 +653,7 @@ + diff --git a/cocos/2d/cocos2d_wp8.vcxproj.filters b/cocos/2d/cocos2d_wp8.vcxproj.filters index a00fbb84f3..5a53e1329e 100644 --- a/cocos/2d/cocos2d_wp8.vcxproj.filters +++ b/cocos/2d/cocos2d_wp8.vcxproj.filters @@ -490,9 +490,6 @@ base - - base - base @@ -517,9 +514,6 @@ platform - - platform - platform @@ -529,9 +523,6 @@ platform - - platform\wp8 - platform\wp8 @@ -617,6 +608,60 @@ 2d + + platform + + + platform\wp8 + + + 2d + + + base + + + 3d + + + 3d + + + 3d + + + 3d + + + base + + + renderer + + + renderer + + + renderer + + + renderer + + + base + + + base + + + 3d + + + 3d + + + 3d + @@ -1141,9 +1186,6 @@ platform - - platform - platform @@ -1156,9 +1198,6 @@ platform\wp8 - - platform\wp8 - platform\wp8 @@ -1259,6 +1298,60 @@ 2d + + platform + + + platform\wp8 + + + 2d + + + base + + + 3d + + + 3d + + + 3d + + + 3d + + + base + + + renderer + + + renderer + + + renderer + + + renderer + + + base + + + base + + + 3d + + + 3d + + + 3d + diff --git a/cocos/2d/cocos2d_wp8_headers.props b/cocos/2d/cocos2d_wp8_headers.props index ca110ab470..b5f55539b7 100644 --- a/cocos/2d/cocos2d_wp8_headers.props +++ b/cocos/2d/cocos2d_wp8_headers.props @@ -7,7 +7,7 @@ - $(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;$(EngineRoot)external\wp8-specific\zlib\include;$(GeneratedFilesDir) + $(EngineRoot)cocos\platform;$(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;$(EngineRoot)external\wp8-specific\zlib\include;$(GeneratedFilesDir) _VARIADIC_MAX=10;NOMINMAX;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true diff --git a/cocos/2d/cocos2d.vcxproj b/cocos/2d/libcocos2d.vcxproj similarity index 91% rename from cocos/2d/cocos2d.vcxproj rename to cocos/2d/libcocos2d.vcxproj index 9e8280f3a4..457a0acc95 100644 --- a/cocos/2d/cocos2d.vcxproj +++ b/cocos/2d/libcocos2d.vcxproj @@ -18,7 +18,7 @@ - StaticLibrary + DynamicLibrary Unicode v100 v110 @@ -27,7 +27,7 @@ v120_xp - StaticLibrary + DynamicLibrary Unicode v100 v110 @@ -65,10 +65,10 @@ - $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath) + ../../external/sqlite3/libraries/win32;$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath) - $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath) + ../../external/sqlite3/libraries/win32;$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath) @@ -78,7 +78,7 @@ Disabled $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\win32;$(EngineRoot)external\jpeg\include\win32;$(EngineRoot)external\tiff\include\win32;$(EngineRoot)external\webp\include\win32;$(EngineRoot)external\freetype2\include\win32;$(EngineRoot)external\win32-specific\icon\include;$(EngineRoot)external\win32-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\xxhash;$(EngineRoot)external\ConvertUTF;$(EngineRoot)external;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_USRDLL;_DEBUG;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) false EnableFastChecks MultiThreadedDebugDLL @@ -103,6 +103,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\websockets\prebuilt\win32\*.*" "$(OutDi xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\zlib\prebuilt\*.*" "$(OutDir)" xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\icon\prebuilt\*.*" "$(OutDir)" xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(OutDir)" +xcopy /Y /Q "$(ProjectDir)..\..\external\sqlite3\libraries\win32\*.*" "$(OutDir)" @@ -114,6 +115,8 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou Windows $(TargetDir)$(TargetName).lib MachineX86 + cocos2d.def + libchipmunk.lib;sqlite3.lib;%(AdditionalDependencies) @@ -127,7 +130,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\win32;$(EngineRoot)external\jpeg\include\win32;$(EngineRoot)external\tiff\include\win32;$(EngineRoot)external\webp\include\win32;$(EngineRoot)external\freetype2\include\win32;$(EngineRoot)external\win32-specific\icon\include;$(EngineRoot)external\win32-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\xxhash;$(EngineRoot)external\ConvertUTF;$(EngineRoot)external;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_USRDLL;NDEBUG;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -155,7 +158,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou - %(AdditionalDependencies) + libchipmunk.lib;sqlite3.lib;%(AdditionalDependencies) $(OutDir)$(ProjectName).dll $(OutDir);%(AdditionalLibraryDirectories) ;%(IgnoreSpecificDefaultLibraries) @@ -165,6 +168,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou true $(TargetDir)$(TargetName).lib MachineX86 + cocos2d.def @@ -179,18 +183,10 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou - - - - - - - - - + @@ -214,8 +210,10 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou + + @@ -226,6 +224,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou + @@ -258,11 +257,11 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou - + - + @@ -277,6 +276,8 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou + + @@ -284,6 +285,9 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou + + + @@ -333,6 +337,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou + @@ -357,20 +362,10 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou - - - - - - - - - - - + @@ -399,11 +394,13 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou + + @@ -418,6 +415,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou + @@ -461,11 +459,11 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou - + - + @@ -481,6 +479,8 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou + + @@ -489,6 +489,9 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou + + + @@ -538,6 +541,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou + @@ -556,7 +560,6 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou - @@ -564,6 +567,12 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou + + + + + {207bc7a9-ccf1-4f2f-a04d-45f72242ae25} + diff --git a/cocos/2d/cocos2d.vcxproj.filters b/cocos/2d/libcocos2d.vcxproj.filters similarity index 94% rename from cocos/2d/cocos2d.vcxproj.filters rename to cocos/2d/libcocos2d.vcxproj.filters index af367c9ab0..b7bbac671f 100644 --- a/cocos/2d/cocos2d.vcxproj.filters +++ b/cocos/2d/libcocos2d.vcxproj.filters @@ -52,8 +52,8 @@ {b4e2b1e5-2d79-44a3-af45-728d47b7bdb2} - - {a20c4bdc-bd4c-40c1-a78a-fe31cd3ec76a} + + {44bdf58f-4af2-433c-b4af-58dc05ef96b5} @@ -403,9 +403,6 @@ base - - base - base @@ -418,6 +415,9 @@ base + + platform + base @@ -472,9 +472,6 @@ renderer - - platform\desktop - platform\win32 @@ -523,9 +520,6 @@ platform - - platform - platform @@ -553,42 +547,48 @@ renderer - - 3d - - - 3d - - - 3d - base - - 3d - - - 3d - - - 3d - - - 3d - - - 3d - - - 3d - 2d 2d + + storage + + + platform\desktop + + + platform + + + 2d + + + base + + + renderer + + + renderer + + + renderer + + + renderer + + + base + + + base + @@ -988,6 +988,9 @@ base + + platform + base @@ -1054,9 +1057,6 @@ renderer - - platform\desktop - platform\win32\compat @@ -1123,9 +1123,6 @@ platform - - platform - platform @@ -1156,48 +1153,48 @@ renderer - - 3d - - - 3d - - - 3d - base - - 3d - - - 3d - - - 3d - - - 3d - - - 3d - - - 3d - - - 3d - - - 3d - 2d 2d + + storage + + + platform\desktop + + + platform + + + 2d + + + base + + + renderer + + + renderer + + + renderer + + + renderer + + + base + + + base + @@ -1221,8 +1218,6 @@ math - - 3d - + \ No newline at end of file diff --git a/cocos/3d/3dExport.h b/cocos/3d/3dExport.h new file mode 100644 index 0000000000..2639bab2eb --- /dev/null +++ b/cocos/3d/3dExport.h @@ -0,0 +1,28 @@ +#ifndef __COCOS_3D_3DEXPORT_H__ +#define __COCOS_3D_3DEXPORT_H__ + +#if defined(WIN32) && defined(_WINDOWS) + #ifdef __MINGW32__ + #include + #endif + + #if defined(_USE3DDLL) + #define CC_3D_DLL __declspec(dllexport) + #else /* use a DLL library */ + #define CC_3D_DLL __declspec(dllimport) + #endif + + + /* Define NULL pointer value */ + #ifndef NULL + #ifdef __cplusplus + #define NULL 0 + #else + #define NULL ((void *)0) + #endif + #endif +#else + #define CC_3D_DLL +#endif + +#endif // __COCOS_3D_3DEXPORT_H__ diff --git a/cocos/3d/Android.mk b/cocos/3d/Android.mk new file mode 100644 index 0000000000..cf05d12d7b --- /dev/null +++ b/cocos/3d/Android.mk @@ -0,0 +1,33 @@ +LOCAL_PATH := $(call my-dir) +include $(CLEAR_VARS) + +LOCAL_MODULE := cocos3d_static + +LOCAL_MODULE_FILENAME := libcocos3d + +LOCAL_SRC_FILES := \ +CCRay.cpp \ +CCAABB.cpp \ +CCOBB.cpp \ +CCAnimate3D.cpp \ +CCAnimation3D.cpp \ +CCAttachNode.cpp \ +CCBundle3D.cpp \ +CCBundleReader.cpp \ +CCMesh.cpp \ +CCMeshSkin.cpp \ +CCSprite3DMaterial.cpp \ +CCObjLoader.cpp \ +CCSkeleton3D.cpp \ +CCSprite3D.cpp \ +CCSubMesh.cpp \ +CCSubMeshState.cpp \ + +LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/.. + +LOCAL_C_INCLUDES := $(LOCAL_PATH)/.. \ + $(LOCAL_PATH)/../../external \ + +LOCAL_WHOLE_STATIC_LIBRARIES := cocos2dx_static + +include $(BUILD_STATIC_LIBRARY) diff --git a/cocos/3d/CCAABB.cpp b/cocos/3d/CCAABB.cpp new file mode 100755 index 0000000000..4c159ae8b8 --- /dev/null +++ b/cocos/3d/CCAABB.cpp @@ -0,0 +1,184 @@ +/**************************************************************************** + 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/CCAABB.h" + +NS_CC_BEGIN + +AABB::AABB() +{ + reset(); +} + +AABB::AABB(const Vec3& min, const Vec3& max) +{ + set(min, max); +} + +AABB::AABB(const AABB& box) +{ + set(box._min,box._max); +} + +Vec3 AABB::getCenter() +{ + Vec3 center; + center.x = 0.5f*(_min.x+_max.x); + center.y = 0.5f*(_min.y+_max.y); + center.z = 0.5f*(_min.z+_max.z); + + return center; +} + +void AABB::getCorners(Vec3 *dst) const +{ + assert(dst); + + // Near face, specified counter-clockwise looking towards the origin from the positive z-axis. + // Left-top-front. + dst[0].set(_min.x, _max.y, _max.z); + // Left-bottom-front. + dst[1].set(_min.x, _min.y, _max.z); + // Right-bottom-front. + dst[2].set(_max.x, _min.y, _max.z); + // Right-top-front. + dst[3].set(_max.x, _max.y, _max.z); + + // Far face, specified counter-clockwise looking towards the origin from the negative z-axis. + // Right-top-back. + dst[4].set(_max.x, _max.y, _min.z); + // Right-bottom-back. + dst[5].set(_max.x, _min.y, _min.z); + // Left-bottom-back. + dst[6].set(_min.x, _min.y, _min.z); + // Left-top-back. + dst[7].set(_min.x, _max.y, _min.z); +} + +bool AABB::intersects(const AABB& aabb) const +{ + return ((_min.x >= aabb._min.x && _min.x <= aabb._max.x) || (aabb._min.x >= _min.x && aabb._min.x <= _max.x)) && + ((_min.y >= aabb._min.y && _min.y <= aabb._max.y) || (aabb._min.y >= _min.y && aabb._min.y <= _max.y)) && + ((_min.z >= aabb._min.z && _min.z <= aabb._max.z) || (aabb._min.z >= _min.z && aabb._min.z <= _max.z)); +} + +bool AABB::containPoint(const Vec3& point) const +{ + if (point.x < _min.x) return false; + if (point.y < _min.y) return false; + if (point.z < _min.z) return false; + if (point.x > _max.x) return false; + if (point.y > _max.y) return false; + if (point.z > _max.z) return false; + return true; +} + +void AABB::merge(const AABB& box) +{ + // Calculate the new minimum point. + _min.x = std::min(_min.x, box._min.x); + _min.y = std::min(_min.y, box._min.y); + _min.z = std::min(_min.z, box._min.z); + + // Calculate the new maximum point. + _max.x = std::max(_max.x, box._max.x); + _max.y = std::max(_max.y, box._max.y); + _max.z = std::max(_max.z, box._max.z); +} + +void AABB::set(const Vec3& min, const Vec3& max) +{ + this->_min = min; + this->_max = max; +} + +void AABB::reset() +{ + _min.set(99999.0f, 99999.0f, 99999.0f); + _max.set(-99999.0f, -99999.0f, -99999.0f); +} + +void AABB::updateMinMax(const Vec3* point, ssize_t num) +{ + for (ssize_t i = 0; i < num; i++) + { + // Leftmost point. + if (point[i].x < _min.x) + _min.x = point[i].x; + + // Lowest point. + if (point[i].y < _min.y) + _min.y = point[i].y; + + // Farthest point. + if (point[i].z < _min.z) + _min.z = point[i].z; + + // Rightmost point. + if (point[i].x > _max.x) + _max.x = point[i].x; + + // Highest point. + if (point[i].y > _max.y) + _max.y = point[i].y; + + // Nearest point. + if (point[i].z > _max.z) + _max.z = point[i].z; + } +} + +void AABB::transform(const Mat4& mat) +{ + Vec3 corners[8]; + // Near face, specified counter-clockwise + // Left-top-front. + corners[0].set(_min.x, _max.y, _max.z); + // Left-bottom-front. + corners[1].set(_min.x, _min.y, _max.z); + // Right-bottom-front. + corners[2].set(_max.x, _min.y, _max.z); + // Right-top-front. + corners[3].set(_max.x, _max.y, _max.z); + + // Far face, specified clockwise + // Right-top-back. + corners[4].set(_max.x, _max.y, _min.z); + // Right-bottom-back. + corners[5].set(_max.x, _min.y, _min.z); + // Left-bottom-back. + corners[6].set(_min.x, _min.y, _min.z); + // Left-top-back. + corners[7].set(_min.x, _max.y, _min.z); + + // Transform the corners, recalculate the min and max points along the way. + for (int i = 0; i < 8; i++) + mat.transformPoint(&corners[i]); + + reset(); + + updateMinMax(corners, 8); +} + +NS_CC_END diff --git a/cocos/3d/CCAABB.h b/cocos/3d/CCAABB.h new file mode 100644 index 0000000000..20d1650e70 --- /dev/null +++ b/cocos/3d/CCAABB.h @@ -0,0 +1,115 @@ +/**************************************************************************** + 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 __CC_AABB_H__ +#define __CC_AABB_H__ + +#include "base/ccMacros.h" +#include "math/CCMath.h" +#include "3d/3dExport.h" + +NS_CC_BEGIN + +class CC_3D_DLL AABB +{ + +public: + /** + * Constructor. + */ + AABB(); + + /** + * Constructor. + */ + AABB(const Vec3& min, const Vec3& max); + + /** + * Constructor. + */ + AABB(const AABB& box); + + /** + * Gets the center point of the bounding box. + */ + Vec3 getCenter(); + + /* Near face, specified counter-clockwise looking towards the origin from the positive z-axis. + * verts[0] : left top front + * verts[1] : left bottom front + * verts[2] : right bottom front + * verts[3] : right top front + * + * Far face, specified counter-clockwise looking towards the origin from the negative z-axis. + * verts[4] : right top back + * verts[5] : right bottom back + * verts[6] : left bottom back + * verts[7] : left top back + */ + void getCorners(Vec3 *dst) const; + + /** + * Tests whether this bounding box intersects the specified bounding object. + */ + bool intersects(const AABB& aabb) const; + + /** + * check whether the point is in. + */ + bool containPoint(const Vec3& point) const; + + /** + * Sets this bounding box to the smallest bounding box + * that contains both this bounding object and the specified bounding box. + */ + void merge(const AABB& box); + + /** + * Sets this bounding box to the specified values. + */ + void set(const Vec3& min, const Vec3& max); + + /** + * reset min and max value. + */ + void reset(); + + /** + * update the _min and _max from the given point. + */ + void updateMinMax(const Vec3* point, ssize_t num); + + /** + * Transforms the bounding box by the given transformation matrix. + */ + void transform(const Mat4& mat); + +public: + Vec3 _min; + Vec3 _max; +}; + +NS_CC_END + +#endif diff --git a/cocos/3d/CCAnimate3D.cpp b/cocos/3d/CCAnimate3D.cpp index da1e2c6a80..0034621814 100644 --- a/cocos/3d/CCAnimate3D.cpp +++ b/cocos/3d/CCAnimate3D.cpp @@ -25,6 +25,7 @@ #include "3d/CCAnimate3D.h" #include "3d/CCAnimation3D.h" #include "3d/CCSprite3D.h" +#include "3d/CCSkeleton3D.h" #include "3d/CCMeshSkin.h" #include "base/ccMacros.h" diff --git a/cocos/3d/CCAnimate3D.h b/cocos/3d/CCAnimate3D.h index ba8ccee7ae..d6d8152bb2 100644 --- a/cocos/3d/CCAnimate3D.h +++ b/cocos/3d/CCAnimate3D.h @@ -34,6 +34,7 @@ #include "base/ccTypes.h" #include "base/CCPlatformMacros.h" #include "2d/CCActionInterval.h" +#include "3d/3dExport.h" NS_CC_BEGIN @@ -42,7 +43,7 @@ class Bone3D; /** * Animate3D, Animates a Sprite3D given with an Animation3D */ -class Animate3D: public ActionInterval +class CC_3D_DLL Animate3D: public ActionInterval { public: diff --git a/cocos/3d/CCAnimation3D.h b/cocos/3d/CCAnimation3D.h index 1d18cf6b0a..006506d018 100644 --- a/cocos/3d/CCAnimation3D.h +++ b/cocos/3d/CCAnimation3D.h @@ -33,13 +33,14 @@ #include "base/CCRef.h" #include "base/ccTypes.h" #include "CCBundle3DData.h" +#include "3d/3dExport.h" NS_CC_BEGIN /** * static animation data, shared */ -class Animation3D: public Ref +class CC_3D_DLL Animation3D: public Ref { friend class Bundle3D; public: diff --git a/cocos/3d/CCAttachNode.cpp b/cocos/3d/CCAttachNode.cpp new file mode 100644 index 0000000000..030d323e92 --- /dev/null +++ b/cocos/3d/CCAttachNode.cpp @@ -0,0 +1,76 @@ +/**************************************************************************** + 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/CCAttachNode.h" +#include "3d/CCSkeleton3D.h" + +#include "2d/CCNode.h" + +#include "base/CCDirector.h" +#include "base/CCPlatformMacros.h" +#include "base/ccMacros.h" + +NS_CC_BEGIN + +AttachNode* AttachNode::create(Bone3D* attachBone) +{ + auto attachnode = new AttachNode(); + attachnode->_attachBone = attachBone; + attachnode->autorelease(); + + return attachnode; +} + +AttachNode::AttachNode() +: _attachBone(nullptr) +{ + +} +AttachNode::~AttachNode() +{ + +} + +Mat4 AttachNode::getWorldToNodeTransform() const +{ + static Mat4 mat; + mat.setIdentity(); + auto parent = getParent(); + if (parent) + { + mat = parent->getWorldToNodeTransform() * _attachBone->getWorldMat() * getNodeToParentTransform(); + } + else + { + mat = _attachBone->getWorldMat() * getNodeToParentTransform(); + } + return mat; +} + +void AttachNode::visit(Renderer *renderer, const Mat4& parentTransform, uint32_t parentFlags) +{ + Node::visit(renderer, parentTransform * _attachBone->getWorldMat(), Node::FLAGS_DIRTY_MASK); +} +NS_CC_END + diff --git a/cocos/3d/CCAttachNode.h b/cocos/3d/CCAttachNode.h new file mode 100644 index 0000000000..ed67bca143 --- /dev/null +++ b/cocos/3d/CCAttachNode.h @@ -0,0 +1,73 @@ +/**************************************************************************** + 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 __CCATTACHNODE_H__ +#define __CCATTACHNODE_H__ + +#include + +#include "base/CCVector.h" +#include "base/ccTypes.h" +#include "base/CCProtocols.h" +#include "math/CCMath.h" +#include "2d/CCNode.h" +#include "renderer/CCMeshCommand.h" +#include "3d/3dExport.h" + +NS_CC_BEGIN + +class Bone3D; + +/** + * attach a node to a bone + * usage: auto sprite = Sprite3D::create("girl.c3b"); + * auto weapon = Sprite3D::create("weapon.c3b"); + * auto attachNode = sprite->getAttachNode("left hand"); + * attachNode->addChild(weapon); + */ +class CC_3D_DLL AttachNode : public Node +{ +public: + /** + * creates an AttachNode + * @param attachBone The bone to which the AttachNode is going to attach, the attacheBone must be a bone of the AttachNode's parent + */ + static AttachNode* create(Bone3D* attachBone); + + virtual Mat4 getWorldToNodeTransform() const override; + virtual void visit(Renderer *renderer, const Mat4& parentTransform, uint32_t parentFlags) override; + +CC_CONSTRUCTOR_ACCESS: + + AttachNode(); + virtual ~AttachNode(); + + +protected: + Bone3D* _attachBone; +}; + + +NS_CC_END +#endif // __CCATTACHNODE_H__ diff --git a/cocos/3d/CCBundle3D.cpp b/cocos/3d/CCBundle3D.cpp index 991aaec32d..77dfb36c08 100644 --- a/cocos/3d/CCBundle3D.cpp +++ b/cocos/3d/CCBundle3D.cpp @@ -31,7 +31,6 @@ #include "base/CCData.h" #include "json/document.h" - #define BUNDLE_TYPE_SCENE 1 #define BUNDLE_TYPE_NODE 2 #define BUNDLE_TYPE_ANIMATIONS 3 @@ -46,14 +45,17 @@ #define BUNDLE_TYPE_MESHPART 35 #define BUNDLE_TYPE_MESHSKIN 36 +static const char* VERSION = "version"; static const char* ID = "id"; static const char* MESHDATA_MESH = "mesh"; static const char* MESHDATA_DEFAULTPART = "body"; static const char* MESHDATA_VERTEXSIZE = "vertexsize"; +static const char* MESHDATA_VERTEX = "vertex"; static const char* MESHDATA_VERTICES = "vertices"; static const char* MESHDATA_INDEXNUM = "indexnum"; static const char* MESHDATA_INDICES = "indices"; +static const char* MESHDATA_SUBMESH = "submesh"; static const char* MESHDATA_ATTRIBUTES = "attributes"; static const char* MESHDATA_SIZE = "size"; static const char* MESHDATA_TYPE = "type"; @@ -69,6 +71,7 @@ static const char* SKINDATA_TRANSFORM = "tansform"; static const char* MATERIALDATA_MATERIAL = "material"; static const char* MATERIALDATA_BASE = "base"; static const char* MATERIALDATA_FILENAME = "filename"; +static const char* MATERIALDATA_TEXTURES = "textures"; static const char* ANIMATIONDATA_ANIMATION = "animation"; static const char* ANIMATIONDATA_LENGTH = "length"; @@ -140,6 +143,12 @@ void getChildMap(std::map >& map, SkinData* skinData, cons Bundle3D* Bundle3D::_instance = nullptr; +void Bundle3D::setBundleInstance(Bundle3D* bundleInstance) +{ + CC_SAFE_DELETE(_instance); + _instance = bundleInstance; +} + Bundle3D* Bundle3D::getInstance() { if (_instance == nullptr) @@ -197,6 +206,8 @@ bool Bundle3D::load(const std::string& path) bool Bundle3D::loadMeshData(const std::string& id, MeshData* meshdata) { + meshdata->resetData(); + if (_isBinary) { return loadMeshDataBinary(meshdata); @@ -209,6 +220,8 @@ bool Bundle3D::loadMeshData(const std::string& id, MeshData* meshdata) bool Bundle3D::loadSkinData(const std::string& id, SkinData* skindata) { + skindata->resetData(); + if (_isBinary) { return loadSkinDataBinary(skindata); @@ -221,6 +234,8 @@ bool Bundle3D::loadSkinData(const std::string& id, SkinData* skindata) bool Bundle3D::loadMaterialData(const std::string& id, MaterialData* materialdata) { + materialdata->resetData(); + if (_isBinary) { return loadMaterialDataBinary(materialdata); @@ -233,6 +248,8 @@ bool Bundle3D::loadMaterialData(const std::string& id, MaterialData* materialdat bool Bundle3D::loadAnimationData(const std::string& id, Animation3DData* animationdata) { + animationdata->resetData(); + if (_isBinary) { return loadAnimationDataBinary(animationdata); @@ -243,6 +260,14 @@ bool Bundle3D::loadAnimationData(const std::string& id, Animation3DData* animati } } +bool Bundle3D::loadSkeletonData(const std::string& id, Skeleton3DData* skeletondata) +{ + skeletondata->resetData(); + + //TODO + return true; +} + bool Bundle3D::loadJson(const std::string& path) { clear(); @@ -260,58 +285,129 @@ bool Bundle3D::loadJson(const std::string& path) clear(); return false; } + + const rapidjson::Value& mash_data_array = _jsonReader[VERSION]; + _version = mash_data_array.GetString(); return true; } bool Bundle3D::loadMeshDataJson(MeshData* meshdata) { - meshdata->resetData(); - - assert(_jsonReader.HasMember(MESHDATA_MESH)); - const rapidjson::Value& mash_data_array = _jsonReader[MESHDATA_MESH]; - - assert(mash_data_array.IsArray()); - const rapidjson::Value& mash_data_val = mash_data_array[(rapidjson::SizeType)0]; + //1.2 is a wrong version. Our first released fbx-conv write this version id, so we keep on using it. + if (_version == "1.2") + { + return loadMeshDataJson_0_1(meshdata); + } + else if(_version == "0.2") + { + return loadMeshDataJson_0_2(meshdata); + } + else + { + CCLOGINFO(false, "Unsupported version of loadMeshDataJson(): %s", _version); + return false; + } +} - assert(mash_data_val.HasMember(MESHDATA_DEFAULTPART)); - const rapidjson::Value& mesh_data_body_array = mash_data_val[MESHDATA_DEFAULTPART]; +bool Bundle3D::loadMeshDataJson_0_1(MeshData* meshdata) +{ + const rapidjson::Value& mesh_data_array = _jsonReader[MESHDATA_MESH]; + + const rapidjson::Value& mesh_data_val = mesh_data_array[(rapidjson::SizeType)0]; + + const rapidjson::Value& mesh_data_body_array = mesh_data_val[MESHDATA_DEFAULTPART]; - assert(mesh_data_body_array.IsArray()); const rapidjson::Value& mesh_data_body_array_0 = mesh_data_body_array[(rapidjson::SizeType)0]; - // vertex_size - assert(mesh_data_body_array_0.HasMember(MESHDATA_VERTEXSIZE)); - meshdata->vertexSizeInFloat = mesh_data_body_array_0[MESHDATA_VERTEXSIZE].GetInt(); - - // vertices - meshdata->vertex.resize(meshdata->vertexSizeInFloat); - const rapidjson::Value& mesh_data_body_vertices = mesh_data_body_array_0[MESHDATA_VERTICES]; - for (rapidjson::SizeType i = 0; i < mesh_data_body_vertices.Size(); i++) - meshdata->vertex[i] = mesh_data_body_vertices[i].GetDouble(); - - // index_number - meshdata->numIndex = mesh_data_body_array_0[MESHDATA_INDEXNUM].GetUint(); - - // indices - meshdata->indices.resize(meshdata->numIndex); - const rapidjson::Value& mesh_data_body_indices_val = mesh_data_body_array_0[MESHDATA_INDICES]; - for (rapidjson::SizeType i = 0; i < mesh_data_body_indices_val.Size(); i++) - meshdata->indices[i] = (unsigned short)mesh_data_body_indices_val[i].GetUint(); - // mesh_vertex_attribute - const rapidjson::Value& mesh_vertex_attribute = mash_data_val[MESHDATA_ATTRIBUTES]; + const rapidjson::Value& mesh_vertex_attribute = mesh_data_val[MESHDATA_ATTRIBUTES]; meshdata->attribCount = mesh_vertex_attribute.Size(); meshdata->attribs.resize(meshdata->attribCount); for (rapidjson::SizeType i = 0; i < mesh_vertex_attribute.Size(); i++) { const rapidjson::Value& mesh_vertex_attribute_val = mesh_vertex_attribute[i]; - + meshdata->attribs[i].size = mesh_vertex_attribute_val[MESHDATA_SIZE].GetUint(); meshdata->attribs[i].attribSizeBytes = meshdata->attribs[i].size * 4; meshdata->attribs[i].type = parseGLType(mesh_vertex_attribute_val[MESHDATA_TYPE].GetString()); meshdata->attribs[i].vertexAttrib = parseGLProgramAttribute(mesh_vertex_attribute_val[MESHDATA_ATTRIBUTE].GetString()); } + // vertices + meshdata->vertexSizeInFloat = mesh_data_body_array_0[MESHDATA_VERTEXSIZE].GetInt(); + meshdata->vertex.resize(meshdata->vertexSizeInFloat); + + const rapidjson::Value& mesh_data_body_vertices = mesh_data_body_array_0[MESHDATA_VERTICES]; + for (rapidjson::SizeType i = 0; i < mesh_data_body_vertices.Size(); i++) + meshdata->vertex[i] = mesh_data_body_vertices[i].GetDouble(); + + // index_number + unsigned int indexnum = mesh_data_body_array_0[MESHDATA_INDEXNUM].GetUint(); + + // indices + std::vector indices; + indices.resize(indexnum); + + const rapidjson::Value& indices_val_array = mesh_data_body_array_0[MESHDATA_INDICES]; + for (rapidjson::SizeType i = 0; i < indices_val_array.Size(); i++) + indices[i] = (unsigned short)indices_val_array[i].GetUint(); + + meshdata->subMeshIndices.push_back(indices); + + return true; +} + +bool Bundle3D::loadMeshDataJson_0_2(MeshData* meshdata) +{ + const rapidjson::Value& mesh_array = _jsonReader[MESHDATA_MESH]; + + const rapidjson::Value& mesh_array_0 = mesh_array[(rapidjson::SizeType)0]; + + // mesh_vertex_attribute + const rapidjson::Value& mesh_vertex_attribute = mesh_array_0[MESHDATA_ATTRIBUTES]; + meshdata->attribCount = mesh_vertex_attribute.Size(); + meshdata->attribs.resize(meshdata->attribCount); + for (rapidjson::SizeType i = 0; i < mesh_vertex_attribute.Size(); i++) + { + const rapidjson::Value& mesh_vertex_attribute_val = mesh_vertex_attribute[i]; + + meshdata->attribs[i].size = mesh_vertex_attribute_val[MESHDATA_SIZE].GetUint(); + meshdata->attribs[i].attribSizeBytes = meshdata->attribs[i].size * 4; + meshdata->attribs[i].type = parseGLType(mesh_vertex_attribute_val[MESHDATA_TYPE].GetString()); + meshdata->attribs[i].vertexAttrib = parseGLProgramAttribute(mesh_vertex_attribute_val[MESHDATA_ATTRIBUTE].GetString()); + } + + // vertices + const rapidjson::Value& mesh_data_vertex = mesh_array_0[MESHDATA_VERTEX]; + const rapidjson::Value& mesh_data_vertex_0 = mesh_data_vertex[(rapidjson::SizeType)0]; + + meshdata->vertexSizeInFloat = mesh_data_vertex_0[MESHDATA_VERTEXSIZE].GetInt(); + meshdata->vertex.resize(meshdata->vertexSizeInFloat); + + const rapidjson::Value& mesh_data_body_vertices = mesh_data_vertex_0[MESHDATA_VERTICES]; + for (rapidjson::SizeType i = 0; i < mesh_data_body_vertices.Size(); i++) + meshdata->vertex[i] = mesh_data_body_vertices[i].GetDouble(); + + // submesh + const rapidjson::Value& mesh_submesh_array = mesh_array_0[MESHDATA_SUBMESH]; + for (rapidjson::SizeType i = 0; i < mesh_submesh_array.Size(); i++) + { + const rapidjson::Value& mesh_submesh_val = mesh_submesh_array[i]; + //std::string id = mesh_submesh_val[ID].GetString(); + + // index_number + unsigned int indexnum = mesh_submesh_val[MESHDATA_INDEXNUM].GetUint(); + + // indices + std::vector indices; + indices.resize(indexnum); + + const rapidjson::Value& indices_val_array = mesh_submesh_val[MESHDATA_INDICES]; + for (rapidjson::SizeType j = 0; j < indices_val_array.Size(); j++) + indices[j] = (unsigned short)indices_val_array[j].GetUint(); + + meshdata->subMeshIndices.push_back(indices); + } return true; } @@ -319,8 +415,6 @@ bool Bundle3D::loadSkinDataJson(SkinData* skindata) { if (!_jsonReader.HasMember(SKINDATA_SKIN )) return false; - skindata->resetData(); - const rapidjson::Value& skin_data_array = _jsonReader[SKINDATA_SKIN ]; assert(skin_data_array.IsArray()); @@ -350,12 +444,29 @@ bool Bundle3D::loadSkinDataJson(SkinData* skindata) // parent and child relationship map skindata->skinBoneOriginMatrices.resize(skindata->skinBoneNames.size()); - //skindata->nodeBoneOriginMatrices.resize(skindata->nodeBoneNames.size()); getChildMap(skindata->boneChild, skindata, skin_data_1); return true; } bool Bundle3D::loadMaterialDataJson(MaterialData* materialdata) +{ + //1.2 is a wrong version. Our first released fbx-conv write this version id, so we keep on using it. + if (_version == "1.2") + { + return loadMaterialDataJson_0_1(materialdata); + } + else if(_version == "0.2") + { + return loadMaterialDataJson_0_2(materialdata); + } + else + { + CCLOGINFO(false, "Unsupported version of loadMaterialDataJson() : %s", _version); + return false; + } +} + +bool Bundle3D::loadMaterialDataJson_0_1(MaterialData* materialdata) { if (!_jsonReader.HasMember(MATERIALDATA_MATERIAL)) return false; @@ -368,19 +479,35 @@ bool Bundle3D::loadMaterialDataJson(MaterialData* materialdata) const rapidjson::Value& material_data_base_array_0 = material_data_base_array[(rapidjson::SizeType)0]; - materialdata->texturePath = _modelRelativePath + material_data_base_array_0[MATERIALDATA_FILENAME].GetString(); + // set texture + materialdata->texturePaths[0] =_modelRelativePath + material_data_base_array_0[MATERIALDATA_FILENAME].GetString(); return true; } +bool Bundle3D::loadMaterialDataJson_0_2(MaterialData* materialdata) +{ + if (!_jsonReader.HasMember(MATERIALDATA_MATERIAL)) + return false; + + const rapidjson::Value& material_array = _jsonReader[MATERIALDATA_MATERIAL]; + + for (rapidjson::SizeType i = 0; i < material_array.Size(); i++) + { + const rapidjson::Value& material_val = material_array[i]; + //std::string id = material_val[ID].GetString(); + + // set texture + materialdata->texturePaths[i] = _modelRelativePath + material_val[MATERIALDATA_TEXTURES].GetString(); + } + + return true; +} + bool Bundle3D::loadAnimationDataJson(Animation3DData* animationdata) { if (!_jsonReader.HasMember(ANIMATIONDATA_ANIMATION)) return false; - animationdata->_rotationKeys.clear(); - animationdata->_scaleKeys.clear(); - animationdata->_translationKeys.clear(); - const rapidjson::Value& animation_data_array = _jsonReader[ANIMATIONDATA_ANIMATION]; if (animation_data_array.Size()==0) return false; @@ -467,18 +594,9 @@ bool Bundle3D::loadBinary(const std::string& path) return false; } - if (ver[0] != 0) { - clear(); - CCLOGINFO(false, "Unsupported version: (%d, %d)", ver[0], ver[1]); - return false; - } - - if (ver[1] <= 0 || ver[1] > 2) { - clear(); - CCLOGINFO(false, "Unsupported version: (%d, %d)", ver[0], ver[1]); - return false; - } - + char version[20] = {0}; + sprintf(version, "%d.%d", ver[0], ver[1]); + _version = version; // Read ref table size if (_binaryReader.read(&_referenceCount, 4, 1) != 1) @@ -508,11 +626,26 @@ bool Bundle3D::loadBinary(const std::string& path) } bool Bundle3D::loadMeshDataBinary(MeshData* meshdata) +{ + if (_version == "0.1") + { + return loadMeshDataBinary_0_1(meshdata); + } + else if(_version == "0.2") + { + return loadMeshDataBinary_0_2(meshdata); + } + else + { + CCLOGINFO(false, "Unsupported version of loadMeshDataBinary() : %s", _version); + return false; + } +} + +bool Bundle3D::loadMeshDataBinary_0_1(MeshData* meshdata) { if (!seekToFirstType(BUNDLE_TYPE_MESH)) return false; - - meshdata->resetData(); // read mesh data if (_binaryReader.read(&meshdata->attribCount, 4, 1) != 1 || meshdata->attribCount < 1) @@ -563,26 +696,101 @@ bool Bundle3D::loadMeshDataBinary(MeshData* meshdata) CCLOGINFO("Failed to read meshdata: nIndexCount '%s'.", _path.c_str()); return false; } - - meshdata->numIndex = nIndexCount; - meshdata->indices.resize(meshdata->numIndex); - if (_binaryReader.read(&meshdata->indices[0], 2, meshdata->numIndex) != nIndexCount) + + std::vector indices; + indices.resize(nIndexCount); + if (_binaryReader.read(&indices[0], 2, nIndexCount) != nIndexCount) { CCLOGINFO("Failed to read meshdata: indices '%s'.", _path.c_str()); return false; } + + meshdata->subMeshIndices.push_back(indices); } return true; } +bool Bundle3D::loadMeshDataBinary_0_2(MeshData* meshdata) +{ + if (!seekToFirstType(BUNDLE_TYPE_MESH)) + return false; + + meshdata->resetData(); + + // read mesh data + if (_binaryReader.read(&meshdata->attribCount, 4, 1) != 1 || meshdata->attribCount < 1) + { + CCLOGINFO("Failed to read meshdata: attribCount '%s'.", _path.c_str()); + return false; + } + + meshdata->attribs.resize(meshdata->attribCount); + for (ssize_t i = 0; i < meshdata->attribCount; i++) + { + unsigned int vUsage, vSize; + if (_binaryReader.read(&vUsage, 4, 1) != 1 || _binaryReader.read(&vSize, 4, 1) != 1) + { + CCLOGINFO("Failed to read meshdata: usage or size '%s'.", _path.c_str()); + return false; + } + + meshdata->attribs[i].size = vSize; + meshdata->attribs[i].attribSizeBytes = meshdata->attribs[i].size * 4; + meshdata->attribs[i].type = GL_FLOAT; + meshdata->attribs[i].vertexAttrib = vUsage; + } + + // Read vertex data + if (_binaryReader.read(&meshdata->vertexSizeInFloat, 4, 1) != 1 || meshdata->vertexSizeInFloat == 0) + { + CCLOGINFO("Failed to read meshdata: vertexSizeInFloat '%s'.", _path.c_str()); + return false; + } + + meshdata->vertex.resize(meshdata->vertexSizeInFloat); + if (_binaryReader.read(&meshdata->vertex[0], 4, meshdata->vertexSizeInFloat) != meshdata->vertexSizeInFloat) + { + CCLOGINFO("Failed to read meshdata: vertex element '%s'.", _path.c_str()); + return false; + } + + // read submesh + unsigned int submeshCount; + if (_binaryReader.read(&submeshCount, 4, 1) != 1) + { + CCLOGINFO("Failed to read meshdata: submeshCount '%s'.", _path.c_str()); + return false; + } + + for (unsigned int i = 0; i < submeshCount; ++i) + { + unsigned int nIndexCount; + if (_binaryReader.read(&nIndexCount, 4, 1) != 1) + { + CCLOGINFO("Failed to read meshdata: nIndexCount '%s'.", _path.c_str()); + return false; + } + + std::vector indices; + indices.resize(nIndexCount); + if (_binaryReader.read(&indices[0], 2, nIndexCount) != nIndexCount) + { + CCLOGINFO("Failed to read meshdata: indices '%s'.", _path.c_str()); + return false; + } + + meshdata->subMeshIndices.push_back(indices); + } + + return true; +} + bool Bundle3D::loadSkinDataBinary(SkinData* skindata) { if (!seekToFirstType(BUNDLE_TYPE_MESHSKIN)) return false; - skindata->resetData(); - std::string boneName = _binaryReader.readString(); // transform @@ -684,14 +892,25 @@ bool Bundle3D::loadMaterialDataBinary(MaterialData* materialdata) if (!seekToFirstType(BUNDLE_TYPE_MATERIAL)) return false; - std::string texturePath = _binaryReader.readString(); - if (texturePath.empty()) + unsigned int materialnum = 1; + if (_version == "0.2") { - CCLOGINFO("Failed to read Materialdata: texturePath is empty '%s'.", _path.c_str()); - return false; + _binaryReader.read(&materialnum, 4, 1); } - - materialdata->texturePath = _modelRelativePath + texturePath; + + for (int i = 0; i < materialnum; i++) + { + std::string texturePath = _binaryReader.readString(); + if (texturePath.empty()) + { + CCLOGINFO("Failed to read Materialdata: texturePath is empty '%s'.", _path.c_str()); + return false; + } + + std::string path = _modelRelativePath + texturePath; + materialdata->texturePaths[i] = path; + } + return true; } @@ -700,10 +919,6 @@ bool Bundle3D::loadAnimationDataBinary(Animation3DData* animationdata) if (!seekToFirstType(BUNDLE_TYPE_ANIMATIONS)) return false; - animationdata->_rotationKeys.clear(); - animationdata->_scaleKeys.clear(); - animationdata->_translationKeys.clear(); - _binaryReader.readString(); if (!_binaryReader.read(&animationdata->_totalTime)) @@ -877,6 +1092,7 @@ Bundle3D::Bundle3D() :_isBinary(false), _modelRelativePath(""), _path(""), +_version(""), _jsonBuffer(nullptr), _binaryBuffer(nullptr), _referenceCount(0), diff --git a/cocos/3d/CCBundle3D.h b/cocos/3d/CCBundle3D.h index f3a6319ed6..b2b40aaf86 100644 --- a/cocos/3d/CCBundle3D.h +++ b/cocos/3d/CCBundle3D.h @@ -35,6 +35,7 @@ #include "json/document.h" #include "CCBundleReader.h" +#include "3d/3dExport.h" NS_CC_BEGIN class Animation3D; @@ -46,56 +47,68 @@ class Data; * c3t text file * c3b binary file */ -class Bundle3D +class CC_3D_DLL Bundle3D { public: + /**you can define yourself bundle and set it, use default bundle otherwise*/ + static void setBundleInstance(Bundle3D* bundleInstance); static Bundle3D* getInstance(); static void destroyInstance(); - void clear(); + virtual void clear(); /** * load a file. You must load a file first, then call loadMeshData, loadSkinData, and so on * @param path File to be loaded * @return result of load */ - bool load(const std::string& path); + virtual bool load(const std::string& path); /** * load mesh data from bundle * @param id The ID of the mesh, load the first Mesh in the bundle if it is empty */ - bool loadMeshData(const std::string& id, MeshData* meshdata); + virtual bool loadMeshData(const std::string& id, MeshData* meshdata); /** * load skin data from bundle * @param id The ID of the skin, load the first Skin in the bundle if it is empty */ - bool loadSkinData(const std::string& id, SkinData* skindata); + virtual bool loadSkinData(const std::string& id, SkinData* skindata); /** * load material data from bundle * @param id The ID of the material, load the first Material in the bundle if it is empty */ - bool loadMaterialData(const std::string& id, MaterialData* materialdata); + virtual bool loadMaterialData(const std::string& id, MaterialData* materialdata); /** * load material data from bundle * @param id The ID of the animation, load the first animation in the bundle if it is empty */ - bool loadAnimationData(const std::string& id, Animation3DData* animationdata); + virtual bool loadAnimationData(const std::string& id, Animation3DData* animationdata); + + /** + * load skeleton data from bundle + * + */ + virtual bool loadSkeletonData(const std::string& id, Skeleton3DData* skeletondata); protected: bool loadJson(const std::string& path); bool loadMeshDataJson(MeshData* meshdata); + bool loadMeshDataJson_0_1(MeshData* meshdata); + bool loadMeshDataJson_0_2(MeshData* meshdata); bool loadSkinDataJson(SkinData* skindata); bool loadMaterialDataJson(MaterialData* materialdata); + bool loadMaterialDataJson_0_1(MaterialData* materialdata); + bool loadMaterialDataJson_0_2(MaterialData* materialdata); bool loadAnimationDataJson(Animation3DData* animationdata); @@ -110,6 +123,8 @@ protected: * @param meshdata The mesh data pointer */ bool loadMeshDataBinary(MeshData* meshdata); + bool loadMeshDataBinary_0_1(MeshData* meshdata); + bool loadMeshDataBinary_0_2(MeshData* meshdata); /** * load skin data in binary @@ -129,7 +144,6 @@ protected: */ bool loadAnimationDataBinary(Animation3DData* animationdata); -protected: /** * get define data type * @param str The type in string @@ -166,6 +180,8 @@ protected: std::string _modelRelativePath; std::string _path; + std::string _version;// the c3b or c3t version + // for json reading char* _jsonBuffer; rapidjson::Document _jsonReader; @@ -181,4 +197,4 @@ protected: NS_CC_END -#endif // __CCANIMATE3D_H__ +#endif // __CCBUNDLE3D_H__ diff --git a/cocos/3d/CCBundle3DData.h b/cocos/3d/CCBundle3DData.h index 882b0521ca..e6076f082f 100644 --- a/cocos/3d/CCBundle3DData.h +++ b/cocos/3d/CCBundle3DData.h @@ -50,9 +50,10 @@ struct MeshVertexAttrib /**mesh data*/ struct MeshData { + typedef std::vector IndexArray; std::vector vertex; int vertexSizeInFloat; - std::vector indices; + std::vector subMeshIndices; int numIndex; std::vector attribs; int attribCount; @@ -61,7 +62,7 @@ public: void resetData() { vertex.clear(); - indices.clear(); + subMeshIndices.clear(); attribs.clear(); vertexSizeInFloat = 0; numIndex = 0; @@ -104,30 +105,22 @@ struct SkinData void addSkinBoneNames(const std::string& name) { - for (auto iter : skinBoneNames) - { - if ((iter) == name) - return; - } - - skinBoneNames.push_back(name); + auto it = std::find(skinBoneNames.begin(), skinBoneNames.end(), name); + if (it == skinBoneNames.end()) + skinBoneNames.push_back(name); } void addNodeBoneNames(const std::string& name) { - for (auto iter : nodeBoneNames) - { - if ((iter) == name) - return; - } - - nodeBoneNames.push_back(name); + auto it = std::find(nodeBoneNames.begin(), nodeBoneNames.end(), name); + if (it == nodeBoneNames.end()) + nodeBoneNames.push_back(name); } int getSkinBoneNameIndex(const std::string& name)const { int i = 0; - for (auto iter : skinBoneNames) + for (const auto& iter : skinBoneNames) { if ((iter) == name) return i; @@ -139,13 +132,13 @@ struct SkinData int getBoneNameIndex(const std::string& name)const { int i = 0; - for (auto iter : skinBoneNames) + for (const auto& iter : skinBoneNames) { if ((iter) == name) return i; i++; } - for(auto iter : nodeBoneNames) + for(const auto& iter : nodeBoneNames) { if (iter == name) return i; @@ -156,10 +149,54 @@ struct SkinData }; +/**skin data*/ +struct Skeleton3DData +{ + std::vector boneNames; //bone names + std::vector inverseBindPoseMatrices; //bind pose of skin bone + std::vector boneOriginMatrices; // original bone transform + + //bone child info, both skinbone and node bone + std::map > boneChild;//key parent, value child + int rootBoneIndex; + + void resetData() + { + boneNames.clear(); + inverseBindPoseMatrices.clear(); + boneOriginMatrices.clear(); + boneChild.clear(); + rootBoneIndex = -1; + } + + void addBoneNames(const std::string& name) + { + auto it = std::find(boneNames.begin(), boneNames.end(), name); + if (it == boneNames.end()) + boneNames.push_back(name); + } + + int getBoneNameIndex(const std::string& name)const + { + int i = 0; + for (auto iter : boneNames) + { + if ((iter) == name) + return i; + i++; + } + return -1; + } +}; + /**material data*/ struct MaterialData { - std::string texturePath; + std::map texturePaths; //submesh id, texture path + void resetData() + { + texturePaths.clear(); + } }; /**animation data*/ @@ -223,7 +260,7 @@ public: { } - void clear() + void resetData() { _totalTime = 0; _translationKeys.clear(); diff --git a/cocos/3d/CCBundleReader.cpp b/cocos/3d/CCBundleReader.cpp index b3974b07f5..8570111e2c 100644 --- a/cocos/3d/CCBundleReader.cpp +++ b/cocos/3d/CCBundleReader.cpp @@ -1,3 +1,27 @@ +/**************************************************************************** + 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 "CCBundleReader.h" #include "platform/CCFileUtils.h" diff --git a/cocos/3d/CCMesh.cpp b/cocos/3d/CCMesh.cpp index c0511afad1..16007b1588 100644 --- a/cocos/3d/CCMesh.cpp +++ b/cocos/3d/CCMesh.cpp @@ -29,6 +29,7 @@ #include #include +#include "3d/CCSubMesh.h" #include "3d/CCObjLoader.h" #include "3d/CCSprite3DMaterial.h" @@ -58,7 +59,7 @@ bool RenderMeshData::hasVertexAttrib(int attrib) bool RenderMeshData::init(const std::vector& positions, const std::vector& normals, const std::vector& texs, - const std::vector& indices) + const std::vector& indices) { CC_ASSERT(positions.size()<65536 * 3 && "index may out of bound"); @@ -120,15 +121,15 @@ bool RenderMeshData::init(const std::vector& positions, _vertexs.push_back(texs[i * 2 + 1]); } } - _indices = indices; + _subMeshIndices = indices; return true; } -bool RenderMeshData::init(const std::vector& vertices, int vertexSizeInFloat, const std::vector& indices, const std::vector& attribs) +bool RenderMeshData::init(const std::vector& vertices, int vertexSizeInFloat, const std::vector& indices, const std::vector& attribs) { _vertexs = vertices; - _indices = indices; + _subMeshIndices = indices; _vertexAttribs = attribs; _vertexsizeBytes = calVertexSizeBytes(); @@ -150,19 +151,23 @@ int RenderMeshData::calVertexSizeBytes() Mesh::Mesh() :_vertexBuffer(0) -, _indexBuffer(0) -, _primitiveType(PrimitiveType::TRIANGLES) -, _indexFormat(IndexFormat::INDEX16) -, _indexCount(0) { } Mesh::~Mesh() { + _subMeshes.clear(); cleanAndFreeBuffers(); } -Mesh* Mesh::create(const std::vector& positions, const std::vector& normals, const std::vector& texs, const std::vector& indices) +Mesh* Mesh::create(const std::vector& positions, const std::vector& normals, const std::vector& texs, const IndexArray& indices) +{ + std::vector submeshIndices; + submeshIndices.push_back(indices); + return create(positions, normals, texs, submeshIndices); +} + +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)) @@ -174,7 +179,14 @@ Mesh* Mesh::create(const std::vector& positions, const std::vector return nullptr; } -Mesh* Mesh::create(const std::vector &vertices, int vertexSizeInFloat, const std::vector &indices, const std::vector &attribs) +Mesh* Mesh::create(const std::vector& vertices, int vertexSizeInFloat, const IndexArray& indices, const std::vector& attribs) +{ + std::vector submeshIndices; + submeshIndices.push_back(indices); + return create(vertices, vertexSizeInFloat, submeshIndices, attribs); +} + +Mesh* Mesh::create(const std::vector &vertices, int vertexSizeInFloat, const std::vector &indices, const std::vector &attribs) { auto mesh = new Mesh(); if (mesh && mesh->init(vertices, vertexSizeInFloat, indices, attribs)) @@ -186,26 +198,47 @@ Mesh* Mesh::create(const std::vector &vertices, int vertexSizeInFloat, co return nullptr; } -bool Mesh::init(const std::vector& positions, const std::vector& normals, const std::vector& texs, const std::vector& indices) +bool Mesh::init(const std::vector& positions, const std::vector& normals, const std::vector& texs, const std::vector& indices) { bool bRet = _renderdata.init(positions, normals, texs, indices); if (!bRet) return false; + buildSubMeshes(); + buildBuffer(); + + calOriginAABB(positions, 3); + return true; } -bool Mesh::init(const std::vector& vertices, int vertexSizeInFloat, const std::vector& indices, const std::vector& attribs) + +bool Mesh::init(const std::vector& vertices, int vertexSizeInFloat, const std::vector& indices, const std::vector& attribs) { bool bRet = _renderdata.init(vertices, vertexSizeInFloat, indices, attribs); if (!bRet) return false; + buildSubMeshes(); + buildBuffer(); + + unsigned int perVertexSize = _renderdata.calVertexSizeBytes() / sizeof(float); + calOriginAABB(vertices, perVertexSize); + return true; } +void Mesh::buildSubMeshes() +{ + _subMeshes.clear(); + for (auto& it : _renderdata._subMeshIndices) { + auto subMesh = SubMesh::create(PrimitiveType::TRIANGLES, IndexFormat::INDEX16, it); + _subMeshes.pushBack(subMesh); + } +} + void Mesh::cleanAndFreeBuffers() { if(glIsBuffer(_vertexBuffer)) @@ -214,14 +247,19 @@ void Mesh::cleanAndFreeBuffers() _vertexBuffer = 0; } - if(glIsBuffer(_indexBuffer)) - { - glDeleteBuffers(1, &_indexBuffer); - _indexBuffer = 0; + for (auto& it : _subMeshes) { + (*it).cleanAndFreeBuffers(); + } +} + +void Mesh::calOriginAABB(const std::vector& vertices, unsigned int stride) +{ + ssize_t vertexNum = vertices.size() / stride; + for(unsigned int i = 0; i < vertexNum; i++) + { + Vec3 point = Vec3(vertices[i * stride], vertices[i * stride + 1], vertices[i * stride + 2]); + _originAABB.updateMinMax(&point, 1); } - _primitiveType = PrimitiveType::TRIANGLES; - _indexFormat = IndexFormat::INDEX16; - _indexCount = 0; } void Mesh::buildBuffer() @@ -237,28 +275,26 @@ void Mesh::buildBuffer() GL_STATIC_DRAW); glBindBuffer(GL_ARRAY_BUFFER, 0); - glGenBuffers(1, &_indexBuffer); - - glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, _indexBuffer); - - unsigned int indexSize = 2; - - 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::INDEX16; - _indexCount = _renderdata._indices.size(); + for (size_t i = 0; i < _subMeshes.size(); i++) { + _subMeshes.at(i)->buildBuffer(_renderdata._subMeshIndices[i]); + } } void Mesh::restore() { _vertexBuffer = 0; - _indexBuffer = 0; + for (auto& it : _subMeshes) { + it->_indexBuffer = 0; + } + buildBuffer(); } +const AABB& Mesh::getOriginAABB() const +{ + return _originAABB; +} + /** * MeshCache */ diff --git a/cocos/3d/CCMesh.h b/cocos/3d/CCMesh.h index eb6a959286..fa16d6c703 100644 --- a/cocos/3d/CCMesh.h +++ b/cocos/3d/CCMesh.h @@ -29,27 +29,34 @@ #include #include "3d/CCBundle3DData.h" +#include "3d/CCSubMesh.h" #include "base/CCRef.h" #include "base/ccTypes.h" +#include "base/CCVector.h" #include "math/CCMath.h" #include "renderer/CCGLProgram.h" +#include "CCAABB.h" +#include "3d/3dExport.h" + + NS_CC_BEGIN class EventListenerCustom; class EventCustom; -class RenderMeshData +class CC_3D_DLL RenderMeshData { + typedef std::vector IndexArray; friend class Mesh; public: RenderMeshData(): _vertexsizeBytes(0) { } bool hasVertexAttrib(int attrib); - bool init(const std::vector& positions, const std::vector& normals, const std::vector& texs, const std::vector& indices); - bool init(const std::vector& vertices, int vertexSizeInFloat, const std::vector& indices, const std::vector& attribs); + bool init(const std::vector& positions, const std::vector& normals, const std::vector& texs, const std::vector& subMeshIndices); + bool init(const std::vector& vertices, int vertexSizeInFloat, const std::vector& subMeshIndices, const std::vector& attribs); protected: @@ -58,7 +65,7 @@ protected: int _vertexsizeBytes; ssize_t _vertexNum; std::vector _vertexs; - std::vector _indices; + std::vector _subMeshIndices; std::vector _vertexAttribs; }; @@ -66,34 +73,36 @@ protected: * Mesh: Geometry with a collection of vertex. * Supporting various vertex formats. */ -class Mesh : public Ref +class CC_3D_DLL Mesh : public Ref { + typedef std::vector IndexArray; 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 mesh from positions, normals, and so on*/ - static Mesh* create(const std::vector& positions, const std::vector& normals, const std::vector& texs, const std::vector& indices); + /**create mesh from positions, normals, and so on, sigle SubMesh*/ + static Mesh* create(const std::vector& positions, const std::vector& normals, const std::vector& texs, const IndexArray& indices); + + /**create mesh from positions, normals, and so on, multi-SubMesh*/ + static Mesh* create(const std::vector& positions, const std::vector& normals, const std::vector& texs, const std::vector& subMeshIndices); /**create mesh with vertex attributes*/ - CC_DEPRECATED_ATTRIBUTE static Mesh* create(const std::vector& vertices, int vertexSizeInFloat, const std::vector& indices, int numIndex, const std::vector& attribs, int attribCount) { return create(vertices, vertexSizeInFloat, indices, attribs); } + CC_DEPRECATED_ATTRIBUTE static Mesh* create(const std::vector& vertices, int vertexSizeInFloat, const IndexArray& indices, int numIndex, const std::vector& attribs, int attribCount) { return create(vertices, vertexSizeInFloat, indices, attribs); } - /**create mesh with vertex attributes*/ - static Mesh* create(const std::vector& vertices, int vertexSizeInFloat, const std::vector& indices, const std::vector& attribs); + /** + * create Mesh + * @param vertices vertices buffer data + * @param vertexSizeInFloat size of each vertex + * @param indices index buffer data that denotes how to connect the vertex, sigle SubMesh + * @param attribs vertex attributes + */ + static Mesh* create(const std::vector& vertices, int vertexSizeInFloat, const IndexArray& indices, const std::vector& attribs); + + /** + * create Mesh + * @param vertices vertices buffer data + * @param vertexSizeInFloat size of each vertex + * @param subMeshIndices index buffer data that denotes how to connect the vertex, multi-SubMesh + * @param attribs vertex attributes + */ + static Mesh* create(const std::vector& vertices, int vertexSizeInFloat, const std::vector& subMeshIndices, const std::vector& attribs); /**get vertex buffer*/ inline GLuint getVertexBuffer() const { return _vertexBuffer; } @@ -107,41 +116,59 @@ public: /**get per vertex size in bytes*/ int getVertexSizeInBytes() const { return _renderdata._vertexsizeBytes; } - /** get primitive type*/ - PrimitiveType getPrimitiveType() const { return _primitiveType; } - /**get index count*/ - ssize_t getIndexCount() const { return _indexCount; } - /**get index format*/ - IndexFormat getIndexFormat() const { return _indexFormat; } - /**get index buffer*/ - GLuint getIndexBuffer() const {return _indexBuffer; } + /**get sub mesh count*/ + ssize_t getSubMeshCount() const { return _subMeshes.size(); } + + /**get sub mesh by index*/ + SubMesh* getSubMesh(int index) const { return _subMeshes.at(index); } /**build vertex buffer from renderdata*/ void restore(); + + /** get origin aabb that calculate from vertices*/ + const AABB& getOriginAABB() const; + + /**to be deprecated, those functions have been moved to SubMesh*/ + /** get primitive type*/ + CC_DEPRECATED_ATTRIBUTE PrimitiveType getPrimitiveType() const { return _subMeshes.at(0)->getPrimitiveType(); } + /**get index count*/ + CC_DEPRECATED_ATTRIBUTE ssize_t getIndexCount() const { return _subMeshes.at(0)->getIndexCount(); } + /**get index format*/ + CC_DEPRECATED_ATTRIBUTE IndexFormat getIndexFormat() const { return _subMeshes.at(0)->getIndexFormat(); } + /**get index buffer*/ + CC_DEPRECATED_ATTRIBUTE GLuint getIndexBuffer() const {return _subMeshes.at(0)->getIndexBuffer(); } CC_CONSTRUCTOR_ACCESS: Mesh(); virtual ~Mesh(); /**init mesh*/ - bool init(const std::vector& positions, const std::vector& normals, const std::vector& texs, const std::vector& indices); + bool init(const std::vector& positions, const std::vector& normals, const std::vector& texs, const std::vector& indices); /**init mesh*/ - bool init(const std::vector& vertices, int vertexSizeInFloat, const std::vector& indices, const std::vector& attribs); + bool init(const std::vector& vertices, int vertexSizeInFloat, const std::vector& indices, const std::vector& attribs); + /**build sub meshes*/ + void buildSubMeshes(); /**build buffer*/ void buildBuffer(); /**free buffer*/ void cleanAndFreeBuffers(); + + /* + * calculate AABB by origin vertices + * @param the vertices list + * @param stride the stride between two vertex's position data. + */ + void calOriginAABB(const std::vector& vertices, unsigned int stride); protected: - PrimitiveType _primitiveType; - IndexFormat _indexFormat; GLuint _vertexBuffer; - GLuint _indexBuffer; - ssize_t _indexCount; + Vector _subMeshes; RenderMeshData _renderdata; + + AABB _originAABB; }; /** diff --git a/cocos/3d/CCMeshSkin.cpp b/cocos/3d/CCMeshSkin.cpp index 3e8d563888..bedf24ede5 100644 --- a/cocos/3d/CCMeshSkin.cpp +++ b/cocos/3d/CCMeshSkin.cpp @@ -23,6 +23,7 @@ ****************************************************************************/ #include "3d/CCMeshSkin.h" +#include "3d/CCSkeleton3D.h" #include "3d/CCBundle3D.h" #include "base/ccMacros.h" @@ -31,221 +32,6 @@ NS_CC_BEGIN -/** - * Sets the inverse bind pose matrix. - * - * @param m C3DMatrix representing the inverse bind pose for this Bone. - */ -void Bone3D::setInverseBindPose(const Mat4& m) -{ - _invBindPose = m; -} - -const Mat4& Bone3D::getInverseBindPose() -{ - return _invBindPose; -} - -void Bone3D::setOriPose(const Mat4& m) -{ - _oriPose = m; -} - -void Bone3D::resetPose() -{ - _local =_oriPose; - - for (auto it : _children) { - it->resetPose(); - } -} - -void Bone3D::setWorldMatDirty(bool dirty) -{ - _worldDirty = dirty; - for (auto it : _children) { - it->setWorldMatDirty(dirty); - } -} - -//update own world matrix and children's -void Bone3D::updateWorldMat() -{ - getWorldMat(); - for (auto itor : _children) { - itor->updateWorldMat(); - } -} - -const Mat4& Bone3D::getWorldMat() -{ - if (_worldDirty) - { - updateLocalMat(); - if (_parent) - { - _world = _parent->getWorldMat() * _local; - } - else - _world = _local; - - _worldDirty = false; - } - - return _world; -} - -void Bone3D::setAnimationValue(float* trans, float* rot, float* scale, void* tag, float weight) -{ - for (auto& it : _blendStates) { - if (it.tag == tag) - { - if (trans) - it.localTranslate.set(trans); - if (rot) - it.localRot.set(rot); - if (scale) - it.localScale.set(scale); - it.weight = weight; - return; - } - } - BoneBlendState state; - if (trans) - state.localTranslate.set(trans); - if (rot) - state.localRot.set(rot); - if (scale) - state.localScale.set(scale); - - state.weight = weight; - state.tag = tag; - - _blendStates.push_back(state); -} - -void Bone3D::clearBoneBlendState() -{ - _blendStates.clear(); - for (auto it : _children) { - it->clearBoneBlendState(); - } -} - -/** - * Creates C3DBone. - */ -Bone3D* Bone3D::create(const std::string& id) -{ - auto bone = new Bone3D(id); - bone->autorelease(); - return bone; -} - -void Bone3D::updateJointMatrix(Vec4* matrixPalette) -{ - { - static Mat4 t; - Mat4::multiply(_world, getInverseBindPose(), &t); - - matrixPalette[0].set(t.m[0], t.m[4], t.m[8], t.m[12]); - matrixPalette[1].set(t.m[1], t.m[5], t.m[9], t.m[13]); - matrixPalette[2].set(t.m[2], t.m[6], t.m[10], t.m[14]); - } -} - -Bone3D* Bone3D::getParentBone() -{ - return _parent; -} -ssize_t Bone3D::getChildBoneCount() const -{ - return _children.size(); -} -Bone3D* Bone3D::getChildBoneByIndex(int index) -{ - return _children.at(index); -} -void Bone3D::addChildBone(Bone3D* bone) -{ - if (_children.find(bone) == _children.end()) - _children.pushBack(bone); -} -void Bone3D::removeChildBoneByIndex(int index) -{ - _children.erase(index); -} -void Bone3D::removeChildBone(Bone3D* bone) -{ - _children.eraseObject(bone); -} -void Bone3D::removeAllChildBone() -{ - _children.clear(); -} - -Bone3D::Bone3D(const std::string& id) -: _name(id) -, _parent(nullptr) -, _worldDirty(true) -{ - -} - -Bone3D::~Bone3D() -{ - removeAllChildBone(); -} - -void Bone3D::updateLocalMat() -{ - if (_blendStates.size()) - { - Vec3 translate(Vec3::ZERO), scale(Vec3::ZERO); - Quaternion quat(Quaternion::zero()); - - float total = 0.f; - for (auto it: _blendStates) { - total += it.weight; - } - if (total) - { - if (_blendStates.size() == 1) - { - auto& state = _blendStates[0]; - translate = state.localTranslate; - scale = state.localScale; - quat = state.localRot; - } - else - { - float invTotal = 1.f / total; - for (auto it : _blendStates) { - float weight = (it.weight * invTotal); - translate += it.localTranslate * weight; - scale.x += it.localScale.x * weight; - scale.y += it.localScale.y * weight; - scale.z += it.localScale.z * weight; - if (!quat.isZero()) - { - Quaternion& q = _blendStates[0].localRot; - if (q.x * quat.x + q.y * quat.y + q.z * quat.z + q.w * quat.w < 0) - weight = -weight; - } - quat = Quaternion(it.localRot.x * weight + quat.x, it.localRot.y * weight + quat.y, it.localRot.z * weight + quat.z, it.localRot.w * weight + quat.w); - } - } - } - - Mat4::createTranslation(translate, &_local); - _local.rotate(quat); - _local.scale(scale); - - _blendStates.clear(); - } -} - -//////////////////////////////////////////////////////////////////////////////////////////////////////////////// static int PALETTE_ROWS = 3; MeshSkin::MeshSkin() @@ -258,10 +44,10 @@ MeshSkin::MeshSkin() MeshSkin::~MeshSkin() { removeAllBones(); + CC_SAFE_RELEASE(_skeleton); } -//create a new meshskin if do not want to share meshskin -MeshSkin* MeshSkin::create(const std::string& filename, const std::string& name) +MeshSkin* MeshSkin::create(Skeleton3D* skeleton, const std::string& filename, const std::string& name) { //load skin here; std::string fullPath = FileUtils::getInstance()->fullPathForFilename(filename); @@ -270,6 +56,8 @@ MeshSkin* MeshSkin::create(const std::string& filename, const std::string& name) if (skindata) { auto skin = new MeshSkin(); + skin->_skeleton = skeleton; + skeleton->retain(); skin->initFromSkinData(*skindata); skin->autorelease(); return skin; @@ -284,6 +72,8 @@ MeshSkin* MeshSkin::create(const std::string& filename, const std::string& name) if (instance->loadSkinData(name, &data)) { auto skin = new MeshSkin(); + skin->_skeleton = skeleton; + skeleton->retain(); skin->initFromSkinData(data); skin->autorelease(); MeshSkinDataCache::getInstance()->addMeshSkinData(key, data); @@ -302,6 +92,7 @@ bool MeshSkin::initFromSkinData(const SkinData& skindata) auto bone = Bone3D::create(skindata.skinBoneNames[i]); bone->_invBindPose = skindata.inverseBindPoseMatrices[i]; bone->setOriPose(skindata.skinBoneOriginMatrices[i]); + _invBindPoses.push_back(skindata.inverseBindPoseMatrices[i]); addSkinBone(bone); } for (i = 0; i < skindata.nodeBoneNames.size(); i++) { @@ -343,12 +134,12 @@ Bone3D* MeshSkin::getBoneByIndex(unsigned int index) const Bone3D* MeshSkin::getBoneByName(const std::string& id) const { //search from skin bones - for (auto it : _skinBones) { + for (const auto& it : _skinBones) { if (it->getName() == id) return it; } //search from node bones - for (auto it : _nodeBones) { + for (const auto& it : _nodeBones) { if (it->getName() == id ) return it; } @@ -390,11 +181,15 @@ Vec4* MeshSkin::getMatrixPalette() { _matrixPalette = new Vec4[_skinBones.size() * PALETTE_ROWS]; } - int i = 0; - for (auto it : _skinBones ) - { - it->updateJointMatrix(&_matrixPalette[i++ * PALETTE_ROWS]); - } + int i = 0, paletteIndex = 0; + static Mat4 t; + for (auto it : _skinBones ) + { + Mat4::multiply(it->getWorldMat(), _invBindPoses[i++], &t); + _matrixPalette[paletteIndex++].set(t.m[0], t.m[4], t.m[8], t.m[12]); + _matrixPalette[paletteIndex++].set(t.m[1], t.m[5], t.m[9], t.m[13]); + _matrixPalette[paletteIndex++].set(t.m[2], t.m[6], t.m[10], t.m[14]); + } return _matrixPalette; } diff --git a/cocos/3d/CCMeshSkin.h b/cocos/3d/CCMeshSkin.h index b031afeefb..20910ece02 100644 --- a/cocos/3d/CCMeshSkin.h +++ b/cocos/3d/CCMeshSkin.h @@ -28,166 +28,30 @@ #include #include "3d/CCBundle3DData.h" +#include "3d/CCSkeleton3D.h" #include "base/ccMacros.h" #include "base/CCRef.h" #include "base/CCVector.h" #include "base/ccTypes.h" #include "math/CCMath.h" +#include "3d/3dExport.h" NS_CC_BEGIN -/** - * Defines a basic hierachial structure of transformation spaces. - */ -class Bone3D : public Ref -{ - friend class MeshSkin; -public: - - /** - * Returns the inverse bind pose matrix for this joint. - * - * @return Inverse bind pose matrix. - */ - const Mat4& getInverseBindPose(); - - /**update own world matrix and children's*/ - void updateWorldMat(); - - /**get wrod matrix*/ - const Mat4& getWorldMat(); - - /**get bone name*/ - const std::string& getName() const { return _name; } - - /** - * set animation value - * @param trans translate vec3 - * @param rot rotation quaternion - * @param scale scale vec3 - * @param tag, unique tag, only blend animation between different tags - * @param weight, blend weight - */ - void setAnimationValue(float* trans, float* rot, float* scale, void* tag = nullptr, float weight = 1.0f); - - /**clear bone blend states*/ - void clearBoneBlendState(); - /** - * Creates C3DBone. - */ - static Bone3D* create(const std::string& id); - - /** - * Sets the inverse bind pose matrix. - * - * @param m Mat4 representing the inverse bind pose for this Bone. - */ - void setInverseBindPose(const Mat4& m); - - /** - * Sets the bone's original pose. - * - * @param m Mat4 representing the original pose for this Bone. - */ - void setOriPose(const Mat4& m); - - /** - * reset pose to origin - */ - void resetPose(); - - /** - * Updates the joint matrix. - * - * @param matrixPalette The matrix palette to update. - */ - void updateJointMatrix(Vec4* matrixPalette); - - /**bone tree, we do not inherit from Node, Node has too many properties that we do not need. A clean Node is needed.*/ - Bone3D* getParentBone(); - /**get child bone count*/ - ssize_t getChildBoneCount() const; - /**get child bone by index*/ - Bone3D* getChildBoneByIndex(int index); - /**add child bone*/ - void addChildBone(Bone3D* bone); - /**remove child bone by index*/ - void removeChildBoneByIndex(int index); - /**remove child bone*/ - void removeChildBone(Bone3D* bone); - /**remove all child bone*/ - void removeAllChildBone(); - - - -protected: - - struct BoneBlendState - { - Vec3 localTranslate; - Quaternion localRot; - Vec3 localScale; - float weight; - void* tag; // - BoneBlendState() - : localTranslate(Vec3::ZERO) - , localRot(Quaternion::identity()) - , localScale(Vec3::ONE) - , weight(1.f) - , tag(nullptr) - { - - } - }; - /** - * Constructor. - */ - Bone3D(const std::string& id); - - /** - * Destructor. - */ - virtual ~Bone3D(); - - /** - * Update local matrix - */ - void updateLocalMat(); - - /**set world matrix dirty flag*/ - void setWorldMatDirty(bool dirty = true); - - std::string _name; // bone name - /** - * The Mat4 representation of the Joint's bind pose. - */ - Mat4 _invBindPose; - - Mat4 _oriPose; //original bone pose - - Bone3D* _parent; //parent bone - - Vector _children; - - bool _worldDirty; - Mat4 _world; - Mat4 _local; - - std::vector _blendStates; - -}; +class Bone3D; +class Skeleton3D; /** * MeshSkin, A class maintain a collection of bones that affect Mesh vertex. * And it is responsible for computing matrix palletes that used by skin mesh rendering. */ -class MeshSkin: public Ref +class CC_3D_DLL MeshSkin: public Ref { public: /**create a new meshskin if do not want to share meshskin*/ - static MeshSkin* create(const std::string& filename, const std::string& name); + static MeshSkin* create(Skeleton3D* skeleton, const std::string& filename, const std::string& name); /**get total bone count, skin bone + node bone*/ ssize_t getBoneCount() const; @@ -232,10 +96,12 @@ CC_CONSTRUCTOR_ACCESS: protected: - Vector _skinBones; // bones with skin + Vector _skinBones; // bones with skin + std::vector _invBindPoses; //inverse bind pose of bone Vector _nodeBones; //bones without skin, only used to compute transform of children Bone3D* _rootBone; + Skeleton3D* _skeleton; //skeleton the skin refered // Pointer to the array of palette matrices. // This array is passed to the vertex shader as a uniform. diff --git a/cocos/3d/CCOBB.cpp b/cocos/3d/CCOBB.cpp new file mode 100755 index 0000000000..a9e3235c31 --- /dev/null +++ b/cocos/3d/CCOBB.cpp @@ -0,0 +1,452 @@ +/**************************************************************************** + 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/CCOBB.h" + +NS_CC_BEGIN + +#define ROTATE(a,i,j,k,l) g=a.m[i + 4 * j]; h=a.m[k + 4 * l]; a.m[i + 4 * j]=(float)(g-s*(h+g*tau)); a.m[k + 4 * l]=(float)(h+s*(g-h*tau)); + +static Mat4 _getConvarianceMatrix(const Vec3* vertPos, int vertCount) +{ + int i; + Mat4 Cov; + + double S1[3]; + double S2[3][3]; + + S1[0] = S1[1] = S1[2] = 0.0; + S2[0][0] = S2[1][0] = S2[2][0] = 0.0; + S2[0][1] = S2[1][1] = S2[2][1] = 0.0; + S2[0][2] = S2[1][2] = S2[2][2] = 0.0; + + // get center of mass + for(i=0; i3 && fabs(dmip) + g == fabs(dmip) && fabs(dmiq) + g == fabs(dmiq) ) + { + a.m[ip + 4 * iq] = 0.0; + } + else if (fabs(a.m[ip + 4 * iq]) > tresh) + { + h = dmiq - dmip; + if (fabs(h) + g == fabs(h)) + { + t=(a.m[ip + 4 * iq])/h; + } + else + { + theta = 0.5 * h / (a.m[ip + 4 * iq]); + t=1.0 / (fabs(theta) + sqrt(1.0 + theta * theta)); + if (theta < 0.0) t = -t; + } + c = 1.0 / sqrt(1+t*t); + s = t*c; + tau = s / (1.0+c); + h = t * a.m[ip + 4 * iq]; + _getElement(z, ip) -= (float)h; + _getElement(z, iq) += (float)h; + _getElement(d, ip) -= (float)h; + _getElement(d, iq) += (float)h; + a.m[ip + 4 * iq]=0.0; + for(j = 0; j < ip; j++) { ROTATE(a,j,ip,j,iq); } + for(j = ip + 1; j < iq; j++) { ROTATE(a,ip,j,j,iq); } + for(j = iq + 1; j < n; j++) { ROTATE(a,ip,j,iq,j); } + for(j = 0; j < n; j++) { ROTATE(v,j,ip,j,iq); } + nrot++; + } + } + } + + for(ip = 0; ip < n; ip++) + { + _getElement(b, ip) += _getElement(z, ip); + _getElement(d, ip) = _getElement(b, ip); + _getElement(z, ip) = 0.0f; + } + } + + v.transpose(); + *vout = v; + *dout = d; + return; +} + +static Mat4 _getOBBOrientation(const Vec3* vertPos, int num) +{ + Mat4 Cov; + + if (num <= 0) + return Mat4::IDENTITY; + + Cov = _getConvarianceMatrix(vertPos, num); + + // now get eigenvectors + Mat4 Evecs; + Vec3 Evals; + _getEigenVectors(&Evecs, &Evals, Cov); + + Evecs.transpose(); + + return Evecs; +} + +OBB::OBB() +{ + reset(); +} + +OBB::OBB(const AABB& aabb) +{ + reset(); + + _center = (aabb._min + aabb._max); + _center.scale(0.5f); + _xAxis = Vec3(1.0f, 0.0f, 0.0f); + _yAxis = Vec3(0.0f, 1.0f, 0.0f); + _zAxis = Vec3(0.0f, 0.0f, 1.0f); + + _extents = aabb._max - aabb._min; + _extents.scale(0.5f); +} + +OBB::OBB(const Vec3* verts, int num) +{ + if (!verts) return; + + reset(); + + Mat4 matTransform = _getOBBOrientation(verts, num); + + // For matTransform is orthogonal, so the inverse matrix is just rotate it; + matTransform.transpose(); + + Vec3 vecMax = matTransform * Vec3(verts[0].x, verts[0].y, verts[0].z); + + Vec3 vecMin = vecMax; + + for (int i = 1; i < num; i++) + { + Vec3 vect = matTransform * Vec3(verts[i].x, verts[i].y, verts[i].z); + + vecMax.x = vecMax.x > vect.x ? vecMax.x : vect.x; + vecMax.y = vecMax.y > vect.y ? vecMax.y : vect.y; + vecMax.z = vecMax.z > vect.z ? vecMax.z : vect.z; + + vecMin.x = vecMin.x < vect.x ? vecMin.x : vect.x; + vecMin.y = vecMin.y < vect.y ? vecMin.y : vect.y; + vecMin.z = vecMin.z < vect.z ? vecMin.z : vect.z; + } + + matTransform.transpose(); + + _xAxis = Vec3(matTransform.m[0], matTransform.m[1], matTransform.m[2]); + _yAxis = Vec3(matTransform.m[4], matTransform.m[5], matTransform.m[6]); + _zAxis = Vec3(matTransform.m[8], matTransform.m[9], matTransform.m[10]); + + _center = 0.5f * (vecMax + vecMin); + _center *= matTransform; + + _xAxis.normalize(); + _yAxis.normalize(); + _zAxis.normalize(); + + _extents = 0.5f * (vecMax - vecMin); +} + +bool OBB::containPoint(const Vec3& point) const +{ + Vec3 vd = point - _center; + + float d = vd.dot(_xAxis); + if (d > _extents.x || d < -_extents.x) + return false; + + d = vd.dot(_yAxis); + if (d > _extents.y || d < -_extents.y) + return false; + + d = vd.dot(_zAxis); + if (d > _extents.z || d < -_extents.z) + return false; + + return true; +} + +void OBB::set(const Vec3& center, const Vec3& xAxis, const Vec3& yAxis, const Vec3& zAxis, const Vec3& extents) +{ + _center = center; + _xAxis = xAxis; + _yAxis = yAxis; + _zAxis = zAxis; + _extents = extents; +} + +void OBB::reset() +{ + memset(this, 0, sizeof(OBB)); +} + +void OBB::getCorners(Vec3* verts) const +{ + Vec3 extX = _xAxis * _extents.x; + Vec3 extY = _yAxis * _extents.y; + Vec3 extZ = _zAxis * _extents.z; + + verts[0] = _center - extX + extY + extZ; // left top front + verts[1] = _center - extX - extY + extZ; // left bottom front + verts[2] = _center + extX - extY + extZ; // right bottom front + verts[3] = _center + extX + extY + extZ; // right top front + + verts[4] = _center + extX + extY - extZ; // right top back + verts[5] = _center + extX - extY - extZ; // right bottom back + verts[6] = _center - extX - extY - extZ; // left bottom back + verts[7] = _center - extX + extY - extZ; // left top back +} + +float OBB::projectPoint(const Vec3& point, const Vec3& axis)const +{ + float dot = axis.dot(point); + float ret = dot * point.length(); + return ret; +} + +void OBB::getInterval(const OBB& box, const Vec3& axis, float &min, float &max)const +{ + Vec3 corners[8]; + box.getCorners(corners); + float value; + min = max = projectPoint(axis, corners[0]); + for(int i = 1; i < 8; i++) + { + value = projectPoint(axis, corners[i]); + min = MIN(min, value); + max = MAX(max, value); + } +} + +Vec3 OBB::getEdgeDirection(int index)const +{ + Vec3 corners[8]; + getCorners(corners); + + Vec3 tmpLine; + switch(index) + { + case 0:// edge with x axis + tmpLine = corners[5] - corners[6]; + tmpLine.normalize(); + break; + case 1:// edge with y axis + tmpLine = corners[7] - corners[6]; + tmpLine.normalize(); + break; + case 2:// edge with z axis + tmpLine = corners[1] - corners[6]; + tmpLine.normalize(); + break; + default: + CCASSERT(0, "Invalid index!"); + break; + } + return tmpLine; +} + +Vec3 OBB::getFaceDirection(int index) const +{ + Vec3 corners[8]; + getCorners(corners); + + Vec3 faceDirection, v0, v1; + switch(index) + { + case 0:// front and back + v0 = corners[2] - corners[1]; + v1 = corners[0] - corners[1]; + Vec3::cross(v0, v1, &faceDirection); + faceDirection.normalize(); + break; + case 1:// left and right + v0 = corners[5] - corners[2]; + v1 = corners[3] - corners[2]; + Vec3::cross(v0, v1, &faceDirection); + faceDirection.normalize(); + break; + case 2:// top and bottom + v0 = corners[1] - corners[2]; + v1 = corners[5] - corners[2]; + Vec3::cross(v0, v1, &faceDirection); + faceDirection.normalize(); + break; + default: + CCASSERT(0, "Invalid index!"); + break; + } + return faceDirection; +} + +bool OBB::intersects(const OBB& box) const +{ + float min1, max1, min2, max2; + for (int i = 0; i < 3; i++) + { + getInterval(*this, getFaceDirection(i), min1, max1); + getInterval(box, getFaceDirection(i), min2, max2); + if (max1 < min2 || max2 < min1) return false; + } + + for (int i = 0; i < 3; i++) + { + getInterval(*this, box.getFaceDirection(i), min1, max1); + getInterval(box, box.getFaceDirection(i), min2, max2); + if (max1 < min2 || max2 < min1) return false; + } + + for (int i = 0; i < 3; i++) + { + for (int j = 0; j < 3; j++) + { + Vec3 axis; + Vec3::cross(getFaceDirection(i), box.getFaceDirection(j), &axis); + getInterval(*this, axis, min1, max1); + getInterval(box, axis, min2, max2); + if (max1 < min2 || max2 < min1) return false; + } + } + + return true; +} + + +void OBB::transform(const Mat4& mat) +{ + Vec4 newcenter = mat * Vec4(_center.x, _center.y, _center.z, 1.0f);// center; + _center.x = newcenter.x; + _center.y = newcenter.y; + _center.z = newcenter.z; + + _xAxis = mat * _xAxis; + _yAxis = mat * _yAxis; + _zAxis = mat * _zAxis; + + _xAxis.normalize(); + _yAxis.normalize(); + _zAxis.normalize(); + + Vec3 scale, trans; + Quaternion quat; + mat.decompose(&scale, &quat, &trans); + + _extents.x *= scale.x; + _extents.y *= scale.y; + _extents.z *= scale.z; +} + +NS_CC_END diff --git a/cocos/3d/CCOBB.h b/cocos/3d/CCOBB.h new file mode 100644 index 0000000000..917472f224 --- /dev/null +++ b/cocos/3d/CCOBB.h @@ -0,0 +1,118 @@ +/**************************************************************************** + 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 __CC_OBB_H__ +#define __CC_OBB_H__ + +#include "CCAABB.h" +#include "3d/3dExport.h" + +NS_CC_BEGIN + +class CC_3D_DLL OBB +{ +public: + OBB(); + + /* + * Construct obb from oriented bounding box + */ + OBB(const AABB& aabb); + + /* + * Construct obb from points + */ + OBB(const Vec3* verts, int num); + + /* + * Check point in + */ + bool containPoint(const Vec3& point) const; + + /* + * Specify obb values + */ + void set(const Vec3& center, const Vec3& _xAxis, const Vec3& _yAxis, const Vec3& _zAxis, const Vec3& _extents); + + /* + * Clear obb + */ + void reset(); + + /* face to the obb's -z direction + * verts[0] : left top front + * verts[1] : left bottom front + * verts[2] : right bottom front + * verts[3] : right top front + * + * face to the obb's z direction + * verts[4] : right top back + * verts[5] : right bottom back + * verts[6] : left bottom back + * verts[7] : left top back + */ + void getCorners(Vec3* verts) const; + + /* + * Check intersect with other + */ + bool intersects(const OBB& box) const; + + /** + * Transforms the obb by the given transformation matrix. + */ + void transform(const Mat4& mat); + +protected: + /* + * Project point to the target axis + */ + float projectPoint(const Vec3& point, const Vec3& axis) const; + + /* + * Calculate the min and max project value of through the box's corners + */ + void getInterval(const OBB& box, const Vec3& axis, float &min, float &max) const; + + /* + * Get the edege of x y z axis direction + */ + Vec3 getEdgeDirection(int index) const; + + /* + * Get the face of x y z axis direction + */ + Vec3 getFaceDirection(int index) const; + +public: + Vec3 _center; // obb center + Vec3 _xAxis; // x axis of obb, unit vector + Vec3 _yAxis; // y axis of obb, unit vecotr + Vec3 _zAxis; // z axis of obb, unit vector + Vec3 _extents; // obb length along each axis +}; + +NS_CC_END + +#endif diff --git a/cocos/3d/CCRay.cpp b/cocos/3d/CCRay.cpp new file mode 100755 index 0000000000..b8f6b1d56c --- /dev/null +++ b/cocos/3d/CCRay.cpp @@ -0,0 +1,158 @@ +/**************************************************************************** +Copyright (c) Chukong Technologies Inc. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. +****************************************************************************/ + +#include "CCRay.h" +#include "CCAABB.h" +#include "CCOBB.h" + +NS_CC_BEGIN + +Ray::Ray() +: _direction(0, 0, 1) +{ +} + +Ray::Ray(const Vec3& origin, const Vec3& direction) +{ + set(origin, direction); +} + +Ray::~Ray() +{ +} + +bool Ray::intersects(const AABB& aabb) const +{ + Vec3 ptOnPlane; + Vec3 min = aabb._min; + Vec3 max = aabb._max; + + const Vec3& origin = _origin; + const Vec3& dir = _direction; + + float t; + + if (dir.x != 0.f) + { + if (dir.x > 0) + t = (min.x - origin.x) / dir.x; + else + t = (max.x - origin.x) / dir.x; + + if (t > 0.f) + { + ptOnPlane = origin + t * dir; + + if (min.y < ptOnPlane.y && ptOnPlane.y < max.y && min.z < ptOnPlane.z && ptOnPlane.z < max.z) + { + return true; + } + } + } + + if (dir.y != 0.f) + { + if (dir.y > 0) + t = (min.y - origin.y) / dir.y; + else + t = (max.y - origin.y) / dir.y; + + if (t > 0.f) + { + ptOnPlane = origin + t * dir; + + if (min.z < ptOnPlane.z && ptOnPlane.z < max.z && min.x < ptOnPlane.x && ptOnPlane.x < max.x) + { + return true; + } + } + } + + if (dir.z != 0.f) + { + if (dir.z > 0) + t = (min.z - origin.z) / dir.z; + else + t = (max.z - origin.z) / dir.z; + + if (t > 0.f) + { + ptOnPlane = origin + t * dir; + + if (min.x < ptOnPlane.x && ptOnPlane.x < max.x && min.y < ptOnPlane.y && ptOnPlane.y < max.y) + { + return true; + } + } + } + + return false; +} + +bool Ray::intersects(const OBB& obb) const +{ + AABB aabb; + aabb._min = - obb._extents; + aabb._max = obb._extents; + + Ray ray; + ray._direction = _direction; + ray._origin = _origin; + + Mat4 mat = Mat4::IDENTITY; + mat.m[0] = obb._xAxis.x; + mat.m[1] = obb._xAxis.y; + mat.m[2] = obb._xAxis.z; + + mat.m[4] = obb._yAxis.x; + mat.m[5] = obb._yAxis.y; + mat.m[6] = obb._yAxis.z; + + mat.m[8] = obb._zAxis.x; + mat.m[9] = obb._zAxis.y; + mat.m[10] = obb._zAxis.z; + + mat.m[12] = obb._center.x; + mat.m[13] = obb._center.y; + mat.m[14] = obb._center.z; + + mat = mat.getInversed(); + + ray.transform(mat); + + return ray.intersects(aabb); +} + +void Ray::set(const Vec3& origin, const Vec3& direction) +{ + _origin = origin; + _direction = direction; +} + +void Ray::transform(const Mat4& matrix) +{ + matrix.transformPoint(&_origin); + matrix.transformVector(&_direction); + _direction.normalize(); +} + +NS_CC_END diff --git a/cocos/3d/CCRay.h b/cocos/3d/CCRay.h new file mode 100644 index 0000000000..d92d0ac06c --- /dev/null +++ b/cocos/3d/CCRay.h @@ -0,0 +1,93 @@ +/**************************************************************************** + 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 __CC_RAY_H_ +#define __CC_RAY_H_ + +#include "base/ccMacros.h" +#include "math/CCMath.h" +#include "CCAABB.h" +#include "CCOBB.h" +#include "3d/3dExport.h" + +NS_CC_BEGIN + +class CC_3D_DLL Ray +{ +public: + /** + * Constructor. + */ + Ray(); + + /** + * Constructor. + */ + Ray(const Ray& ray); + + /** + * Constructs a new ray initialized to the specified values. + * + * @param origin The ray's origin. + * @param direction The ray's direction. + */ + Ray(const Vec3& origin, const Vec3& direction); + + /** + * Destructor. + */ + ~Ray(); + + /** + * Check whether this ray intersects the specified bounding box. + */ + bool intersects(const AABB& aabb) const; + + /** + * Check whether this ray intersects the specified obb. + */ + bool intersects(const OBB& obb) const; + + /** + * Sets this ray to the specified values. + * + * @param origin The ray's origin. + * @param direction The ray's direction. + */ + void set(const Vec3& origin, const Vec3& direction); + + /** + * Transforms this ray by the given transformation matrix. + * + * @param matrix The transformation matrix to transform by. + */ + void transform(const Mat4& matrix); + + Vec3 _origin; // The ray origin position. + Vec3 _direction; // The ray direction vector. +}; + +NS_CC_END + +#endif diff --git a/cocos/3d/CCSkeleton3D.cpp b/cocos/3d/CCSkeleton3D.cpp new file mode 100644 index 0000000000..57d6ea3c4a --- /dev/null +++ b/cocos/3d/CCSkeleton3D.cpp @@ -0,0 +1,436 @@ +/**************************************************************************** + 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/CCSkeleton3D.h" +#include "3d/CCBundle3D.h" + +#include "base/ccMacros.h" +#include "base/CCPlatformMacros.h" +#include "platform/CCFileUtils.h" + +NS_CC_BEGIN + +/** + * Sets the inverse bind pose matrix. + * + * @param m C3DMatrix representing the inverse bind pose for this Bone. + */ +void Bone3D::setInverseBindPose(const Mat4& m) +{ + _invBindPose = m; +} + +const Mat4& Bone3D::getInverseBindPose() +{ + return _invBindPose; +} + +void Bone3D::setOriPose(const Mat4& m) +{ + _oriPose = m; +} + +void Bone3D::resetPose() +{ + _local =_oriPose; + + for (auto it : _children) { + it->resetPose(); + } +} + +void Bone3D::setWorldMatDirty(bool dirty) +{ + _worldDirty = dirty; + for (auto it : _children) { + it->setWorldMatDirty(dirty); + } +} + +//update own world matrix and children's +void Bone3D::updateWorldMat() +{ + getWorldMat(); + for (auto itor : _children) { + itor->updateWorldMat(); + } +} + +const Mat4& Bone3D::getWorldMat() +{ + if (_worldDirty) + { + updateLocalMat(); + if (_parent) + { + _world = _parent->getWorldMat() * _local; + } + else + _world = _local; + + _worldDirty = false; + } + + return _world; +} + +void Bone3D::setAnimationValue(float* trans, float* rot, float* scale, void* tag, float weight) +{ + for (auto& it : _blendStates) { + if (it.tag == tag) + { + if (trans) + it.localTranslate.set(trans); + if (rot) + it.localRot.set(rot); + if (scale) + it.localScale.set(scale); + it.weight = weight; + return; + } + } + BoneBlendState state; + if (trans) + state.localTranslate.set(trans); + if (rot) + state.localRot.set(rot); + if (scale) + state.localScale.set(scale); + + state.weight = weight; + state.tag = tag; + + _blendStates.push_back(state); +} + +void Bone3D::clearBoneBlendState() +{ + _blendStates.clear(); + for (auto it : _children) { + it->clearBoneBlendState(); + } +} + +/** + * Creates C3DBone. + */ +Bone3D* Bone3D::create(const std::string& id) +{ + auto bone = new Bone3D(id); + bone->autorelease(); + return bone; +} + +void Bone3D::updateJointMatrix(Vec4* matrixPalette) +{ + { + static Mat4 t; + Mat4::multiply(_world, getInverseBindPose(), &t); + + matrixPalette[0].set(t.m[0], t.m[4], t.m[8], t.m[12]); + matrixPalette[1].set(t.m[1], t.m[5], t.m[9], t.m[13]); + matrixPalette[2].set(t.m[2], t.m[6], t.m[10], t.m[14]); + } +} + +Bone3D* Bone3D::getParentBone() +{ + return _parent; +} +ssize_t Bone3D::getChildBoneCount() const +{ + return _children.size(); +} +Bone3D* Bone3D::getChildBoneByIndex(int index) const +{ + return _children.at(index); +} +void Bone3D::addChildBone(Bone3D* bone) +{ + if (_children.find(bone) == _children.end()) + _children.pushBack(bone); +} +void Bone3D::removeChildBoneByIndex(int index) +{ + _children.erase(index); +} +void Bone3D::removeChildBone(Bone3D* bone) +{ + _children.eraseObject(bone); +} +void Bone3D::removeAllChildBone() +{ + _children.clear(); +} + +Bone3D::Bone3D(const std::string& id) +: _name(id) +, _parent(nullptr) +, _worldDirty(true) +{ + +} + +Bone3D::~Bone3D() +{ + removeAllChildBone(); +} + +void Bone3D::updateLocalMat() +{ + if (_blendStates.size()) + { + Vec3 translate(Vec3::ZERO), scale(Vec3::ZERO); + Quaternion quat(Quaternion::ZERO); + + float total = 0.f; + for (auto it: _blendStates) { + total += it.weight; + } + if (total) + { + if (_blendStates.size() == 1) + { + auto& state = _blendStates[0]; + translate = state.localTranslate; + scale = state.localScale; + quat = state.localRot; + } + else + { + float invTotal = 1.f / total; + for (const auto& it : _blendStates) + { + float weight = (it.weight * invTotal); + translate += it.localTranslate * weight; + scale.x += it.localScale.x * weight; + scale.y += it.localScale.y * weight; + scale.z += it.localScale.z * weight; + if (!quat.isZero()) + { + Quaternion& q = _blendStates[0].localRot; + if (q.x * quat.x + q.y * quat.y + q.z * quat.z + q.w * quat.w < 0) + weight = -weight; + } + quat = Quaternion(it.localRot.x * weight + quat.x, it.localRot.y * weight + quat.y, it.localRot.z * weight + quat.z, it.localRot.w * weight + quat.w); + } + } + } + + Mat4::createTranslation(translate, &_local); + _local.rotate(quat); + _local.scale(scale); + + _blendStates.clear(); + } +} + +//////////////////////////////////////////////////////////////////////////////////////////////////////////////// + +Skeleton3D::Skeleton3D() +: _rootBone(nullptr) +{ + +} + +Skeleton3D::~Skeleton3D() +{ + removeAllBones(); +} + +//create a new meshskin if do not want to share meshskin +Skeleton3D* Skeleton3D::create(const std::string& filename, const std::string& name) +{ + //load skin here; + std::string fullPath = FileUtils::getInstance()->fullPathForFilename(filename); + std::string key(fullPath + "#" + name); + const auto skeletondata = Skeleton3DDataCache::getInstance()->getSkeletonData(key); + if (skeletondata) + { + auto skeleton = new Skeleton3D(); + skeleton->initFromSkeletonData(*skeletondata); + skeleton->autorelease(); + return skeleton; + } + else + { + auto instance = Bundle3D::getInstance(); + bool ret = instance->load(fullPath); + if (ret) + { + Skeleton3DData data; + if (instance->loadSkeletonData(name, &data)) + { + auto skeleton = new Skeleton3D(); + skeleton->initFromSkeletonData(data); + skeleton->autorelease(); + Skeleton3DDataCache::getInstance()->addSkeletonData(key, data); + return skeleton; + } + } + } + + return nullptr; +} + +bool Skeleton3D::initFromSkeletonData(const Skeleton3DData& skeletondata) +{ + ssize_t i = 0; + for (; i < skeletondata.boneNames.size(); i++) { + auto bone = Bone3D::create(skeletondata.boneNames[i]); + bone->setOriPose(skeletondata.boneOriginMatrices[i]); + addBone(bone); + } + + for (auto it : skeletondata.boneChild) { + auto parent = getBoneByIndex(it.first); + for (auto childIt : it.second) { + auto child = getBoneByIndex(childIt); + child->_parent = parent; + parent->_children.pushBack(child); + } + } + + setRootBone(getBoneByIndex(skeletondata.rootBoneIndex)); + if (_rootBone) + _rootBone->resetPose(); + + return true; +} + +ssize_t Skeleton3D::getBoneCount() const +{ + return _bones.size(); +} + +//get bone +Bone3D* Skeleton3D::getBoneByIndex(unsigned int index) const +{ + if (index < _bones.size()) + return _bones.at(index); + + return nullptr; +} +Bone3D* Skeleton3D::getBoneByName(const std::string& id) const +{ + //search from bones + for (auto it : _bones) { + if (it->getName() == id) + return it; + } + + return nullptr; +} + +Bone3D* Skeleton3D::getRootBone() const +{ + return _rootBone; +} +void Skeleton3D::setRootBone(Bone3D* joint) +{ + CC_SAFE_RETAIN(joint); + CC_SAFE_RELEASE(_rootBone); + _rootBone = joint; +} + +int Skeleton3D::getBoneIndex(Bone3D* bone) const +{ + int i = 0; + for (; i < _bones.size(); i++) { + if (_bones.at(i) == bone) + return i; + } + + return -1; +} + +//refresh bone world matrix +void Skeleton3D::updateBoneMatrix() +{ + _rootBone->setWorldMatDirty(true); + _rootBone->updateWorldMat(); +} + +void Skeleton3D::removeAllBones() +{ + _bones.clear(); + CC_SAFE_RELEASE(_rootBone); +} + +void Skeleton3D::addBone(Bone3D* bone) +{ + _bones.pushBack(bone); +} + +//////////////////////////////////////////////////////////////////////// +Skeleton3DDataCache* Skeleton3DDataCache::_cacheInstance = nullptr; + +Skeleton3DDataCache* Skeleton3DDataCache::getInstance() +{ + if (_cacheInstance == nullptr) + _cacheInstance = new Skeleton3DDataCache(); + return _cacheInstance; +} +void Skeleton3DDataCache::destroyInstance() +{ + if (_cacheInstance) + { + CC_SAFE_DELETE(_cacheInstance); + } +} + +const Skeleton3DData* Skeleton3DDataCache::getSkeletonData(const std::string& key) const +{ + auto it = _skeletonDatas.find(key); + if (it != _skeletonDatas.end()) + return &it->second; + + return nullptr; +} + +bool Skeleton3DDataCache::addSkeletonData(const std::string& key, const Skeleton3DData& data) +{ + if (_skeletonDatas.find(key) != _skeletonDatas.end()) + return false; // already have this key + + _skeletonDatas[key] = data; + + return true; +} + +void Skeleton3DDataCache::removeAllSkeletonData() +{ + _skeletonDatas.clear(); +} + +Skeleton3DDataCache::Skeleton3DDataCache() +{ + +} +Skeleton3DDataCache::~Skeleton3DDataCache() +{ + +} + +NS_CC_END diff --git a/cocos/3d/CCSkeleton3D.h b/cocos/3d/CCSkeleton3D.h new file mode 100644 index 0000000000..d6c431c22f --- /dev/null +++ b/cocos/3d/CCSkeleton3D.h @@ -0,0 +1,263 @@ +/**************************************************************************** + 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 __CCSKELETON3D_H__ +#define __CCSKELETON3D_H__ + +#include + +#include "3d/CCBundle3DData.h" + +#include "base/ccMacros.h" +#include "base/CCRef.h" +#include "base/CCVector.h" +#include "base/ccTypes.h" +#include "math/CCMath.h" +#include "3d/3dExport.h" + +NS_CC_BEGIN + +/** + * Defines a basic hierachial structure of transformation spaces. + */ +class CC_3D_DLL Bone3D : public Ref +{ + friend class Skeleton3D; + friend class MeshSkin; +public: + + /** + * Returns the inverse bind pose matrix for this joint. + * + * @return Inverse bind pose matrix. + */ + const Mat4& getInverseBindPose(); + + /**update own world matrix and children's*/ + void updateWorldMat(); + + /**get wrod matrix*/ + const Mat4& getWorldMat(); + + /**get bone name*/ + const std::string& getName() const { return _name; } + + /** + * set animation value + * @param trans translate vec3 + * @param rot rotation quaternion + * @param scale scale vec3 + * @param tag, unique tag, only blend animation between different tags + * @param weight, blend weight + */ + void setAnimationValue(float* trans, float* rot, float* scale, void* tag = nullptr, float weight = 1.0f); + + /**clear bone blend states*/ + void clearBoneBlendState(); + /** + * Creates C3DBone. + */ + static Bone3D* create(const std::string& id); + + /** + * Sets the inverse bind pose matrix. + * + * @param m Mat4 representing the inverse bind pose for this Bone. + */ + void setInverseBindPose(const Mat4& m); + + /** + * Sets the bone's original pose. + * + * @param m Mat4 representing the original pose for this Bone. + */ + void setOriPose(const Mat4& m); + + /** + * reset pose to origin + */ + void resetPose(); + + /** + * Updates the joint matrix. + * + * @param matrixPalette The matrix palette to update. + */ + void updateJointMatrix(Vec4* matrixPalette); + + /**bone tree, we do not inherit from Node, Node has too many properties that we do not need. A clean Node is needed.*/ + Bone3D* getParentBone(); + /**get child bone count*/ + ssize_t getChildBoneCount() const; + /**get child bone by index*/ + Bone3D* getChildBoneByIndex(int index) const; + /**add child bone*/ + void addChildBone(Bone3D* bone); + /**remove child bone by index*/ + void removeChildBoneByIndex(int index); + /**remove child bone*/ + void removeChildBone(Bone3D* bone); + /**remove all child bone*/ + void removeAllChildBone(); + + + +protected: + + struct BoneBlendState + { + Vec3 localTranslate; + Quaternion localRot; + Vec3 localScale; + float weight; + void* tag; // + BoneBlendState() + : localTranslate(Vec3::ZERO) + , localRot(Quaternion::identity()) + , localScale(Vec3::ONE) + , weight(1.f) + , tag(nullptr) + { + + } + }; + /** + * Constructor. + */ + Bone3D(const std::string& id); + + /** + * Destructor. + */ + virtual ~Bone3D(); + + /** + * Update local matrix + */ + void updateLocalMat(); + + /**set world matrix dirty flag*/ + void setWorldMatDirty(bool dirty = true); + + std::string _name; // bone name + /** + * The Mat4 representation of the Joint's bind pose. + */ + Mat4 _invBindPose; + + Mat4 _oriPose; //original bone pose + + Bone3D* _parent; //parent bone + + Vector _children; + + bool _worldDirty; + Mat4 _world; + Mat4 _local; + + std::vector _blendStates; + +}; + +/** + * Skeleton + * + */ +class CC_3D_DLL Skeleton3D: public Ref +{ +public: + + /**create a new meshskin if do not want to share Skeleton3D*/ + static Skeleton3D* create(const std::string& filename, const std::string& name); + + /**get total bone count*/ + ssize_t getBoneCount() const; + + /**get bone*/ + Bone3D* getBoneByIndex(unsigned int index) const; + Bone3D* getBoneByName(const std::string& id) const; + + /**get & set root bone*/ + Bone3D* getRootBone() const; + void setRootBone(Bone3D* bone); + + /**get bone index*/ + int getBoneIndex(Bone3D* bone) const; + + /**refresh bone world matrix*/ + void updateBoneMatrix(); + +CC_CONSTRUCTOR_ACCESS: + + Skeleton3D(); + + ~Skeleton3D(); + + /**init from skeleton data*/ + bool initFromSkeletonData(const Skeleton3DData& skeletondata); + + /**remove all bones*/ + void removeAllBones(); + + /**add bone*/ + void addBone(Bone3D* bone); + +protected: + + Vector _bones; // bones + + Bone3D* _rootBone; +}; + +/** + * Skeleton3DData Cache + */ +class Skeleton3DDataCache +{ +public: + /**get & destroy*/ + static Skeleton3DDataCache* getInstance(); + static void destroyInstance(); + + /**get mesh skin data from cache*/ + const Skeleton3DData* getSkeletonData(const std::string& key) const; + + /**add skeleton data to cache*/ + bool addSkeletonData(const std::string& key, const Skeleton3DData& skeletonData); + + /**remove all skeleton data*/ + void removeAllSkeletonData(); + +CC_CONSTRUCTOR_ACCESS: + Skeleton3DDataCache(); + ~Skeleton3DDataCache(); + + static Skeleton3DDataCache* _cacheInstance; // instance + + std::unordered_map _skeletonDatas; //cached skeleton datas +}; + +NS_CC_END + +#endif // __CCSKELETON3D_H__ diff --git a/cocos/3d/CCSprite3D.cpp b/cocos/3d/CCSprite3D.cpp index a1244d2efb..5e81c75532 100644 --- a/cocos/3d/CCSprite3D.cpp +++ b/cocos/3d/CCSprite3D.cpp @@ -28,6 +28,10 @@ #include "3d/CCMeshSkin.h" #include "3d/CCBundle3D.h" #include "3d/CCSprite3DMaterial.h" +#include "3d/CCSubMesh.h" +#include "3d/CCAttachNode.h" +#include "3d/CCSubMeshState.h" +#include "3d/CCSkeleton3D.h" #include "base/CCDirector.h" #include "base/CCPlatformMacros.h" @@ -70,24 +74,7 @@ Sprite3D* Sprite3D::create(const std::string &modelPath, const std::string &text 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) +bool Sprite3D::loadFromCache(const std::string& path) { std::string fullPath = FileUtils::getInstance()->fullPathForFilename(path); @@ -99,14 +86,35 @@ bool Sprite3D::loadFromObj(const std::string& path) _mesh = mesh; _mesh->retain(); - auto tex = Sprite3DMaterialCache::getInstance()->getSprite3DMaterial(key); - setTexture(tex); + char str[20]; + for (int i = 0; i < (int)_mesh->getSubMeshCount(); i++) { + sprintf(str, "submesh%d", i); + std::string submeshkey = key + std::string(str); + auto tex = Sprite3DMaterialCache::getInstance()->getSprite3DMaterial(submeshkey); + auto submeshstate = SubMeshState::create(); + submeshstate->setTexture(tex); + _subMeshStates.pushBack(submeshstate); + } + + _skeleton = Skeleton3D::create(fullPath, ""); + CC_SAFE_RETAIN(_skeleton); + _skin = MeshSkin::create(_skeleton, fullPath, ""); + CC_SAFE_RETAIN(_skin); genGLProgramState(); return true; } + return false; +} + +//.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); + std::string key = fullPath + "#"; + //.mtl file directory std::string dir = ""; auto last = fullPath.rfind("/"); @@ -119,67 +127,36 @@ bool Sprite3D::loadFromObj(const std::string& path) return false; //convert to mesh and material - std::vector indices; + std::vector > submeshIndices; 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); + submeshIndices.push_back((*it).mesh.indices); + + texname = (*it).material.diffuse_texname; + if (!texname.empty()) + texname = dir + (*it).material.diffuse_texname; + matnames.push_back(texname); } - _mesh = Mesh::create(shapes.positions, shapes.normals, shapes.texcoords, indices); - + _mesh = Mesh::create(shapes.positions, shapes.normals, shapes.texcoords, submeshIndices); _mesh->retain(); if (_mesh == nullptr) return false; - - if (matnames.size()) - { - setTexture(matnames[0]); - } - genGLProgramState(); - - //add to cache - - if (_texture) - { - Sprite3DMaterialCache::getInstance()->addSprite3DMaterial(key, _texture); - } - + //add mesh to cache MeshCache::getInstance()->addMesh(key, _mesh); + genMaterials(key, matnames); + + genGLProgramState(); + return true; } bool Sprite3D::loadFromC3x(const std::string& path) { std::string fullPath = FileUtils::getInstance()->fullPathForFilename(path); - //find from the cache std::string key = fullPath + "#"; - auto mesh = MeshCache::getInstance()->getMesh(key); - if (mesh) - { - _mesh = mesh; - _mesh->retain(); - - auto tex = Sprite3DMaterialCache::getInstance()->getSprite3DMaterial(key); - setTexture(tex); - - _skin = MeshSkin::create(fullPath, ""); - CC_SAFE_RETAIN(_skin); - - genGLProgramState(); - - return true; - } //load from .c3b or .c3t auto bundle = Bundle3D::getInstance(); @@ -193,52 +170,60 @@ bool Sprite3D::loadFromC3x(const std::string& path) return false; } - _mesh = Mesh::create(meshdata.vertex, meshdata.vertexSizeInFloat, meshdata.indices, meshdata.attribs); + _mesh = Mesh::create(meshdata.vertex, meshdata.vertexSizeInFloat, meshdata.subMeshIndices, meshdata.attribs); + CC_SAFE_RETAIN(_mesh); - - _skin = MeshSkin::create(fullPath, ""); + //add mesh to cache + MeshCache::getInstance()->addMesh(key, _mesh); + _skeleton = Skeleton3D::create(fullPath, ""); + CC_SAFE_RETAIN(_skeleton); + _skin = MeshSkin::create(_skeleton, fullPath, ""); CC_SAFE_RETAIN(_skin); MaterialData materialdata; ret = bundle->loadMaterialData("", &materialdata); if (ret) { - setTexture(materialdata.texturePath); + std::vector texpaths; + texpaths.resize(_mesh->getSubMeshCount(), ""); + for (auto& it : materialdata.texturePaths) + { + texpaths[it.first] = it.second; + } + genMaterials(key, texpaths); } genGLProgramState(); - //add to cache - auto cache = Director::getInstance()->getTextureCache(); - auto tex = cache->addImage(materialdata.texturePath); - if (tex) - Sprite3DMaterialCache::getInstance()->addSprite3DMaterial(key, tex); - - MeshCache::getInstance()->addMesh(key, _mesh); - return true; } Sprite3D::Sprite3D() : _mesh(nullptr) , _skin(nullptr) -, _texture(nullptr) +, _skeleton(nullptr) , _blend(BlendFunc::ALPHA_NON_PREMULTIPLIED) { } Sprite3D::~Sprite3D() { - CC_SAFE_RELEASE_NULL(_texture); + _subMeshStates.clear(); CC_SAFE_RELEASE_NULL(_mesh); CC_SAFE_RELEASE_NULL(_skin); + CC_SAFE_RELEASE_NULL(_skeleton); + removeAllAttachNode(); } bool Sprite3D::initWithFile(const std::string &path) { + _subMeshStates.clear(); CC_SAFE_RELEASE_NULL(_mesh); CC_SAFE_RELEASE_NULL(_skin); - CC_SAFE_RELEASE_NULL(_texture); + CC_SAFE_RELEASE_NULL(_skeleton); + + if (loadFromCache(path)) + return true; //load from file std::string ext = path.substr(path.length() - 4, 4); @@ -273,8 +258,13 @@ void Sprite3D::genGLProgramState() } setGLProgramState(programstate); - GLuint texID = _texture ? _texture->getName() : 0; - _meshCommand.genMaterialID(texID, programstate, _mesh, _blend); + auto count = _mesh->getSubMeshCount(); + _meshCommands.resize(count); + for (int i = 0; i < count; i++) { + auto tex = _subMeshStates.at(i)->getTexture(); + GLuint texID = tex ? tex->getName() : 0; + _meshCommands[i].genMaterialID(texID, programstate, _mesh, _blend); + } } GLProgram* Sprite3D::getDefaultGLProgram(bool textured) @@ -295,59 +285,105 @@ GLProgram* Sprite3D::getDefaultGLProgram(bool textured) } } +void Sprite3D::genMaterials(const std::string& keyprefix, const std::vector& texpaths) +{ + _subMeshStates.clear(); + + char str[20]; + auto cache = Director::getInstance()->getTextureCache(); + int index = 0; + for (auto& it : texpaths) { + auto tex = cache->addImage(it); + auto subMeshState = SubMeshState::create(); + subMeshState->setTexture(tex); + _subMeshStates.pushBack(subMeshState); + + //add to cache + sprintf(str, "submesh%d", index); + std::string submeshkey = keyprefix + std::string(str); + Sprite3DMaterialCache::getInstance()->addSprite3DMaterial(submeshkey, tex); + index++; + } +} + 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; -// } setTexture(tex); } void Sprite3D::setTexture(Texture2D* texture) { - if(_texture != texture) { - CC_SAFE_RETAIN(texture); - CC_SAFE_RELEASE_NULL(_texture); - _texture = texture; - if (getGLProgramState() && _mesh) - { - GLuint texID = _texture ? _texture->getName() : 0; - _meshCommand.genMaterialID(texID, getGLProgramState(), _mesh, _blend); - } + _subMeshStates.at(0)->setTexture(texture); +} + +AttachNode* Sprite3D::getAttachNode(const std::string& boneName) +{ + auto it = _attachments.find(boneName); + if (it != _attachments.end()) + return it->second; + + if (_skin) + { + auto bone = _skin->getBoneByName(boneName); + auto attachNode = AttachNode::create(bone); + addChild(attachNode); + _attachments[boneName] = attachNode; + return attachNode; } + + return nullptr; +} + +void Sprite3D::removeAttachNode(const std::string& boneName) +{ + auto it = _attachments.find(boneName); + if (it != _attachments.end()) + { + removeChild(it->second); + _attachments.erase(it); + } +} + +void Sprite3D::removeAllAttachNode() +{ + for (auto& it : _attachments) { + removeChild(it.second); + } + _attachments.clear(); } void Sprite3D::draw(Renderer *renderer, const Mat4 &transform, uint32_t flags) { +// if (_skeleton) +// _skeleton->updateBoneMatrix(); + 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); - if (_skin) - { - _meshCommand.setMatrixPaletteSize((int)_skin->getMatrixPaletteSize()); - _meshCommand.setMatrixPalette(_skin->getMatrixPalette()); + for (ssize_t i = 0; i < _mesh->getSubMeshCount(); i++) { + auto submeshstate = _subMeshStates.at(i); + if (!submeshstate->isVisible()) + continue; + + auto submesh = _mesh->getSubMesh((int)i); + auto& meshCommand = _meshCommands[i]; + + GLuint textureID = submeshstate->getTexture() ? submeshstate->getTexture()->getName() : 0; + meshCommand.init(_globalZOrder, textureID, programstate, _blend, _mesh->getVertexBuffer(), submesh->getIndexBuffer(), (GLenum)submesh->getPrimitiveType(), (GLenum)submesh->getIndexFormat(), submesh->getIndexCount(), transform); + + meshCommand.setCullFaceEnabled(true); + meshCommand.setDepthTestEnabled(true); + if (_skin) + { + meshCommand.setMatrixPaletteSize((int)_skin->getMatrixPaletteSize()); + meshCommand.setMatrixPalette(_skin->getMatrixPalette()); + } + //support tint and fade + meshCommand.setDisplayColor(Vec4(color.r, color.g, color.b, color.a)); + renderer->addCommand(&meshCommand); } - //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) @@ -363,4 +399,51 @@ const BlendFunc& Sprite3D::getBlendFunc() const return _blend; } +AABB Sprite3D::getAABB() const +{ + Mat4 nodeToWorldTransform(getNodeToWorldTransform()); + + // If nodeToWorldTransform matrix isn't changed, we don't need to transform aabb. + if (memcmp(_nodeToWorldTransform.m, nodeToWorldTransform.m, sizeof(Mat4)) == 0) + { + return _aabb; + } + else + { + Mat4 transform(nodeToWorldTransform); + _aabb = _mesh->getOriginAABB(); + + if (getSkin() && getSkin()->getRootBone()) + { + transform = nodeToWorldTransform * getSkin()->getRootBone()->getWorldMat(); + } + + _aabb.transform(transform); + _nodeToWorldTransform = nodeToWorldTransform; + } + + return _aabb; +} + +Rect Sprite3D::getBoundingBox() const +{ + AABB aabb = getAABB(); + Rect ret(aabb._min.x, aabb._min.y, (aabb._max.x - aabb._min.x), (aabb._max.y - aabb._min.y)); + return ret; +} + +void Sprite3D::setCullFace(GLenum cullFace) +{ + for (auto& it : _meshCommands) { + it.setCullFace(cullFace); + } +} + +void Sprite3D::setCullFaceEnabled(bool enable) +{ + for (auto& it : _meshCommands) { + it.setCullFaceEnabled(enable); + } +} + NS_CC_END diff --git a/cocos/3d/CCSprite3D.h b/cocos/3d/CCSprite3D.h index bec90631eb..36de7ac3cf 100644 --- a/cocos/3d/CCSprite3D.h +++ b/cocos/3d/CCSprite3D.h @@ -26,12 +26,15 @@ #define __CCSPRITE3D_H__ #include +#include #include "base/CCVector.h" #include "base/ccTypes.h" #include "base/CCProtocols.h" #include "2d/CCNode.h" #include "renderer/CCMeshCommand.h" +#include "CCAABB.h" +#include "3d/3dExport.h" NS_CC_BEGIN @@ -39,9 +42,12 @@ class GLProgramState; class Mesh; class Texture2D; class MeshSkin; +class AttachNode; +class SubMeshState; +class Skeleton3D; /** Sprite3D: A sprite can be loaded from 3D model files, .obj, .c3t, .c3b, then can be drawed as sprite */ -class Sprite3D : public Node, public BlendProtocol +class CC_3D_DLL Sprite3D : public Node, public BlendProtocol { public: /** creates a Sprite3D*/ @@ -50,19 +56,50 @@ public: // 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*/ + /**set texture, set the first if multiple textures exist*/ void setTexture(const std::string& texFile); void setTexture(Texture2D* texture); + + /**get SubMeshState by index*/ + SubMeshState* getSubMeshState(int index) const; /**get mesh*/ Mesh* getMesh() const { return _mesh; } /**get skin*/ MeshSkin* getSkin() const { return _skin; } + + /**get AttachNode by bone name, return nullptr if not exist*/ + AttachNode* getAttachNode(const std::string& boneName); + + /**remove attach node*/ + void removeAttachNode(const std::string& boneName); + + /**remove all attach nodes*/ + void removeAllAttachNode(); // overrides virtual void setBlendFunc(const BlendFunc &blendFunc) override; virtual const BlendFunc &getBlendFunc() const override; + + /* + * Get AABB + * If the sprite has animation, it can't be calculated accuratly, + * because bone can drive the vertices, we just use the origin vertices + * to calculate the AABB. + */ + AABB getAABB() const; + + /** + * Returns 2d bounding-box + * Note: the bouding-box is just get from the AABB which as Z=0, so that is not very accurate. + */ + virtual Rect getBoundingBox() const override; + + // set which face is going to cull, GL_BACK, GL_FRONT, GL_FRONT_AND_BACK, default GL_BACK + void setCullFace(GLenum cullFace); + // set cull face enable or not + void setCullFaceEnabled(bool enable); CC_CONSTRUCTOR_ACCESS: @@ -70,6 +107,9 @@ CC_CONSTRUCTOR_ACCESS: virtual ~Sprite3D(); bool initWithFile(const std::string &path); + /**load sprite3d from cache, return true if succeed, false otherwise*/ + bool loadFromCache(const std::string& path); + /**.mtl file should at the same directory with the same name if exist*/ bool loadFromObj(const std::string& path); @@ -84,17 +124,28 @@ CC_CONSTRUCTOR_ACCESS: /**generate default GLProgramState*/ void genGLProgramState(); + + /**generate materials, and add them to cache, keyprefix is used as key prefix when added to cache*/ + void genMaterials(const std::string& keyprefix, const std::vector& texpaths); protected: - Mesh* _mesh;//mesh - MeshSkin* _skin;//skin + Mesh* _mesh;//mesh + MeshSkin* _skin;//skin + Skeleton3D* _skeleton; //skeleton - MeshCommand _meshCommand; //render command - Texture2D* _texture; - BlendFunc _blend; + std::vector _meshCommands; //render command each for one submesh + + Vector _subMeshStates; // SubMeshStates + + std::unordered_map _attachments; + + BlendFunc _blend; + + mutable AABB _aabb; // cache current aabb + mutable Mat4 _nodeToWorldTransform; // cache the matrix }; -extern std::string s_attributeNames[];//attribute names array +extern std::string CC_3D_DLL s_attributeNames[];//attribute names array NS_CC_END #endif // __SPRITE3D_H_ diff --git a/cocos/3d/CCSubMesh.cpp b/cocos/3d/CCSubMesh.cpp new file mode 100644 index 0000000000..330e6e3f2a --- /dev/null +++ b/cocos/3d/CCSubMesh.cpp @@ -0,0 +1,97 @@ +/**************************************************************************** + 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 "CCSubMesh.h" + +#include +#include +#include +#include + +#include "3d/CCObjLoader.h" +#include "3d/CCSprite3DMaterial.h" + +#include "base/ccMacros.h" +#include "base/CCEventCustom.h" +#include "base/CCEventListenerCustom.h" +#include "base/CCEventDispatcher.h" +#include "base/CCEventType.h" +#include "base/CCDirector.h" +#include "renderer/ccGLStateCache.h" + + +using namespace std; + +NS_CC_BEGIN + +SubMesh::SubMesh() +: _indexBuffer(0) +, _primitiveType(PrimitiveType::TRIANGLES) +, _indexFormat(IndexFormat::INDEX16) +, _indexCount(0) +{ +} + +SubMesh::~SubMesh() +{ + cleanAndFreeBuffers(); +} + +SubMesh* SubMesh::create(PrimitiveType primitivetype, IndexFormat indexformat, const std::vector& indices) +{ + auto submesh = new SubMesh(); + submesh->_primitiveType = primitivetype; + submesh->_indexFormat = indexformat; + submesh->autorelease(); + + return submesh; +} + +void SubMesh::cleanAndFreeBuffers() +{ + if(glIsBuffer(_indexBuffer)) + { + glDeleteBuffers(1, &_indexBuffer); + _indexBuffer = 0; + } + + _indexCount = 0; +} + +void SubMesh::buildBuffer(const std::vector& indices) +{ + glGenBuffers(1, &_indexBuffer); + + glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, _indexBuffer); + + unsigned int indexSize = 2; + + glBufferData(GL_ELEMENT_ARRAY_BUFFER, indexSize * indices.size(), &indices[0], GL_STATIC_DRAW); + + glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0); + + _indexCount = indices.size(); +} + +NS_CC_END diff --git a/cocos/3d/CCSubMesh.h b/cocos/3d/CCSubMesh.h new file mode 100644 index 0000000000..d8f62e7e65 --- /dev/null +++ b/cocos/3d/CCSubMesh.h @@ -0,0 +1,99 @@ +/**************************************************************************** + 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 __CCSUBMESH_H__ +#define __CCSUBMESH_H__ + +#include +#include + +#include "3d/CCBundle3DData.h" + +#include "base/CCRef.h" +#include "base/ccTypes.h" +#include "math/CCMath.h" +#include "renderer/CCGLProgram.h" +#include "3d/3dExport.h" + +NS_CC_BEGIN + +/** 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 +}; + +/** + * SubMesh: Defines the way the mesh's vertices how to be connected together. + */ +class CC_3D_DLL SubMesh : public Ref +{ + friend class Mesh; +public: + + /**create submesh from primitivetype indexformat and indices*/ + static SubMesh* create(PrimitiveType primitivetype, IndexFormat indexformat, const std::vector& indices); + + /** get primitive type*/ + PrimitiveType getPrimitiveType() const { return _primitiveType; } + /**get index count*/ + ssize_t getIndexCount() const { return _indexCount; } + /**get index format*/ + IndexFormat getIndexFormat() const { return _indexFormat; } + /**get index buffer*/ + GLuint getIndexBuffer() const {return _indexBuffer; } + + +CC_CONSTRUCTOR_ACCESS: + + SubMesh(); + virtual ~SubMesh(); + + /**build buffer*/ + void buildBuffer(const std::vector& indices); + /**free buffer*/ + void cleanAndFreeBuffers(); + +protected: + PrimitiveType _primitiveType; + IndexFormat _indexFormat; + + GLuint _indexBuffer; + ssize_t _indexCount; +}; + +NS_CC_END + +#endif // __CCMESH_H_ diff --git a/cocos/3d/CCSubMeshState.cpp b/cocos/3d/CCSubMeshState.cpp new file mode 100644 index 0000000000..639c1e87cd --- /dev/null +++ b/cocos/3d/CCSubMeshState.cpp @@ -0,0 +1,89 @@ +/**************************************************************************** + 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 +#include +#include +#include + +#include "3d/CCSubMeshState.h" +#include "3d/CCMeshSkin.h" +#include "3d/CCSubMesh.h" + +#include "base/ccMacros.h" +#include "base/CCEventCustom.h" +#include "base/CCEventListenerCustom.h" +#include "base/CCEventDispatcher.h" +#include "base/CCEventType.h" +#include "base/CCDirector.h" +#include "renderer/ccGLStateCache.h" +#include "renderer/CCTexture2D.h" + + +using namespace std; + +NS_CC_BEGIN + +SubMeshState::SubMeshState() +: _visible(true) +, _texture(nullptr) +, _skin(nullptr) +{ + +} +SubMeshState::~SubMeshState() +{ + CC_SAFE_RELEASE(_texture); + CC_SAFE_RELEASE(_skin); +} + +SubMeshState* SubMeshState::create() +{ + auto state = new SubMeshState(); + state->autorelease(); + + return state; +} + +void SubMeshState::setTexture(Texture2D* tex) +{ + if (tex != _texture) + { + CC_SAFE_RETAIN(tex); + CC_SAFE_RELEASE(_texture); + _texture = tex; + } +} + +void SubMeshState::setSkin(MeshSkin* skin) +{ + if (_skin != skin) + { + CC_SAFE_RETAIN(skin); + CC_SAFE_RELEASE(_skin); + _skin = skin; + } +} + +NS_CC_END diff --git a/cocos/3d/CCSubMeshState.h b/cocos/3d/CCSubMeshState.h new file mode 100644 index 0000000000..542b0ecd32 --- /dev/null +++ b/cocos/3d/CCSubMeshState.h @@ -0,0 +1,78 @@ +/**************************************************************************** + 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 __CCSUBMESHSTATE_H__ +#define __CCSUBMESHSTATE_H__ + +#include +#include + +#include "3d/CCBundle3DData.h" + +#include "base/CCRef.h" +#include "base/ccTypes.h" +#include "math/CCMath.h" +#include "renderer/CCGLProgram.h" +#include "3d/3dExport.h" + +NS_CC_BEGIN + +class Texture2D; +class MeshSkin; +/** + * SubMeshState: visibility and apperence of submesh + */ +class CC_3D_DLL SubMeshState : public Ref +{ +public: + + /**create submesh from primitivetype indexformat and indices*/ + static SubMeshState* create(); + + /**texture getter and setter*/ + void setTexture(Texture2D* tex); + Texture2D* getTexture() const { return _texture; } + + /**visible getter and setter*/ + void setVisible(bool visible) { _visible = visible; } + bool isVisible() const { return _visible; } + + /**skin getter and setter*/ + void setSkin(MeshSkin* skin); + MeshSkin* getSkin() const { return _skin; } + +CC_CONSTRUCTOR_ACCESS: + + SubMeshState(); + virtual ~SubMeshState(); + +protected: + Texture2D* _texture; //texture that submesh is using + MeshSkin* _skin; //skin + bool _visible; // is the submesh visible +}; + +NS_CC_END + +#endif // __CCSUBMESHSTATE_H__ diff --git a/cocos/3d/CMakeLists.txt b/cocos/3d/CMakeLists.txt index 11b2f6650d..28e0ac6970 100644 --- a/cocos/3d/CMakeLists.txt +++ b/cocos/3d/CMakeLists.txt @@ -1,12 +1,37 @@ set(COCOS_3D_SRC - 3d/CCMesh.cpp - 3d/CCObjLoader.cpp - 3d/CCSprite3D.cpp - 3d/CCSprite3DMaterial.cpp - 3d/CCAnimate3D.cpp - 3d/CCAnimation3D.cpp - 3d/CCBundle3D.cpp - 3d/CCMeshSkin.cpp - 3d/CCBundleReader.cpp +CCRay.cpp +CCAABB.cpp +CCOBB.cpp +CCAnimate3D.cpp +CCAnimation3D.cpp +CCAttachNode.cpp +CCBundle3D.cpp +CCBundleReader.cpp +CCMesh.cpp +CCMeshSkin.cpp +CCSprite3DMaterial.cpp +CCObjLoader.cpp +CCSkeleton3D.cpp +CCSprite3D.cpp +CCSubMesh.cpp +CCSubMeshState.cpp ) + +include_directories( + 3d +) + +add_library(cocos3d STATIC + ${COCOS_3D_SRC} +) + +target_link_libraries(cocos3d + cocos2d +) + +set_target_properties(cocos3d + PROPERTIES + ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib" + LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib" +) diff --git a/cocos/3d/cocos3d.h b/cocos/3d/cocos3d.h new file mode 100755 index 0000000000..58e88e969d --- /dev/null +++ b/cocos/3d/cocos3d.h @@ -0,0 +1,41 @@ +/**************************************************************************** + 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 __COCOS_3D_COCOS3D_H__ +#define __COCOS_3D_COCOS3D_H__ + +//3d +#include "3d/CCAABB.h" +#include "3d/CCOBB.h" +#include "3d/CCRay.h" +#include "3d/CCSprite3D.h" +#include "3d/CCMesh.h" +#include "3d/CCMeshSkin.h" +#include "3d/CCAnimate3D.h" +#include "3d/CCAnimation3D.h" +#include "3d/CCSprite3DMaterial.h" +#include "3d/CCSubMeshState.h" +#include "3d/CCAttachNode.h" + +#endif diff --git a/cocos/storage/local-storage/proj.win32/libLocalStorage.vcxproj b/cocos/3d/proj.win32/libcocos3d.vcxproj similarity index 58% rename from cocos/storage/local-storage/proj.win32/libLocalStorage.vcxproj rename to cocos/3d/proj.win32/libcocos3d.vcxproj index 2f37b0f0fd..25fe3874e2 100644 --- a/cocos/storage/local-storage/proj.win32/libLocalStorage.vcxproj +++ b/cocos/3d/proj.win32/libcocos3d.vcxproj @@ -11,18 +11,58 @@ - + + {98a51ba8-fc3a-415b-ac8f-8c7bd464e93e} + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - {632A8F38-D0F0-4D22-86B3-D69F5E6BF63A} - libLocalStorage + {E24950FA-5BC1-4AEE-A900-4F0259354BF0} + libcocos3d + libcocos3d - StaticLibrary + DynamicLibrary true v100 v110 @@ -32,7 +72,7 @@ Unicode - StaticLibrary + DynamicLibrary false v100 v110 @@ -47,11 +87,11 @@ - + - + @@ -68,14 +108,17 @@ Disabled - $(EngineRoot)external\sqlite3\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + $(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)external;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_USE3DDLL;%(PreprocessorDefinitions) true 4267;4251;4244;%(DisableSpecificWarnings) false + OldStyle true + $(OutDir);%(AdditionalLibraryDirectories) + opengl32.lib;glew32.lib;%(AdditionalDependencies) @@ -86,8 +129,8 @@ true - $(EngineRoot)external\sqlite3\include;%(AdditionalIncludeDirectories) - WIN32;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_WINDOWS;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_USE3DDLL;%(PreprocessorDefinitions) + $(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)external;%(AdditionalIncludeDirectories) None false @@ -95,6 +138,8 @@ true true true + $(OutDir);%(AdditionalLibraryDirectories) + opengl32.lib;glew32.lib;%(AdditionalDependencies) diff --git a/cocos/3d/proj.win32/libcocos3d.vcxproj.filters b/cocos/3d/proj.win32/libcocos3d.vcxproj.filters new file mode 100644 index 0000000000..21f2af6ec5 --- /dev/null +++ b/cocos/3d/proj.win32/libcocos3d.vcxproj.filters @@ -0,0 +1,120 @@ + + + + + {6107c94d-579b-488f-86b7-c191d4c3b9aa} + + + + + 3d + + + 3d + + + 3d + + + 3d + + + 3d + + + 3d + + + 3d + + + 3d + + + 3d + + + 3d + + + 3d + + + 3d + + + 3d + + + 3d + + + 3d + + + 3d + + + + + 3d + + + 3d + + + 3d + + + 3d + + + 3d + + + 3d + + + 3d + + + 3d + + + 3d + + + 3d + + + 3d + + + 3d + + + 3d + + + 3d + + + 3d + + + 3d + + + 3d + + + 3d + + + 3d + + + 3d + + + \ No newline at end of file diff --git a/cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj.user b/cocos/3d/proj.win32/libcocos3d.vcxproj.user similarity index 100% rename from cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj.user rename to cocos/3d/proj.win32/libcocos3d.vcxproj.user diff --git a/cocos/Android.mk b/cocos/Android.mk index 47d9e8bf5f..d97efe68e9 100644 --- a/cocos/Android.mk +++ b/cocos/Android.mk @@ -55,6 +55,7 @@ cocos2d.cpp \ 2d/CCParticleSystem.cpp \ 2d/CCParticleSystemQuad.cpp \ 2d/CCProgressTimer.cpp \ +2d/CCProtectedNode.cpp \ 2d/CCRenderTexture.cpp \ 2d/CCScene.cpp \ 2d/CCSprite.cpp \ @@ -73,16 +74,7 @@ cocos2d.cpp \ 2d/CCTransitionPageTurn.cpp \ 2d/CCTransitionProgress.cpp \ 2d/CCTweenFunction.cpp \ -3d/CCAnimate3D.cpp \ -3d/CCAnimation3D.cpp \ -3d/CCBundle3D.cpp \ -3d/CCBundleReader.cpp \ -3d/CCMesh.cpp \ -3d/CCMeshSkin.cpp \ -3d/CCSprite3DMaterial.cpp \ -3d/CCObjLoader.cpp \ -3d/CCSprite3D.cpp \ -platform/CCGLViewProtocol.cpp \ +platform/CCGLView.cpp \ platform/CCFileUtils.cpp \ platform/CCSAXParser.cpp \ platform/CCThread.cpp \ @@ -98,6 +90,7 @@ math/Vec2.cpp \ math/Vec3.cpp \ math/Vec4.cpp \ base/CCAutoreleasePool.cpp \ +base/CCCamera.cpp \ base/CCConfiguration.cpp \ base/CCConsole.cpp \ base/CCData.cpp \ @@ -121,8 +114,10 @@ base/CCEventListenerTouch.cpp \ base/CCEventMouse.cpp \ base/CCEventTouch.cpp \ base/CCIMEDispatcher.cpp \ +base/CCModuleManager.cpp \ base/CCNS.cpp \ base/CCProfiling.cpp \ +base/ccRandom.cpp \ base/CCRef.cpp \ base/CCScheduler.cpp \ base/CCScriptSupport.cpp \ @@ -140,6 +135,7 @@ base/ccTypes.cpp \ base/ccUTF8.cpp \ base/ccUtils.cpp \ base/etc1.cpp \ +base/pvr.cpp \ base/s3tc.cpp \ base/CCController.cpp \ base/CCController-android.cpp \ @@ -160,6 +156,10 @@ renderer/CCTextureAtlas.cpp \ renderer/CCTextureCache.cpp \ renderer/ccGLStateCache.cpp \ renderer/ccShaders.cpp \ +renderer/CCVertexIndexBuffer.cpp \ +renderer/CCVertexIndexData.cpp \ +renderer/CCPrimitive.cpp \ +renderer/CCPrimitiveCommand.cpp \ deprecated/CCArray.cpp \ deprecated/CCSet.cpp \ deprecated/CCString.cpp \ @@ -207,20 +207,15 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH) \ $(LOCAL_PATH)/../external/ConvertUTF \ $(LOCAL_PATH)/../external/nslog - -LOCAL_LDLIBS := -lGLESv2 \ - -llog \ - -lz \ - -landroid - LOCAL_EXPORT_LDLIBS := -lGLESv2 \ -llog \ -lz \ -landroid -LOCAL_WHOLE_STATIC_LIBRARIES := cocos_freetype2_static -LOCAL_WHOLE_STATIC_LIBRARIES += chipmunk_static -LOCAL_WHOLE_STATIC_LIBRARIES += cocos2dxandroid_static +LOCAL_STATIC_LIBRARIES := cocos_freetype2_static +LOCAL_STATIC_LIBRARIES += chipmunk_static +LOCAL_STATIC_LIBRARIES += cocos_png_static +LOCAL_WHOLE_STATIC_LIBRARIES := cocos2dxandroid_static # define the macro to compile through support/zip_support/ioapi.c LOCAL_CFLAGS := -DUSE_FILE32API @@ -233,3 +228,4 @@ include $(BUILD_STATIC_LIBRARY) $(call import-module,freetype2/prebuilt/android) $(call import-module,chipmunk) $(call import-module,platform/android) +$(call import-module,png/prebuilt/android) diff --git a/cocos/CMakeLists.txt b/cocos/CMakeLists.txt index 1479931bc8..bb62406fe1 100644 --- a/cocos/CMakeLists.txt +++ b/cocos/CMakeLists.txt @@ -1,93 +1,34 @@ -if(WIN32) -ADD_DEFINITIONS(-DUNICODE -D_UNICODE) +if(WINDOWS) + ADD_DEFINITIONS(-DUNICODE -D_UNICODE) endif() - -set(COCOS_SRC - cocos2d.cpp -) +set(COCOS_SRC cocos2d.cpp) include(2d/CMakeLists.txt) -include(3d/CMakeLists.txt) include(platform/CMakeLists.txt) include(physics/CMakeLists.txt) include(math/CMakeLists.txt) include(renderer/CMakeLists.txt) include(base/CMakeLists.txt) -include(ui/CMakeLists.txt) include(deprecated/CMakeLists.txt) -include(network/CMakeLists.txt) -include(storage/CMakeLists.txt) add_library(cocos2d STATIC ${COCOS_SRC} ${COCOS_2D_SRC} - ${COCOS_3D_SRC} ${COCOS_PLATFORM_SRC} ${COCOS_BASE_SRC} ${COCOS_RENDERER_SRC} ${COCOS_MATH_SRC} ${COCOS_PHYSICS_SRC} - ${COCOS_UI_SRC} - ${COCOS_NETWORK_SRC} - ${COCOS_STORAGE_SRC} ${COCOS_DEPRECATED_SRC} ) -if(WIN32) - if(MINGW) - -set(COCOS_LINK - z - jpeg - png - webp - tiff - glfw3 - glew32 - opengl32 - iconv - freetype - bz2 - ) - -else() - - -set(COCOS_LINK - libjpeg - libpng - libwebp - libtiff - freetype250 - glfw3 - glew32 - opengl32 - libiconv - libzlib - ) - -endif() - -elseif(APPLE) - -else() -set(COCOS_LINK - jpeg - webp - tiff - freetype - fontconfig - png - pthread - glfw - GLEW - GL - X11 - rt - z -) + set(COCOS_LINK z jpeg png webp tiff glfw3 glew32 opengl32 iconv freetype bz2) +elseif(WINDOWS) + set(COCOS_LINK libjpeg libpng libwebp libtiff freetype250 glfw3 glew32 opengl32 libiconv libzlib) +elseif(LINUX) + set(COCOS_LINK jpeg webp tiff freetype fontconfig png pthread glfw GLEW GL X11 rt z) endif() target_link_libraries(cocos2d @@ -95,8 +36,6 @@ target_link_libraries(cocos2d tinyxml2 unzip xxhash - ${COCOS_STORAGE_LINK} - ${COCOS_NETWORK_LINK} ${COCOS_LINK} ) @@ -105,4 +44,3 @@ set_target_properties(cocos2d ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib" LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib" ) - diff --git a/cocos/audio/CMakeLists.txt b/cocos/audio/CMakeLists.txt index 42ebc3a9a7..c2e15dfaa8 100644 --- a/cocos/audio/CMakeLists.txt +++ b/cocos/audio/CMakeLists.txt @@ -1,29 +1,26 @@ # architecture -if ( CMAKE_SIZEOF_VOID_P EQUAL 8 ) -set(ARCH_DIR "64-bit") -else() -set(ARCH_DIR "32-bit") -endif() +#if ( CMAKE_SIZEOF_VOID_P EQUAL 8 ) +#set(ARCH_DIR "64-bit") +#else() +#set(ARCH_DIR "32-bit") +#endif() -if(WIN32) +if(WINDOWS) set(AUDIO_SRC win32/SimpleAudioEngine.cpp win32/MciPlayer.cpp - win32/MciPlayer.h + win32/MciPlayer.h ) -elseif(APPLE) -else() +elseif(LINUX) set(AUDIO_SRC linux/SimpleAudioEngineFMOD.cpp linux/FmodAudioPlayer.cpp - linux/FmodAudioPlayer.h - linux/AudioPlayer.h + linux/FmodAudioPlayer.h + linux/AudioPlayer.h ) - include_directories( - ../../external/linux-specific/fmod/include/${ARCH_DIR} - ) + include_directories( ../../external/linux-specific/fmod/include/${ARCH_DIR} ) endif() @@ -33,28 +30,23 @@ add_library(audio STATIC include/SimpleAudioEngine.h ) -if((NOT APPLE) AND (NOT WIN32)) +if(LINUX) -if ( CMAKE_SIZEOF_VOID_P EQUAL 8 ) -set(FMOD_LIB "fmodex64") -else() -set(FMOD_LIB "fmodex") + if ( CMAKE_SIZEOF_VOID_P EQUAL 8 ) + set(FMOD_LIB "fmodex64") + else() + set(FMOD_LIB "fmodex") + endif() + + target_link_libraries(audio ${FMOD_LIB}) +elseif(WINDOWS) + target_link_libraries(audio Winmm) endif() -target_link_libraries(audio - ${FMOD_LIB} -) - set_target_properties(audio PROPERTIES ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib" LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib" ) -elseif(WIN32) -target_link_libraries(audio - Winmm -) - -endif() diff --git a/cocos/audio/include/Export.h b/cocos/audio/include/Export.h index 86ca3b7845..c5fe8dc80e 100644 --- a/cocos/audio/include/Export.h +++ b/cocos/audio/include/Export.h @@ -30,11 +30,11 @@ THE SOFTWARE. #define EXPORT_DLL _EXPORT_ #elif defined(_WIN32) #if defined(_EXPORT_DLL_) - #define EXPORT_DLL// __declspec(dllexport) - #elif defined(IGNORE_EXPORT) - #define EXPORT_DLL + #define EXPORT_DLL __declspec(dllexport) + #elif (defined(IGNORE_EXPORT) || defined(WP8)) + #define EXPORT_DLL #else /* use a DLL library */ - #define EXPORT_DLL// __declspec(dllimport) + #define EXPORT_DLL __declspec(dllimport) #endif #else #if defined(_SHARED_) diff --git a/cocos/audio/proj.win32/CocosDenshion.vcxproj b/cocos/audio/proj.win32/libcocosdenshion.vcxproj similarity index 92% rename from cocos/audio/proj.win32/CocosDenshion.vcxproj rename to cocos/audio/proj.win32/libcocosdenshion.vcxproj index 836fc86ec5..ecb37bbc32 100644 --- a/cocos/audio/proj.win32/CocosDenshion.vcxproj +++ b/cocos/audio/proj.win32/libcocosdenshion.vcxproj @@ -11,14 +11,14 @@ - libAudio + libcocosdenshion {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6} CocosDenshion.win32 Win32Proj - StaticLibrary + DynamicLibrary NotSet v100 v110 @@ -27,7 +27,7 @@ v120_xp - StaticLibrary + DynamicLibrary NotSet v100 v110 @@ -74,7 +74,7 @@ Disabled $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;..\Include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_EXPORT_DLL_;%(PreprocessorDefinitions) false EnableFastChecks MultiThreadedDebugDLL @@ -90,7 +90,7 @@ $(OutDir)$(ProjectName).dll true Windows - $(TargetDir)$(TargetName).lib + $(OutDir)$(TargetName).lib MachineX86 $(OutDir) @@ -98,7 +98,7 @@ $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;..\Include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_EXPORT_DLL_;%(PreprocessorDefinitions) MultiThreadedDLL @@ -116,7 +116,7 @@ Windows true true - $(TargetDir)$(TargetName).lib + $(OutDir)$(TargetName).lib MachineX86 $(OutDir) @@ -130,6 +130,11 @@ + + + {98a51ba8-fc3a-415b-ac8f-8c7bd464e93e} + + diff --git a/cocos/audio/proj.win32/CocosDenshion.vcxproj.filters b/cocos/audio/proj.win32/libcocosdenshion.vcxproj.filters similarity index 100% rename from cocos/audio/proj.win32/CocosDenshion.vcxproj.filters rename to cocos/audio/proj.win32/libcocosdenshion.vcxproj.filters diff --git a/cocos/audio/proj.win32/CocosDenshion.vcxproj.user b/cocos/audio/proj.win32/libcocosdenshion.vcxproj.user similarity index 100% rename from cocos/audio/proj.win32/CocosDenshion.vcxproj.user rename to cocos/audio/proj.win32/libcocosdenshion.vcxproj.user diff --git a/cocos/base/CCCamera.cpp b/cocos/base/CCCamera.cpp new file mode 100644 index 0000000000..3cb67e4a46 --- /dev/null +++ b/cocos/base/CCCamera.cpp @@ -0,0 +1,292 @@ +/**************************************************************************** + 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 "base/CCCamera.h" +#include "base/CCDirector.h" +#include "platform/CCGLView.h" +#include "2d/CCScene.h" +#include "2d/CCNode.h" + +NS_CC_BEGIN + +Camera* Camera::_visitingCamera = nullptr; + +Camera* Camera::create() +{ + Camera* camera = new Camera(); + camera->initDefault(); + camera->autorelease(); + + return camera; +} + +Camera* Camera::createPerspective(float fieldOfView, float aspectRatio, float nearPlane, float farPlane) +{ + auto ret = new Camera(); + if (ret) + { + ret->initPerspective(fieldOfView, aspectRatio, nearPlane, farPlane); + ret->autorelease(); + return ret; + } + CC_SAFE_DELETE(ret); + return nullptr; +} + +Camera* Camera::createOrthographic(float zoomX, float zoomY, float nearPlane, float farPlane) +{ + auto ret = new Camera(); + if (ret) + { + ret->initOrthographic(zoomX, zoomY, nearPlane, farPlane); + ret->autorelease(); + return ret; + } + CC_SAFE_DELETE(ret); + return nullptr; +} + +Camera::Camera() +: _cameraFlag(1) +, _scene(nullptr) +, _viewProjectionDirty(true) +{ + +} + +Camera::~Camera() +{ + +} + +void Camera::setPosition3D(const Vec3& position) +{ + Node::setPosition3D(position); + + _transformUpdated = _transformDirty = _inverseDirty = true; +} + +const Mat4& Camera::getProjectionMatrix() const +{ + return _projection; +} +const Mat4& Camera::getViewMatrix() const +{ + Mat4 viewInv(getNodeToWorldTransform()); + static int count = sizeof(float) * 16; + if (memcmp(viewInv.m, _viewInv.m, count) != 0) + { + _viewProjectionDirty = true; + _viewInv = viewInv; + _view = viewInv.getInversed(); + } + return _view; +} +void Camera::lookAt(const Vec3& lookAtPos, const Vec3& up) +{ + Vec3 upv = up; + upv.normalize(); + Vec3 zaxis; + Vec3::subtract(this->getPosition3D(), lookAtPos, &zaxis); + zaxis.normalize(); + + Vec3 xaxis; + Vec3::cross(upv, zaxis, &xaxis); + xaxis.normalize(); + + Vec3 yaxis; + Vec3::cross(zaxis, xaxis, &yaxis); + yaxis.normalize(); + Mat4 rotation; + rotation.m[0] = xaxis.x; + rotation.m[1] = xaxis.y; + rotation.m[2] = xaxis.z; + rotation.m[3] = 0; + + rotation.m[4] = yaxis.x; + rotation.m[5] = yaxis.y; + rotation.m[6] = yaxis.z; + rotation.m[7] = 0; + rotation.m[8] = zaxis.x; + rotation.m[9] = zaxis.y; + rotation.m[10] = zaxis.z; + rotation.m[11] = 0; + Quaternion quaternion; + Quaternion::createFromRotationMatrix(rotation,&quaternion); + float fRoll = atan2(2 * (quaternion.w * quaternion.z + quaternion.x * quaternion.y) , 1 - 2 * (quaternion.z * quaternion.z + quaternion.x * quaternion.x)); + float fPitch = asin(clampf(2 * (quaternion.w * quaternion.x - quaternion.y * quaternion.z) , -1.0f , 1.0f)); + float fYaw = atan2(2 * (quaternion.w * quaternion.y + quaternion.z * quaternion.x) , 1 - 2 * (quaternion.x * quaternion.x + quaternion.y * quaternion.y)); + setRotation3D(Vec3(CC_RADIANS_TO_DEGREES(fPitch),CC_RADIANS_TO_DEGREES(fYaw),CC_RADIANS_TO_DEGREES(fRoll))); +} + +const Mat4& Camera::getViewProjectionMatrix() const +{ + getViewMatrix(); + if (_viewProjectionDirty) + { + _viewProjectionDirty = false; + Mat4::multiply(_projection, _view, &_viewProjection); + } + + return _viewProjection; +} + +void Camera::setAdditionalProjection(const Mat4& mat) +{ + _projection = mat * _projection; + getViewProjectionMatrix(); +} + +bool Camera::initDefault() +{ + auto size = Director::getInstance()->getWinSize(); + //create default camera + auto projection = Director::getInstance()->getProjection(); + switch (projection) + { + case Director::Projection::_2D: + { + initOrthographic(size.width, size.height, -1024, 1024); + setPosition3D(Vec3(0.0f, 0.0f, 0.0f)); + setRotation3D(Vec3(0.f, 0.f, 0.f)); + break; + } + case Director::Projection::_3D: + { + float zeye = Director::getInstance()->getZEye(); + initPerspective(60, (GLfloat)size.width / size.height, 10, zeye + size.height / 2.0f); + Vec3 eye(size.width/2, size.height/2.0f, zeye), center(size.width/2, size.height/2, 0.0f), up(0.0f, 1.0f, 0.0f); + setPosition3D(eye); + lookAt(center, up); + break; + } + default: + CCLOG("unrecognized projection"); + break; + } + return true; +} + +bool Camera::initPerspective(float fieldOfView, float aspectRatio, float nearPlane, float farPlane) +{ + _fieldOfView = fieldOfView; + _aspectRatio = aspectRatio; + _nearPlane = nearPlane; + _farPlane = farPlane; + Mat4::createPerspective(_fieldOfView, _aspectRatio, _nearPlane, _farPlane, &_projection); +#if CC_TARGET_PLATFORM == CC_PLATFORM_WP8 + //if needed, we need to add a rotation for Landscape orientations on Windows Phone 8 since it is always in Portrait Mode + GLView* view = Director::getInstance()->getOpenGLView(); + if(view != nullptr) + { + setAdditionalProjection(view->getOrientationMatrix()); + } +#endif + _viewProjectionDirty = true; + + return true; +} + +bool Camera::initOrthographic(float zoomX, float zoomY, float nearPlane, float farPlane) +{ + _zoom[0] = zoomX; + _zoom[1] = zoomY; + _nearPlane = nearPlane; + _farPlane = farPlane; + Mat4::createOrthographicOffCenter(0, _zoom[0], 0, _zoom[1], _nearPlane, _farPlane, &_projection); +#if CC_TARGET_PLATFORM == CC_PLATFORM_WP8 + //if needed, we need to add a rotation for Landscape orientations on Windows Phone 8 since it is always in Portrait Mode + GLView* view = Director::getInstance()->getOpenGLView(); + if(view != nullptr) + { + setAdditionalProjection(view->getOrientationMatrix()); + } +#endif + _viewProjectionDirty = true; + + return true; +} + +void Camera::unproject(const Size& viewport, Vec3* src, Vec3* dst) const +{ + assert(dst); + Vec4 screen(src->x / viewport.width, ((viewport.height - src->y)) / viewport.height, src->z, 1.0f); + screen.x = screen.x * 2.0f - 1.0f; + screen.y = screen.y * 2.0f - 1.0f; + screen.z = screen.z * 2.0f - 1.0f; + + getViewProjectionMatrix().getInversed().transformVector(screen, &screen); + if (screen.w != 0.0f) + { + screen.x /= screen.w; + screen.y /= screen.w; + screen.z /= screen.w; + } + + dst->set(screen.x, screen.y, screen.z); +} + +void Camera::onEnter() +{ + if (_scene == nullptr) + { + auto scene = getScene(); + if (scene) + setScene(scene); + } + Node::onEnter(); +} + +void Camera::onExit() +{ + // remove this camera from scene + setScene(nullptr); + Node::onExit(); +} + +void Camera::setScene(Scene* scene) +{ + if (_scene != scene) + { + //remove old scene + if (_scene) + { + auto& cameras = _scene->_cameras; + auto it = std::find(cameras.begin(), cameras.end(), this); + if (it != cameras.end()) + cameras.erase(it); + _scene = nullptr; + } + //set new scene + if (scene) + { + _scene = scene; + auto& cameras = _scene->_cameras; + auto it = std::find(cameras.begin(), cameras.end(), this); + if (it == cameras.end()) + _scene->_cameras.push_back(this); + } + } +} + +NS_CC_END diff --git a/cocos/base/CCCamera.h b/cocos/base/CCCamera.h new file mode 100644 index 0000000000..6825b14268 --- /dev/null +++ b/cocos/base/CCCamera.h @@ -0,0 +1,176 @@ +/**************************************************************************** +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 _CCCAMERA_H__ +#define _CCCAMERA_H__ + +#include "base/CCVector.h" +#include "2d/CCNode.h" + +NS_CC_BEGIN + +//class Ray; +class Scene; + +enum class CameraFlag +{ + DEFAULT = 1, + USER1 = 1 << 1, + USER2 = 1 << 2, + USER3 = 1 << 3, + USER4 = 1 << 4, + USER5 = 1 << 5, + USER6 = 1 << 6, + USER7 = 1 << 7, + USER8 = 1 << 8, +}; + +/** +* Defines a camera . +*/ +class CC_DLL Camera :public Node +{ + friend class Scene; +public: + /** + * The type of camera. + */ + enum class Type + { + PERSPECTIVE = 1, + ORTHOGRAPHIC = 2 + }; +public: + /** + * Creates a perspective camera. + * + * @param fieldOfView The field of view for the perspective camera (normally in the range of 40-60 degrees). + * @param aspectRatio The aspect ratio of the camera (normally the width of the viewport divided by the height of the viewport). + * @param nearPlane The near plane distance. + * @param farPlane The far plane distance. + */ + static Camera* createPerspective(float fieldOfView, float aspectRatio, float nearPlane, float farPlane); + /** + * Creates an orthographic camera. + * + * @param zoomX The zoom factor along the X-axis of the orthographic projection (the width of the ortho projection). + * @param zoomY The zoom factor along the Y-axis of the orthographic projection (the height of the ortho projection). + * @param aspectRatio The aspect ratio of the orthographic projection. + * @param nearPlane The near plane distance. + * @param farPlane The far plane distance. + */ + static Camera* createOrthographic(float zoomX, float zoomY, float nearPlane, float farPlane); + + /** create default camera, the camera type depends on Director::getProjection */ + static Camera* create(); + + /** + * Gets the type of camera. + * + * @return The camera type. + */ + Camera::Type getType() const { return _type; } + + /**get & set Camera flag*/ + CameraFlag getCameraFlag() const { return (CameraFlag)_cameraFlag; } + void setCameraFlag(CameraFlag flag) { _cameraFlag = (unsigned short)flag; } + /** + * Sets the position (X, Y, and Z) in its parent's coordinate system + */ + virtual void setPosition3D(const Vec3& position) override; + /** + * Creates a view matrix based on the specified input parameters. + * + * @param eyePosition The eye position. + * @param targetPosition The target's center position. + * @param up The up vector. + * @param dst A matrix to store the result in. + */ + virtual void lookAt(const Vec3& target, const Vec3& up); + + /** + * Gets the camera's projection matrix. + * + * @return The camera projection matrix. + */ + const Mat4& getProjectionMatrix() const; + /** + * Gets the camera's view matrix. + * + * @return The camera view matrix. + */ + const Mat4& getViewMatrix() const; + + /**get view projection matrix*/ + const Mat4& getViewProjectionMatrix() const; + + /** + * Convert the specified point of viewport from screenspace coordinate into the worldspace coordinate. + */ + void unproject(const Size& viewport, Vec3* src, Vec3* dst) const; + + //override + virtual void onEnter() override; + virtual void onExit() override; + + static const Camera* getVisitingCamera() { return _visitingCamera; } + +CC_CONSTRUCTOR_ACCESS: + Camera(); + ~Camera(); + + void setScene(Scene* scene); + + /**set additional matrix for the projection matrix, it multiplys mat to projection matrix when called, used by WP8*/ + void setAdditionalProjection(const Mat4& mat); + + /** init camera */ + bool initDefault(); + bool initPerspective(float fieldOfView, float aspectRatio, float nearPlane, float farPlane); + bool initOrthographic(float zoomX, float zoomY, float nearPlane, float farPlane); + +protected: + + Scene* _scene; //Scene camera belongs to + Mat4 _projection; + mutable Mat4 _view; + mutable Mat4 _viewInv; + mutable Mat4 _viewProjection; + Vec3 _up; + Camera::Type _type; + float _fieldOfView; + float _zoom[2]; + float _aspectRatio; + float _nearPlane; + float _farPlane; + mutable bool _viewProjectionDirty; + unsigned short _cameraFlag; // camera flag + + static Camera* _visitingCamera; + + friend class Director; +}; + +NS_CC_END + +#endif// __CCCAMERA_H_ diff --git a/cocos/base/CCConsole.cpp b/cocos/base/CCConsole.cpp index 8e149e76c1..85775dbaad 100644 --- a/cocos/base/CCConsole.cpp +++ b/cocos/base/CCConsole.cpp @@ -61,7 +61,6 @@ #include "2d/CCScene.h" #include "platform/CCFileUtils.h" #include "renderer/CCTextureCache.h" -#include "CCGLView.h" #include "base/base64.h" #include "base/ccUtils.h" NS_CC_BEGIN @@ -132,7 +131,7 @@ static ssize_t mydprintf(int sock, const char *format, ...) static void sendPrompt(int fd) { const char prompt[] = "> "; - send(fd, prompt, sizeof(prompt),0); + send(fd, prompt, strlen(prompt),0); } static int printSceneGraph(int fd, Node* node, int level) diff --git a/cocos/base/CCDirector.cpp b/cocos/base/CCDirector.cpp index fe22befbce..30518792db 100644 --- a/cocos/base/CCDirector.cpp +++ b/cocos/base/CCDirector.cpp @@ -47,6 +47,7 @@ THE SOFTWARE. #include "renderer/CCTextureCache.h" #include "renderer/ccGLStateCache.h" #include "renderer/CCRenderer.h" +#include "base/CCCamera.h" #include "base/CCUserDefault.h" #include "base/ccFPSImages.h" #include "base/CCScheduler.h" @@ -61,7 +62,7 @@ THE SOFTWARE. #include "base/CCNS.h" #include "math/CCMath.h" #include "CCApplication.h" -#include "CCGLView.h" +#include "CCGLViewImpl.h" /** Position of the FPS @@ -231,7 +232,7 @@ void Director::setDefaultValues(void) // PVR v2 has alpha premultiplied ? bool pvr_alpha_premultipled = conf->getValue("cocos2d.x.texture.pvrv2_has_alpha_premultiplied", Value(false)).asBool(); - Texture2D::PVRImagesHavePremultipliedAlpha(pvr_alpha_premultipled); + Image::setPVRImagesHavePremultipliedAlpha(pvr_alpha_premultipled); } void Director::setGLDefaultValues() @@ -263,7 +264,7 @@ void Director::drawScene() if (_openGLView) { - _openGLView->pollInputEvents(); + _openGLView->pollEvents(); } //tick before glClear: issue #533 @@ -283,26 +284,60 @@ void Director::drawScene() } pushMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_MODELVIEW); - - // draw the scene + if (_runningScene) { - _runningScene->visit(_renderer, Mat4::IDENTITY, false); + Camera* defaultCamera = nullptr; + const auto& cameras = _runningScene->_cameras; + //draw with camera + for (size_t i = 0; i < cameras.size(); i++) + { + Camera::_visitingCamera = cameras[i]; + if (Camera::_visitingCamera->getCameraFlag() == CameraFlag::DEFAULT) + { + defaultCamera = Camera::_visitingCamera; + continue; + } + + pushMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_PROJECTION); + loadMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_PROJECTION, Camera::_visitingCamera->getViewProjectionMatrix()); + + //visit the scene + _runningScene->visit(_renderer, Mat4::IDENTITY, 0); + _renderer->render(); + + popMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_PROJECTION); + } + //draw with default camera + if (defaultCamera) + { + Camera::_visitingCamera = defaultCamera; + pushMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_PROJECTION); + loadMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_PROJECTION, Camera::_visitingCamera->getViewProjectionMatrix()); + + //visit the scene + _runningScene->visit(_renderer, Mat4::IDENTITY, 0); + _renderer->render(); + + popMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_PROJECTION); + } + Camera::_visitingCamera = nullptr; + _eventDispatcher->dispatchEvent(_eventAfterVisit); } // draw the notifications node if (_notificationNode) { - _notificationNode->visit(_renderer, Mat4::IDENTITY, false); + _notificationNode->visit(_renderer, Mat4::IDENTITY, 0); } if (_displayStats) { showStats(); } - _renderer->render(); + _eventDispatcher->dispatchEvent(_eventAfterDraw); popMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_MODELVIEW); @@ -825,9 +860,14 @@ void Director::runWithScene(Scene *scene) void Director::replaceScene(Scene *scene) { - CCASSERT(_runningScene, "Use runWithScene: instead to start the director"); + //CCASSERT(_runningScene, "Use runWithScene: instead to start the director"); CCASSERT(scene != nullptr, "the scene should not be null"); + if (_runningScene == nullptr) { + runWithScene(scene); + return; + } + if (scene == _nextScene) return; diff --git a/cocos/base/CCDirector.h b/cocos/base/CCDirector.h index 5505787cb0..c5ffd80e0a 100644 --- a/cocos/base/CCDirector.h +++ b/cocos/base/CCDirector.h @@ -36,8 +36,10 @@ THE SOFTWARE. #include "base/CCVector.h" #include "CCGL.h" #include "2d/CCLabelAtlas.h" +#include "2d/CCScene.h" #include #include "math/CCMath.h" +#include "platform/CCGLView.h" NS_CC_BEGIN @@ -49,7 +51,7 @@ NS_CC_BEGIN /* Forward declarations. */ class LabelAtlas; class Scene; -class GLView; +//class GLView; class DirectorDelegate; class Node; class Scheduler; @@ -59,6 +61,7 @@ class EventCustom; class EventListenerCustom; class TextureCache; class Renderer; +class Camera; #if (CC_TARGET_PLATFORM != CC_PLATFORM_WINRT) class Console; @@ -441,7 +444,8 @@ protected: /* delta time since last tick to main loop */ float _deltaTime; - /* The GLView, where everything is rendered */ + /* The _openGLView, where everything is rendered, GLView is a abstract class,cocos2d-x provide GLViewImpl + which inherit from it as default renderer context,you can have your own by inherit from it*/ GLView *_openGLView; //texture cache belongs to this director @@ -508,8 +512,8 @@ protected: Console *_console; #endif - // GLViewProtocol will recreate stats labels to fit visible rect - friend class GLViewProtocol; + // GLView will recreate stats labels to fit visible rect + friend class GLView; }; /** diff --git a/cocos/base/CCEvent.h b/cocos/base/CCEvent.h index 98480961b9..fa2445d60a 100644 --- a/cocos/base/CCEvent.h +++ b/cocos/base/CCEvent.h @@ -39,7 +39,7 @@ class Node; /** * Base class of all kinds of events. */ -class Event : public Ref +class CC_DLL Event : public Ref { public: enum class Type diff --git a/cocos/base/CCEventAcceleration.h b/cocos/base/CCEventAcceleration.h index d03c3cae72..8aa7ecd589 100644 --- a/cocos/base/CCEventAcceleration.h +++ b/cocos/base/CCEventAcceleration.h @@ -30,7 +30,7 @@ NS_CC_BEGIN -class EventAcceleration : public Event +class CC_DLL EventAcceleration : public Event { public: EventAcceleration(const Acceleration& acc); diff --git a/cocos/base/CCEventCustom.h b/cocos/base/CCEventCustom.h index fce6a315c3..00ea4555ed 100644 --- a/cocos/base/CCEventCustom.h +++ b/cocos/base/CCEventCustom.h @@ -29,7 +29,7 @@ NS_CC_BEGIN -class EventCustom : public Event +class CC_DLL EventCustom : public Event { public: /** Constructor */ diff --git a/cocos/base/CCEventDispatcher.h b/cocos/base/CCEventDispatcher.h index 5fd9f80877..249e39d23e 100644 --- a/cocos/base/CCEventDispatcher.h +++ b/cocos/base/CCEventDispatcher.h @@ -53,7 +53,7 @@ event listeners can be added and removed even from within an EventListener, while events are being dispatched. */ -class EventDispatcher : public Ref +class CC_DLL EventDispatcher : public Ref { public: // Adds event listener diff --git a/cocos/base/CCEventFocus.h b/cocos/base/CCEventFocus.h index 83fc989143..c43399d446 100644 --- a/cocos/base/CCEventFocus.h +++ b/cocos/base/CCEventFocus.h @@ -35,7 +35,7 @@ namespace ui { class Widget; } -class EventFocus : public Event +class CC_DLL EventFocus : public Event { public: EventFocus(ui::Widget* widgetLoseFocus, ui::Widget* widgetGetFocus); diff --git a/cocos/base/CCEventKeyboard.h b/cocos/base/CCEventKeyboard.h index c043d67e45..392cb4c867 100644 --- a/cocos/base/CCEventKeyboard.h +++ b/cocos/base/CCEventKeyboard.h @@ -30,7 +30,7 @@ NS_CC_BEGIN -class EventKeyboard : public Event +class CC_DLL EventKeyboard : public Event { public: /** diff --git a/cocos/base/CCEventListener.h b/cocos/base/CCEventListener.h index a771f70443..18a135515f 100644 --- a/cocos/base/CCEventListener.h +++ b/cocos/base/CCEventListener.h @@ -43,7 +43,7 @@ class Node; * If you need custom listener which with different callback, you need to inherit this class. * For instance, you could refer to EventListenerAcceleration, EventListenerKeyboard, EventListenerTouchOneByOne, EventListenerCustom. */ -class EventListener : public Ref +class CC_DLL EventListener : public Ref { public: enum class Type diff --git a/cocos/base/CCEventListenerAcceleration.h b/cocos/base/CCEventListenerAcceleration.h index 0bf473e4bd..ea339770ca 100644 --- a/cocos/base/CCEventListenerAcceleration.h +++ b/cocos/base/CCEventListenerAcceleration.h @@ -30,7 +30,7 @@ NS_CC_BEGIN -class EventListenerAcceleration : public EventListener +class CC_DLL EventListenerAcceleration : public EventListener { public: static const std::string LISTENER_ID; diff --git a/cocos/base/CCEventListenerCustom.h b/cocos/base/CCEventListenerCustom.h index 10e9643790..c602d626b5 100644 --- a/cocos/base/CCEventListenerCustom.h +++ b/cocos/base/CCEventListenerCustom.h @@ -49,7 +49,7 @@ class EventCustom; * * dispatcher->removeEventListener(listener); */ -class EventListenerCustom : public EventListener +class CC_DLL EventListenerCustom : public EventListener { public: /** Creates an event listener with type and callback. diff --git a/cocos/base/CCEventListenerFocus.h b/cocos/base/CCEventListenerFocus.h index 1e30eb9a9f..300fdcdac8 100644 --- a/cocos/base/CCEventListenerFocus.h +++ b/cocos/base/CCEventListenerFocus.h @@ -35,7 +35,7 @@ namespace ui { class Widget; } -class EventListenerFocus : public EventListener +class CC_DLL EventListenerFocus : public EventListener { public: static const std::string LISTENER_ID; diff --git a/cocos/base/CCEventListenerKeyboard.h b/cocos/base/CCEventListenerKeyboard.h index 1aa8a10f85..283a0ed41e 100644 --- a/cocos/base/CCEventListenerKeyboard.h +++ b/cocos/base/CCEventListenerKeyboard.h @@ -33,7 +33,7 @@ NS_CC_BEGIN class Event; -class EventListenerKeyboard : public EventListener +class CC_DLL EventListenerKeyboard : public EventListener { public: static const std::string LISTENER_ID; diff --git a/cocos/base/CCEventListenerMouse.h b/cocos/base/CCEventListenerMouse.h index 57b98997dc..c5141444b7 100644 --- a/cocos/base/CCEventListenerMouse.h +++ b/cocos/base/CCEventListenerMouse.h @@ -33,7 +33,7 @@ NS_CC_BEGIN class Event; -class EventListenerMouse : public EventListener +class CC_DLL EventListenerMouse : public EventListener { public: static const std::string LISTENER_ID; diff --git a/cocos/base/CCEventListenerTouch.h b/cocos/base/CCEventListenerTouch.h index 13b35d8a0e..b125b8e95f 100644 --- a/cocos/base/CCEventListenerTouch.h +++ b/cocos/base/CCEventListenerTouch.h @@ -33,7 +33,7 @@ NS_CC_BEGIN -class EventListenerTouchOneByOne : public EventListener +class CC_DLL EventListenerTouchOneByOne : public EventListener { public: static const std::string LISTENER_ID; @@ -68,7 +68,7 @@ private: }; -class EventListenerTouchAllAtOnce : public EventListener +class CC_DLL EventListenerTouchAllAtOnce : public EventListener { public: static const std::string LISTENER_ID; diff --git a/cocos/base/CCEventMouse.cpp b/cocos/base/CCEventMouse.cpp index 447862de49..5c90e1c1ee 100644 --- a/cocos/base/CCEventMouse.cpp +++ b/cocos/base/CCEventMouse.cpp @@ -24,6 +24,7 @@ ****************************************************************************/ #include "base/CCEventMouse.h" +#include "base/CCDirector.h" NS_CC_BEGIN @@ -38,4 +39,45 @@ EventMouse::EventMouse(MouseEventType mouseEventCode) { }; +// returns the current touch location in screen coordinates +Vec2 EventMouse::getLocationInView() const +{ + return _point; +} + +// returns the previous touch location in screen coordinates +Vec2 EventMouse::getPreviousLocationInView() const +{ + return _prevPoint; +} + +// returns the start touch location in screen coordinates +Vec2 EventMouse::getStartLocationInView() const +{ + return _startPoint; +} + +// returns the current touch location in OpenGL coordinates +Vec2 EventMouse::getLocation() const +{ + return Director::getInstance()->convertToGL(_point); +} + +// returns the previous touch location in OpenGL coordinates +Vec2 EventMouse::getPreviousLocation() const +{ + return Director::getInstance()->convertToGL(_prevPoint); +} + +// returns the start touch location in OpenGL coordinates +Vec2 EventMouse::getStartLocation() const +{ + return Director::getInstance()->convertToGL(_startPoint); +} + +// returns the delta position between the current location and the previous location in OpenGL coordinates +Vec2 EventMouse::getDelta() const +{ + return getLocation() - getPreviousLocation(); +} NS_CC_END diff --git a/cocos/base/CCEventMouse.h b/cocos/base/CCEventMouse.h index f1cfc19a90..1c5af7eb22 100644 --- a/cocos/base/CCEventMouse.h +++ b/cocos/base/CCEventMouse.h @@ -27,6 +27,7 @@ #define __cocos2d_libs__CCMouseEvent__ #include "base/CCEvent.h" +#include "math/CCGeometry.h" #define MOUSE_BUTTON_LEFT 0 #define MOUSE_BUTTON_RIGHT 1 @@ -39,7 +40,7 @@ NS_CC_BEGIN -class EventMouse : public Event +class CC_DLL EventMouse : public Event { public: /** @@ -61,12 +62,40 @@ public: inline float getScrollX() { return _scrollX; }; inline float getScrollY() { return _scrollY; }; - inline void setCursorPosition(float x, float y) { _x = x; _y = y; }; + inline void setCursorPosition(float x, float y) { + _x = x; + _y = y; + _prevPoint = _point; + _point.x = x; + _point.y = y; + if (!_startPointCaptured) + { + _startPoint = _point; + _startPointCaptured = true; + } + } + inline void setMouseButton(int button) { _mouseButton = button; }; inline int getMouseButton() { return _mouseButton; }; inline float getCursorX() { return _x; }; inline float getCursorY() { return _y; }; + /** returns the current touch location in OpenGL coordinates */ + Vec2 getLocation() const; + /** returns the previous touch location in OpenGL coordinates */ + Vec2 getPreviousLocation() const; + /** returns the start touch location in OpenGL coordinates */ + Vec2 getStartLocation() const; + /** returns the delta of 2 current touches locations in screen coordinates */ + Vec2 getDelta() const; + /** returns the current touch location in screen coordinates */ + Vec2 getLocationInView() const; + /** returns the previous touch location in screen coordinates */ + Vec2 getPreviousLocationInView() const; + /** returns the start touch location in screen coordinates */ + Vec2 getStartLocationInView() const; + + private: MouseEventType _mouseEventType; int _mouseButton; @@ -75,6 +104,11 @@ private: float _scrollX; float _scrollY; + bool _startPointCaptured; + Vec2 _startPoint; + Vec2 _point; + Vec2 _prevPoint; + friend class EventListenerMouse; }; diff --git a/cocos/base/CCEventTouch.h b/cocos/base/CCEventTouch.h index 60b0c96f0c..52bbbf9a2c 100644 --- a/cocos/base/CCEventTouch.h +++ b/cocos/base/CCEventTouch.h @@ -33,10 +33,10 @@ NS_CC_BEGIN #define TOUCH_PERF_DEBUG 1 -class EventTouch : public Event +class CC_DLL EventTouch : public Event { public: - static const int MAX_TOUCHES = 5; + static const int MAX_TOUCHES = 15; enum class EventCode { @@ -60,7 +60,7 @@ private: EventCode _eventCode; std::vector _touches; - friend class GLViewProtocol; + friend class GLView; }; diff --git a/cocos/base/CCIMEDelegate.h b/cocos/base/CCIMEDelegate.h index a4f0f65740..15988c6477 100644 --- a/cocos/base/CCIMEDelegate.h +++ b/cocos/base/CCIMEDelegate.h @@ -30,7 +30,7 @@ THE SOFTWARE. #include "math/CCGeometry.h" NS_CC_BEGIN -extern const std::string STD_STRING_EMPTY; +extern const std::string CC_DLL STD_STRING_EMPTY; /** * @addtogroup input diff --git a/cocos/base/CCMap.h b/cocos/base/CCMap.h index 11c0f02f27..18a00da257 100644 --- a/cocos/base/CCMap.h +++ b/cocos/base/CCMap.h @@ -45,7 +45,7 @@ NS_CC_BEGIN */ template -class CC_DLL Map +class Map { public: // ------------------------------------------ diff --git a/cocos/base/CCModuleManager.cpp b/cocos/base/CCModuleManager.cpp new file mode 100644 index 0000000000..d6a8d9b681 --- /dev/null +++ b/cocos/base/CCModuleManager.cpp @@ -0,0 +1,71 @@ +/**************************************************************************** + Copyright (c) 2014 cocos2d-x.org + + 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/CCModuleManager.h" +#include +#include "base/CCConsole.h" + +using namespace std; + +//RegisterJPEG *temp = new RegisterJPEG(); + +NS_CC_BEGIN + +void ModuleManager::registerModule(const string &moduleName, void* module) +{ + auto &moduleMap = createMap(); + if (moduleMap.find(moduleName) != moduleMap.end()) + { + CCLOG("module: %s exists", moduleName.c_str()); + return; + } + + moduleMap[moduleName] = module; +} + +void ModuleManager::unRegisterModule(const string &moduleName) +{ + auto &moduleMap = createMap(); + moduleMap.erase(moduleName); +} + +void* ModuleManager::getModule(const string &moduleName) +{ + auto &moduleMap = createMap(); + auto result = moduleMap.find(moduleName); + if (result != moduleMap.end()) + { + return result->second; + } + else + return nullptr; +} + +unordered_map& ModuleManager::createMap() +{ + static unordered_map map; + return map; +} + +NS_CC_END diff --git a/cocos/base/CCModuleManager.h b/cocos/base/CCModuleManager.h new file mode 100644 index 0000000000..c6ec6f1268 --- /dev/null +++ b/cocos/base/CCModuleManager.h @@ -0,0 +1,50 @@ +/**************************************************************************** + Copyright (c) 2014 cocos2d-x.org + + 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 __BASE_CC_MODULE_MANAGER__ +#define __BASE_CC_MODULE_MANAGER__ + +#include +#include + +#include "base/CCPlatformMacros.h" + + +NS_CC_BEGIN + +class CC_DLL ModuleManager +{ +public: + static void registerModule(const std::string &moduleName, void* module); + static void unRegisterModule(const std::string &moduleName); + static void* getModule(const std::string &moduleName); + +private: + static std::unordered_map& createMap(); +}; + +NS_CC_END + +#endif + diff --git a/cocos/base/CCPlatformMacros.h b/cocos/base/CCPlatformMacros.h index 4d7c837ff2..2e91a5fda2 100644 --- a/cocos/base/CCPlatformMacros.h +++ b/cocos/base/CCPlatformMacros.h @@ -104,10 +104,12 @@ It's new in cocos2d-x since v0.99.5 #define NS_CC_BEGIN namespace cocos2d { #define NS_CC_END } #define USING_NS_CC using namespace cocos2d + #define NS_CC ::cocos2d #else #define NS_CC_BEGIN #define NS_CC_END #define USING_NS_CC + #define NS_CC #endif /** CC_PROPERTY_READONLY is used to declare a protected variable. diff --git a/cocos/base/CCProfiling.h b/cocos/base/CCProfiling.h index 41f0d463be..63625f6702 100644 --- a/cocos/base/CCProfiling.h +++ b/cocos/base/CCProfiling.h @@ -143,9 +143,9 @@ public: long numberOfCalls; }; -extern void ProfilingBeginTimingBlock(const char *timerName); -extern void ProfilingEndTimingBlock(const char *timerName); -extern void ProfilingResetTimingBlock(const char *timerName); +extern void CC_DLL ProfilingBeginTimingBlock(const char *timerName); +extern void CC_DLL ProfilingEndTimingBlock(const char *timerName); +extern void CC_DLL ProfilingResetTimingBlock(const char *timerName); /* * cocos2d profiling categories diff --git a/cocos/base/CCTouch.h b/cocos/base/CCTouch.h index 624016aafd..efde06d223 100644 --- a/cocos/base/CCTouch.h +++ b/cocos/base/CCTouch.h @@ -77,6 +77,7 @@ public: { _startPoint = _point; _startPointCaptured = true; + _prevPoint = _point; } } /** diff --git a/cocos/base/CCValue.h b/cocos/base/CCValue.h index 0212e16b52..a3cf561ce0 100644 --- a/cocos/base/CCValue.h +++ b/cocos/base/CCValue.h @@ -43,7 +43,7 @@ extern const ValueVector ValueVectorNull; extern const ValueMap ValueMapNull; extern const ValueMapIntKey ValueMapIntKeyNull; -class Value +class CC_DLL Value { public: static const Value Null; diff --git a/cocos/base/CCVector.h b/cocos/base/CCVector.h index 5d4f2eaeec..dc16c5a568 100644 --- a/cocos/base/CCVector.h +++ b/cocos/base/CCVector.h @@ -35,7 +35,7 @@ THE SOFTWARE. NS_CC_BEGIN template -class CC_DLL Vector +class Vector { public: // ------------------------------------------ diff --git a/cocos/base/CMakeLists.txt b/cocos/base/CMakeLists.txt index 701c8ba5a6..dc46fc23cd 100644 --- a/cocos/base/CMakeLists.txt +++ b/cocos/base/CMakeLists.txt @@ -1,5 +1,6 @@ set(COCOS_BASE_SRC base/CCAutoreleasePool.cpp + base/CCCamera.cpp base/CCConfiguration.cpp base/CCConsole.cpp base/CCData.cpp @@ -21,8 +22,10 @@ set(COCOS_BASE_SRC base/CCEventMouse.cpp base/CCEventTouch.cpp base/CCIMEDispatcher.cpp + base/CCModuleManager.cpp base/CCNS.cpp base/CCProfiling.cpp + base/ccRandom.cpp base/CCRef.cpp base/CCScheduler.cpp base/CCScriptSupport.cpp @@ -40,6 +43,7 @@ set(COCOS_BASE_SRC base/ccUTF8.cpp base/ccUtils.cpp base/etc1.cpp + base/pvr.cpp base/s3tc.cpp base/ObjectFactory.cpp ) diff --git a/cocos/base/ObjectFactory.h b/cocos/base/ObjectFactory.h index 4d5e537e2f..658fc65352 100644 --- a/cocos/base/ObjectFactory.h +++ b/cocos/base/ObjectFactory.h @@ -32,11 +32,11 @@ THE SOFTWARE. NS_CC_BEGIN -class ObjectFactory +class CC_DLL ObjectFactory { public: typedef cocos2d::Ref* (*Instance)(void); - struct TInfo + struct CC_DLL TInfo { TInfo(void); TInfo(const std::string& type, Instance ins = NULL); diff --git a/cocos/base/ZipUtils.h b/cocos/base/ZipUtils.h index d6b1e20c9a..9920cd582c 100644 --- a/cocos/base/ZipUtils.h +++ b/cocos/base/ZipUtils.h @@ -223,7 +223,7 @@ namespace cocos2d * * @since v2.0.5 */ - class ZipFile + class CC_DLL ZipFile { public: /** diff --git a/cocos/base/base64.cpp b/cocos/base/base64.cpp index f697c1cb2f..5e7b7ef0de 100644 --- a/cocos/base/base64.cpp +++ b/cocos/base/base64.cpp @@ -68,7 +68,7 @@ int _base64Decode(const unsigned char *input, unsigned int input_len, unsigned c switch (char_count) { case 1: #if (CC_TARGET_PLATFORM != CC_PLATFORM_BADA) - std::fprintf(stderr, "base64Decode: encoding incomplete: at least 2 bits missing"); + fprintf(stderr, "base64Decode: encoding incomplete: at least 2 bits missing"); #endif errors++; break; @@ -83,7 +83,7 @@ int _base64Decode(const unsigned char *input, unsigned int input_len, unsigned c } else if ( input_idx < input_len ) { if (char_count) { #if (CC_TARGET_PLATFORM != CC_PLATFORM_BADA) - std::fprintf(stderr, "base64 encoding incomplete: at least %d bits truncated", + fprintf(stderr, "base64 encoding incomplete: at least %d bits truncated", ((4 - char_count) * 6)); #endif errors++; diff --git a/cocos/base/base64.h b/cocos/base/base64.h index 67149d78ed..1180c365ce 100644 --- a/cocos/base/base64.h +++ b/cocos/base/base64.h @@ -26,6 +26,8 @@ THE SOFTWARE. #ifndef __SUPPORT_BASE64_H__ #define __SUPPORT_BASE64_H__ +#include "base/CCPlatformMacros.h" + #ifdef __cplusplus extern "C" { #endif @@ -44,7 +46,7 @@ namespace cocos2d { * @since v0.8.1 */ -int base64Decode(const unsigned char *in, unsigned int inLength, unsigned char **out); +int CC_DLL base64Decode(const unsigned char *in, unsigned int inLength, unsigned char **out); /** * Encodes bytes into a 64base encoded memory with terminating '\0' character. @@ -54,7 +56,7 @@ int base64Decode(const unsigned char *in, unsigned int inLength, unsigned char * * @since v2.1.4 */ -int base64Encode(const unsigned char *in, unsigned int inLength, char **out); +int CC_DLL base64Encode(const unsigned char *in, unsigned int inLength, char **out); }//namespace cocos2d diff --git a/cocos/base/ccConfig.h b/cocos/base/ccConfig.h index 1249819c48..90c10e6a56 100644 --- a/cocos/base/ccConfig.h +++ b/cocos/base/ccConfig.h @@ -283,5 +283,5 @@ To enable set it to a value different than 0. Disabled by default. #ifndef CC_CONSTRUCTOR_ACCESS #define CC_CONSTRUCTOR_ACCESS public #endif - + #endif // __CCCONFIG_H__ diff --git a/cocos/base/ccMacros.h b/cocos/base/ccMacros.h index 165dbab7cf..e72c32f265 100644 --- a/cocos/base/ccMacros.h +++ b/cocos/base/ccMacros.h @@ -69,16 +69,17 @@ simple macro that swaps 2 variables x = y; y = temp; \ } +#include "base/ccRandom.h" /** @def CCRANDOM_MINUS1_1 returns a random float between -1 and 1 */ -#define CCRANDOM_MINUS1_1() ((2.0f*((float)rand()/RAND_MAX))-1.0f) +#define CCRANDOM_MINUS1_1() cocos2d::rand_minus1_1() /** @def CCRANDOM_0_1 returns a random float between 0 and 1 */ -#define CCRANDOM_0_1() ((float)rand()/RAND_MAX) +#define CCRANDOM_0_1() cocos2d::rand_0_1() /** @def CC_DEGREES_TO_RADIANS converts degrees to radians @@ -203,20 +204,20 @@ It should work same as apples CFSwapInt32LittleToHost(..) /**********************/ #if CC_ENABLE_PROFILERS -#define CC_PROFILER_DISPLAY_TIMERS() Profiler::getInstance()->displayTimers() -#define CC_PROFILER_PURGE_ALL() Profiler::getInstance()->releaseAllTimers() +#define CC_PROFILER_DISPLAY_TIMERS() NS_CC::Profiler::getInstance()->displayTimers() +#define CC_PROFILER_PURGE_ALL() NS_CC::Profiler::getInstance()->releaseAllTimers() -#define CC_PROFILER_START(__name__) ProfilingBeginTimingBlock(__name__) -#define CC_PROFILER_STOP(__name__) ProfilingEndTimingBlock(__name__) -#define CC_PROFILER_RESET(__name__) ProfilingResetTimingBlock(__name__) +#define CC_PROFILER_START(__name__) NS_CC::ProfilingBeginTimingBlock(__name__) +#define CC_PROFILER_STOP(__name__) NS_CC::ProfilingEndTimingBlock(__name__) +#define CC_PROFILER_RESET(__name__) NS_CC::ProfilingResetTimingBlock(__name__) -#define CC_PROFILER_START_CATEGORY(__cat__, __name__) do{ if(__cat__) ProfilingBeginTimingBlock(__name__); } while(0) -#define CC_PROFILER_STOP_CATEGORY(__cat__, __name__) do{ if(__cat__) ProfilingEndTimingBlock(__name__); } while(0) -#define CC_PROFILER_RESET_CATEGORY(__cat__, __name__) do{ if(__cat__) ProfilingResetTimingBlock(__name__); } while(0) +#define CC_PROFILER_START_CATEGORY(__cat__, __name__) do{ if(__cat__) NS_CC::ProfilingBeginTimingBlock(__name__); } while(0) +#define CC_PROFILER_STOP_CATEGORY(__cat__, __name__) do{ if(__cat__) NS_CC::ProfilingEndTimingBlock(__name__); } while(0) +#define CC_PROFILER_RESET_CATEGORY(__cat__, __name__) do{ if(__cat__) NS_CC::ProfilingResetTimingBlock(__name__); } while(0) -#define CC_PROFILER_START_INSTANCE(__id__, __name__) do{ ProfilingBeginTimingBlock( String::createWithFormat("%08X - %s", __id__, __name__)->getCString() ); } while(0) -#define CC_PROFILER_STOP_INSTANCE(__id__, __name__) do{ ProfilingEndTimingBlock( String::createWithFormat("%08X - %s", __id__, __name__)->getCString() ); } while(0) -#define CC_PROFILER_RESET_INSTANCE(__id__, __name__) do{ ProfilingResetTimingBlock( String::createWithFormat("%08X - %s", __id__, __name__)->getCString() ); } while(0) +#define CC_PROFILER_START_INSTANCE(__id__, __name__) do{ NS_CC::ProfilingBeginTimingBlock( NS_CC::String::createWithFormat("%08X - %s", __id__, __name__)->getCString() ); } while(0) +#define CC_PROFILER_STOP_INSTANCE(__id__, __name__) do{ NS_CC::ProfilingEndTimingBlock( NS_CC::String::createWithFormat("%08X - %s", __id__, __name__)->getCString() ); } while(0) +#define CC_PROFILER_RESET_INSTANCE(__id__, __name__) do{ NS_CC::ProfilingResetTimingBlock( NS_CC::String::createWithFormat("%08X - %s", __id__, __name__)->getCString() ); } while(0) #else diff --git a/cocos/base/ccRandom.cpp b/cocos/base/ccRandom.cpp new file mode 100644 index 0000000000..b14783f2e9 --- /dev/null +++ b/cocos/base/ccRandom.cpp @@ -0,0 +1,32 @@ +/**************************************************************************** +Copyright (c) 2010 cocos2d-x.org +Copyright (c) 2013-2014 Chukong Technologies Inc. + +http://www.cocos2d-x.org + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. +****************************************************************************/ + +#include "ccRandom.h" + +std::mt19937 &cocos2d::RandomHelper::getEngine() { + static std::random_device seed_gen; + static std::mt19937 engine(seed_gen()); + return engine; +} diff --git a/cocos/base/ccRandom.h b/cocos/base/ccRandom.h new file mode 100644 index 0000000000..272da902b2 --- /dev/null +++ b/cocos/base/ccRandom.h @@ -0,0 +1,99 @@ +/**************************************************************************** +Copyright (c) 2010 cocos2d-x.org +Copyright (c) 2013-2014 Chukong Technologies Inc. + +http://www.cocos2d-x.org + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. +****************************************************************************/ + +#ifndef __ccRandom_H_ +#define __ccRandom_H_ + +#include "base/CCPlatformMacros.h" +#include + + +NS_CC_BEGIN + +class CC_DLL RandomHelper { +public: + template + static inline T random_real(T min, T max) { + std::uniform_real_distribution dist(min, max); + auto &mt = RandomHelper::getEngine(); + return dist(mt); + } + + template + static inline T random_int(T min, T max) { + std::uniform_int_distribution<> dist(min, max); + auto &mt = RandomHelper::getEngine(); + return dist(mt); + } +private: + static std::mt19937 &getEngine(); +}; + +/** +* returns a random value between `min` and `max` +*/ +template +inline T random(T min, T max) { + return RandomHelper::random_int(min, max); +} + +template<> +inline float random(float min, float max) { + return RandomHelper::random_real(min, max); +} + +template<> +inline long double random(long double min, long double max) { + return RandomHelper::random_real(min, max); +} + +template<> +inline double random(double min, double max) { + return RandomHelper::random_real(min, max); +} + +/** +* returns a random int between 0 and RAND_MAX +*/ +inline int random() { + return cocos2d::random(0, RAND_MAX); +}; + +/** +* returns a random float between -1 and 1 +*/ +inline float rand_minus1_1() { + return cocos2d::random(-1.f, 1.f); +}; + +/** +* returns a random float between 0 and 1 +*/ +inline float rand_0_1() { + return cocos2d::random(0.f, 1.f); +}; + +NS_CC_END +#endif //__ccRandom_H_ diff --git a/cocos/base/ccTypes.h b/cocos/base/ccTypes.h index 0aa38f29bc..8e75b828a8 100644 --- a/cocos/base/ccTypes.h +++ b/cocos/base/ccTypes.h @@ -43,7 +43,7 @@ struct Color4F; /** RGB color composed of bytes 3 bytes @since v3.0 */ -struct Color3B +struct CC_DLL Color3B { Color3B(); Color3B(GLubyte _r, GLubyte _g, GLubyte _b); @@ -80,7 +80,7 @@ struct Color3B /** RGBA color composed of 4 bytes @since v3.0 */ -struct Color4B +struct CC_DLL Color4B { Color4B(); Color4B(GLubyte _r, GLubyte _g, GLubyte _b, GLubyte _a); @@ -114,7 +114,7 @@ struct Color4B /** RGBA color composed of 4 floats @since v3.0 */ -struct Color4F +struct CC_DLL Color4F { Color4F(); Color4F(float _r, float _g, float _b, float _a); @@ -184,7 +184,7 @@ struct Color4F /** A texcoord composed of 2 floats: u, y @since v3.0 */ -struct Tex2F { +struct CC_DLL Tex2F { Tex2F(float _u, float _v): u(_u), v(_v) {} Tex2F(): u(0.f), v(0.f) {} @@ -195,7 +195,7 @@ struct Tex2F { //! Vec2 Sprite component -struct PointSprite +struct CC_DLL PointSprite { Vec2 pos; // 8 bytes Color4B color; // 4 bytes @@ -203,7 +203,7 @@ struct PointSprite }; //! A 2D Quad. 4 * 2 floats -struct Quad2 +struct CC_DLL Quad2 { Vec2 tl; Vec2 tr; @@ -213,7 +213,7 @@ struct Quad2 //! A 3D Quad. 4 * 3 floats -struct Quad3 { +struct CC_DLL Quad3 { Vec3 bl; Vec3 br; Vec3 tl; @@ -232,7 +232,7 @@ struct V2F_C4B_T2F }; //! a Vec2 with a vertex point, a tex coord point and a color 4F -struct V2F_C4F_T2F +struct CC_DLL V2F_C4F_T2F { //! vertices (2F) Vec2 vertices; @@ -243,7 +243,7 @@ struct V2F_C4F_T2F }; //! a Vec2 with a vertex point, a tex coord point and a color 4B -struct V3F_C4B_T2F +struct CC_DLL V3F_C4B_T2F { //! vertices (3F) Vec3 vertices; // 12 bytes @@ -256,7 +256,7 @@ struct V3F_C4B_T2F }; //! a Vec2 with a vertex point, a tex coord point -struct V3F_T2F +struct CC_DLL V3F_T2F { //! vertices (2F) Vec3 vertices; @@ -265,7 +265,7 @@ struct V3F_T2F }; //! A Triangle of V2F_C4B_T2F -struct V2F_C4B_T2F_Triangle +struct CC_DLL V2F_C4B_T2F_Triangle { //! Vec2 A V2F_C4B_T2F a; @@ -276,7 +276,7 @@ struct V2F_C4B_T2F_Triangle }; //! A Quad of V2F_C4B_T2F -struct V2F_C4B_T2F_Quad +struct CC_DLL V2F_C4B_T2F_Quad { //! bottom left V2F_C4B_T2F bl; @@ -289,7 +289,7 @@ struct V2F_C4B_T2F_Quad }; //! 4 Vertex3FTex2FColor4B -struct V3F_C4B_T2F_Quad +struct CC_DLL V3F_C4B_T2F_Quad { //! top left V3F_C4B_T2F tl; @@ -302,7 +302,7 @@ struct V3F_C4B_T2F_Quad }; //! 4 Vertex2FTex2FColor4F Quad -struct V2F_C4F_T2F_Quad +struct CC_DLL V2F_C4F_T2F_Quad { //! bottom left V2F_C4F_T2F bl; @@ -314,7 +314,7 @@ struct V2F_C4F_T2F_Quad V2F_C4F_T2F tr; }; -struct V3F_T2F_Quad +struct CC_DLL V3F_T2F_Quad { //! bottom left V3F_T2F bl; @@ -327,7 +327,7 @@ struct V3F_T2F_Quad }; //! Blend Function used for textures -struct BlendFunc +struct CC_DLL BlendFunc { //! source blend function GLenum src; @@ -348,6 +348,11 @@ struct BlendFunc return src == a.src && dst == a.dst; } + bool operator!=(const BlendFunc &a) const + { + return src != a.src || dst != a.dst; + } + bool operator<(const BlendFunc &a) const { return src < a.src || (src == a.src && dst < a.dst); @@ -359,7 +364,7 @@ struct BlendFunc // XXX: If any of these enums are edited and/or reordered, update Texture2D.m //! Vertical text alignment type -enum class TextVAlignment +enum class CC_DLL TextVAlignment { TOP, CENTER, @@ -368,7 +373,7 @@ enum class TextVAlignment // XXX: If any of these enums are edited and/or reordered, update Texture2D.m //! Horizontal text alignment type -enum class TextHAlignment +enum class CC_DLL TextHAlignment { LEFT, CENTER, @@ -378,7 +383,7 @@ enum class TextHAlignment // types for animation in particle systems // texture coordinates for a quad -struct T2F_Quad +struct CC_DLL T2F_Quad { //! bottom left Tex2F bl; @@ -391,7 +396,7 @@ struct T2F_Quad }; // struct that holds the size in pixels, texture coordinates and delays for animated ParticleSystemQuad -struct AnimationFrameData +struct CC_DLL AnimationFrameData { T2F_Quad texCoords; float delay; @@ -404,7 +409,7 @@ struct AnimationFrameData // shadow attributes -struct FontShadow +struct CC_DLL FontShadow { public: @@ -426,7 +431,7 @@ public: }; // stroke attributes -struct FontStroke +struct CC_DLL FontStroke { public: @@ -447,7 +452,7 @@ public: }; // font attributes -struct FontDefinition +struct CC_DLL FontDefinition { public: /** @@ -484,7 +489,7 @@ public: /** @brief The device accelerometer reports values for each axis in units of g-force */ -class Acceleration +class CC_DLL Acceleration : public Ref { public: @@ -497,8 +502,8 @@ public: Acceleration(): x(0), y(0), z(0), timestamp(0) {} }; -extern const std::string STD_STRING_EMPTY; -extern const ssize_t CC_INVALID_INDEX; +extern const std::string CC_DLL STD_STRING_EMPTY; +extern const ssize_t CC_DLL CC_INVALID_INDEX; NS_CC_END diff --git a/cocos/base/ccUTF8.h b/cocos/base/ccUTF8.h index 87760db047..f9561efa09 100644 --- a/cocos/base/ccUTF8.h +++ b/cocos/base/ccUTF8.h @@ -133,7 +133,7 @@ CC_DEPRECATED_ATTRIBUTE CC_DLL int cc_wcslen(const unsigned short* str); * @deprecated Please use `StringUtils::trimUTF16Vector` instead */ -CC_DEPRECATED_ATTRIBUTE void cc_utf8_trim_ws(std::vector* str); +CC_DEPRECATED_ATTRIBUTE CC_DLL void cc_utf8_trim_ws(std::vector* str); /** * Whether the character is a whitespace character. @@ -144,7 +144,7 @@ CC_DEPRECATED_ATTRIBUTE void cc_utf8_trim_ws(std::vector* str); * * @see http://en.wikipedia.org/wiki/Whitespace_character#Unicode * */ -CC_DEPRECATED_ATTRIBUTE bool isspace_unicode(unsigned short ch); +CC_DEPRECATED_ATTRIBUTE CC_DLL bool isspace_unicode(unsigned short ch); /** * Whether the character is a Chinese/Japanese/Korean character. @@ -156,7 +156,7 @@ CC_DEPRECATED_ATTRIBUTE bool isspace_unicode(unsigned short ch); * @see http://www.searchtb.com/2012/04/chinese_encode.html * @see http://tieba.baidu.com/p/748765987 * */ -CC_DEPRECATED_ATTRIBUTE bool iscjk_unicode(unsigned short ch); +CC_DEPRECATED_ATTRIBUTE CC_DLL bool iscjk_unicode(unsigned short ch); /** * Returns the length of the string in characters. @@ -166,7 +166,7 @@ CC_DEPRECATED_ATTRIBUTE bool iscjk_unicode(unsigned short ch); * @deprecated Please use `StringUtils::getCharacterCountInUTF8String` instead * @returns the length of the string in characters **/ -CC_DEPRECATED_ATTRIBUTE long cc_utf8_strlen (const char * p, int max = -1); +CC_DEPRECATED_ATTRIBUTE CC_DLL long cc_utf8_strlen (const char * p, int max = -1); /** * Find the last character that is not equal to the character given. @@ -176,13 +176,13 @@ CC_DEPRECATED_ATTRIBUTE long cc_utf8_strlen (const char * p, int max = -1); * @deprecated Please use `StringUtils::getIndexOfLastNotChar16` instead * @returns the index of the last character that is not \p c. * */ -CC_DEPRECATED_ATTRIBUTE unsigned int cc_utf8_find_last_not_char(const std::vector& str, unsigned short c); +CC_DEPRECATED_ATTRIBUTE CC_DLL unsigned int cc_utf8_find_last_not_char(const std::vector& str, unsigned short c); /** * @brief Gets `unsigned short` vector from a given utf16 string * @deprecated Please use `StringUtils::getChar16VectorFromUTF16String` instead */ -CC_DEPRECATED_ATTRIBUTE std::vector cc_utf16_vec_from_utf16_str(const unsigned short* str); +CC_DEPRECATED_ATTRIBUTE CC_DLL std::vector cc_utf16_vec_from_utf16_str(const unsigned short* str); /** * Creates an utf8 string from a c string. The result will be null terminated. @@ -194,7 +194,7 @@ CC_DEPRECATED_ATTRIBUTE std::vector cc_utf16_vec_from_utf16_str( * @returns the newly created utf16 string, it must be released with `delete[]`, * If an error occurs, %NULL will be returned. * */ -CC_DEPRECATED_ATTRIBUTE unsigned short* cc_utf8_to_utf16(const char* str_old, int length = -1, int* rUtf16Size = nullptr); +CC_DEPRECATED_ATTRIBUTE CC_DLL unsigned short* cc_utf8_to_utf16(const char* str_old, int length = -1, int* rUtf16Size = nullptr); /** * Converts a string from UTF-16 to UTF-8. The result will be null terminated. @@ -207,7 +207,7 @@ CC_DEPRECATED_ATTRIBUTE unsigned short* cc_utf8_to_utf16(const char* str_old, in * @returns a pointer to a newly allocated UTF-8 string. This value must be * released with `delete[]`. If an error occurs, %NULL will be returned. **/ -CC_DEPRECATED_ATTRIBUTE char * cc_utf16_to_utf8 (const unsigned short *str, +CC_DEPRECATED_ATTRIBUTE CC_DLL char * cc_utf16_to_utf8 (const unsigned short *str, int len = -1, long *items_read = nullptr, long *items_written = nullptr); diff --git a/cocos/base/ccUtils.cpp b/cocos/base/ccUtils.cpp index 36cafb1c20..b304b95751 100644 --- a/cocos/base/ccUtils.cpp +++ b/cocos/base/ccUtils.cpp @@ -32,7 +32,6 @@ THE SOFTWARE. #include "renderer/CCRenderer.h" #include "platform/CCImage.h" #include "platform/CCFileUtils.h" -#include "CCGLView.h" NS_CC_BEGIN @@ -184,7 +183,15 @@ double atof(const char* str) return ::atof(buf); } - + +double gettime() +{ + struct timeval tv; + gettimeofday(&tv, nullptr); + + return (double)tv.tv_sec + (double)tv.tv_usec/1000000; +} + } NS_CC_END diff --git a/cocos/base/ccUtils.h b/cocos/base/ccUtils.h index 1fba5b1b40..ba5dabbe15 100644 --- a/cocos/base/ccUtils.h +++ b/cocos/base/ccUtils.h @@ -61,7 +61,7 @@ namespace utils * base filename ("hello.png" etc.), don't use a relative path containing directory names.("mydir/hello.png" etc.) * @since v3.2 */ - void captureScreen(const std::function& afterCaptured, const std::string& filename); + void CC_DLL captureScreen(const std::function& afterCaptured, const std::string& filename); /** Find children by name, it will return all child that has the same name. * It supports c++ 11 regular expression. It is a helper function of `Node::enumerateChildren()`. @@ -72,12 +72,16 @@ namespace utils * @return Array of Nodes that matches the name * @since v3.2 */ - std::vector findChildren(const Node &node, const std::string &name); + std::vector CC_DLL findChildren(const Node &node, const std::string &name); - /** Same to ::atof, but strip the string, remain 7 numbers after '.' before call atof。 - * Why we need this? Because in android c++_static, atof ( and std::atof ) is unsupported for numbers have long decimal part and contain several numbers can approximate to 1 （ like 90.099998474121094 ), it will return inf. this function is used to fix this bug. + /** Same to ::atof, but strip the string, remain 7 numbers after '.' before call atof. + * Why we need this? Because in android c++_static, atof ( and std::atof ) is unsupported for numbers have long decimal part and contain several numbers can approximate to 1 ( like 90.099998474121094 ), it will return inf. this function is used to fix this bug. */ - double atof(const char* str); + double CC_DLL atof(const char* str); + + /** Get current exact time, accurate to nanoseconds. + */ + double CC_DLL gettime(); } NS_CC_END diff --git a/cocos/base/pvr.cpp b/cocos/base/pvr.cpp new file mode 100644 index 0000000000..3a59860c6f --- /dev/null +++ b/cocos/base/pvr.cpp @@ -0,0 +1,713 @@ +/****************************************************************************** + + @File PVRTDecompress.cpp + + @Title + + @Copyright Copyright (C) 2000 - 2008 by Imagination Technologies Limited. + + @Platform ANSI compatible + + @Description PVRTC Texture Decompression. + + ******************************************************************************/ +#include +#include +#include +#include +#include +#include +#include +#include "pvr.h" + +#define PVRT_MIN(a,b) (((a) < (b)) ? (a) : (b)) +#define PVRT_MAX(a,b) (((a) > (b)) ? (a) : (b)) +#define PVRT_CLAMP(x, l, h) (PVRT_MIN((h), PVRT_MAX((x), (l)))) + +/***************************************************************************** + * defines and consts + *****************************************************************************/ +#define PT_INDEX (2) // The Punch-through index + +#define BLK_Y_SIZE (4) // always 4 for all 2D block types + +#define BLK_X_MAX (8) // Max X dimension for blocks + +#define BLK_X_2BPP (8) // dimensions for the two formats +#define BLK_X_4BPP (4) + +#define WRAP_COORD(Val, Size) ((Val) & ((Size)-1)) + +#define POWER_OF_2(X) util_number_is_power_2(X) + +/* + Define an expression to either wrap or clamp large or small vals to the + legal coordinate range + */ +#define LIMIT_COORD(Val, Size, AssumeImageTiles) \ +((AssumeImageTiles)? WRAP_COORD((Val), (Size)): PVRT_CLAMP((Val), 0, (Size)-1)) + +/***************************************************************************** + * Useful typedefs + *****************************************************************************/ + +typedef uint32_t U32; +typedef uint8_t U8; + +/*********************************************************** + DECOMPRESSION ROUTINES + ************************************************************/ + +/*!*********************************************************************** + @Struct AMTC_BLOCK_STRUCT + @Brief + *************************************************************************/ +typedef struct +{ + // Uses 64 bits pre block + U32 PackedData[2]; +}AMTC_BLOCK_STRUCT; + + +static void PVRDecompress(AMTC_BLOCK_STRUCT *pCompressedData, + const bool Do2bitMode, + const int XDim, + const int YDim, + const int AssumeImageTiles, + unsigned char* pResultImage); + +/*!*********************************************************************** + @Function PVRTDecompressPVRTC + @Input pCompressedData The PVRTC texture data to decompress + @Input Do2bitMode Signifies whether the data is PVRTC2 or PVRTC4 + @Input XDim X dimension of the texture + @Input YDim Y dimension of the texture + @Modified pResultImage The decompressed texture data + @Description Decompresses PVRTC to RGBA 8888 + *************************************************************************/ +int PVRTDecompressPVRTC(const void * const pCompressedData,const int XDim,const int YDim, void *pDestData,const bool Do2bitMode) +{ + PVRDecompress((AMTC_BLOCK_STRUCT*)pCompressedData,Do2bitMode,XDim,YDim,1,(unsigned char*)pDestData); + + return XDim*YDim/2; +} + +/*!*********************************************************************** + @Function util_number_is_power_2 + @Input input A number + @Returns TRUE if the number is an integer power of two, else FALSE. + @Description Check that a number is an integer power of two, i.e. + 1, 2, 4, 8, ... etc. + Returns FALSE for zero. + *************************************************************************/ +int util_number_is_power_2( unsigned input ) +{ + unsigned minus1; + + if( !input ) return 0; + + minus1 = input - 1; + return ( (input | minus1) == (input ^ minus1) ) ? 1 : 0; +} + + +/*!*********************************************************************** + @Function Unpack5554Colour + @Input pBlock + @Input ABColours + @Description Given a block, extract the colour information and convert + to 5554 formats + *************************************************************************/ +static void Unpack5554Colour(const AMTC_BLOCK_STRUCT *pBlock, + int ABColours[2][4]) +{ + U32 RawBits[2]; + + int i; + + // Extract A and B + RawBits[0] = pBlock->PackedData[1] & (0xFFFE); // 15 bits (shifted up by one) + RawBits[1] = pBlock->PackedData[1] >> 16; // 16 bits + + // step through both colours + for(i = 0; i < 2; i++) + { + // If completely opaque + if(RawBits[i] & (1<<15)) + { + // Extract R and G (both 5 bit) + ABColours[i][0] = (RawBits[i] >> 10) & 0x1F; + ABColours[i][1] = (RawBits[i] >> 5) & 0x1F; + + /* + The precision of Blue depends on A or B. If A then we need to + replicate the top bit to get 5 bits in total + */ + ABColours[i][2] = RawBits[i] & 0x1F; + if(i==0) + { + ABColours[0][2] |= ABColours[0][2] >> 4; + } + + // set 4bit alpha fully on... + ABColours[i][3] = 0xF; + } + else // Else if colour has variable translucency + { + /* + Extract R and G (both 4 bit). + (Leave a space on the end for the replication of bits + */ + ABColours[i][0] = (RawBits[i] >> (8-1)) & 0x1E; + ABColours[i][1] = (RawBits[i] >> (4-1)) & 0x1E; + + // replicate bits to truly expand to 5 bits + ABColours[i][0] |= ABColours[i][0] >> 4; + ABColours[i][1] |= ABColours[i][1] >> 4; + + // grab the 3(+padding) or 4 bits of blue and add an extra padding bit + ABColours[i][2] = (RawBits[i] & 0xF) << 1; + + /* + expand from 3 to 5 bits if this is from colour A, or 4 to 5 bits if from + colour B + */ + if(i==0) + { + ABColours[0][2] |= ABColours[0][2] >> 3; + } + else + { + ABColours[0][2] |= ABColours[0][2] >> 4; + } + + // Set the alpha bits to be 3 + a zero on the end + ABColours[i][3] = (RawBits[i] >> 11) & 0xE; + } + } +} + +/*!*********************************************************************** + @Function UnpackModulations + @Input pBlock + @Input Do2bitMode + @Input ModulationVals + @Input ModulationModes + @Input StartX + @Input StartY + @Description Given the block and the texture type and it's relative + position in the 2x2 group of blocks, extract the bit + patterns for the fully defined pixels. + *************************************************************************/ +static void UnpackModulations(const AMTC_BLOCK_STRUCT *pBlock, + const int Do2bitMode, + int ModulationVals[8][16], + int ModulationModes[8][16], + int StartX, + int StartY) +{ + int BlockModMode; + U32 ModulationBits; + + int x, y; + + BlockModMode= pBlock->PackedData[1] & 1; + ModulationBits = pBlock->PackedData[0]; + + // if it's in an interpolated mode + if(Do2bitMode && BlockModMode) + { + /* + run through all the pixels in the block. Note we can now treat all the + "stored" values as if they have 2bits (even when they didn't!) + */ + for(y = 0; y < BLK_Y_SIZE; y++) + { + for(x = 0; x < BLK_X_2BPP; x++) + { + ModulationModes[y+StartY][x+StartX] = BlockModMode; + + // if this is a stored value... + if(((x^y)&1) == 0) + { + ModulationVals[y+StartY][x+StartX] = ModulationBits & 3; + ModulationBits >>= 2; + } + } + } + } + else if(Do2bitMode) // else if direct encoded 2bit mode - i.e. 1 mode bit per pixel + { + for(y = 0; y < BLK_Y_SIZE; y++) + { + for(x = 0; x < BLK_X_2BPP; x++) + { + ModulationModes[y+StartY][x+StartX] = BlockModMode; + + // double the bits so 0=> 00, and 1=>11 + if(ModulationBits & 1) + { + ModulationVals[y+StartY][x+StartX] = 0x3; + } + else + { + ModulationVals[y+StartY][x+StartX] = 0x0; + } + ModulationBits >>= 1; + } + } + } + else // else its the 4bpp mode so each value has 2 bits + { + for(y = 0; y < BLK_Y_SIZE; y++) + { + for(x = 0; x < BLK_X_4BPP; x++) + { + ModulationModes[y+StartY][x+StartX] = BlockModMode; + + ModulationVals[y+StartY][x+StartX] = ModulationBits & 3; + ModulationBits >>= 2; + } + } + } + + // make sure nothing is left over + assert(ModulationBits==0); +} + +/*!*********************************************************************** + @Function InterpolateColours + @Input ColourP + @Input ColourQ + @Input ColourR + @Input ColourS + @Input Do2bitMode + @Input x + @Input y + @Modified Result + @Description This performs a HW bit accurate interpolation of either the + A or B colours for a particular pixel. + + NOTE: It is assumed that the source colours are in ARGB 5554 + format - This means that some "preparation" of the values will + be necessary. + *************************************************************************/ +static void InterpolateColours(const int ColourP[4], + const int ColourQ[4], + const int ColourR[4], + const int ColourS[4], + const int Do2bitMode, + const int x, + const int y, + int Result[4]) +{ + int u, v, uscale; + int k; + + int tmp1, tmp2; + + int P[4], Q[4], R[4], S[4]; + + // Copy the colours + for(k = 0; k < 4; k++) + { + P[k] = ColourP[k]; + Q[k] = ColourQ[k]; + R[k] = ColourR[k]; + S[k] = ColourS[k]; + } + + // put the x and y values into the right range + v = (y & 0x3) | ((~y & 0x2) << 1); + + if(Do2bitMode) + u = (x & 0x7) | ((~x & 0x4) << 1); + else + u = (x & 0x3) | ((~x & 0x2) << 1); + + // get the u and v scale amounts + v = v - BLK_Y_SIZE/2; + + if(Do2bitMode) + { + u = u - BLK_X_2BPP/2; + uscale = 8; + } + else + { + u = u - BLK_X_4BPP/2; + uscale = 4; + } + + for(k = 0; k < 4; k++) + { + tmp1 = P[k] * uscale + u * (Q[k] - P[k]); + tmp2 = R[k] * uscale + u * (S[k] - R[k]); + + tmp1 = tmp1 * 4 + v * (tmp2 - tmp1); + + Result[k] = tmp1; + } + + // Lop off the appropriate number of bits to get us to 8 bit precision + if(Do2bitMode) + { + // do RGB + for(k = 0; k < 3; k++) + { + Result[k] >>= 2; + } + + Result[3] >>= 1; + } + else + { + // do RGB (A is ok) + for(k = 0; k < 3; k++) + { + Result[k] >>= 1; + } + } + + // sanity check + for(k = 0; k < 4; k++) + { + assert(Result[k] < 256); + } + + + /* + Convert from 5554 to 8888 + + do RGB 5.3 => 8 + */ + for(k = 0; k < 3; k++) + { + Result[k] += Result[k] >> 5; + } + + Result[3] += Result[3] >> 4; + + // 2nd sanity check + for(k = 0; k < 4; k++) + { + assert(Result[k] < 256); + } + +} + +/*!*********************************************************************** + @Function GetModulationValue + @Input x + @Input y + @Input Do2bitMode + @Input ModulationVals + @Input ModulationModes + @Input Mod + @Input DoPT + @Description Get the modulation value as a numerator of a fraction of 8ths + *************************************************************************/ +static void GetModulationValue(int x, + int y, + const int Do2bitMode, + const int ModulationVals[8][16], + const int ModulationModes[8][16], + int *Mod, + int *DoPT) +{ + static const int RepVals0[4] = {0, 3, 5, 8}; + static const int RepVals1[4] = {0, 4, 4, 8}; + + int ModVal; + + // Map X and Y into the local 2x2 block + y = (y & 0x3) | ((~y & 0x2) << 1); + + if(Do2bitMode) + x = (x & 0x7) | ((~x & 0x4) << 1); + else + x = (x & 0x3) | ((~x & 0x2) << 1); + + // assume no PT for now + *DoPT = 0; + + // extract the modulation value. If a simple encoding + if(ModulationModes[y][x]==0) + { + ModVal = RepVals0[ModulationVals[y][x]]; + } + else if(Do2bitMode) + { + // if this is a stored value + if(((x^y)&1)==0) + ModVal = RepVals0[ModulationVals[y][x]]; + else if(ModulationModes[y][x] == 1) // else average from the neighbours if H&V interpolation.. + { + ModVal = (RepVals0[ModulationVals[y-1][x]] + + RepVals0[ModulationVals[y+1][x]] + + RepVals0[ModulationVals[y][x-1]] + + RepVals0[ModulationVals[y][x+1]] + 2) / 4; + } + else if(ModulationModes[y][x] == 2) // else if H-Only + { + ModVal = (RepVals0[ModulationVals[y][x-1]] + + RepVals0[ModulationVals[y][x+1]] + 1) / 2; + } + else // else it's V-Only + { + ModVal = (RepVals0[ModulationVals[y-1][x]] + + RepVals0[ModulationVals[y+1][x]] + 1) / 2; + } + } + else // else it's 4BPP and PT encoding + { + ModVal = RepVals1[ModulationVals[y][x]]; + + *DoPT = ModulationVals[y][x] == PT_INDEX; + } + + *Mod =ModVal; +} + +/*!*********************************************************************** + @Function TwiddleUV + @Input YSize Y dimension of the texture in pixels + @Input XSize X dimension of the texture in pixels + @Input YPos Pixel Y position + @Input XPos Pixel X position + @Returns The twiddled offset of the pixel + @Description Given the Block (or pixel) coordinates and the dimension of + the texture in blocks (or pixels) this returns the twiddled + offset of the block (or pixel) from the start of the map. + + NOTE the dimensions of the texture must be a power of 2 + *************************************************************************/ +static int DisableTwiddlingRoutine = 0; + +static U32 TwiddleUV(U32 YSize, U32 XSize, U32 YPos, U32 XPos) +{ + U32 Twiddled; + + U32 MinDimension; + U32 MaxValue; + + U32 SrcBitPos; + U32 DstBitPos; + + int ShiftCount; + + assert(YPos < YSize); + assert(XPos < XSize); + + assert(POWER_OF_2(YSize)); + assert(POWER_OF_2(XSize)); + + if(YSize < XSize) + { + MinDimension = YSize; + MaxValue = XPos; + } + else + { + MinDimension = XSize; + MaxValue = YPos; + } + + // Nasty hack to disable twiddling + if(DisableTwiddlingRoutine) + return (YPos* XSize + XPos); + + // Step through all the bits in the "minimum" dimension + SrcBitPos = 1; + DstBitPos = 1; + Twiddled = 0; + ShiftCount = 0; + + while(SrcBitPos < MinDimension) + { + if(YPos & SrcBitPos) + { + Twiddled |= DstBitPos; + } + + if(XPos & SrcBitPos) + { + Twiddled |= (DstBitPos << 1); + } + + + SrcBitPos <<= 1; + DstBitPos <<= 2; + ShiftCount += 1; + + } + + // prepend any unused bits + MaxValue >>= ShiftCount; + + Twiddled |= (MaxValue << (2*ShiftCount)); + + return Twiddled; +} + +/*!*********************************************************************** + @Function Decompress + @Input pCompressedData The PVRTC texture data to decompress + @Input Do2BitMode Signifies whether the data is PVRTC2 or PVRTC4 + @Input XDim X dimension of the texture + @Input YDim Y dimension of the texture + @Input AssumeImageTiles Assume the texture data tiles + @Modified pResultImage The decompressed texture data + @Description Decompresses PVRTC to RGBA 8888 + *************************************************************************/ +static void PVRDecompress(AMTC_BLOCK_STRUCT *pCompressedData, + const bool Do2bitMode, + const int XDim, + const int YDim, + const int AssumeImageTiles, + unsigned char* pResultImage) +{ + int x, y; + int i, j; + + int BlkX, BlkY; + int BlkXp1, BlkYp1; + int XBlockSize; + int BlkXDim, BlkYDim; + + int StartX, StartY; + + int ModulationVals[8][16]; + int ModulationModes[8][16]; + + int Mod, DoPT; + + unsigned int uPosition; + + // local neighbourhood of blocks + AMTC_BLOCK_STRUCT *pBlocks[2][2]; + + AMTC_BLOCK_STRUCT *pPrevious[2][2] = {{NULL, NULL}, {NULL, NULL}}; + + // Low precision colours extracted from the blocks + struct + { + int Reps[2][4]; + }Colours5554[2][2]; + + // Interpolated A and B colours for the pixel + int ASig[4], BSig[4]; + + int Result[4]; + + if(Do2bitMode) + XBlockSize = BLK_X_2BPP; + else + XBlockSize = BLK_X_4BPP; + + // For MBX don't allow the sizes to get too small + BlkXDim = PVRT_MAX(2, XDim / XBlockSize); + BlkYDim = PVRT_MAX(2, YDim / BLK_Y_SIZE); + + /* + Step through the pixels of the image decompressing each one in turn + + Note that this is a hideously inefficient way to do this! + */ + for(y = 0; y < YDim; y++) + { + for(x = 0; x < XDim; x++) + { + // map this pixel to the top left neighbourhood of blocks + BlkX = (x - XBlockSize/2); + BlkY = (y - BLK_Y_SIZE/2); + + BlkX = LIMIT_COORD(BlkX, XDim, AssumeImageTiles); + BlkY = LIMIT_COORD(BlkY, YDim, AssumeImageTiles); + + + BlkX /= XBlockSize; + BlkY /= BLK_Y_SIZE; + + // compute the positions of the other 3 blocks + BlkXp1 = LIMIT_COORD(BlkX+1, BlkXDim, AssumeImageTiles); + BlkYp1 = LIMIT_COORD(BlkY+1, BlkYDim, AssumeImageTiles); + + // Map to block memory locations + pBlocks[0][0] = pCompressedData +TwiddleUV(BlkYDim, BlkXDim, BlkY, BlkX); + pBlocks[0][1] = pCompressedData +TwiddleUV(BlkYDim, BlkXDim, BlkY, BlkXp1); + pBlocks[1][0] = pCompressedData +TwiddleUV(BlkYDim, BlkXDim, BlkYp1, BlkX); + pBlocks[1][1] = pCompressedData +TwiddleUV(BlkYDim, BlkXDim, BlkYp1, BlkXp1); + + + /* + extract the colours and the modulation information IF the previous values + have changed. + */ + if(memcmp(pPrevious, pBlocks, 4*sizeof(void*)) != 0) + { + StartY = 0; + for(i = 0; i < 2; i++) + { + StartX = 0; + for(j = 0; j < 2; j++) + { + Unpack5554Colour(pBlocks[i][j], Colours5554[i][j].Reps); + + UnpackModulations(pBlocks[i][j], + Do2bitMode, + ModulationVals, + ModulationModes, + StartX, StartY); + + StartX += XBlockSize; + } + + StartY += BLK_Y_SIZE; + } + + // make a copy of the new pointers + memcpy(pPrevious, pBlocks, 4*sizeof(void*)); + } + + // decompress the pixel. First compute the interpolated A and B signals + InterpolateColours(Colours5554[0][0].Reps[0], + Colours5554[0][1].Reps[0], + Colours5554[1][0].Reps[0], + Colours5554[1][1].Reps[0], + Do2bitMode, x, y, + ASig); + + InterpolateColours(Colours5554[0][0].Reps[1], + Colours5554[0][1].Reps[1], + Colours5554[1][0].Reps[1], + Colours5554[1][1].Reps[1], + Do2bitMode, x, y, + BSig); + + GetModulationValue(x,y, Do2bitMode, (const int (*)[16])ModulationVals, (const int (*)[16])ModulationModes, + &Mod, &DoPT); + + // compute the modulated colour + for(i = 0; i < 4; i++) + { + Result[i] = ASig[i] * 8 + Mod * (BSig[i] - ASig[i]); + Result[i] >>= 3; + } + + if(DoPT) + Result[3] = 0; + + // Store the result in the output image + uPosition = (x+y*XDim)<<2; + pResultImage[uPosition+0] = (U8)Result[0]; + pResultImage[uPosition+1] = (U8)Result[1]; + pResultImage[uPosition+2] = (U8)Result[2]; + pResultImage[uPosition+3] = (U8)Result[3]; + } + } +} + +/***************************************************************************** + End of file (pvr.cpp) + *****************************************************************************/ \ No newline at end of file diff --git a/cocos/base/pvr.h b/cocos/base/pvr.h new file mode 100644 index 0000000000..33c14a4e06 --- /dev/null +++ b/cocos/base/pvr.h @@ -0,0 +1,22 @@ +/****************************************************************************** + + @File PVRTDecompress.h + + @Title + + @Copyright Copyright (C) 2000 - 2008 by Imagination Technologies Limited. + + @Platform ANSI compatible + + @Description PVRTC Texture Decompression. + + ******************************************************************************/ + +#ifndef __PVR_H__ +#define __PVR_H__ + + +int PVRTDecompressPVRTC(const void * const pCompressedData,const int XDim,const int YDim,void *pDestData,const bool Do2bitMode); + + +#endif //__PVR_H__ diff --git a/cocos/cocos2d.cpp b/cocos/cocos2d.cpp index d96b55ce20..83c40ab695 100644 --- a/cocos/cocos2d.cpp +++ b/cocos/cocos2d.cpp @@ -29,9 +29,9 @@ THE SOFTWARE. NS_CC_BEGIN -const char* cocos2dVersion() +CC_DLL const char* cocos2dVersion() { - return "cocos2d-x 3.2"; + return "cocos2d-x 3.3"; } NS_CC_END diff --git a/cocos/cocos2d.h b/cocos/cocos2d.h index db8e89fa4c..2998a244b6 100644 --- a/cocos/cocos2d.h +++ b/cocos/cocos2d.h @@ -29,8 +29,8 @@ THE SOFTWARE. #define __COCOS2D_H__ // 0x00 HI ME LO -// 00 03 02 00 -#define COCOS2D_VERSION 0x00030200 +// 00 03 03 00 +#define COCOS2D_VERSION 0x00030300 // // all cocos2d include files @@ -61,6 +61,7 @@ THE SOFTWARE. #include "base/CCIMEDelegate.h" #include "base/CCIMEDispatcher.h" #include "base/ccUtils.h" +#include "base/CCCamera.h" // EventDispatcher #include "base/CCEventType.h" @@ -153,6 +154,10 @@ THE SOFTWARE. #include "renderer/ccShaders.h" #include "renderer/CCTexture2D.h" #include "renderer/CCTextureCache.h" +#include "renderer/CCVertexIndexBuffer.h" +#include "renderer/CCVertexIndexData.h" +#include "renderer/CCPrimitive.h" +#include "renderer/CCPrimitiveCommand.h" // physics #include "physics/CCPhysicsBody.h" @@ -173,49 +178,49 @@ THE SOFTWARE. #if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) #include "platform/ios/CCApplication.h" - #include "platform/ios/CCGLView.h" + #include "platform/ios/CCGLViewImpl.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 "platform/android/CCApplication.h" - #include "platform/android/CCGLView.h" + #include "platform/android/CCGLViewImpl.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 "platform/blackberry/CCApplication.h" - #include "platform/blackberry/CCGLView.h" + #include "platform/blackberry/CCGLViewImpl.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 "platform/win32/CCApplication.h" - #include "platform/desktop/CCGLView.h" + #include "platform/desktop/CCGLViewImpl.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 "platform/mac/CCApplication.h" - #include "platform/desktop/CCGLView.h" + #include "platform/desktop/CCGLViewImpl.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 "platform/linux/CCApplication.h" - #include "platform/desktop/CCGLView.h" + #include "platform/desktop/CCGLViewImpl.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 "platform/winrt/CCApplication.h" - #include "platform/winrt/CCGLView.h" + #include "platform/winrt/CCGLViewImpl.h" #include "platform/winrt/CCGL.h" #include "platform/winrt/CCStdC.h" #include "platform/winrt/CCPrecompiledShaders.h" @@ -223,7 +228,7 @@ THE SOFTWARE. #if (CC_TARGET_PLATFORM == CC_PLATFORM_WP8) #include "platform/winrt/CCApplication.h" - #include "platform/wp8/CCGLView.h" + #include "platform/wp8/CCGLViewImpl.h" #include "platform/winrt/CCGL.h" #include "platform/winrt/CCStdC.h" #include "platform/winrt/CCPrecompiledShaders.h" @@ -260,17 +265,6 @@ THE SOFTWARE. #include "2d/CCComponent.h" #include "2d/CCComponentContainer.h" -//3d -#include "3d/CCSprite3D.h" -#include "3d/CCMesh.h" -#include "3d/CCMeshSkin.h" -#include "3d/CCAnimate3D.h" -#include "3d/CCAnimation3D.h" -#include "3d/CCSprite3DMaterial.h" - -// Audio -#include "audio/include/SimpleAudioEngine.h" - // Deprecated include #include "deprecated/CCDictionary.h" #include "deprecated/CCArray.h" diff --git a/cocos/deprecated/CCString.h b/cocos/deprecated/CCString.h index 0bf66dcf8e..18d2002a56 100644 --- a/cocos/deprecated/CCString.h +++ b/cocos/deprecated/CCString.h @@ -215,7 +215,7 @@ std::string toString(T arg) return ss.str(); } -std::string format(const char* format, ...) CC_FORMAT_PRINTF(1, 2); +std::string CC_DLL format(const char* format, ...) CC_FORMAT_PRINTF(1, 2); } // namespace StringUtils { diff --git a/cocos/editor-support/cocosbuilder/Android.mk b/cocos/editor-support/cocosbuilder/Android.mk index 52863eda24..5bde8a025b 100644 --- a/cocos/editor-support/cocosbuilder/Android.mk +++ b/cocos/editor-support/cocosbuilder/Android.mk @@ -36,7 +36,7 @@ $(LOCAL_PATH) \ $(LOCAL_PATH)/../../.. -LOCAL_WHOLE_STATIC_LIBRARIES := cocos_extension_static +LOCAL_STATIC_LIBRARIES := cocos_extension_static include $(BUILD_STATIC_LIBRARY) diff --git a/cocos/editor-support/cocosbuilder/CMakeLists.txt b/cocos/editor-support/cocosbuilder/CMakeLists.txt index 6d41d29579..607c85be8e 100644 --- a/cocos/editor-support/cocosbuilder/CMakeLists.txt +++ b/cocos/editor-support/cocosbuilder/CMakeLists.txt @@ -23,17 +23,12 @@ set(CCB_SRC CCNode+CCBRelativePositioning.cpp ) -include_directories( - .. -) +include_directories( .. ) -add_library(cocosbuilder STATIC - ${CCB_SRC} -) +add_library(cocosbuilder STATIC ${CCB_SRC}) set_target_properties(cocosbuilder PROPERTIES ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib" LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib" ) - diff --git a/cocos/editor-support/cocosbuilder/proj.win32/libCocosBuilder.vcxproj b/cocos/editor-support/cocosbuilder/proj.win32/libcocosbuilder.vcxproj similarity index 95% rename from cocos/editor-support/cocosbuilder/proj.win32/libCocosBuilder.vcxproj rename to cocos/editor-support/cocosbuilder/proj.win32/libcocosbuilder.vcxproj index 1c4ac42ad3..c19e5572e8 100644 --- a/cocos/editor-support/cocosbuilder/proj.win32/libCocosBuilder.vcxproj +++ b/cocos/editor-support/cocosbuilder/proj.win32/libcocosbuilder.vcxproj @@ -12,7 +12,7 @@ {811C0DAB-7B96-4BD3-A154-B7572B58E4AB} - libCocosBuilder + libcocosbuilder @@ -145,6 +145,14 @@ + + + {21b2c324-891f-48ea-ad1a-5ae13de12e28} + + + {98a51ba8-fc3a-415b-ac8f-8c7bd464e93e} + + diff --git a/cocos/editor-support/cocostudio/ActionTimeline/CCActionTimeline.cpp b/cocos/editor-support/cocostudio/ActionTimeline/CCActionTimeline.cpp index 4c123c2f30..0eca4088a7 100644 --- a/cocos/editor-support/cocostudio/ActionTimeline/CCActionTimeline.cpp +++ b/cocos/editor-support/cocostudio/ActionTimeline/CCActionTimeline.cpp @@ -215,13 +215,17 @@ void ActionTimeline::startWithTarget(Node *target) [this, target](Node* child) { ActionTimelineData* data = dynamic_cast(child->getUserObject()); - int actionTag = data->getActionTag(); - if(_timelineMap.find(actionTag) != _timelineMap.end()) + + if(data) { - auto timelines = this->_timelineMap[actionTag]; - for (auto timeline : timelines) + int actionTag = data->getActionTag(); + if(_timelineMap.find(actionTag) != _timelineMap.end()) { - timeline->setNode(child); + auto timelines = this->_timelineMap[actionTag]; + for (auto timeline : timelines) + { + timeline->setNode(child); + } } } }); diff --git a/cocos/editor-support/cocostudio/ActionTimeline/CCActionTimeline.h b/cocos/editor-support/cocostudio/ActionTimeline/CCActionTimeline.h index 211f1d290a..ae8427002b 100644 --- a/cocos/editor-support/cocostudio/ActionTimeline/CCActionTimeline.h +++ b/cocos/editor-support/cocostudio/ActionTimeline/CCActionTimeline.h @@ -27,10 +27,11 @@ THE SOFTWARE. #include "CCTimeLine.h" #include "renderer/CCRenderer.h" +#include "cocostudio/CocosStudioExport.h" NS_TIMELINE_BEGIN -class ActionTimelineData : public cocos2d::Ref +class CC_STUDIO_DLL ActionTimelineData : public cocos2d::Ref { public: static ActionTimelineData* create(int actionTag); @@ -45,7 +46,7 @@ protected: }; -class ActionTimeline : public cocos2d::Action +class CC_STUDIO_DLL ActionTimeline : public cocos2d::Action { public: friend class Frame; diff --git a/cocos/editor-support/cocostudio/ActionTimeline/CCActionTimelineCache.h b/cocos/editor-support/cocostudio/ActionTimeline/CCActionTimelineCache.h index 3f9547e822..c2b2ec4fe0 100644 --- a/cocos/editor-support/cocostudio/ActionTimeline/CCActionTimelineCache.h +++ b/cocos/editor-support/cocostudio/ActionTimeline/CCActionTimelineCache.h @@ -28,6 +28,7 @@ THE SOFTWARE. #include "cocos2d.h" #include "cocostudio/DictionaryHelper.h" #include "CCTimelineMacro.h" +#include "cocostudio/CocosStudioExport.h" NS_TIMELINE_BEGIN @@ -35,7 +36,7 @@ class ActionTimeline; class Timeline; class Frame; -class ActionTimelineCache +class CC_STUDIO_DLL ActionTimelineCache { public: /** Gets the singleton */ diff --git a/cocos/editor-support/cocostudio/ActionTimeline/CCFrame.cpp b/cocos/editor-support/cocostudio/ActionTimeline/CCFrame.cpp index 5ccc31f8d9..917cadd851 100644 --- a/cocos/editor-support/cocostudio/ActionTimeline/CCFrame.cpp +++ b/cocos/editor-support/cocostudio/ActionTimeline/CCFrame.cpp @@ -175,7 +175,7 @@ void RotationFrame::onEnter(Frame *nextFrame) void RotationFrame::apply(float percent) { - if (_tween && percent != 0 && _betwennRotation != 0) + if (_tween && _betwennRotation != 0) { float rotation = _rotation + percent * _betwennRotation; _node->setRotation(rotation); @@ -227,7 +227,7 @@ void SkewFrame::onEnter(Frame *nextFrame) void SkewFrame::apply(float percent) { - if (_tween && percent != 0 && (_betweenSkewX != 0 || _betweenSkewY != 0)) + if (_tween && (_betweenSkewX != 0 || _betweenSkewY != 0)) { float skewx = _skewX + percent * _betweenSkewX; float skewy = _skewY + percent * _betweenSkewY; @@ -282,7 +282,7 @@ void RotationSkewFrame::onEnter(Frame *nextFrame) void RotationSkewFrame::apply(float percent) { - if (_tween && percent != 0 && (_betweenSkewX != 0 || _betweenSkewY != 0)) + if (_tween && (_betweenSkewX != 0 || _betweenSkewY != 0)) { float skewx = _skewX + percent * _betweenSkewX; float skewy = _skewY + percent * _betweenSkewY; @@ -335,7 +335,7 @@ void PositionFrame::onEnter(Frame *nextFrame) void PositionFrame::apply(float percent) { - if (_tween && percent != 0 && (_betweenX != 0 || _betweenY != 0)) + if (_tween && (_betweenX != 0 || _betweenY != 0)) { Point p; p.x = _position.x + _betweenX * percent; @@ -389,7 +389,7 @@ void ScaleFrame::onEnter(Frame *nextFrame) void ScaleFrame::apply(float percent) { - if (_tween && percent != 0 && (_betweenScaleX != 0 || _betweenScaleY != 0)) + if (_tween && (_betweenScaleX != 0 || _betweenScaleY != 0)) { float scaleX = _scaleX + _betweenScaleX * percent; float scaleY = _scaleY + _betweenScaleY * percent; @@ -516,14 +516,11 @@ void ColorFrame::onEnter(Frame *nextFrame) _betweenGreen = color.g - _color.g; _betweenBlue = color.b - _color.b; } - - _node->setCascadeColorEnabled(true); - _node->setCascadeOpacityEnabled(true); } void ColorFrame::apply(float percent) { - if (_tween && percent != 0 && (_betweenAlpha !=0 || _betweenRed != 0 || _betweenGreen != 0 || _betweenBlue != 0)) + if (_tween && (_betweenAlpha !=0 || _betweenRed != 0 || _betweenGreen != 0 || _betweenBlue != 0)) { GLubyte alpha = _alpha + _betweenAlpha * percent; diff --git a/cocos/editor-support/cocostudio/ActionTimeline/CCFrame.h b/cocos/editor-support/cocostudio/ActionTimeline/CCFrame.h index c049eebd66..c0e28ec1a7 100644 --- a/cocos/editor-support/cocostudio/ActionTimeline/CCFrame.h +++ b/cocos/editor-support/cocostudio/ActionTimeline/CCFrame.h @@ -27,12 +27,13 @@ THE SOFTWARE. #include "cocos2d.h" #include "CCTimelineMacro.h" +#include "cocostudio/CocosStudioExport.h" NS_TIMELINE_BEGIN class Timeline; -class Frame : public cocos2d::Ref +class CC_STUDIO_DLL Frame : public cocos2d::Ref { public: @@ -68,7 +69,7 @@ protected: }; -class VisibleFrame : public Frame +class CC_STUDIO_DLL VisibleFrame : public Frame { public: static VisibleFrame* create(); @@ -86,7 +87,7 @@ protected: }; -class TextureFrame : public Frame +class CC_STUDIO_DLL TextureFrame : public Frame { public: static TextureFrame* create(); @@ -106,7 +107,7 @@ protected: std::string _textureName; }; -class RotationFrame : public Frame +class CC_STUDIO_DLL RotationFrame : public Frame { public: static RotationFrame* create(); @@ -125,7 +126,7 @@ protected: float _betwennRotation; }; -class SkewFrame : public Frame +class CC_STUDIO_DLL SkewFrame : public Frame { public: static SkewFrame* create(); @@ -150,7 +151,7 @@ protected: }; -class RotationSkewFrame : public SkewFrame +class CC_STUDIO_DLL RotationSkewFrame : public SkewFrame { public: static RotationSkewFrame* create(); @@ -163,7 +164,7 @@ public: }; -class PositionFrame : public Frame +class CC_STUDIO_DLL PositionFrame : public Frame { public: static PositionFrame* create(); @@ -189,7 +190,7 @@ protected: }; -class ScaleFrame : public Frame +class CC_STUDIO_DLL ScaleFrame : public Frame { public: static ScaleFrame* create(); @@ -216,7 +217,7 @@ protected: }; -class AnchorPointFrame : public Frame +class CC_STUDIO_DLL AnchorPointFrame : public Frame { public: static AnchorPointFrame* create(); @@ -242,7 +243,7 @@ enum InnerActionType SingleFrame }; -class InnerActionFrame : public Frame +class CC_STUDIO_DLL InnerActionFrame : public Frame { public: static InnerActionFrame* create(); @@ -263,7 +264,7 @@ protected: }; -class ColorFrame : public Frame +class CC_STUDIO_DLL ColorFrame : public Frame { public: static ColorFrame* create(); @@ -290,7 +291,7 @@ protected: }; -class EventFrame : public Frame +class CC_STUDIO_DLL EventFrame : public Frame { public: static EventFrame* create(); @@ -307,7 +308,7 @@ protected: std::string _event; }; -class ZOrderFrame : public Frame +class CC_STUDIO_DLL ZOrderFrame : public Frame { public: static ZOrderFrame* create(); diff --git a/cocos/editor-support/cocostudio/ActionTimeline/CCNodeReader.cpp b/cocos/editor-support/cocostudio/ActionTimeline/CCNodeReader.cpp index 6d180fc4e2..e7d51d9529 100644 --- a/cocos/editor-support/cocostudio/ActionTimeline/CCNodeReader.cpp +++ b/cocos/editor-support/cocostudio/ActionTimeline/CCNodeReader.cpp @@ -236,8 +236,20 @@ Node* NodeReader::loadNode(const rapidjson::Value& json) { const rapidjson::Value &dic = DICTOOL->getSubDictionary_json(json, CHILDREN, i); Node* child = loadNode(dic); - if (child) + if (child) { + auto widgetChild = dynamic_cast(child); + if (widgetChild + && dynamic_cast(node) + && !dynamic_cast(node)) + { + if (widgetChild->getPositionType() == ui::Widget::PositionType::PERCENT) + { + widgetChild->setPositionPercent(Vec2(widgetChild->getPositionPercent().x + node->getAnchorPoint().x, widgetChild->getPositionPercent().y + node->getAnchorPoint().y)); + } + widgetChild->setPosition(Vec2(widgetChild->getPositionX() + node->getAnchorPointInPoints().x, widgetChild->getPositionY() + node->getAnchorPointInPoints().y)); + } + node->addChild(child); child->release(); } @@ -450,8 +462,10 @@ Node* NodeReader::loadWidget(const rapidjson::Value& json) CC_SAFE_DELETE(guiReader); int actionTag = DICTOOL->getIntValue_json(json, ACTION_TAG); - widget->setUserObject(ActionTimelineData::create(actionTag)); - + widget->setUserObject(ActionTimelineData::create(actionTag)); + + initNode(widget, json); + return widget; } diff --git a/cocos/editor-support/cocostudio/ActionTimeline/CCNodeReader.h b/cocos/editor-support/cocostudio/ActionTimeline/CCNodeReader.h index 669a3123ed..c45b99638c 100644 --- a/cocos/editor-support/cocostudio/ActionTimeline/CCNodeReader.h +++ b/cocos/editor-support/cocostudio/ActionTimeline/CCNodeReader.h @@ -26,6 +26,7 @@ THE SOFTWARE. #define __CC_NODE_CACHE_H__ #include "cocostudio/DictionaryHelper.h" +#include "cocostudio/CocosStudioExport.h" #include "cocos2d.h" namespace cocostudio { @@ -33,7 +34,7 @@ namespace cocostudio { namespace timeline{ -class NodeReader +class CC_STUDIO_DLL NodeReader { public: static NodeReader* getInstance(); diff --git a/cocos/editor-support/cocostudio/ActionTimeline/CCTimeLine.h b/cocos/editor-support/cocostudio/ActionTimeline/CCTimeLine.h index d81f44488f..8228baed89 100644 --- a/cocos/editor-support/cocostudio/ActionTimeline/CCTimeLine.h +++ b/cocos/editor-support/cocostudio/ActionTimeline/CCTimeLine.h @@ -27,12 +27,13 @@ THE SOFTWARE. #include "CCFrame.h" #include "CCTimelineMacro.h" +#include "cocostudio/CocosStudioExport.h" NS_TIMELINE_BEGIN class ActionTimeline; -class Timeline : public cocos2d::Ref +class CC_STUDIO_DLL Timeline : public cocos2d::Ref { public: static Timeline* create(); diff --git a/cocos/editor-support/cocostudio/Android.mk b/cocos/editor-support/cocostudio/Android.mk index 69ea743984..c6356d29c4 100644 --- a/cocos/editor-support/cocostudio/Android.mk +++ b/cocos/editor-support/cocostudio/Android.mk @@ -72,13 +72,10 @@ $(LOCAL_PATH)/WidgetReader LOCAL_CFLAGS += -fexceptions -LOCAL_WHOLE_STATIC_LIBRARIES := cocos2dx_static -LOCAL_WHOLE_STATIC_LIBRARIES += cocosdenshion_static -LOCAL_WHOLE_STATIC_LIBRARIES += cocos_ui_static +LOCAL_STATIC_LIBRARIES := cocos_ui_static +LOCAL_STATIC_LIBRARIES += cocosdenshion_static include $(BUILD_STATIC_LIBRARY) -$(call import-module,.) -$(call import-module,audio/android) $(call import-module,ui) - +$(call import-module,audio/android) diff --git a/cocos/editor-support/cocostudio/CCActionFrame.h b/cocos/editor-support/cocostudio/CCActionFrame.h index 367aeb59ba..a6f71c6172 100644 --- a/cocos/editor-support/cocostudio/CCActionFrame.h +++ b/cocos/editor-support/cocostudio/CCActionFrame.h @@ -27,6 +27,7 @@ THE SOFTWARE. #include "math/CCGeometry.h" #include "2d/CCActionInterval.h" +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { @@ -92,7 +93,7 @@ enum class FrameEaseType * @js NA * @lua NA */ -class ActionFrame: public cocos2d::Ref +class CC_STUDIO_DLL ActionFrame: public cocos2d::Ref { public: @@ -210,7 +211,7 @@ protected: * @js NA * @lua NA */ -class ActionMoveFrame:public ActionFrame +class CC_STUDIO_DLL ActionMoveFrame:public ActionFrame { public: @@ -254,7 +255,7 @@ protected: * @js NA * @lua NA */ -class ActionScaleFrame:public ActionFrame +class CC_STUDIO_DLL ActionScaleFrame:public ActionFrame { public: @@ -312,7 +313,7 @@ protected: * @js NA * @lua NA */ -class ActionRotationFrame:public ActionFrame +class CC_STUDIO_DLL ActionRotationFrame:public ActionFrame { public: @@ -365,7 +366,7 @@ public: * @js NA * @lua NA */ -class ActionFadeFrame:public ActionFrame +class CC_STUDIO_DLL ActionFadeFrame:public ActionFrame { public: @@ -408,7 +409,7 @@ protected: * @js NA * @lua NA */ -class ActionTintFrame:public ActionFrame +class CC_STUDIO_DLL ActionTintFrame:public ActionFrame { public: diff --git a/cocos/editor-support/cocostudio/CCActionFrameEasing.h b/cocos/editor-support/cocostudio/CCActionFrameEasing.h index 122f2dd219..ea67bf0500 100644 --- a/cocos/editor-support/cocostudio/CCActionFrameEasing.h +++ b/cocos/editor-support/cocostudio/CCActionFrameEasing.h @@ -26,6 +26,7 @@ THE SOFTWARE. #define __ActionFrameEasing_H__ #include "base/CCRef.h" +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { @@ -56,7 +57,7 @@ enum FrameEasingType * @js NA * @lua NA */ -class ActionFrameEasing:public cocos2d::Ref +class CC_STUDIO_DLL ActionFrameEasing:public cocos2d::Ref { protected: FrameEasingType _type; diff --git a/cocos/editor-support/cocostudio/CCActionManagerEx.h b/cocos/editor-support/cocostudio/CCActionManagerEx.h index ebea434825..5b4622c6cd 100644 --- a/cocos/editor-support/cocostudio/CCActionManagerEx.h +++ b/cocos/editor-support/cocostudio/CCActionManagerEx.h @@ -27,13 +27,14 @@ THE SOFTWARE. #include "cocostudio/CCActionObject.h" #include "cocostudio/DictionaryHelper.h" +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { class CocoLoader; struct stExpCocoNode; -class ActionManagerEx:public cocos2d::Ref +class CC_STUDIO_DLL ActionManagerEx:public cocos2d::Ref { public: diff --git a/cocos/editor-support/cocostudio/CCActionNode.h b/cocos/editor-support/cocostudio/CCActionNode.h index 5b6da79620..f862bed64e 100644 --- a/cocos/editor-support/cocostudio/CCActionNode.h +++ b/cocos/editor-support/cocostudio/CCActionNode.h @@ -27,6 +27,7 @@ THE SOFTWARE. #include "cocostudio/CCActionFrame.h" #include "cocostudio/DictionaryHelper.h" +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { @@ -36,7 +37,7 @@ struct stExpCocoNode; * @js NA * @lua NA */ -class ActionNode : public cocos2d::Ref +class CC_STUDIO_DLL ActionNode : public cocos2d::Ref { public: diff --git a/cocos/editor-support/cocostudio/CCActionObject.h b/cocos/editor-support/cocostudio/CCActionObject.h index 401a18431d..045c5a403d 100644 --- a/cocos/editor-support/cocostudio/CCActionObject.h +++ b/cocos/editor-support/cocostudio/CCActionObject.h @@ -28,6 +28,7 @@ THE SOFTWARE. #include "cocostudio/CCActionNode.h" #include "2d/CCActionInstant.h" #include "cocostudio/DictionaryHelper.h" +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { @@ -38,7 +39,7 @@ struct stExpCocoNode; * @js NA * @lua NA */ -class ActionObject : public cocos2d::Ref +class CC_STUDIO_DLL ActionObject : public cocos2d::Ref { public: diff --git a/cocos/editor-support/cocostudio/CCArmature.cpp b/cocos/editor-support/cocostudio/CCArmature.cpp index d385cc1f4c..c9081721ea 100644 --- a/cocos/editor-support/cocostudio/CCArmature.cpp +++ b/cocos/editor-support/cocostudio/CCArmature.cpp @@ -122,7 +122,7 @@ bool Armature::init(const std::string& name) _boneDic.clear(); _topBoneList.clear(); - _blendFunc = BlendFunc::ALPHA_NON_PREMULTIPLIED; + _blendFunc = BlendFunc::ALPHA_PREMULTIPLIED; _name = name; @@ -404,13 +404,20 @@ void Armature::draw(cocos2d::Renderer *renderer, const Mat4 &transform, uint32_t BlendFunc func = bone->getBlendFunc(); - if (func.src != _blendFunc.src || func.dst != _blendFunc.dst) + if (func.src != BlendFunc::ALPHA_PREMULTIPLIED.src || func.dst != BlendFunc::ALPHA_PREMULTIPLIED.dst) { skin->setBlendFunc(bone->getBlendFunc()); } else { - skin->setBlendFunc(_blendFunc); + if (_blendFunc == BlendFunc::ALPHA_PREMULTIPLIED && !skin->getTexture()->hasPremultipliedAlpha()) + { + skin->setBlendFunc(_blendFunc.ALPHA_NON_PREMULTIPLIED); + } + else + { + skin->setBlendFunc(_blendFunc); + } } skin->draw(renderer, transform, flags); } @@ -460,7 +467,7 @@ void Armature::onExit() void Armature::visit(cocos2d::Renderer *renderer, const Mat4 &parentTransform, uint32_t parentFlags) { // quick return if not visible. children won't be drawn. - if (!_visible) + if (!_visible || !isVisitableByVisitingCamera()) { return; } diff --git a/cocos/editor-support/cocostudio/CCArmature.h b/cocos/editor-support/cocostudio/CCArmature.h index 09cd53da8e..3ce0a58ac7 100644 --- a/cocos/editor-support/cocostudio/CCArmature.h +++ b/cocos/editor-support/cocostudio/CCArmature.h @@ -31,6 +31,7 @@ THE SOFTWARE. #include "cocostudio/CCArmatureAnimation.h" #include "cocostudio/CCSpriteFrameCacheHelper.h" #include "cocostudio/CCArmatureDataManager.h" +#include "cocostudio/CocosStudioExport.h" #include "math/CCMath.h" class b2Body; @@ -67,7 +68,7 @@ CC_DEPRECATED_ATTRIBUTE typedef Armature CCArmature; CC_DEPRECATED_ATTRIBUTE typedef ArmatureDataManager CCArmatureDataManager; CC_DEPRECATED_ATTRIBUTE typedef cocos2d::tweenfunc::TweenType CCTweenType; -class Armature : public cocos2d::Node, public cocos2d::BlendProtocol +class CC_STUDIO_DLL Armature : public cocos2d::Node, public cocos2d::BlendProtocol { public: diff --git a/cocos/editor-support/cocostudio/CCArmatureAnimation.cpp b/cocos/editor-support/cocostudio/CCArmatureAnimation.cpp index febd77e6f2..cf578879ae 100644 --- a/cocos/editor-support/cocostudio/CCArmatureAnimation.cpp +++ b/cocos/editor-support/cocostudio/CCArmatureAnimation.cpp @@ -153,7 +153,7 @@ void ArmatureAnimation::setSpeedScale(float speedScale) bone->getTween()->setProcessScale(_processScale); if (bone->getChildArmature()) { - bone->getChildArmature()->getAnimation()->setProcessScale(_processScale); + bone->getChildArmature()->getAnimation()->setSpeedScale(_processScale); } } } @@ -228,7 +228,7 @@ void ArmatureAnimation::play(const std::string& animationName, int durationTo, if (bone->getChildArmature()) { - bone->getChildArmature()->getAnimation()->setProcessScale(_processScale); + bone->getChildArmature()->getAnimation()->setSpeedScale(_processScale); } } else diff --git a/cocos/editor-support/cocostudio/CCArmatureAnimation.h b/cocos/editor-support/cocostudio/CCArmatureAnimation.h index 6514694419..04ab3af4f1 100644 --- a/cocos/editor-support/cocostudio/CCArmatureAnimation.h +++ b/cocos/editor-support/cocostudio/CCArmatureAnimation.h @@ -28,6 +28,7 @@ THE SOFTWARE. #include "cocostudio/CCProcessBase.h" #include "cocostudio/CCTween.h" +#include "cocostudio/CocosStudioExport.h" #include namespace cocostudio { @@ -65,7 +66,7 @@ struct MovementEvent std::string movementID; }; -class ArmatureAnimation : public ProcessBase +class CC_STUDIO_DLL ArmatureAnimation : public ProcessBase { public: /** diff --git a/cocos/editor-support/cocostudio/CCArmatureDataManager.h b/cocos/editor-support/cocostudio/CCArmatureDataManager.h index 0375890180..a42072528f 100644 --- a/cocos/editor-support/cocostudio/CCArmatureDataManager.h +++ b/cocos/editor-support/cocostudio/CCArmatureDataManager.h @@ -27,7 +27,7 @@ THE SOFTWARE. #include "cocostudio/CCArmatureDefine.h" #include "cocostudio/CCDatas.h" - +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { @@ -42,7 +42,7 @@ struct RelativeData /** * @brief format and manage armature configuration and armature animation */ -class ArmatureDataManager : public cocos2d::Ref +class CC_STUDIO_DLL ArmatureDataManager : public cocos2d::Ref { public: /** @deprecated Use getInstance() instead */ diff --git a/cocos/editor-support/cocostudio/CCBatchNode.cpp b/cocos/editor-support/cocostudio/CCBatchNode.cpp index f11e38affc..eb0ba5cf70 100644 --- a/cocos/editor-support/cocostudio/CCBatchNode.cpp +++ b/cocos/editor-support/cocostudio/CCBatchNode.cpp @@ -108,7 +108,7 @@ void BatchNode::removeChild(Node* child, bool cleanup) void BatchNode::visit(Renderer *renderer, const Mat4 &parentTransform, uint32_t parentFlags) { // quick return if not visible. children won't be drawn. - if (!_visible) + if (!_visible || !isVisitableByVisitingCamera()) { return; } diff --git a/cocos/editor-support/cocostudio/CCBatchNode.h b/cocos/editor-support/cocostudio/CCBatchNode.h index 031a939f00..bb52eba815 100644 --- a/cocos/editor-support/cocostudio/CCBatchNode.h +++ b/cocos/editor-support/cocostudio/CCBatchNode.h @@ -27,6 +27,7 @@ THE SOFTWARE. #include "2d/CCNode.h" #include "cocostudio/CCArmatureDefine.h" +#include "cocostudio/CocosStudioExport.h" namespace cocos2d { class GroupCommand; @@ -34,7 +35,7 @@ namespace cocos2d { namespace cocostudio { -class BatchNode : public cocos2d::Node +class CC_STUDIO_DLL BatchNode : public cocos2d::Node { public: static BatchNode *create(); diff --git a/cocos/editor-support/cocostudio/CCBone.cpp b/cocos/editor-support/cocostudio/CCBone.cpp index 7a446d1521..44ff408343 100644 --- a/cocos/editor-support/cocostudio/CCBone.cpp +++ b/cocos/editor-support/cocostudio/CCBone.cpp @@ -74,7 +74,7 @@ Bone::Bone() // _worldTransform = AffineTransformMake(1, 0, 0, 1, 0, 0); _worldTransform = Mat4::IDENTITY; _boneTransformDirty = true; - _blendFunc = BlendFunc::ALPHA_NON_PREMULTIPLIED; + _blendFunc = BlendFunc::ALPHA_PREMULTIPLIED; _blendDirty = false; _worldInfo = nullptr; @@ -201,8 +201,8 @@ void Bone::update(float delta) _worldInfo->y = _tweenData->y + _position.y; _worldInfo->scaleX = _tweenData->scaleX * _scaleX; _worldInfo->scaleY = _tweenData->scaleY * _scaleY; - _worldInfo->skewX = _tweenData->skewX + _skewX + _rotationZ_X; - _worldInfo->skewY = _tweenData->skewY + _skewY - _rotationZ_Y; + _worldInfo->skewX = _tweenData->skewX + _skewX + CC_DEGREES_TO_RADIANS(_rotationZ_X); + _worldInfo->skewY = _tweenData->skewY + _skewY - CC_DEGREES_TO_RADIANS(_rotationZ_Y); if(_parentBone) { diff --git a/cocos/editor-support/cocostudio/CCBone.h b/cocos/editor-support/cocostudio/CCBone.h index bda4366fce..ec7661b380 100644 --- a/cocos/editor-support/cocostudio/CCBone.h +++ b/cocos/editor-support/cocostudio/CCBone.h @@ -30,6 +30,7 @@ THE SOFTWARE. #include "cocostudio/CCTween.h" #include "cocostudio/CCDecorativeDisplay.h" #include "cocostudio/CCDisplayManager.h" +#include "cocostudio/CocosStudioExport.h" #include "2d/CCNode.h" #include "math/CCMath.h" @@ -37,7 +38,7 @@ namespace cocostudio { class Armature; -class Bone : public cocos2d::Node +class CC_STUDIO_DLL Bone : public cocos2d::Node { public: /** diff --git a/cocos/editor-support/cocostudio/CCColliderDetector.h b/cocos/editor-support/cocostudio/CCColliderDetector.h index 91ed2dc26a..3ddc289a6e 100644 --- a/cocos/editor-support/cocostudio/CCColliderDetector.h +++ b/cocos/editor-support/cocostudio/CCColliderDetector.h @@ -27,6 +27,7 @@ THE SOFTWARE. #include "cocostudio/CCArmatureDefine.h" #include "cocostudio/CCDatas.h" +#include "cocostudio/CocosStudioExport.h" #ifndef PT_RATIO #define PT_RATIO 32 @@ -48,7 +49,7 @@ class Bone; * @js NA * @lua NA */ -class ColliderFilter +class CC_STUDIO_DLL ColliderFilter { public: virtual ~ColliderFilter() { } @@ -85,7 +86,7 @@ protected: #endif }; -class ColliderBody : public cocos2d::Ref +class CC_STUDIO_DLL ColliderBody : public cocos2d::Ref { public: ColliderBody(ContourData *contourData); @@ -130,7 +131,7 @@ private: * @js NA * @lua NA */ -class ColliderDetector : public cocos2d::Ref +class CC_STUDIO_DLL ColliderDetector : public cocos2d::Ref { public: static ColliderDetector *create(); diff --git a/cocos/editor-support/cocostudio/CCComAttribute.h b/cocos/editor-support/cocostudio/CCComAttribute.h index 5feecf2595..b97a000f73 100644 --- a/cocos/editor-support/cocostudio/CCComAttribute.h +++ b/cocos/editor-support/cocostudio/CCComAttribute.h @@ -28,13 +28,14 @@ THE SOFTWARE. #include "CCComBase.h" #include "2d/CCComponent.h" #include "base/CCValue.h" +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { -class ComAttribute : public cocos2d::Component +class CC_STUDIO_DLL ComAttribute : public cocos2d::Component { DECLARE_CLASS_COMPONENT_INFO -protected: +public: /** * @js ctor */ diff --git a/cocos/editor-support/cocostudio/CCComAudio.h b/cocos/editor-support/cocostudio/CCComAudio.h index 1643082307..d91dbe7bee 100644 --- a/cocos/editor-support/cocostudio/CCComAudio.h +++ b/cocos/editor-support/cocostudio/CCComAudio.h @@ -27,14 +27,16 @@ THE SOFTWARE. #include "CCComBase.h" #include "2d/CCComponent.h" +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { -class ComAudio : public cocos2d::Component +class CC_STUDIO_DLL ComAudio : public cocos2d::Component { DECLARE_CLASS_COMPONENT_INFO -protected: + +public: /** * @js ctor */ diff --git a/cocos/editor-support/cocostudio/CCComBase.h b/cocos/editor-support/cocostudio/CCComBase.h index 6d526b60ce..21750ab22b 100644 --- a/cocos/editor-support/cocostudio/CCComBase.h +++ b/cocos/editor-support/cocostudio/CCComBase.h @@ -27,6 +27,7 @@ THE SOFTWARE. #include #include "DictionaryHelper.h" +#include "cocostudio/CocosStudioExport.h" #include "base/ObjectFactory.h" #include "CocoLoader.h" @@ -46,7 +47,7 @@ THE SOFTWARE. #define CREATE_CLASS_COMPONENT_INFO(className) \ cocos2d::ObjectFactory::TInfo(#className, &className::createInstance) -struct SerData +struct CC_STUDIO_DLL SerData { const rapidjson::Value *_rData; cocostudio::stExpCocoNode *_cocoNode; diff --git a/cocos/editor-support/cocostudio/CCComController.h b/cocos/editor-support/cocostudio/CCComController.h index 4428d93f89..8a3ad4f32a 100644 --- a/cocos/editor-support/cocostudio/CCComController.h +++ b/cocos/editor-support/cocostudio/CCComController.h @@ -27,11 +27,12 @@ THE SOFTWARE. #include "CCComBase.h" #include "cocostudio/CCInputDelegate.h" +#include "cocostudio/CocosStudioExport.h" #include "2d/CCComponent.h" namespace cocostudio { -class ComController : public cocos2d::Component, public InputDelegate +class CC_STUDIO_DLL ComController : public cocos2d::Component, public InputDelegate { DECLARE_CLASS_COMPONENT_INFO diff --git a/cocos/editor-support/cocostudio/CCComRender.h b/cocos/editor-support/cocostudio/CCComRender.h index 9598ec57ab..0ff90d979c 100644 --- a/cocos/editor-support/cocostudio/CCComRender.h +++ b/cocos/editor-support/cocostudio/CCComRender.h @@ -27,10 +27,11 @@ THE SOFTWARE. #include "CCComBase.h" #include "2d/CCComponent.h" +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { -class ComRender : public cocos2d::Component +class CC_STUDIO_DLL ComRender : public cocos2d::Component { DECLARE_CLASS_COMPONENT_INFO protected: diff --git a/cocos/editor-support/cocostudio/CCDataReaderHelper.cpp b/cocos/editor-support/cocostudio/CCDataReaderHelper.cpp index 22b076371c..729fdc95da 100644 --- a/cocos/editor-support/cocostudio/CCDataReaderHelper.cpp +++ b/cocos/editor-support/cocostudio/CCDataReaderHelper.cpp @@ -1050,7 +1050,7 @@ FrameData *DataReaderHelper::decodeFrame(tinyxml2::XMLElement *frameXML, tinyxm { case BLEND_NORMAL: { - frameData->blendFunc = BlendFunc::ALPHA_NON_PREMULTIPLIED; + frameData->blendFunc = BlendFunc::ALPHA_PREMULTIPLIED; } break; case BLEND_ADD: @@ -1614,8 +1614,8 @@ FrameData *DataReaderHelper::decodeFrame(const rapidjson::Value& json, DataInfo frameData->tweenEasing = (TweenType)(DICTOOL->getIntValue_json(json, A_TWEEN_EASING, cocos2d::tweenfunc::Linear)); frameData->displayIndex = DICTOOL->getIntValue_json(json, A_DISPLAY_INDEX); - frameData->blendFunc.src = (GLenum)(DICTOOL->getIntValue_json(json, A_BLEND_SRC, BlendFunc::ALPHA_NON_PREMULTIPLIED.src)); - frameData->blendFunc.dst = (GLenum)(DICTOOL->getIntValue_json(json, A_BLEND_DST, BlendFunc::ALPHA_NON_PREMULTIPLIED.dst)); + frameData->blendFunc.src = (GLenum)(DICTOOL->getIntValue_json(json, A_BLEND_SRC, BlendFunc::ALPHA_PREMULTIPLIED.src)); + frameData->blendFunc.dst = (GLenum)(DICTOOL->getIntValue_json(json, A_BLEND_DST, BlendFunc::ALPHA_PREMULTIPLIED.dst)); frameData->isTween = DICTOOL->getBooleanValue_json(json, A_TWEEN_FRAME, true); const char *event = DICTOOL->getStringValue_json(json, A_EVENT); diff --git a/cocos/editor-support/cocostudio/CCDataReaderHelper.h b/cocos/editor-support/cocostudio/CCDataReaderHelper.h index 2401d710d0..4e8b941f5a 100644 --- a/cocos/editor-support/cocostudio/CCDataReaderHelper.h +++ b/cocos/editor-support/cocostudio/CCDataReaderHelper.h @@ -29,6 +29,7 @@ THE SOFTWARE. #include "cocostudio/CCDatas.h" #include "cocostudio/CCArmature.h" #include "cocostudio/DictionaryHelper.h" +#include "cocostudio/CocosStudioExport.h" #include "json/document.h" #include "DictionaryHelper.h" @@ -52,7 +53,7 @@ namespace cocostudio { * @js NA * @lua NA */ -class DataReaderHelper : cocos2d::Ref +class CC_STUDIO_DLL DataReaderHelper : cocos2d::Ref { protected: diff --git a/cocos/editor-support/cocostudio/CCDatas.cpp b/cocos/editor-support/cocostudio/CCDatas.cpp index 94a35ca249..33fda0a4d3 100644 --- a/cocos/editor-support/cocostudio/CCDatas.cpp +++ b/cocos/editor-support/cocostudio/CCDatas.cpp @@ -254,7 +254,7 @@ FrameData::FrameData(void) , easingParams(nullptr) , isTween(true) , displayIndex(0) - , blendFunc(BlendFunc::ALPHA_NON_PREMULTIPLIED) + , blendFunc(BlendFunc::ALPHA_PREMULTIPLIED) , strEvent("") , strMovement("") diff --git a/cocos/editor-support/cocostudio/CCDatas.h b/cocos/editor-support/cocostudio/CCDatas.h index 84eb57679d..2eac5f9511 100644 --- a/cocos/editor-support/cocostudio/CCDatas.h +++ b/cocos/editor-support/cocostudio/CCDatas.h @@ -33,6 +33,7 @@ THE SOFTWARE. #include "cocostudio/CCArmatureDefine.h" #include "2d/CCTweenFunction.h" +#include "cocostudio/CocosStudioExport.h" #define CC_CREATE_NO_PARAM_NO_INIT(varType)\ @@ -68,7 +69,7 @@ namespace cocostudio { * @js NA * @lua NA */ -class BaseData : public cocos2d::Ref +class CC_STUDIO_DLL BaseData : public cocos2d::Ref { public: CC_CREATE_NO_PARAM_NO_INIT(BaseData) @@ -137,7 +138,7 @@ enum DisplayType * @js NA * @lua NA */ -class DisplayData : public cocos2d::Ref +class CC_STUDIO_DLL DisplayData : public cocos2d::Ref { public: CC_CREATE_NO_PARAM_NO_INIT(DisplayData) @@ -165,7 +166,7 @@ public: * @js NA * @lua NA */ -class SpriteDisplayData : public DisplayData +class CC_STUDIO_DLL SpriteDisplayData : public DisplayData { public: CC_CREATE_NO_PARAM_NO_INIT(SpriteDisplayData) @@ -189,7 +190,7 @@ public: * @js NA * @lua NA */ -class ArmatureDisplayData : public DisplayData +class CC_STUDIO_DLL ArmatureDisplayData : public DisplayData { public: CC_CREATE_NO_PARAM_NO_INIT(ArmatureDisplayData) @@ -209,7 +210,7 @@ public: * @js NA * @lua NA */ -class ParticleDisplayData : public DisplayData +class CC_STUDIO_DLL ParticleDisplayData : public DisplayData { public: CC_CREATE_NO_PARAM_NO_INIT(ParticleDisplayData) @@ -234,7 +235,7 @@ public: * @js NA * @lua NA */ -class BoneData : public BaseData +class CC_STUDIO_DLL BoneData : public BaseData { public: CC_CREATE_NO_PARAM(BoneData) @@ -268,7 +269,7 @@ public: * @js NA * @lua NA */ -class ArmatureData : public cocos2d::Ref +class CC_STUDIO_DLL ArmatureData : public cocos2d::Ref { public: CC_CREATE_NO_PARAM(ArmatureData) @@ -314,7 +315,7 @@ enum BlendType * @js NA * @lua NA */ -class FrameData : public BaseData +class CC_STUDIO_DLL FrameData : public BaseData { public: CC_CREATE_NO_PARAM_NO_INIT(FrameData) @@ -361,7 +362,7 @@ public: * @js NA * @lua NA */ -class MovementBoneData : public cocos2d::Ref +class CC_STUDIO_DLL MovementBoneData : public cocos2d::Ref { public: CC_CREATE_NO_PARAM(MovementBoneData) @@ -393,7 +394,7 @@ public: * @js NA * @lua NA */ -class MovementData : public cocos2d::Ref +class CC_STUDIO_DLL MovementData : public cocos2d::Ref { public: CC_CREATE_NO_PARAM_NO_INIT(MovementData) @@ -455,7 +456,7 @@ public: * @js NA * @lua NA */ -class AnimationData : public cocos2d::Ref +class CC_STUDIO_DLL AnimationData : public cocos2d::Ref { public: CC_CREATE_NO_PARAM_NO_INIT(AnimationData) @@ -486,7 +487,7 @@ public: * @js NA * @lua NA */ -class ContourData : public cocos2d::Ref +class CC_STUDIO_DLL ContourData : public cocos2d::Ref { public: CC_CREATE_NO_PARAM(ContourData) @@ -515,7 +516,7 @@ public: * @js NA * @lua NA */ -class TextureData : public cocos2d::Ref +class CC_STUDIO_DLL TextureData : public cocos2d::Ref { public: CC_CREATE_NO_PARAM(TextureData) diff --git a/cocos/editor-support/cocostudio/CCDecorativeDisplay.h b/cocos/editor-support/cocostudio/CCDecorativeDisplay.h index 1902565550..9a880b385f 100644 --- a/cocos/editor-support/cocostudio/CCDecorativeDisplay.h +++ b/cocos/editor-support/cocostudio/CCDecorativeDisplay.h @@ -28,6 +28,7 @@ THE SOFTWARE. #include "cocostudio/CCArmatureDefine.h" #include "cocostudio/CCDisplayFactory.h" #include "cocostudio/CCDatas.h" +#include "cocostudio/CocosStudioExport.h" #if ENABLE_PHYSICS_BOX2D_DETECT || ENABLE_PHYSICS_CHIPMUNK_DETECT || ENABLE_PHYSICS_SAVE_CALCULATED_VERTEX @@ -43,7 +44,7 @@ namespace cocostudio { * @js NA * @lua NA */ -class DecorativeDisplay: public cocos2d::Ref +class CC_STUDIO_DLL DecorativeDisplay: public cocos2d::Ref { public: static DecorativeDisplay *create(); diff --git a/cocos/editor-support/cocostudio/CCDisplayFactory.h b/cocos/editor-support/cocostudio/CCDisplayFactory.h index 3c94dc8d3b..037395bc31 100644 --- a/cocos/editor-support/cocostudio/CCDisplayFactory.h +++ b/cocos/editor-support/cocostudio/CCDisplayFactory.h @@ -27,6 +27,8 @@ THE SOFTWARE. #include "cocostudio/CCArmatureDefine.h" #include "cocostudio/CCDatas.h" +#include "cocostudio/CocosStudioExport.h" +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { @@ -38,7 +40,7 @@ class DisplayData; * @js NA * @lua NA */ -class DisplayFactory +class CC_STUDIO_DLL DisplayFactory { public: static void addDisplay(Bone *bone, DecorativeDisplay *decoDisplay, DisplayData *displayData); diff --git a/cocos/editor-support/cocostudio/CCDisplayManager.h b/cocos/editor-support/cocostudio/CCDisplayManager.h index b4010c4eac..2f7b5e0f60 100644 --- a/cocos/editor-support/cocostudio/CCDisplayManager.h +++ b/cocos/editor-support/cocostudio/CCDisplayManager.h @@ -28,6 +28,7 @@ THE SOFTWARE. #include "cocostudio/CCArmatureDefine.h" #include "cocostudio/CCDecorativeDisplay.h" #include "cocostudio/CCDatas.h" +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { @@ -37,7 +38,7 @@ class Bone; * @js NA * @lua NA */ -class DisplayManager : public cocos2d::Ref +class CC_STUDIO_DLL DisplayManager : public cocos2d::Ref { public: static DisplayManager *create(Bone *bone); diff --git a/cocos/editor-support/cocostudio/CCInputDelegate.h b/cocos/editor-support/cocostudio/CCInputDelegate.h index 4d20fd53c2..15b1233bb0 100644 --- a/cocos/editor-support/cocostudio/CCInputDelegate.h +++ b/cocos/editor-support/cocostudio/CCInputDelegate.h @@ -31,6 +31,7 @@ THE SOFTWARE. #include "base/ccTypes.h" #include "base/CCEventKeyboard.h" #include "base/CCEventListener.h" +#include "cocostudio/CocosStudioExport.h" namespace cocos2d { class __Set; @@ -41,7 +42,7 @@ namespace cocostudio { /** * @lua NA */ -class InputDelegate +class CC_STUDIO_DLL InputDelegate { CC_CONSTRUCTOR_ACCESS: /** diff --git a/cocos/editor-support/cocostudio/CCProcessBase.h b/cocos/editor-support/cocostudio/CCProcessBase.h index 59f0824f6b..b2acabee6b 100644 --- a/cocos/editor-support/cocostudio/CCProcessBase.h +++ b/cocos/editor-support/cocostudio/CCProcessBase.h @@ -27,6 +27,7 @@ THE SOFTWARE. #include "cocostudio/CCArmatureDefine.h" #include "cocostudio/CCDatas.h" +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { @@ -50,7 +51,7 @@ enum AnimationType * @js NA * @lua NA */ -class ProcessBase : public cocos2d::Ref +class CC_STUDIO_DLL ProcessBase : public cocos2d::Ref { public: ProcessBase(void); diff --git a/cocos/editor-support/cocostudio/CCSGUIReader.h b/cocos/editor-support/cocostudio/CCSGUIReader.h index c5a798a878..89f27a6a1b 100644 --- a/cocos/editor-support/cocostudio/CCSGUIReader.h +++ b/cocos/editor-support/cocostudio/CCSGUIReader.h @@ -25,10 +25,11 @@ THE SOFTWARE. #ifndef __CCSGUIREADER_H__ #define __CCSGUIREADER_H__ -#include "ui/UIWidget.h" +#include "ui/UILayout.h" #include "cocostudio/DictionaryHelper.h" #include "WidgetReader/WidgetReaderProtocol.h" #include "base/ObjectFactory.h" +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { @@ -41,7 +42,7 @@ namespace cocostudio { typedef void (cocos2d::Ref::*SEL_ParseEvent)(const std::string&, cocos2d::Ref*, const rapidjson::Value&); #define parseselector(_SELECTOR) (SEL_ParseEvent)(&_SELECTOR) -class GUIReader : public cocos2d::Ref +class CC_STUDIO_DLL GUIReader : public cocos2d::Ref { public: CC_DEPRECATED_ATTRIBUTE static GUIReader* shareReader() { return GUIReader::getInstance(); }; @@ -89,7 +90,7 @@ public: }; -class WidgetPropertiesReader : public cocos2d::Ref +class CC_STUDIO_DLL WidgetPropertiesReader : public cocos2d::Ref { public: virtual cocos2d::ui::Widget* createWidget(const rapidjson::Value& dic, const char* fullPath, const char* fileName)=0; @@ -124,7 +125,7 @@ protected: }; -class WidgetPropertiesReader0250 : public WidgetPropertiesReader +class CC_STUDIO_DLL WidgetPropertiesReader0250 : public WidgetPropertiesReader { @@ -171,7 +172,7 @@ public: const rapidjson::Value& customOptions); }; -class WidgetPropertiesReader0300 : public WidgetPropertiesReader +class CC_STUDIO_DLL WidgetPropertiesReader0300 : public WidgetPropertiesReader { diff --git a/cocos/editor-support/cocostudio/CCSSceneReader.h b/cocos/editor-support/cocostudio/CCSSceneReader.h index 9f0d152bef..1980b47ce0 100644 --- a/cocos/editor-support/cocostudio/CCSSceneReader.h +++ b/cocos/editor-support/cocostudio/CCSSceneReader.h @@ -26,12 +26,12 @@ THE SOFTWARE. #define __CCSSCENEREADER_H__ #include "cocostudio/DictionaryHelper.h" - +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { -class SceneReader +class CC_STUDIO_DLL SceneReader { public: diff --git a/cocos/editor-support/cocostudio/CCSkin.h b/cocos/editor-support/cocostudio/CCSkin.h index 67f409274c..1987eb968a 100644 --- a/cocos/editor-support/cocostudio/CCSkin.h +++ b/cocos/editor-support/cocostudio/CCSkin.h @@ -30,10 +30,11 @@ THE SOFTWARE. #include "cocostudio/CCArmatureDefine.h" #include "cocostudio/CCBone.h" +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { -class Skin : public cocos2d::Sprite +class CC_STUDIO_DLL Skin : public cocos2d::Sprite { public: static Skin *create(); diff --git a/cocos/editor-support/cocostudio/CCSpriteFrameCacheHelper.h b/cocos/editor-support/cocostudio/CCSpriteFrameCacheHelper.h index 3c50ae7e4b..6a98a8ead5 100644 --- a/cocos/editor-support/cocostudio/CCSpriteFrameCacheHelper.h +++ b/cocos/editor-support/cocostudio/CCSpriteFrameCacheHelper.h @@ -26,6 +26,7 @@ THE SOFTWARE. #include "base/CCPlatformMacros.h" #include "cocostudio/CCArmatureDefine.h" +#include "cocostudio/CocosStudioExport.h" #include #include @@ -35,7 +36,7 @@ namespace cocostudio { * @js NA * @lua NA */ -class SpriteFrameCacheHelper +class CC_STUDIO_DLL SpriteFrameCacheHelper { public: /** @deprecated Use getInstance() instead */ diff --git a/cocos/editor-support/cocostudio/CCTransformHelp.h b/cocos/editor-support/cocostudio/CCTransformHelp.h index ec93a2ac55..452257fb3e 100644 --- a/cocos/editor-support/cocostudio/CCTransformHelp.h +++ b/cocos/editor-support/cocostudio/CCTransformHelp.h @@ -27,6 +27,7 @@ THE SOFTWARE. #include "cocostudio/CCArmatureDefine.h" #include "cocostudio/CCDatas.h" +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { @@ -35,7 +36,7 @@ namespace cocostudio { * @js NA * @lua NA */ -class TransformHelp +class CC_STUDIO_DLL TransformHelp { public: TransformHelp(); diff --git a/cocos/editor-support/cocostudio/CCTween.h b/cocos/editor-support/cocostudio/CCTween.h index c12f9c7b46..1eeda5da47 100644 --- a/cocos/editor-support/cocostudio/CCTween.h +++ b/cocos/editor-support/cocostudio/CCTween.h @@ -28,6 +28,7 @@ THE SOFTWARE. #include "cocostudio/CCProcessBase.h" #include "2d/CCTweenFunction.h" +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { @@ -39,7 +40,7 @@ using cocos2d::tweenfunc::TweenType; * @js NA * @lua NA */ -class Tween : public ProcessBase +class CC_STUDIO_DLL Tween : public ProcessBase { public: /** diff --git a/cocos/editor-support/cocostudio/CCUtilMath.h b/cocos/editor-support/cocostudio/CCUtilMath.h index 5a4827bf44..46868313b5 100644 --- a/cocos/editor-support/cocostudio/CCUtilMath.h +++ b/cocos/editor-support/cocostudio/CCUtilMath.h @@ -27,6 +27,7 @@ THE SOFTWARE. #include "2d/CCSprite.h" #include "cocostudio/CCArmatureDefine.h" +#include "cocostudio/CocosStudioExport.h" #include namespace cocostudio { @@ -37,18 +38,18 @@ namespace cocostudio { //! hit test function -bool isSpriteContainPoint(cocos2d::Sprite *sprite, cocos2d::Vec2 point); -bool isSpriteContainPoint(cocos2d::Sprite *sprite, cocos2d::Vec2 point, cocos2d::Vec2 &outPoint); +bool CC_STUDIO_DLL isSpriteContainPoint(cocos2d::Sprite *sprite, cocos2d::Vec2 point); +bool CC_STUDIO_DLL isSpriteContainPoint(cocos2d::Sprite *sprite, cocos2d::Vec2 point, cocos2d::Vec2 &outPoint); #define CC_SPRITE_CONTAIN_POINT(sprite, point) isSpriteContainPoint((sprite), (point)) #define CC_SPRITE_CONTAIN_POINT_WITH_RETURN(sprite, point, outPoint) isSpriteContainPoint((sprite), (point), outPoint) //! motion curve function -cocos2d::Vec2 bezierTo(float t, cocos2d::Vec2 &point1, cocos2d::Vec2 &point2, cocos2d::Vec2 &point3); -cocos2d::Vec2 bezierTo(float t, cocos2d::Vec2 &point1, cocos2d::Vec2 &point2, cocos2d::Vec2 &point3, cocos2d::Vec2 &point4); +cocos2d::Vec2 CC_STUDIO_DLL bezierTo(float t, cocos2d::Vec2 &point1, cocos2d::Vec2 &point2, cocos2d::Vec2 &point3); +cocos2d::Vec2 CC_STUDIO_DLL bezierTo(float t, cocos2d::Vec2 &point1, cocos2d::Vec2 &point2, cocos2d::Vec2 &point3, cocos2d::Vec2 &point4); -cocos2d::Vec2 circleTo(float t, cocos2d::Vec2 ¢er, float radius, float fromRadian, float radianDif); +cocos2d::Vec2 CC_STUDIO_DLL circleTo(float t, cocos2d::Vec2 ¢er, float radius, float fromRadian, float radianDif); } diff --git a/cocos/editor-support/cocostudio/CMakeLists.txt b/cocos/editor-support/cocostudio/CMakeLists.txt index aa662393ef..fc722a7c7b 100644 --- a/cocos/editor-support/cocostudio/CMakeLists.txt +++ b/cocos/editor-support/cocostudio/CMakeLists.txt @@ -55,16 +55,11 @@ set(CS_SRC ActionTimeline/CCTimeLine.cpp ) -include_directories( - .. -) +include_directories( .. ) -add_library(cocostudio STATIC - ${CS_SRC} -) +add_library(cocostudio STATIC ${CS_SRC} ) -target_link_libraries(cocostudio -) +target_link_libraries(cocostudio) set_target_properties(cocostudio PROPERTIES diff --git a/cocos/editor-support/cocostudio/CocoLoader.h b/cocos/editor-support/cocostudio/CocoLoader.h index b54681aaa6..29d0983e4d 100644 --- a/cocos/editor-support/cocostudio/CocoLoader.h +++ b/cocos/editor-support/cocostudio/CocoLoader.h @@ -31,6 +31,7 @@ #include #include "json/rapidjson.h" #include "json/document.h" +#include "cocostudio/CocosStudioExport.h" #pragma pack (4) @@ -38,7 +39,7 @@ namespace cocostudio{ class CocoLoader; -struct stExpCocoAttribDesc +struct CC_STUDIO_DLL stExpCocoAttribDesc { char m_cTypeName; uint32_t m_szName; @@ -46,7 +47,7 @@ public: char* GetName(CocoLoader* pCoco); }; -struct stExpCocoObjectDesc +struct CC_STUDIO_DLL stExpCocoObjectDesc { unsigned char m_cAttribNum; uint32_t m_szName; @@ -57,7 +58,7 @@ public: stExpCocoAttribDesc* GetAttribDescArray(CocoLoader* pCoco); }; -struct stExpCocoNode +struct CC_STUDIO_DLL stExpCocoNode { public: int16_t m_ObjIndex; @@ -75,7 +76,7 @@ public: void WriteJson(CocoLoader* pCoco,void* pFileName = nullptr, int vLayer = 0, bool bEndNode = false, bool bParentNodeIsArray = false); }; -struct stCocoFileHeader +struct CC_STUDIO_DLL stCocoFileHeader { char m_FileDesc[32]; char m_Version[32]; @@ -88,7 +89,7 @@ struct stCocoFileHeader }; -class CocoLoader +class CC_STUDIO_DLL CocoLoader { stCocoFileHeader* m_pFileHeader; stExpCocoNode* m_pRootNode; diff --git a/cocos/editor-support/cocostudio/CocoStudio.h b/cocos/editor-support/cocostudio/CocoStudio.h index 29d8319a38..ea49115db8 100644 --- a/cocos/editor-support/cocostudio/CocoStudio.h +++ b/cocos/editor-support/cocostudio/CocoStudio.h @@ -63,5 +63,6 @@ THE SOFTWARE. #include "cocostudio/ActionTimeline/CCFrame.h" #include "cocostudio/ActionTimeline/CCTimeLine.h" #include "cocostudio/ActionTimeline/CCActionTimeline.h" +#include "cocostudio/CocosStudioExport.h" #endif diff --git a/cocos/editor-support/cocostudio/CocosStudioExport.h b/cocos/editor-support/cocostudio/CocosStudioExport.h new file mode 100644 index 0000000000..552aad7519 --- /dev/null +++ b/cocos/editor-support/cocostudio/CocosStudioExport.h @@ -0,0 +1,28 @@ +#ifndef __CCCOCOSSTUDIO_H__ +#define __CCCOCOSSTUDIO_H__ + +#if defined(WIN32) && defined(_WINDOWS) + #ifdef __MINGW32__ + #include + #endif + + #if defined(_USRSTUDIODLL) + #define CC_STUDIO_DLL __declspec(dllexport) + #else /* use a DLL library */ + #define CC_STUDIO_DLL __declspec(dllimport) + #endif + + + /* Define NULL pointer value */ + #ifndef NULL + #ifdef __cplusplus + #define NULL 0 + #else + #define NULL ((void *)0) + #endif + #endif +#else + #define CC_STUDIO_DLL +#endif + +#endif /* __CCEXTENSIONEXPORT_H__*/ \ No newline at end of file diff --git a/cocos/editor-support/cocostudio/DictionaryHelper.h b/cocos/editor-support/cocostudio/DictionaryHelper.h index cefb9610ff..2107008818 100644 --- a/cocos/editor-support/cocostudio/DictionaryHelper.h +++ b/cocos/editor-support/cocostudio/DictionaryHelper.h @@ -26,6 +26,7 @@ THE SOFTWARE. #define __DICTIONARYHELPER_H__ #include "json/document.h" +#include "cocostudio/CocosStudioExport.h" #define DICTOOL DictionaryHelper::getInstance() @@ -34,7 +35,7 @@ namespace cocostudio { * @js NA * @lua NA */ -class DictionaryHelper +class CC_STUDIO_DLL DictionaryHelper { public: DictionaryHelper(); diff --git a/cocos/editor-support/cocostudio/TriggerBase.h b/cocos/editor-support/cocostudio/TriggerBase.h index c5c6fe5c6f..31dc0c0308 100755 --- a/cocos/editor-support/cocostudio/TriggerBase.h +++ b/cocos/editor-support/cocostudio/TriggerBase.h @@ -30,6 +30,7 @@ THE SOFTWARE. #include "base/ObjectFactory.h" #include "TriggerObj.h" #include "TriggerMng.h" +#include "cocostudio/CocosStudioExport.h" #define DECLARE_CLASS_INFO \ @@ -47,7 +48,7 @@ THE SOFTWARE. cocos2d::ObjectFactory::TInfo className::Type(#className, &className::createInstance); \ -void sendEvent(unsigned int event); +void CC_STUDIO_DLL sendEvent(unsigned int event); #endif diff --git a/cocos/editor-support/cocostudio/TriggerMng.h b/cocos/editor-support/cocostudio/TriggerMng.h index afae1d2eb5..7d43eb5e74 100755 --- a/cocos/editor-support/cocostudio/TriggerMng.h +++ b/cocos/editor-support/cocostudio/TriggerMng.h @@ -36,7 +36,7 @@ namespace cocostudio { class TriggerObj; -class ArmatureMovementDispatcher : public cocos2d::Ref +class CC_STUDIO_DLL ArmatureMovementDispatcher : public cocos2d::Ref { public: ArmatureMovementDispatcher(void); @@ -51,7 +51,7 @@ private: }; -class TriggerMng +class CC_STUDIO_DLL TriggerMng { public: TriggerMng(void); diff --git a/cocos/editor-support/cocostudio/TriggerObj.h b/cocos/editor-support/cocostudio/TriggerObj.h index e026cc738a..464c0d98f7 100755 --- a/cocos/editor-support/cocostudio/TriggerObj.h +++ b/cocos/editor-support/cocostudio/TriggerObj.h @@ -35,7 +35,7 @@ class EventListenerCustom; namespace cocostudio { -class BaseTriggerCondition : public cocos2d::Ref +class CC_STUDIO_DLL BaseTriggerCondition : public cocos2d::Ref { protected: BaseTriggerCondition(void); @@ -48,7 +48,7 @@ public: virtual void removeAll(); }; -class BaseTriggerAction : public cocos2d::Ref +class CC_STUDIO_DLL BaseTriggerAction : public cocos2d::Ref { protected: BaseTriggerAction(void); @@ -62,7 +62,7 @@ public: }; -class TriggerObj : public cocos2d::Ref +class CC_STUDIO_DLL TriggerObj : public cocos2d::Ref { public: TriggerObj(void); diff --git a/cocos/editor-support/cocostudio/WidgetReader/ButtonReader/ButtonReader.h b/cocos/editor-support/cocostudio/WidgetReader/ButtonReader/ButtonReader.h index d2ba76cbde..4b9bb4f91d 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/ButtonReader/ButtonReader.h +++ b/cocos/editor-support/cocostudio/WidgetReader/ButtonReader/ButtonReader.h @@ -26,10 +26,11 @@ #define __TestCpp__ButtonReader__ #include "../WidgetReader.h" +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { - class ButtonReader : public WidgetReader + class CC_STUDIO_DLL ButtonReader : public WidgetReader { public: DECLARE_CLASS_WIDGET_READER_INFO diff --git a/cocos/editor-support/cocostudio/WidgetReader/CheckBoxReader/CheckBoxReader.h b/cocos/editor-support/cocostudio/WidgetReader/CheckBoxReader/CheckBoxReader.h index 1c934dfb99..f512b08b2d 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/CheckBoxReader/CheckBoxReader.h +++ b/cocos/editor-support/cocostudio/WidgetReader/CheckBoxReader/CheckBoxReader.h @@ -26,10 +26,11 @@ #define __TestCpp__CheckBoxReader__ #include "../WidgetReader.h" +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { - class CheckBoxReader : public WidgetReader + class CC_STUDIO_DLL CheckBoxReader : public WidgetReader { public: DECLARE_CLASS_WIDGET_READER_INFO diff --git a/cocos/editor-support/cocostudio/WidgetReader/ImageViewReader/ImageViewReader.h b/cocos/editor-support/cocostudio/WidgetReader/ImageViewReader/ImageViewReader.h index 27dd31eab5..2d890eaf14 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/ImageViewReader/ImageViewReader.h +++ b/cocos/editor-support/cocostudio/WidgetReader/ImageViewReader/ImageViewReader.h @@ -26,10 +26,11 @@ #define __TestCpp__ImageViewReader__ #include "../WidgetReader.h" +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { - class ImageViewReader : public WidgetReader + class CC_STUDIO_DLL ImageViewReader : public WidgetReader { public: DECLARE_CLASS_WIDGET_READER_INFO diff --git a/cocos/editor-support/cocostudio/WidgetReader/LayoutReader/LayoutReader.h b/cocos/editor-support/cocostudio/WidgetReader/LayoutReader/LayoutReader.h index 77518df738..3b39a6a106 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/LayoutReader/LayoutReader.h +++ b/cocos/editor-support/cocostudio/WidgetReader/LayoutReader/LayoutReader.h @@ -26,10 +26,11 @@ #define __TestCpp__LayoutReader__ #include "../WidgetReader.h" +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { - class LayoutReader : public WidgetReader + class CC_STUDIO_DLL LayoutReader : public WidgetReader { public: DECLARE_CLASS_WIDGET_READER_INFO diff --git a/cocos/editor-support/cocostudio/WidgetReader/ListViewReader/ListViewReader.h b/cocos/editor-support/cocostudio/WidgetReader/ListViewReader/ListViewReader.h index 226ac4fac8..97564e614a 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/ListViewReader/ListViewReader.h +++ b/cocos/editor-support/cocostudio/WidgetReader/ListViewReader/ListViewReader.h @@ -26,10 +26,11 @@ #define __TestCpp__ListViewReader__ #include "../ScrollViewReader/ScrollViewReader.h" +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { - class ListViewReader : public ScrollViewReader + class CC_STUDIO_DLL ListViewReader : public ScrollViewReader { public: DECLARE_CLASS_WIDGET_READER_INFO diff --git a/cocos/editor-support/cocostudio/WidgetReader/LoadingBarReader/LoadingBarReader.h b/cocos/editor-support/cocostudio/WidgetReader/LoadingBarReader/LoadingBarReader.h index 7a08aa7e04..e77beb22ab 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/LoadingBarReader/LoadingBarReader.h +++ b/cocos/editor-support/cocostudio/WidgetReader/LoadingBarReader/LoadingBarReader.h @@ -26,10 +26,11 @@ #define __TestCpp__LoadingBarReader__ #include "../WidgetReader.h" +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { - class LoadingBarReader : public WidgetReader + class CC_STUDIO_DLL LoadingBarReader : public WidgetReader { public: DECLARE_CLASS_WIDGET_READER_INFO diff --git a/cocos/editor-support/cocostudio/WidgetReader/PageViewReader/PageViewReader.h b/cocos/editor-support/cocostudio/WidgetReader/PageViewReader/PageViewReader.h index 63f6f446ab..975049bd1a 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/PageViewReader/PageViewReader.h +++ b/cocos/editor-support/cocostudio/WidgetReader/PageViewReader/PageViewReader.h @@ -26,10 +26,11 @@ #define __TestCpp__PageViewReader__ #include "../LayoutReader/LayoutReader.h" +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { - class PageViewReader : public LayoutReader + class CC_STUDIO_DLL PageViewReader : public LayoutReader { public: DECLARE_CLASS_WIDGET_READER_INFO diff --git a/cocos/editor-support/cocostudio/WidgetReader/ScrollViewReader/ScrollViewReader.h b/cocos/editor-support/cocostudio/WidgetReader/ScrollViewReader/ScrollViewReader.h index ce95c3b5f7..a50d45d8b2 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/ScrollViewReader/ScrollViewReader.h +++ b/cocos/editor-support/cocostudio/WidgetReader/ScrollViewReader/ScrollViewReader.h @@ -26,10 +26,11 @@ #define __TestCpp__ScrollViewReader__ #include "../LayoutReader/LayoutReader.h" +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { - class ScrollViewReader : public LayoutReader + class CC_STUDIO_DLL ScrollViewReader : public LayoutReader { public: DECLARE_CLASS_WIDGET_READER_INFO diff --git a/cocos/editor-support/cocostudio/WidgetReader/SliderReader/SliderReader.h b/cocos/editor-support/cocostudio/WidgetReader/SliderReader/SliderReader.h index 2ea5f002ff..ab025eb87d 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/SliderReader/SliderReader.h +++ b/cocos/editor-support/cocostudio/WidgetReader/SliderReader/SliderReader.h @@ -26,10 +26,11 @@ #define __TestCpp__SliderReader__ #include "../WidgetReader.h" +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { - class SliderReader : public WidgetReader + class CC_STUDIO_DLL SliderReader : public WidgetReader { public: DECLARE_CLASS_WIDGET_READER_INFO diff --git a/cocos/editor-support/cocostudio/WidgetReader/TextAtlasReader/TextAtlasReader.h b/cocos/editor-support/cocostudio/WidgetReader/TextAtlasReader/TextAtlasReader.h index 99a00444c1..b104fb8af1 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/TextAtlasReader/TextAtlasReader.h +++ b/cocos/editor-support/cocostudio/WidgetReader/TextAtlasReader/TextAtlasReader.h @@ -26,10 +26,11 @@ #define __TestCpp__TextAtlasReader__ #include "../WidgetReader.h" +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { - class TextAtlasReader : public WidgetReader + class CC_STUDIO_DLL TextAtlasReader : public WidgetReader { public: DECLARE_CLASS_WIDGET_READER_INFO diff --git a/cocos/editor-support/cocostudio/WidgetReader/TextBMFontReader/TextBMFontReader.h b/cocos/editor-support/cocostudio/WidgetReader/TextBMFontReader/TextBMFontReader.h index 4fdc193a40..a08f39876d 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/TextBMFontReader/TextBMFontReader.h +++ b/cocos/editor-support/cocostudio/WidgetReader/TextBMFontReader/TextBMFontReader.h @@ -26,10 +26,11 @@ #define __TestCpp__TextBMFontReader__ #include "../WidgetReader.h" +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { - class TextBMFontReader : public WidgetReader + class CC_STUDIO_DLL TextBMFontReader : public WidgetReader { public: DECLARE_CLASS_WIDGET_READER_INFO diff --git a/cocos/editor-support/cocostudio/WidgetReader/TextFieldReader/TextFieldReader.h b/cocos/editor-support/cocostudio/WidgetReader/TextFieldReader/TextFieldReader.h index bcd01d0021..d8b96f5a8e 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/TextFieldReader/TextFieldReader.h +++ b/cocos/editor-support/cocostudio/WidgetReader/TextFieldReader/TextFieldReader.h @@ -26,10 +26,11 @@ #define __TestCpp__TextFieldReader__ #include "../WidgetReader.h" +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { - class TextFieldReader : public WidgetReader + class CC_STUDIO_DLL TextFieldReader : public WidgetReader { public: DECLARE_CLASS_WIDGET_READER_INFO diff --git a/cocos/editor-support/cocostudio/WidgetReader/TextReader/TextReader.h b/cocos/editor-support/cocostudio/WidgetReader/TextReader/TextReader.h index 9482ecbe60..0f7337360a 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/TextReader/TextReader.h +++ b/cocos/editor-support/cocostudio/WidgetReader/TextReader/TextReader.h @@ -26,10 +26,11 @@ #define __TestCpp__TextReader__ #include "../WidgetReader.h" +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { - class TextReader : public WidgetReader + class CC_STUDIO_DLL TextReader : public WidgetReader { public: DECLARE_CLASS_WIDGET_READER_INFO diff --git a/cocos/editor-support/cocostudio/WidgetReader/WidgetReader.h b/cocos/editor-support/cocostudio/WidgetReader/WidgetReader.h index ca62aab066..31dc939da2 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/WidgetReader.h +++ b/cocos/editor-support/cocostudio/WidgetReader/WidgetReader.h @@ -29,14 +29,14 @@ #include "cocostudio/CCSGUIReader.h" #include "ui/GUIDefine.h" #include "ui/UIWidget.h" - +#include "cocostudio/CocosStudioExport.h" namespace cocostudio { class CocoLoader; struct stExpCocoNode; - class WidgetReader : public cocos2d::Ref, public WidgetReaderProtocol + class CC_STUDIO_DLL WidgetReader : public cocos2d::Ref, public WidgetReaderProtocol { public: DECLARE_CLASS_WIDGET_READER_INFO diff --git a/cocos/editor-support/cocostudio/WidgetReader/WidgetReaderProtocol.h b/cocos/editor-support/cocostudio/WidgetReader/WidgetReaderProtocol.h index 0461ca5cec..c663ae3535 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/WidgetReaderProtocol.h +++ b/cocos/editor-support/cocostudio/WidgetReader/WidgetReaderProtocol.h @@ -27,8 +27,7 @@ #include "cocos2d.h" #include "cocostudio/DictionaryHelper.h" - - +#include "cocostudio/CocosStudioExport.h" namespace cocos2d { @@ -43,7 +42,7 @@ namespace cocostudio class CocoLoader; struct stExpCocoNode; - class WidgetReaderProtocol + class CC_STUDIO_DLL WidgetReaderProtocol { public: virtual ~WidgetReaderProtocol() {}; diff --git a/cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj b/cocos/editor-support/cocostudio/proj.win32/libcocostudio.vcxproj similarity index 88% rename from cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj rename to cocos/editor-support/cocostudio/proj.win32/libcocostudio.vcxproj index 684f848d8d..53888d21ad 100644 --- a/cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj +++ b/cocos/editor-support/cocostudio/proj.win32/libcocostudio.vcxproj @@ -117,6 +117,7 @@ + @@ -136,13 +137,25 @@ + + + {98a51ba8-fc3a-415b-ac8f-8c7bd464e93e} + + + {f8edd7fa-9a51-4e80-baeb-860825d2eac6} + + + {7e06e92c-537a-442b-9e4a-4761c84f8a1a} + + {B57CF53F-2E49-4031-9822-047CC0E6BDE2} - libCocosStudio + libcocostudio + libcocostudio - StaticLibrary + DynamicLibrary true v100 v110 @@ -152,7 +165,7 @@ Unicode - StaticLibrary + DynamicLibrary false v100 v110 @@ -189,7 +202,7 @@ $(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\editor-support;$(EngineRoot)external;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;$(EngineRoot)external\win32-specific\zlib\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;_USRSTUDIODLL;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;COCOS2DXWIN32_EXPORTS;%(PreprocessorDefinitions) true 4267;4251;4244;%(DisableSpecificWarnings) false @@ -197,6 +210,8 @@ true + $(OutDir);%(AdditionalLibraryDirectories) + libzlib.lib;%(AdditionalDependencies) @@ -207,7 +222,7 @@ true - WIN32;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_WINDOWS;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_USRSTUDIODLL;%(PreprocessorDefinitions) $(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\editor-support;$(EngineRoot)external;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;$(EngineRoot)external\win32-specific\zlib\include;%(AdditionalIncludeDirectories) None false @@ -216,6 +231,8 @@ true true true + libzlib.lib;%(AdditionalDependencies) + $(OutDir);%(AdditionalLibraryDirectories) diff --git a/cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj.filters b/cocos/editor-support/cocostudio/proj.win32/libcocostudio.vcxproj.filters similarity index 99% rename from cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj.filters rename to cocos/editor-support/cocostudio/proj.win32/libcocostudio.vcxproj.filters index 8e91fb082e..3102335bfe 100644 --- a/cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj.filters +++ b/cocos/editor-support/cocostudio/proj.win32/libcocostudio.vcxproj.filters @@ -455,5 +455,6 @@ TimelineAction + \ No newline at end of file diff --git a/cocos/storage/local-storage/proj.win32/libLocalStorage.vcxproj.user b/cocos/editor-support/cocostudio/proj.win32/libcocostudio.vcxproj.user similarity index 100% rename from cocos/storage/local-storage/proj.win32/libLocalStorage.vcxproj.user rename to cocos/editor-support/cocostudio/proj.win32/libcocostudio.vcxproj.user diff --git a/cocos/editor-support/spine/Android.mk b/cocos/editor-support/spine/Android.mk index afdbad89a3..b7f3446e1b 100644 --- a/cocos/editor-support/spine/Android.mk +++ b/cocos/editor-support/spine/Android.mk @@ -36,7 +36,7 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/.. LOCAL_C_INCLUDES := $(LOCAL_PATH)/../.. \ $(LOCAL_PATH)/.. -LOCAL_WHOLE_STATIC_LIBRARIES := cocos2dx_static +LOCAL_STATIC_LIBRARIES := cocos2dx_static include $(BUILD_STATIC_LIBRARY) diff --git a/cocos/editor-support/spine/CMakeLists.txt b/cocos/editor-support/spine/CMakeLists.txt index c3d96e8b61..4ce0a73646 100644 --- a/cocos/editor-support/spine/CMakeLists.txt +++ b/cocos/editor-support/spine/CMakeLists.txt @@ -32,13 +32,9 @@ set(SPINE_SRC SkeletonBounds.cpp ) -include_directories( - .. -) +include_directories( .. ) -add_library(spine STATIC - ${SPINE_SRC} -) +add_library(spine STATIC ${SPINE_SRC}) set_target_properties(spine PROPERTIES diff --git a/cocos/editor-support/spine/proj.win32/libSpine.vcxproj b/cocos/editor-support/spine/proj.win32/libSpine.vcxproj index 2f033657b8..c5d85d8d2e 100644 --- a/cocos/editor-support/spine/proj.win32/libSpine.vcxproj +++ b/cocos/editor-support/spine/proj.win32/libSpine.vcxproj @@ -65,9 +65,14 @@ + + + {98a51ba8-fc3a-415b-ac8f-8c7bd464e93e} + + {B7C2A162-DEC9-4418-972E-240AB3CBFCAE} - libSpine + libspine diff --git a/cocos/math/CCAffineTransform.h b/cocos/math/CCAffineTransform.h index e5a158a946..a055fa5bfd 100644 --- a/cocos/math/CCAffineTransform.h +++ b/cocos/math/CCAffineTransform.h @@ -33,7 +33,7 @@ THE SOFTWARE. NS_CC_BEGIN -struct AffineTransform { +struct CC_DLL AffineTransform { float a, b, c, d; float tx, ty; @@ -62,7 +62,7 @@ CC_DLL AffineTransform AffineTransformConcat(const AffineTransform& t1, const Af CC_DLL bool AffineTransformEqualToTransform(const AffineTransform& t1, const AffineTransform& t2); CC_DLL AffineTransform AffineTransformInvert(const AffineTransform& t); -Mat4 TransformConcat(const Mat4& t1, const Mat4& t2); +CC_DLL Mat4 TransformConcat(const Mat4& t1, const Mat4& t2); extern CC_DLL const AffineTransform AffineTransformIdentity; diff --git a/cocos/math/CCMathBase.h b/cocos/math/CCMathBase.h index cd02313b12..ee777d52e2 100644 --- a/cocos/math/CCMathBase.h +++ b/cocos/math/CCMathBase.h @@ -3,6 +3,7 @@ #include #include +#include "base/CCPlatformMacros.h" #define MATH_DEG_TO_RAD(x) ((x) * 0.0174532925f) #define MATH_RAD_TO_DEG(x) ((x)* 57.29577951f) diff --git a/cocos/math/Mat4.h b/cocos/math/Mat4.h index 077e5c0882..53b4b64da1 100644 --- a/cocos/math/Mat4.h +++ b/cocos/math/Mat4.h @@ -59,7 +59,7 @@ NS_CC_MATH_BEGIN * * @see Transform */ -class Mat4 +class CC_DLL Mat4 { public: // //temp add conversion diff --git a/cocos/math/MathUtil.h b/cocos/math/MathUtil.h index 7618650833..da5fe3c830 100644 --- a/cocos/math/MathUtil.h +++ b/cocos/math/MathUtil.h @@ -30,7 +30,7 @@ NS_CC_MATH_BEGIN * * This is primarily used for optimized internal math operations. */ -class MathUtil +class CC_DLL MathUtil { friend class Mat4; friend class Vec3; diff --git a/cocos/math/Quaternion.cpp b/cocos/math/Quaternion.cpp index 36089ee011..16dac52d71 100644 --- a/cocos/math/Quaternion.cpp +++ b/cocos/math/Quaternion.cpp @@ -23,6 +23,8 @@ NS_CC_MATH_BEGIN +const Quaternion Quaternion::ZERO(0.0f, 0.0f, 0.0f, 0.0f); + Quaternion::Quaternion() : x(0.0f), y(0.0f), z(0.0f), w(1.0f) { diff --git a/cocos/math/Quaternion.h b/cocos/math/Quaternion.h index bd8bc47db3..414a9b0c48 100644 --- a/cocos/math/Quaternion.h +++ b/cocos/math/Quaternion.h @@ -57,7 +57,7 @@ class Mat4; * q4 = (-0.8, 0.0, -0.6, 0.0). * For the point p = (1.0, 1.0, 1.0), the following figures show the trajectories of p using lerp, slerp, and squad. */ -class Quaternion +class CC_DLL Quaternion { friend class Curve; friend class Transform; @@ -369,6 +369,9 @@ public: * @return This quaternion, after the multiplication occurs. */ inline Quaternion& operator*=(const Quaternion& q); + + /** equals to Quaternion(0,0,0, 0) */ + static const Quaternion ZERO; private: diff --git a/cocos/math/TransformUtils.h b/cocos/math/TransformUtils.h index 83072d7ccb..30ec353ba7 100644 --- a/cocos/math/TransformUtils.h +++ b/cocos/math/TransformUtils.h @@ -30,13 +30,14 @@ THE SOFTWARE. // todo: // when in MAC or windows, it includes #include "CCGL.h" +#include "base/ccMacros.h" namespace cocos2d { struct AffineTransform; -void CGAffineToGL(const AffineTransform &t, GLfloat *m); -void GLToCGAffine(const GLfloat *m, AffineTransform *t); +CC_DLL void CGAffineToGL(const AffineTransform &t, GLfloat *m); +CC_DLL void GLToCGAffine(const GLfloat *m, AffineTransform *t); }//namespace cocos2d #endif // __SUPPORT_TRANSFORM_UTILS_H__ diff --git a/cocos/math/Vec2.h b/cocos/math/Vec2.h index 85a93e5815..78aac69b95 100644 --- a/cocos/math/Vec2.h +++ b/cocos/math/Vec2.h @@ -44,7 +44,7 @@ class Mat4; /** * Defines a 2-element floating point vector. */ -class Vec2 +class CC_DLL Vec2 { public: diff --git a/cocos/math/Vec3.h b/cocos/math/Vec3.h index 165af010f3..da567aa56c 100644 --- a/cocos/math/Vec3.h +++ b/cocos/math/Vec3.h @@ -37,7 +37,7 @@ class Quaternion; * the magnitude of the vector intact. When used as a point, * the elements of the vector represent a position in 3D space. */ -class Vec3 +class CC_DLL Vec3 { public: diff --git a/cocos/math/Vec4.h b/cocos/math/Vec4.h index 2523978ce4..d6399fb339 100644 --- a/cocos/math/Vec4.h +++ b/cocos/math/Vec4.h @@ -30,7 +30,7 @@ class Mat4; /** * Defines 4-element floating point vector. */ -class Vec4 +class CC_DLL Vec4 { public: diff --git a/cocos/network/Android.mk b/cocos/network/Android.mk index 045a8d5eab..b47964af29 100644 --- a/cocos/network/Android.mk +++ b/cocos/network/Android.mk @@ -16,9 +16,9 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/../.. \ $(LOCAL_PATH)/.. -LOCAL_WHOLE_STATIC_LIBRARIES := cocos2dx_static -LOCAL_WHOLE_STATIC_LIBRARIES += cocos_curl_static -LOCAL_WHOLE_STATIC_LIBRARIES += libwebsockets_static +LOCAL_STATIC_LIBRARIES := cocos2dx_static +LOCAL_STATIC_LIBRARIES += cocos_curl_static +LOCAL_STATIC_LIBRARIES += libwebsockets_static include $(BUILD_STATIC_LIBRARY) diff --git a/cocos/network/CMakeLists.txt b/cocos/network/CMakeLists.txt index 5bcf40d79e..1ea26015b8 100644 --- a/cocos/network/CMakeLists.txt +++ b/cocos/network/CMakeLists.txt @@ -1,37 +1,37 @@ -if(WIN32) - set(PLATFORM_SRC - network/WebSocket.cpp - ) - - set(PLATFORM_LINK - websockets - ) -elseif(NOT APPLE) - set(PLATFORM_SRC - network/WebSocket.cpp - ) - - set(PLATFORM_LINK - websockets - ssl - crypto - ) +if(WINDOWS) + set(PLATFORM_LINK websockets) +elseif(LINUX) + set(PLATFORM_LINK websockets ssl crypto) endif() set(COCOS_NETWORK_SRC - network/HttpClient.cpp - network/SocketIO.cpp - ${PLATFORM_SRC} + HttpClient.cpp + SocketIO.cpp + WebSocket.cpp ) -IF (WIN32 AND NOT MINGW) - set(COCOS_NETWORK_LINK - libcurl_imp +add_library(network STATIC + ${COCOS_NETWORK_SRC} +) + +if(MSVC) + set(COCOS_NETWORK_LINK + libcurl_imp ${PLATFORM_LINK} ) -ELSE() - set(COCOS_NETWORK_LINK +else() + set(COCOS_NETWORK_LINK curl - ${PLATFORM_LINK} + ${PLATFORM_LINK} ) -ENDIF() +endif() + +target_link_libraries(network + ${COCOS_NETWORK_LINK} +) + +set_target_properties(network + PROPERTIES + ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib" + LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib" +) diff --git a/cocos/network/proj.win32/libNetwork.vcxproj b/cocos/network/proj.win32/libnetwork.vcxproj similarity index 96% rename from cocos/network/proj.win32/libNetwork.vcxproj rename to cocos/network/proj.win32/libnetwork.vcxproj index 8a218e85ee..4716547e07 100644 --- a/cocos/network/proj.win32/libNetwork.vcxproj +++ b/cocos/network/proj.win32/libnetwork.vcxproj @@ -22,10 +22,15 @@ + + + {98a51ba8-fc3a-415b-ac8f-8c7bd464e93e} + + - libNetwork + libnetwork {DF2638C0-8128-4847-867C-6EAFE3DEE7B5} - network.win32 + libnetwork.win32 Win32Proj diff --git a/cocos/network/proj.win32/libNetwork.vcxproj.filters b/cocos/network/proj.win32/libnetwork.vcxproj.filters similarity index 100% rename from cocos/network/proj.win32/libNetwork.vcxproj.filters rename to cocos/network/proj.win32/libnetwork.vcxproj.filters diff --git a/cocos/network/proj.win32/libNetwork.vcxproj.user b/cocos/network/proj.win32/libnetwork.vcxproj.user similarity index 100% rename from cocos/network/proj.win32/libNetwork.vcxproj.user rename to cocos/network/proj.win32/libnetwork.vcxproj.user diff --git a/cocos/physics/CCPhysicsBody.cpp b/cocos/physics/CCPhysicsBody.cpp index bc38e34e32..233e55f157 100644 --- a/cocos/physics/CCPhysicsBody.cpp +++ b/cocos/physics/CCPhysicsBody.cpp @@ -69,10 +69,6 @@ PhysicsBody::PhysicsBody() , _linearDamping(0.0f) , _angularDamping(0.0f) , _tag(0) -, _categoryBitmask(UINT_MAX) -, _collisionBitmask(0) -, _contactTestBitmask(UINT_MAX) -, _group(0) , _positionResetTag(false) , _rotationResetTag(false) , _rotationOffset(0) @@ -422,11 +418,6 @@ PhysicsShape* PhysicsBody::addShape(PhysicsShape* shape, bool addMassAndMoment/* } _shapes.pushBack(shape); - - if (_group != CP_NO_GROUP && shape->getGroup() == CP_NO_GROUP) - { - shape->setGroup(_group); - } } return shape; @@ -829,34 +820,64 @@ void PhysicsBody::update(float delta) void PhysicsBody::setCategoryBitmask(int bitmask) { - _categoryBitmask = bitmask; - for (auto& shape : _shapes) { shape->setCategoryBitmask(bitmask); } } +int PhysicsBody::getCategoryBitmask() const +{ + if (!_shapes.empty()) + { + return _shapes.front()->getCategoryBitmask(); + } + else + { + return UINT_MAX; + } +} + void PhysicsBody::setContactTestBitmask(int bitmask) { - _contactTestBitmask = bitmask; - for (auto& shape : _shapes) { shape->setContactTestBitmask(bitmask); } } +int PhysicsBody::getContactTestBitmask() const +{ + if (!_shapes.empty()) + { + return _shapes.front()->getContactTestBitmask(); + } + else + { + return 0x00000000; + } +} + void PhysicsBody::setCollisionBitmask(int bitmask) { - _collisionBitmask = bitmask; - for (auto& shape : _shapes) { shape->setCollisionBitmask(bitmask); } } +int PhysicsBody::getCollisionBitmask() const +{ + if (!_shapes.empty()) + { + return _shapes.front()->getCollisionBitmask(); + } + else + { + return UINT_MAX; + } +} + void PhysicsBody::setGroup(int group) { for (auto& shape : _shapes) @@ -865,6 +886,18 @@ void PhysicsBody::setGroup(int group) } } +int PhysicsBody::getGroup() const +{ + if (!_shapes.empty()) + { + return _shapes.front()->getGroup(); + } + else + { + return 0; + } +} + void PhysicsBody::setPositionOffset(const Vec2& position) { if (!_positionOffset.equals(position)) diff --git a/cocos/physics/CCPhysicsBody.h b/cocos/physics/CCPhysicsBody.h index a9de180e0d..dd09c9556b 100644 --- a/cocos/physics/CCPhysicsBody.h +++ b/cocos/physics/CCPhysicsBody.h @@ -53,7 +53,7 @@ const PhysicsMaterial PHYSICSBODY_MATERIAL_DEFAULT(0.1f, 0.5f, 0.5f); * if you create body with createEdgeXXX, the mass and moment will be PHYSICS_INFINITY by default. and it's a static body. * you can change mass and moment with setMass() and setMoment(). and you can change the body to be dynamic or static by use function setDynamic(). */ -class PhysicsBody : public Ref +class CC_DLL PhysicsBody : public Ref { public: /** create a body with defult mass and moment. */ @@ -171,12 +171,12 @@ public: * The default value is 0xFFFFFFFF (all bits set). */ void setCollisionBitmask(int bitmask); - /** get the category bit mask */ - inline int getCategoryBitmask() const { return _categoryBitmask; } - /** get the contact test bit mask */ - inline int getContactTestBitmask() const { return _contactTestBitmask; } - /** get the collision bit mask */ - inline int getCollisionBitmask() const { return _collisionBitmask; } + /** Return bitmask of first shape, if there is no shape in body, return default value.(0xFFFFFFFF) */ + int getCategoryBitmask() const; + /** Return bitmask of first shape, if there is no shape in body, return default value.(0x00000000) */ + int getContactTestBitmask() const; + /** Return bitmask of first shape, if there is no shape in body, return default value.(0xFFFFFFFF) */ + int getCollisionBitmask() const; /** * set the group of body @@ -184,8 +184,8 @@ public: * it have high priority than bit masks */ void setGroup(int group); - /** get the group of body */ - inline int getGroup() const { return _group; } + /** Return group of first shape, if there is no shape in body, return default value.(0) */ + int getGroup() const; /** get the body position. */ Vec2 getPosition() const; @@ -339,11 +339,6 @@ protected: float _angularDamping; int _tag; - int _categoryBitmask; - int _collisionBitmask; - int _contactTestBitmask; - int _group; - bool _positionResetTag; /// To avoid reset the body position when body invoke Node::setPosition(). bool _rotationResetTag; /// To avoid reset the body rotation when body invoke Node::setRotation(). Vec2 _positionOffset; diff --git a/cocos/physics/CCPhysicsContact.h b/cocos/physics/CCPhysicsContact.h index b67510cf9e..eee9727560 100644 --- a/cocos/physics/CCPhysicsContact.h +++ b/cocos/physics/CCPhysicsContact.h @@ -44,7 +44,7 @@ class PhysicsContactInfo; typedef Vec2 Vect; -typedef struct PhysicsContactData +typedef struct CC_DLL PhysicsContactData { static const int POINT_MAX = 4; Vec2 points[POINT_MAX]; @@ -59,7 +59,7 @@ typedef struct PhysicsContactData /** * @brief Contact infomation. it will created automatically when two shape contact with each other. and it will destoried automatically when two shape separated. */ -class PhysicsContact : public EventCustom +class CC_DLL PhysicsContact : public EventCustom { public: @@ -129,7 +129,7 @@ private: /* * @brief presolve value generated when onContactPreSolve called. */ -class PhysicsContactPreSolve +class CC_DLL PhysicsContactPreSolve { public: /** get restitution between two bodies*/ @@ -160,7 +160,7 @@ private: /* * @brief postsolve value generated when onContactPostSolve called. */ -class PhysicsContactPostSolve +class CC_DLL PhysicsContactPostSolve { public: /** get restitution between two bodies*/ @@ -181,7 +181,7 @@ private: }; /* contact listener. it will recive all the contact callbacks. */ -class EventListenerPhysicsContact : public EventListenerCustom +class CC_DLL EventListenerPhysicsContact : public EventListenerCustom { public: /** create the listener */ @@ -227,7 +227,7 @@ protected: }; /** this event listener only be called when bodyA and bodyB have contacts */ -class EventListenerPhysicsContactWithBodies : public EventListenerPhysicsContact +class CC_DLL EventListenerPhysicsContactWithBodies : public EventListenerPhysicsContact { public: static EventListenerPhysicsContactWithBodies* create(PhysicsBody* bodyA, PhysicsBody* bodyB); @@ -245,7 +245,7 @@ protected: }; /** this event listener only be called when shapeA and shapeB have contacts */ -class EventListenerPhysicsContactWithShapes : public EventListenerPhysicsContact +class CC_DLL EventListenerPhysicsContactWithShapes : public EventListenerPhysicsContact { public: static EventListenerPhysicsContactWithShapes* create(PhysicsShape* shapeA, PhysicsShape* shapeB); @@ -263,7 +263,7 @@ protected: }; /** this event listener only be called when shapeA or shapeB is in the group your specified */ -class EventListenerPhysicsContactWithGroup : public EventListenerPhysicsContact +class CC_DLL EventListenerPhysicsContactWithGroup : public EventListenerPhysicsContact { public: static EventListenerPhysicsContactWithGroup* create(int group); diff --git a/cocos/physics/CCPhysicsJoint.h b/cocos/physics/CCPhysicsJoint.h index e892b29032..9861bc9a63 100644 --- a/cocos/physics/CCPhysicsJoint.h +++ b/cocos/physics/CCPhysicsJoint.h @@ -42,7 +42,7 @@ class PhysicsBodyInfo; /* * @brief An PhysicsJoint object connects two physics bodies together. */ -class PhysicsJoint +class CC_DLL PhysicsJoint { protected: PhysicsJoint(); @@ -97,7 +97,7 @@ protected: /* * @brief A fixed joint fuses the two bodies together at a reference point. Fixed joints are useful for creating complex shapes that can be broken apart later. */ -class PhysicsJointFixed : public PhysicsJoint +class CC_DLL PhysicsJointFixed : public PhysicsJoint { public: static PhysicsJointFixed* construct(PhysicsBody* a, PhysicsBody* b, const Vec2& anchr); @@ -113,7 +113,7 @@ protected: /* * @brief A limit joint imposes a maximum distance between the two bodies, as if they were connected by a rope. */ -class PhysicsJointLimit : public PhysicsJoint +class CC_DLL PhysicsJointLimit : public PhysicsJoint { public: static PhysicsJointLimit* construct(PhysicsBody* a, PhysicsBody* b, const Vec2& anchr1, const Vec2& anchr2); @@ -139,7 +139,7 @@ protected: /* * @brief A pin joint allows the two bodies to independently rotate around the anchor point as if pinned together. */ -class PhysicsJointPin : public PhysicsJoint +class CC_DLL PhysicsJointPin : public PhysicsJoint { public: static PhysicsJointPin* construct(PhysicsBody* a, PhysicsBody* b, const Vec2& anchr); @@ -153,7 +153,7 @@ protected: }; /** Set the fixed distance with two bodies */ -class PhysicsJointDistance : public PhysicsJoint +class CC_DLL PhysicsJointDistance : public PhysicsJoint { public: static PhysicsJointDistance* construct(PhysicsBody* a, PhysicsBody* b, const Vec2& anchr1, const Vec2& anchr2); @@ -170,7 +170,7 @@ protected: }; /** Connecting two physics bodies together with a spring. */ -class PhysicsJointSpring : public PhysicsJoint +class CC_DLL PhysicsJointSpring : public PhysicsJoint { public: static PhysicsJointSpring* construct(PhysicsBody* a, PhysicsBody* b, const Vec2& anchr1, const Vec2& anchr2, float stiffness, float damping); @@ -194,7 +194,7 @@ protected: }; /** Attach body a to a line, and attach body b to a dot */ -class PhysicsJointGroove : public PhysicsJoint +class CC_DLL PhysicsJointGroove : public PhysicsJoint { public: static PhysicsJointGroove* construct(PhysicsBody* a, PhysicsBody* b, const Vec2& grooveA, const Vec2& grooveB, const Vec2& anchr2); @@ -215,7 +215,7 @@ protected: }; /** Likes a spring joint, but works with rotary */ -class PhysicsJointRotarySpring : public PhysicsJoint +class CC_DLL PhysicsJointRotarySpring : public PhysicsJoint { public: static PhysicsJointRotarySpring* construct(PhysicsBody* a, PhysicsBody* b, float stiffness, float damping); @@ -236,7 +236,7 @@ protected: }; /** Likes a limit joint, but works with rotary */ -class PhysicsJointRotaryLimit : public PhysicsJoint +class CC_DLL PhysicsJointRotaryLimit : public PhysicsJoint { public: static PhysicsJointRotaryLimit* construct(PhysicsBody* a, PhysicsBody* b, float min, float max); @@ -256,7 +256,7 @@ protected: }; /** Works like a socket wrench. */ -class PhysicsJointRatchet : public PhysicsJoint +class CC_DLL PhysicsJointRatchet : public PhysicsJoint { public: static PhysicsJointRatchet* construct(PhysicsBody* a, PhysicsBody* b, float phase, float ratchet); @@ -277,7 +277,7 @@ protected: }; /** Keeps the angular velocity ratio of a pair of bodies constant. */ -class PhysicsJointGear : public PhysicsJoint +class CC_DLL PhysicsJointGear : public PhysicsJoint { public: static PhysicsJointGear* construct(PhysicsBody* a, PhysicsBody* b, float phase, float ratio); @@ -296,7 +296,7 @@ protected: }; /** Keeps the relative angular velocity of a pair of bodies constant */ -class PhysicsJointMotor : public PhysicsJoint +class CC_DLL PhysicsJointMotor : public PhysicsJoint { public: static PhysicsJointMotor* construct(PhysicsBody* a, PhysicsBody* b, float rate); diff --git a/cocos/physics/CCPhysicsShape.h b/cocos/physics/CCPhysicsShape.h index c8921b0430..cc72a828ef 100644 --- a/cocos/physics/CCPhysicsShape.h +++ b/cocos/physics/CCPhysicsShape.h @@ -38,7 +38,7 @@ class PhysicsBody; class PhysicsBodyInfo; -typedef struct PhysicsMaterial +typedef struct CC_DLL PhysicsMaterial { float density; ///< The density of the object. float restitution; ///< The bounciness of the physics body. @@ -62,7 +62,7 @@ const PhysicsMaterial PHYSICSSHAPE_MATERIAL_DEFAULT(0.0f, 0.5f, 0.5f); /** * @brief A shape for body. You do not create PhysicsWorld objects directly, instead, you can view PhysicsBody to see how to create it. */ -class PhysicsShape : public Ref +class CC_DLL PhysicsShape : public Ref { public: enum class Type @@ -140,6 +140,11 @@ public: inline void setCollisionBitmask(int bitmask) { _collisionBitmask = bitmask; } inline int getCollisionBitmask() const { return _collisionBitmask; } + /** + * set the group of body + * Collision groups let you specify an integral group index. You can have all fixtures with the same group index always collide (positive index) or never collide (negative index) + * it have high priority than bit masks + */ void setGroup(int group); inline int getGroup() { return _group; } @@ -192,7 +197,7 @@ protected: }; /** A circle shape */ -class PhysicsShapeCircle : public PhysicsShape +class CC_DLL PhysicsShapeCircle : public PhysicsShape { public: static PhysicsShapeCircle* create(float radius, const PhysicsMaterial& material = PHYSICSSHAPE_MATERIAL_DEFAULT, const Vec2& offset = Vec2(0, 0)); @@ -219,7 +224,7 @@ protected: }; /** A polygon shape */ -class PhysicsShapePolygon : public PhysicsShape +class CC_DLL PhysicsShapePolygon : public PhysicsShape { public: static PhysicsShapePolygon* create(const Vec2* points, int count, const PhysicsMaterial& material = PHYSICSSHAPE_MATERIAL_DEFAULT, const Vec2& offset = Vec2::ZERO); @@ -243,7 +248,7 @@ protected: }; /** A box shape */ -class PhysicsShapeBox : public PhysicsShapePolygon +class CC_DLL PhysicsShapeBox : public PhysicsShapePolygon { public: static PhysicsShapeBox* create(const Size& size, const PhysicsMaterial& material = PHYSICSSHAPE_MATERIAL_DEFAULT, const Vec2& offset = Vec2::ZERO); @@ -260,7 +265,7 @@ protected: }; /** A segment shape */ -class PhysicsShapeEdgeSegment : public PhysicsShape +class CC_DLL PhysicsShapeEdgeSegment : public PhysicsShape { public: static PhysicsShapeEdgeSegment* create(const Vec2& a, const Vec2& b, const PhysicsMaterial& material = PHYSICSSHAPE_MATERIAL_DEFAULT, float border = 1); @@ -281,7 +286,7 @@ protected: }; /** An edge polygon shape */ -class PhysicsShapeEdgePolygon : public PhysicsShape +class CC_DLL PhysicsShapeEdgePolygon : public PhysicsShape { public: static PhysicsShapeEdgePolygon* create(const Vec2* points, int count, const PhysicsMaterial& material = PHYSICSSHAPE_MATERIAL_DEFAULT, float border = 1); @@ -301,7 +306,7 @@ protected: }; /** An edge box shape */ -class PhysicsShapeEdgeBox : public PhysicsShapeEdgePolygon +class CC_DLL PhysicsShapeEdgeBox : public PhysicsShapeEdgePolygon { public: static PhysicsShapeEdgeBox* create(const Size& size, const PhysicsMaterial& material = PHYSICSSHAPE_MATERIAL_DEFAULT, float border = 0, const Vec2& offset = Vec2::ZERO); @@ -318,7 +323,7 @@ protected: }; /** a chain shape */ -class PhysicsShapeEdgeChain : public PhysicsShape +class CC_DLL PhysicsShapeEdgeChain : public PhysicsShape { public: static PhysicsShapeEdgeChain* create(const Vec2* points, int count, const PhysicsMaterial& material = PHYSICSSHAPE_MATERIAL_DEFAULT, float border = 1); diff --git a/cocos/physics/CCPhysicsWorld.cpp b/cocos/physics/CCPhysicsWorld.cpp index be97f220c6..27ed867c47 100644 --- a/cocos/physics/CCPhysicsWorld.cpp +++ b/cocos/physics/CCPhysicsWorld.cpp @@ -879,7 +879,19 @@ void PhysicsWorld::setGravity(const Vect& gravity) _info->setGravity(gravity); } -void PhysicsWorld::update(float delta) +void PhysicsWorld::step(float delta) +{ + if (_autoStep) + { + CCLOG("Physics Warning: You need to close auto step( setAutoStep(false) ) first"); + } + else + { + update(delta, true); + } +} + +void PhysicsWorld::update(float delta, bool userCall/* = false*/) { while (_delayDirty) { @@ -889,16 +901,27 @@ void PhysicsWorld::update(float delta) _delayDirty = !(_delayAddBodies.size() == 0 && _delayRemoveBodies.size() == 0 && _delayAddJoints.size() == 0 && _delayRemoveJoints.size() == 0); } - _updateTime += delta; - if (++_updateRateCount >= _updateRate) + if (userCall) { - _info->step(_updateTime * _speed); + _info->step(delta); for (auto& body : _bodies) { - body->update(_updateTime * _speed); + body->update(delta); + } + } + else + { + _updateTime += delta; + if (++_updateRateCount >= _updateRate) + { + _info->step(_updateTime * _speed); + for (auto& body : _bodies) + { + body->update(_updateTime * _speed); + } + _updateRateCount = 0; + _updateTime = 0.0f; } - _updateRateCount = 0; - _updateTime = 0.0f; } if (_debugDrawMask != DEBUGDRAW_NONE) @@ -916,6 +939,7 @@ PhysicsWorld::PhysicsWorld() , _info(nullptr) , _scene(nullptr) , _delayDirty(false) +, _autoStep(true) , _debugDraw(nullptr) , _debugDrawMask(DEBUGDRAW_NONE) { diff --git a/cocos/physics/CCPhysicsWorld.h b/cocos/physics/CCPhysicsWorld.h index e091017426..7a9263e153 100644 --- a/cocos/physics/CCPhysicsWorld.h +++ b/cocos/physics/CCPhysicsWorld.h @@ -31,7 +31,7 @@ #include "base/CCVector.h" #include "base/CCRef.h" #include "math/CCGeometry.h" - +#include "physics/CCPhysicsBody.h" #include NS_CC_BEGIN @@ -80,7 +80,7 @@ typedef PhysicsQueryRectCallbackFunc PhysicsQueryPointCallbackFunc; /** * @brief An PhysicsWorld object simulates collisions and other physical properties. You do not create PhysicsWorld objects directly; instead, you can get it from an Scene object. */ -class PhysicsWorld +class CC_DLL PhysicsWorld { public: static const int DEBUGDRAW_NONE; ///< draw nothing @@ -125,14 +125,18 @@ public: inline Vect getGravity() const { return _gravity; } /** set the gravity value */ void setGravity(const Vect& gravity); - /** Set the speed of physics world, speed is the rate at which the simulation executes. default value is 1.0 */ + /** + * Set the speed of physics world, speed is the rate at which the simulation executes. default value is 1.0 + * Note: if you setAutoStep(false), this won't work. + */ inline void setSpeed(float speed) { if(speed >= 0.0f) { _speed = speed; } } /** get the speed of physics world */ inline float getSpeed() { return _speed; } - /** + /** * set the update rate of physics world, update rate is the value of EngineUpdateTimes/PhysicsWorldUpdateTimes. * set it higher can improve performance, set it lower can improve accuracy of physics world simulation. * default value is 1.0 + * Note: if you setAutoStep(false), this won't work. */ inline void setUpdateRate(int rate) { if(rate > 0) { _updateRate = rate; } } /** get the update rate */ @@ -143,6 +147,20 @@ public: /** get the bebug draw mask */ inline int getDebugDrawMask() { return _debugDrawMask; } + /** + * To control the step of physics, if you want control it by yourself( fixed-timestep for example ), you can set this to false and call step by yourself. + * Defaut value is true. + * Note: if you set auto step to false, setSpeed and setUpdateRate won't work, you need to control the time step by yourself. + */ + void setAutoStep(bool autoStep){ _autoStep = autoStep; } + /** Get the auto step */ + bool isAutoStep() { return _autoStep; } + /** + * The step for physics world, The times passing for simulate the physics. + * Note: you need to setAutoStep(false) first before it can work. + */ + void step(float delta); + protected: static PhysicsWorld* construct(Scene& scene); bool init(Scene& scene); @@ -150,7 +168,7 @@ protected: virtual void addBody(PhysicsBody* body); virtual void addShape(PhysicsShape* shape); virtual void removeShape(PhysicsShape* shape); - virtual void update(float delta); + virtual void update(float delta, bool userCall = false); virtual void debugDraw(); @@ -183,6 +201,7 @@ protected: Scene* _scene; bool _delayDirty; + bool _autoStep; PhysicsDebugDraw* _debugDraw; int _debugDrawMask; @@ -207,7 +226,7 @@ protected: }; -class PhysicsDebugDraw +class CC_DLL PhysicsDebugDraw { protected: virtual bool begin(); @@ -226,7 +245,7 @@ protected: friend class PhysicsWorld; }; -extern const float PHYSICS_INFINITY; +extern const float CC_DLL PHYSICS_INFINITY; NS_CC_END diff --git a/cocos/platform/CCDevice.h b/cocos/platform/CCDevice.h index 1affa43e7b..91e6485559 100644 --- a/cocos/platform/CCDevice.h +++ b/cocos/platform/CCDevice.h @@ -65,6 +65,8 @@ public: static void setAccelerometerInterval(float interval); static Data getTextureDataForText(const char * text, const FontDefinition& textDefinition, TextAlign align, int &width, int &height, bool& hasPremultipliedAlpha); + + static void setKeepScreenOn(bool value); private: CC_DISALLOW_IMPLICIT_CONSTRUCTORS(Device); diff --git a/cocos/platform/CCFileUtils.cpp b/cocos/platform/CCFileUtils.cpp index 5079035ce7..bc839281ca 100644 --- a/cocos/platform/CCFileUtils.cpp +++ b/cocos/platform/CCFileUtils.cpp @@ -35,9 +35,13 @@ THE SOFTWARE. #include "tinyxml2.h" #include "unzip.h" +#include - -using namespace std; +#if (CC_TARGET_PLATFORM != CC_PLATFORM_WIN32) && (CC_TARGET_PLATFORM != CC_PLATFORM_WP8) && (CC_TARGET_PLATFORM != CC_PLATFORM_WINRT) +#include +#include +#include +#endif #if (CC_TARGET_PLATFORM != CC_PLATFORM_IOS) && (CC_TARGET_PLATFORM != CC_PLATFORM_MAC) @@ -101,6 +105,18 @@ public: return _rootDict; } + ValueMap dictionaryWithDataOfFile(const char* filedata, int filesize) + { + _resultType = SAX_RESULT_DICT; + SAXParser parser; + + CCASSERT(parser.init("UTF-8"), "The file format isn't UTF-8"); + parser.setDelegator(this); + + parser.parse(filedata, filesize); + return _rootDict; + } + ValueVector arrayWithContentsOfFile(const std::string& fileName) { _resultType = SAX_RESULT_ARRAY; @@ -317,6 +333,12 @@ ValueMap FileUtils::getValueMapFromFile(const std::string& filename) return tMaker.dictionaryWithContentsOfFile(fullPath.c_str()); } +ValueMap FileUtils::getValueMapFromData(const char* filedata, int filesize) +{ + DictMaker tMaker; + return tMaker.dictionaryWithDataOfFile(filedata, filesize); +} + ValueVector FileUtils::getValueVectorFromFile(const std::string& filename) { const std::string fullPath = fullPathForFilename(filename.c_str()); @@ -468,6 +490,7 @@ NS_CC_BEGIN /* The subclass FileUtilsApple should override these two method. */ ValueMap FileUtils::getValueMapFromFile(const std::string& filename) {return ValueMap();} +ValueMap FileUtils::getValueMapFromData(const char* filedata, int filesize) {return ValueMap();} ValueVector FileUtils::getValueVectorFromFile(const std::string& filename) {return ValueVector();} bool FileUtils::writeToFile(ValueMap& dict, const std::string &fullPath) {return false;} @@ -882,41 +905,37 @@ std::string FileUtils::getFullPathForDirectoryAndFilename(const std::string& dir return ret; } +std::string FileUtils::searchFullPathForFilename(const std::string& filename) const +{ + if (isAbsolutePath(filename)) + { + return filename; + } + std::string path = const_cast(this)->fullPathForFilename(filename); + if (0 == path.compare(filename)) + { + return ""; + } + else + { + return path; + } +} + bool FileUtils::isFileExist(const std::string& filename) const { - // If filename is absolute path, we don't need to consider 'search paths' and 'resolution orders'. if (isAbsolutePath(filename)) { return isFileExistInternal(filename); } - - // Already Cached ? - auto cacheIter = _fullPathCache.find(filename); - if( cacheIter != _fullPathCache.end() ) + else { - return true; + std::string fullpath = searchFullPathForFilename(filename); + if (fullpath.empty()) + return false; + else + return true; } - - // Get the new file name. - const std::string newFilename( getNewFilename(filename) ); - - std::string fullpath; - - for (auto searchIt = _searchPathArray.cbegin(); searchIt != _searchPathArray.cend(); ++searchIt) - { - for (auto resolutionIt = _searchResolutionsOrderArray.cbegin(); resolutionIt != _searchResolutionsOrderArray.cend(); ++resolutionIt) - { - fullpath = const_cast(this)->getPathForFilename(newFilename, *resolutionIt, *searchIt); - - if (!fullpath.empty()) - { - // Using the filename passed in as key. - const_cast(this)->_fullPathCache.insert(std::make_pair(filename, fullpath)); - return true; - } - } - } - return false; } bool FileUtils::isAbsolutePath(const std::string& path) const @@ -924,6 +943,275 @@ bool FileUtils::isAbsolutePath(const std::string& path) const return (path[0] == '/'); } +bool FileUtils::isDirectoryExistInternal(const std::string& dirPath) const +{ +#if (CC_TARGET_PLATFORM != CC_PLATFORM_WIN32) && (CC_TARGET_PLATFORM != CC_PLATFORM_WP8) && (CC_TARGET_PLATFORM != CC_PLATFORM_WINRT) + struct stat st; + if (stat(dirPath.c_str(), &st) == 0) + { + return S_ISDIR(st.st_mode); + } + return false; +#endif +#if (CC_TARGET_PLATFORM == CC_PLATFORM_WP8) || (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT) + WIN32_FILE_ATTRIBUTE_DATA wfad; + if (GetFileAttributesExA(dirPath.c_str(), GetFileExInfoStandard, &wfad)) + { + return true; + } + return false; +#endif +#if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) + unsigned long fAttrib = GetFileAttributesA(dirPath.c_str()); + if (fAttrib != INVALID_FILE_ATTRIBUTES && + (fAttrib & FILE_ATTRIBUTE_DIRECTORY)) + { + return true; + } + return false; +#endif +} + +bool FileUtils::isDirectoryExist(const std::string& dirPath) +{ + CCASSERT(!dirPath.empty(), "Invalid path"); + + if (isAbsolutePath(dirPath)) + { + return isDirectoryExistInternal(dirPath); + } + + // Already Cached ? + auto cacheIter = _fullPathCache.find(dirPath); + if( cacheIter != _fullPathCache.end() ) + { + return isDirectoryExistInternal(cacheIter->second); + } + + std::string fullpath; + for (auto searchIt = _searchPathArray.cbegin(); searchIt != _searchPathArray.cend(); ++searchIt) + { + for (auto resolutionIt = _searchResolutionsOrderArray.cbegin(); resolutionIt != _searchResolutionsOrderArray.cend(); ++resolutionIt) + { + // searchPath + file_path + resourceDirectory + fullpath = *searchIt + dirPath + *resolutionIt; + if (isDirectoryExistInternal(fullpath)) + { + const_cast(this)->_fullPathCache.insert(std::make_pair(dirPath, fullpath)); + return true; + } + } + } + + return false; +} + +bool FileUtils::createDirectory(const std::string& path) +{ + CCASSERT(!path.empty(), "Invalid path"); + + if (isDirectoryExist(path)) + return true; + + // Split the path + size_t start = 0; + size_t found = path.find_first_of("/\\", start); + std::string subpath; + std::vector dirs; + + if (found != std::string::npos) + { + while (true) + { + subpath = path.substr(start, found - start + 1); + if (!subpath.empty()) + dirs.push_back(subpath); + start = found+1; + found = path.find_first_of("/\\", start); + if (found == std::string::npos) + { + if (start < path.length()) + { + dirs.push_back(path.substr(start)); + } + break; + } + } + } + +#if (CC_TARGET_PLATFORM != CC_PLATFORM_WIN32) && (CC_TARGET_PLATFORM != CC_PLATFORM_WP8) && (CC_TARGET_PLATFORM != CC_PLATFORM_WINRT) + DIR *dir = NULL; + + // Create path recursively + subpath = ""; + for (int i = 0; i < dirs.size(); ++i) { + subpath += dirs[i]; + dir = opendir(subpath.c_str()); + if (!dir) + { + int ret = mkdir(subpath.c_str(), S_IRWXU | S_IRWXG | S_IRWXO); + if (ret != 0 && (errno != EEXIST)) + { + return false; + } + } + } + return true; +#endif +#if (CC_TARGET_PLATFORM == CC_PLATFORM_WP8) || (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT) + WIN32_FILE_ATTRIBUTE_DATA wfad; + if (!(GetFileAttributesExA(path.c_str(), GetFileExInfoStandard, &wfad))) + { + subpath = ""; + for(int i = 0 ; i < dirs.size() ; ++i) + { + subpath += dirs[i]; + BOOL ret = CreateDirectoryA(subpath.c_str(), NULL); + if (!ret && ERROR_ALREADY_EXISTS != GetLastError()) + { + return false; + } + } + } + return true; +#endif +#if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) + if ((GetFileAttributesA(path.c_str())) == INVALID_FILE_ATTRIBUTES) + { + subpath = ""; + for(int i = 0 ; i < dirs.size() ; ++i) + { + subpath += dirs[i]; + BOOL ret = CreateDirectoryA(subpath.c_str(), NULL); + if (!ret && ERROR_ALREADY_EXISTS != GetLastError()) + { + return false; + } + } + } + return true; +#endif +} + +bool FileUtils::removeDirectory(const std::string& path) +{ + if (path.size() > 0 && path[path.size() - 1] != '/') + { + CCLOGERROR("Fail to remove directory, path must termniate with '/': %s", path.c_str()); + return false; + } + + // Remove downloaded files +#if (CC_TARGET_PLATFORM != CC_PLATFORM_WIN32) && (CC_TARGET_PLATFORM != CC_PLATFORM_WP8) && (CC_TARGET_PLATFORM != CC_PLATFORM_WINRT) + std::string command = "rm -r "; + // Path may include space. + command += "\"" + path + "\""; + if (system(command.c_str()) >= 0) + return true; + else + return false; +#endif +#if (CC_TARGET_PLATFORM == CC_PLATFORM_WP8) || (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT) + if (RemoveDirectoryA(path.c_str())) + { + return true; + } + return false; +#endif +#if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) + std::string command = "rd /s /q "; + // Path may include space. + command += "\"" + path + "\""; + if (WinExec(command.c_str(), SW_HIDE) > 31) + return true; + else + return false; +#endif +} + +bool FileUtils::removeFile(const std::string &path) +{ + // Remove downloaded file +#if (CC_TARGET_PLATFORM != CC_PLATFORM_WIN32) && (CC_TARGET_PLATFORM != CC_PLATFORM_WP8) && (CC_TARGET_PLATFORM != CC_PLATFORM_WINRT) + std::string command = "rm -f "; + // Path may include space. + command += "\"" + path + "\""; + if (system(command.c_str()) >= 0) + return true; + else + return false; +#endif +#if (CC_TARGET_PLATFORM == CC_PLATFORM_WP8) || (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT) + if (DeleteFileA(path.c_str())) + { + return true; + } + return false; +#endif +#if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) + std::string command = "del /q "; + // Path may include space. + command += "\"" + path + "\""; + if (WinExec(command.c_str(), SW_HIDE) > 31) + return true; + else + return false; +#endif +} + +bool FileUtils::renameFile(const std::string &path, const std::string &oldname, const std::string &name) +{ + CCASSERT(!path.empty(), "Invalid path"); + + // Rename a file +#if (CC_TARGET_PLATFORM != CC_PLATFORM_WIN32) + std::string oldPath = path + oldname; + std::string newPath = path + name; + if (rename(oldPath.c_str(), newPath.c_str()) != 0) + { + CCLOGERROR("Fail to rename file %s to %s !", oldPath.c_str(), newPath.c_str()); + return false; + } + return true; +#else + std::string command = "ren "; + // Path may include space. + command += "\"" + path + oldname + "\" \"" + name + "\""; + if (WinExec(command.c_str(), SW_HIDE) > 31) + return true; + else + return false; +#endif +} + +long FileUtils::getFileSize(const std::string &filepath) +{ + CCASSERT(!filepath.empty(), "Invalid path"); + + std::string fullpath = filepath; + if (!isAbsolutePath(filepath)) + { + fullpath = searchFullPathForFilename(filepath); + if (fullpath.empty()) + return 0; + } + + struct stat info; + // Get data associated with "crt_stat.c": + int result = stat( fullpath.c_str(), &info ); + + // Check if statistics are valid: + if( result != 0 ) + { + // Failed + return -1; + } + else + { + return (long)(info.st_size); + } +} + ////////////////////////////////////////////////////////////////////////// // Notification support when getFileData from invalid file path. ////////////////////////////////////////////////////////////////////////// diff --git a/cocos/platform/CCFileUtils.h b/cocos/platform/CCFileUtils.h index 570b02fc50..fc8ec3b69a 100644 --- a/cocos/platform/CCFileUtils.h +++ b/cocos/platform/CCFileUtils.h @@ -283,6 +283,36 @@ public: */ virtual std::string getWritablePath() const = 0; + /** + * Sets/Gets whether to pop-up a message box when failed to load an image. + */ + virtual void setPopupNotify(bool notify); + virtual bool isPopupNotify(); + + /** + * Converts the contents of a file to a ValueMap. + * @note This method is used internally. + */ + virtual ValueMap getValueMapFromFile(const std::string& filename); + + /** + * Converts the contents of a file to a ValueMap. + * @note This method is used internally. + */ + virtual ValueMap getValueMapFromData(const char* filedata, int filesize); + + /** + * Write a ValueMap to a plist file. + * @note This method is used internally. + */ + virtual bool writeToFile(ValueMap& dict, const std::string& fullPath); + + /** + * Converts the contents of a file to a ValueVector. + * @note This method is used internally. + */ + virtual ValueVector getValueVectorFromFile(const std::string& filename); + /** * Checks whether a file exists. * @@ -303,30 +333,56 @@ public: */ virtual bool isAbsolutePath(const std::string& path) const; + /** + * Checks whether the path is a directory + * + * @param dirPath The path of the directory, it could be a relative or an absolute path. + * @return true if the directory exists, otherwise it will return false. + */ + virtual bool isDirectoryExist(const std::string& dirPath); /** - * Sets/Gets whether to pop-up a message box when failed to load an image. + * Creates a directory + * + * @param dirPath The path of the directory, it must be an absolute path. + * @return true if the directory have been created successfully, otherwise it will return false. */ - virtual void setPopupNotify(bool notify); - virtual bool isPopupNotify(); - - /** - * Converts the contents of a file to a ValueMap. - * @note This method is used internally. - */ - virtual ValueMap getValueMapFromFile(const std::string& filename); + virtual bool createDirectory(const std::string& dirPath); /** - * Write a ValueMap to a plist file. - * @note This method is used internally. + * Remove a directory + * + * @param dirPath The full path of the directory, it must be an absolute path. + * @return true if the directory have been removed successfully, otherwise it will return false. */ - virtual bool writeToFile(ValueMap& dict, const std::string& fullPath); + virtual bool removeDirectory(const std::string& dirPath); /** - * Converts the contents of a file to a ValueVector. - * @note This method is used internally. + * Remove a file + * + * @param filepath The full path of the file, it must be an absolute path. + * @return true if the file have been removed successfully, otherwise it will return false. */ - virtual ValueVector getValueVectorFromFile(const std::string& filename); + virtual bool removeFile(const std::string &filepath); + + /** + * Rename a file under the given directory + * + * @param path The parent directory path of the file, it must be an absolute path. + * @param oldname The current name of the file. + * @param name The new name of the file. + * @return true if the file have been renamed successfully, otherwise it will return false. + */ + virtual bool renameFile(const std::string &path, const std::string &oldname, const std::string &name); + + /** + * Retrieve the file size + * + * @note If a relative path was passed in, it will be inserted a default root path at the beginning. + * @param filepath The path of the file, it could be a relative or absolute path. + * @return The file size. + */ + virtual long getFileSize(const std::string &filepath); /** Returns the full path cache */ const std::unordered_map& getFullPathCache() const { return _fullPathCache; } @@ -357,10 +413,19 @@ protected: virtual std::string getNewFilename(const std::string &filename) const; /** - * Checks whether file exists without considering search paths and resolution orders. + * Checks whether a file exists without considering search paths and resolution orders. + * @param The file (with absolute path) to look up for + * @return Returns true if the file found at the given absolute path, otherwise returns false */ virtual bool isFileExistInternal(const std::string& filename) const = 0; + /** + * Checks whether a directory exists without considering search paths and resolution orders. + * @param The directory (with absolute path) to look up for + * @return Returns true if the directory found at the given absolute path, otherwise returns false + */ + virtual bool isDirectoryExistInternal(const std::string& dirPath) const; + /** * Gets full path for filename, resolution directory and search path. * @@ -383,6 +448,16 @@ protected: */ virtual std::string getFullPathForDirectoryAndFilename(const std::string& directory, const std::string& filename); + /** + * Returns the fullpath for a given filename. + * This is an alternative for fullPathForFilename, there are two main differences: + * First, it returns empty string instead of the original filename when no file found for the given name. + * Secondly, it's a const function. + * @param filename The file name to look up for + * @return The full path for the file, if not found, the return value will be an empty string + */ + virtual std::string searchFullPathForFilename(const std::string& filename) const; + /** Dictionary used to lookup filenames based on a key. * It is used internally by the following methods: diff --git a/cocos/platform/CCGLViewProtocol.cpp b/cocos/platform/CCGLView.cpp similarity index 86% rename from cocos/platform/CCGLViewProtocol.cpp rename to cocos/platform/CCGLView.cpp index 1e8423a155..f7cdf090ac 100644 --- a/cocos/platform/CCGLViewProtocol.cpp +++ b/cocos/platform/CCGLView.cpp @@ -23,7 +23,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "platform/CCGLViewProtocol.h" +#include "platform/CCGLView.h" #include "base/CCTouch.h" #include "base/CCDirector.h" @@ -70,24 +70,28 @@ namespace { } -GLViewProtocol::GLViewProtocol() +GLView::GLView() : _scaleX(1.0f) , _scaleY(1.0f) , _resolutionPolicy(ResolutionPolicy::UNKNOWN) { } -GLViewProtocol::~GLViewProtocol() +GLView::~GLView() { } -void GLViewProtocol::pollInputEvents() +void GLView::pollInputEvents() +{ + pollEvents(); +} + +void GLView::pollEvents() { } - -void GLViewProtocol::updateDesignResolutionSize() +void GLView::updateDesignResolutionSize() { if (_screenSize.width > 0 && _screenSize.height > 0 && _designResolutionSize.width > 0 && _designResolutionSize.height > 0) @@ -129,7 +133,7 @@ void GLViewProtocol::updateDesignResolutionSize() } } -void GLViewProtocol::setDesignResolutionSize(float width, float height, ResolutionPolicy resolutionPolicy) +void GLView::setDesignResolutionSize(float width, float height, ResolutionPolicy resolutionPolicy) { CCASSERT(resolutionPolicy != ResolutionPolicy::UNKNOWN, "should set resolutionPolicy"); @@ -144,22 +148,22 @@ void GLViewProtocol::setDesignResolutionSize(float width, float height, Resoluti updateDesignResolutionSize(); } -const Size& GLViewProtocol::getDesignResolutionSize() const +const Size& GLView::getDesignResolutionSize() const { return _designResolutionSize; } -const Size& GLViewProtocol::getFrameSize() const +const Size& GLView::getFrameSize() const { return _screenSize; } -void GLViewProtocol::setFrameSize(float width, float height) +void GLView::setFrameSize(float width, float height) { _designResolutionSize = _screenSize = Size(width, height); } -Rect GLViewProtocol::getVisibleRect() const +Rect GLView::getVisibleRect() const { Rect ret; ret.size = getVisibleSize(); @@ -167,7 +171,7 @@ Rect GLViewProtocol::getVisibleRect() const return ret; } -Size GLViewProtocol::getVisibleSize() const +Size GLView::getVisibleSize() const { if (_resolutionPolicy == ResolutionPolicy::NO_BORDER) { @@ -179,7 +183,7 @@ Size GLViewProtocol::getVisibleSize() const } } -Vec2 GLViewProtocol::getVisibleOrigin() const +Vec2 GLView::getVisibleOrigin() const { if (_resolutionPolicy == ResolutionPolicy::NO_BORDER) { @@ -192,7 +196,7 @@ Vec2 GLViewProtocol::getVisibleOrigin() const } } -void GLViewProtocol::setViewPortInPoints(float x , float y , float w , float h) +void GLView::setViewPortInPoints(float x , float y , float w , float h) { glViewport((GLint)(x * _scaleX + _viewPortRect.origin.x), (GLint)(y * _scaleY + _viewPortRect.origin.y), @@ -200,7 +204,7 @@ void GLViewProtocol::setViewPortInPoints(float x , float y , float w , float h) (GLsizei)(h * _scaleY)); } -void GLViewProtocol::setScissorInPoints(float x , float y , float w , float h) +void GLView::setScissorInPoints(float x , float y , float w , float h) { glScissor((GLint)(x * _scaleX + _viewPortRect.origin.x), (GLint)(y * _scaleY + _viewPortRect.origin.y), @@ -208,12 +212,12 @@ void GLViewProtocol::setScissorInPoints(float x , float y , float w , float h) (GLsizei)(h * _scaleY)); } -bool GLViewProtocol::isScissorEnabled() +bool GLView::isScissorEnabled() { return (GL_FALSE == glIsEnabled(GL_SCISSOR_TEST)) ? false : true; } -Rect GLViewProtocol::getScissorRect() const +Rect GLView::getScissorRect() const { GLfloat params[4]; glGetFloatv(GL_SCISSOR_BOX, params); @@ -224,17 +228,17 @@ Rect GLViewProtocol::getScissorRect() const return Rect(x, y, w, h); } -void GLViewProtocol::setViewName(const std::string& viewname ) +void GLView::setViewName(const std::string& viewname ) { _viewName = viewname; } -const std::string& GLViewProtocol::getViewName() const +const std::string& GLView::getViewName() const { return _viewName; } -void GLViewProtocol::handleTouchesBegin(int num, intptr_t ids[], float xs[], float ys[]) +void GLView::handleTouchesBegin(int num, intptr_t ids[], float xs[], float ys[]) { intptr_t id = 0; float x = 0.0f; @@ -283,7 +287,7 @@ void GLViewProtocol::handleTouchesBegin(int num, intptr_t ids[], float xs[], flo dispatcher->dispatchEvent(&touchEvent); } -void GLViewProtocol::handleTouchesMove(int num, intptr_t ids[], float xs[], float ys[]) +void GLView::handleTouchesMove(int num, intptr_t ids[], float xs[], float ys[]) { intptr_t id = 0; float x = 0.0f; @@ -331,7 +335,7 @@ void GLViewProtocol::handleTouchesMove(int num, intptr_t ids[], float xs[], floa dispatcher->dispatchEvent(&touchEvent); } -void GLViewProtocol::handleTouchesOfEndOrCancel(EventTouch::EventCode eventCode, int num, intptr_t ids[], float xs[], float ys[]) +void GLView::handleTouchesOfEndOrCancel(EventTouch::EventCode eventCode, int num, intptr_t ids[], float xs[], float ys[]) { intptr_t id = 0; float x = 0.0f; @@ -391,27 +395,27 @@ void GLViewProtocol::handleTouchesOfEndOrCancel(EventTouch::EventCode eventCode, } } -void GLViewProtocol::handleTouchesEnd(int num, intptr_t ids[], float xs[], float ys[]) +void GLView::handleTouchesEnd(int num, intptr_t ids[], float xs[], float ys[]) { handleTouchesOfEndOrCancel(EventTouch::EventCode::ENDED, num, ids, xs, ys); } -void GLViewProtocol::handleTouchesCancel(int num, intptr_t ids[], float xs[], float ys[]) +void GLView::handleTouchesCancel(int num, intptr_t ids[], float xs[], float ys[]) { handleTouchesOfEndOrCancel(EventTouch::EventCode::CANCELLED, num, ids, xs, ys); } -const Rect& GLViewProtocol::getViewPortRect() const +const Rect& GLView::getViewPortRect() const { return _viewPortRect; } -float GLViewProtocol::getScaleX() const +float GLView::getScaleX() const { return _scaleX; } -float GLViewProtocol::getScaleY() const +float GLView::getScaleY() const { return _scaleY; } diff --git a/cocos/platform/CCGLViewProtocol.h b/cocos/platform/CCGLView.h similarity index 79% rename from cocos/platform/CCGLViewProtocol.h rename to cocos/platform/CCGLView.h index 3b7404ecd0..cb0e133702 100644 --- a/cocos/platform/CCGLViewProtocol.h +++ b/cocos/platform/CCGLView.h @@ -23,14 +23,22 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#ifndef __CCGLVIEWPROTOCOL_H__ -#define __CCGLVIEWPROTOCOL_H__ +#ifndef __CCGLVIEW_H__ +#define __CCGLVIEW_H__ #include "base/ccTypes.h" #include "base/CCEventTouch.h" #include +#if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) +#include +#endif /* (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) */ + +#if (CC_TARGET_PLATFORM == CC_PLATFORM_MAC) +typedef void* id; +#endif /* (CC_TARGET_PLATFORM == CC_PLATFORM_MAC) */ + enum class ResolutionPolicy { // The entire application is visible in the specified area without trying to preserve the original aspect ratio. @@ -63,18 +71,18 @@ NS_CC_BEGIN * @{ */ -class CC_DLL GLViewProtocol +class CC_DLL GLView : public Ref { public: /** * @js ctor */ - GLViewProtocol(); + GLView(); /** * @js NA * @lua NA */ - virtual ~GLViewProtocol(); + virtual ~GLView(); /** Force destroying EGL view, subclass must implement this method. */ virtual void end() = 0; @@ -87,12 +95,16 @@ public: /** Open or close IME keyboard , subclass must implement this method. */ virtual void setIMEKeyboardState(bool open) = 0; + + virtual bool windowShouldClose() { return false; }; /** * Polls input events. Subclass must implement methods if platform * does not provide event callbacks. */ - virtual void pollInputEvents(); + CC_DEPRECATED_ATTRIBUTE virtual void pollInputEvents(); + + virtual void pollEvents(); /** * Get the frame size of EGL view. @@ -105,6 +117,30 @@ public: */ virtual void setFrameSize(float width, float height); + /** Set and get zoom factor for frame. This two methods are for + debugging big resolution (e.g.new ipad) app on desktop.*/ + virtual void setFrameZoomFactor(float zoomFactor) {} + virtual float getFrameZoomFactor() const { return 1.0; } + + /** Get retina factor */ + virtual int getRetinaFactor() const { return 1; } + + /** only works on ios platform*/ + virtual bool setContentScaleFactor(float scaleFactor) { return false; } + virtual float getContentScaleFactor() const { return 1.0; } + + /** returns whether or not the view is in Retina Display mode */ + virtual bool isRetinaDisplay() const { return false; } + +#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) + virtual void* getEAGLView() const { return nullptr; } +#endif /* (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) */ + +#if (CC_TARGET_PLATFORM == CC_PLATFORM_WP8) + virtual Size getRenerTargetSize() const = 0; + virtual const Mat4& getOrientationMatrix() const = 0; + virtual const Mat4& getReverseOrientationMatrix() const = 0; +#endif /** * Get the visible area size of opengl viewport. */ @@ -183,6 +219,14 @@ public: /** returns the current Resolution policy */ ResolutionPolicy getResolutionPolicy() const { return _resolutionPolicy; } +#if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) + virtual HWND getWin32Window() = 0; +#endif /* (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) */ + +#if (CC_TARGET_PLATFORM == CC_PLATFORM_MAC) + virtual id getCocoaWindow() = 0; +#endif /* (CC_TARGET_PLATFORM == CC_PLATFORM_MAC) */ + protected: void updateDesignResolutionSize(); @@ -207,4 +251,4 @@ protected: NS_CC_END -#endif /* __CCGLVIEWPROTOCOL_H__ */ +#endif /* __CCGLVIEW_H__ */ diff --git a/cocos/platform/CCImage.cpp b/cocos/platform/CCImage.cpp index f4c8604b3a..80ba8e672b 100644 --- a/cocos/platform/CCImage.cpp +++ b/cocos/platform/CCImage.cpp @@ -31,17 +31,11 @@ THE SOFTWARE. #include "base/CCData.h" - -#ifdef EMSCRIPTEN -#include -#include -#endif // EMSCRIPTEN - extern "C" { // To resolve link error when building 32bits with Xcode 6. // More information please refer to the discussion in https://github.com/cocos2d/cocos2d-x/pull/6986 -#if defined(__APPLE__) || defined(__unix) +#if defined (__unix) || (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) #ifndef __ENABLE_COMPATIBILITY_WITH_UNIX_2003__ #define __ENABLE_COMPATIBILITY_WITH_UNIX_2003__ #include @@ -57,21 +51,21 @@ extern "C" { return strerror(errnum); } + // int fputs(const char * __restrict, FILE * __restrict) __DARWIN_ALIAS(fputs); + int fputs$UNIX2003(const char *str, FILE *stream) + { + return fputs(str, stream); + } #endif #endif #include "png.h" -#include "tiffio.h" #include "base/etc1.h" -#include "jpeglib.h" } #include "base/s3tc.h" #include "base/atitc.h" +#include "base/pvr.h" #include "base/TGAlib.h" -#if (CC_TARGET_PLATFORM != CC_PLATFORM_WP8) && (CC_TARGET_PLATFORM != CC_PLATFORM_WINRT) -#include "decode.h" -#endif - #include "base/ccMacros.h" #include "CCCommon.h" #include "CCStdC.h" @@ -79,6 +73,7 @@ extern "C" #include "base/CCConfiguration.h" #include "base/ccUtils.h" #include "base/ZipUtils.h" +#include "base/CCModuleManager.h" #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) #include "android/CCFileUtilsAndroid.h" #endif @@ -95,6 +90,7 @@ NS_CC_BEGIN namespace { static const int PVR_TEXTURE_FLAG_TYPE_MASK = 0xff; + static bool _PVRHaveAlphaPremultiplied = false; // Values taken from PVRTexture.h from http://www.imgtec.com enum class PVR2TextureFlag @@ -141,6 +137,34 @@ namespace PVRTC2BPP_RGBA = 1ULL, PVRTC4BPP_RGB = 2ULL, PVRTC4BPP_RGBA = 3ULL, + PVRTC2_2BPP_RGBA = 4ULL, + PVRTC2_4BPP_RGBA = 5ULL, + ETC1 = 6ULL, + DXT1 = 7ULL, + DXT2 = 8ULL, + DXT3 = 9ULL, + DXT4 = 10ULL, + DXT5 = 11ULL, + BC1 = 7ULL, + BC2 = 9ULL, + BC3 = 11ULL, + BC4 = 12ULL, + BC5 = 13ULL, + BC6 = 14ULL, + BC7 = 15ULL, + UYVY = 16ULL, + YUY2 = 17ULL, + BW1bpp = 18ULL, + R9G9B9E5 = 19ULL, + RGBG8888 = 20ULL, + GRGB8888 = 21ULL, + ETC2_RGB = 22ULL, + ETC2_RGBA = 23ULL, + ETC2_RGBA1 = 24ULL, + EAC_R11_Unsigned = 25ULL, + EAC_R11_Signed = 26ULL, + EAC_RG11_Unsigned = 27ULL, + EAC_RG11_Signed = 28ULL, BGRA8888 = 0x0808080861726762ULL, RGBA8888 = 0x0808080861626772ULL, @@ -169,10 +193,8 @@ namespace _pixel2_formathash::value_type(PVR2TexturePixelFormat::I8, Texture2D::PixelFormat::I8), _pixel2_formathash::value_type(PVR2TexturePixelFormat::AI88, Texture2D::PixelFormat::AI88), -#ifdef GL_COMPRESSED_RGB_PVRTC_2BPPV1_IMG _pixel2_formathash::value_type(PVR2TexturePixelFormat::PVRTC2BPP_RGBA, Texture2D::PixelFormat::PVRTC2A), _pixel2_formathash::value_type(PVR2TexturePixelFormat::PVRTC4BPP_RGBA, Texture2D::PixelFormat::PVRTC4A), -#endif }; static const int PVR2_MAX_TABLE_ELEMENTS = sizeof(v2_pixel_formathash_value) / sizeof(v2_pixel_formathash_value[0]); @@ -192,12 +214,12 @@ namespace _pixel3_formathash::value_type(PVR3TexturePixelFormat::L8, Texture2D::PixelFormat::I8), _pixel3_formathash::value_type(PVR3TexturePixelFormat::LA88, Texture2D::PixelFormat::AI88), -#ifdef GL_COMPRESSED_RGB_PVRTC_2BPPV1_IMG _pixel3_formathash::value_type(PVR3TexturePixelFormat::PVRTC2BPP_RGB, Texture2D::PixelFormat::PVRTC2), _pixel3_formathash::value_type(PVR3TexturePixelFormat::PVRTC2BPP_RGBA, Texture2D::PixelFormat::PVRTC2A), _pixel3_formathash::value_type(PVR3TexturePixelFormat::PVRTC4BPP_RGB, Texture2D::PixelFormat::PVRTC4), _pixel3_formathash::value_type(PVR3TexturePixelFormat::PVRTC4BPP_RGBA, Texture2D::PixelFormat::PVRTC4A), -#endif + + _pixel3_formathash::value_type(PVR3TexturePixelFormat::ETC1, Texture2D::PixelFormat::ETC), }; static const int PVR3_MAX_TABLE_ELEMENTS = sizeof(v3_pixel_formathash_value) / sizeof(v3_pixel_formathash_value[0]); @@ -395,6 +417,27 @@ namespace } } +Texture2D::PixelFormat getDevicePixelFormat(Texture2D::PixelFormat format) +{ + switch (format) { + case Texture2D::PixelFormat::PVRTC4: + case Texture2D::PixelFormat::PVRTC4A: + case Texture2D::PixelFormat::PVRTC2: + case Texture2D::PixelFormat::PVRTC2A: + if(Configuration::getInstance()->supportsPVRTC()) + return format; + else + return Texture2D::PixelFormat::RGBA8888; + case Texture2D::PixelFormat::ETC: + if(Configuration::getInstance()->supportsETC()) + return format; + else + return Texture2D::PixelFormat::RGB888; + default: + return format; + } +} + ////////////////////////////////////////////////////////////////////////// // Implement Image ////////////////////////////////////////////////////////////////////////// @@ -404,9 +447,9 @@ Image::Image() , _dataLen(0) , _width(0) , _height(0) +, _unpack(false) , _fileType(Format::UNKOWN) , _renderFormat(Texture2D::PixelFormat::NONE) -, _preMulti(false) , _numberOfMipmaps(0) , _hasPremultipliedAlpha(true) { @@ -415,7 +458,13 @@ Image::Image() Image::~Image() { - CC_SAFE_FREE(_data); + if(_unpack) + { + for (unsigned int i = 0; i < _numberOfMipmaps; ++i) + CC_SAFE_DELETE_ARRAY(_mipmaps[i].address); + } + else + CC_SAFE_FREE(_data); } bool Image::initWithImageFile(const std::string& path) @@ -703,158 +752,28 @@ bool Image::isCompressed() return Texture2D::getPixelFormatInfoMap().at(_renderFormat).compressed; } -namespace -{ -/* - * ERROR HANDLING: - * - * The JPEG library's standard error handler (jerror.c) is divided into - * several "methods" which you can override individually. This lets you - * adjust the behavior without duplicating a lot of code, which you might - * have to update with each future release. - * - * We override the "error_exit" method so that control is returned to the - * library's caller when a fatal error occurs, rather than calling exit() - * as the standard error_exit method does. - * - * We use C's setjmp/longjmp facility to return control. This means that the - * routine which calls the JPEG library must first execute a setjmp() call to - * establish the return point. We want the replacement error_exit to do a - * longjmp(). But we need to make the setjmp buffer accessible to the - * error_exit routine. To do this, we make a private extension of the - * standard JPEG error handler object. (If we were using C++, we'd say we - * were making a subclass of the regular error handler.) - * - * Here's the extended error handler struct: - */ - struct MyErrorMgr - { - struct jpeg_error_mgr pub; /* "public" fields */ - jmp_buf setjmp_buffer; /* for return to caller */ - }; - - typedef struct MyErrorMgr * MyErrorPtr; - - /* - * Here's the routine that will replace the standard error_exit method: - */ - - METHODDEF(void) - myErrorExit(j_common_ptr cinfo) - { - /* cinfo->err really points to a MyErrorMgr struct, so coerce pointer */ - MyErrorPtr myerr = (MyErrorPtr) cinfo->err; - - /* Always display the message. */ - /* We could postpone this until after returning, if we chose. */ - /* internal message function cann't show error message in some platforms, so we rewrite it here. - * edit it if has version confilict. - */ - //(*cinfo->err->output_message) (cinfo); - char buffer[JMSG_LENGTH_MAX]; - (*cinfo->err->format_message) (cinfo, buffer); - CCLOG("jpeg error: %s", buffer); - - /* Return control to the setjmp point */ - longjmp(myerr->setjmp_buffer, 1); - } -} - bool Image::initWithJpgData(const unsigned char * data, ssize_t dataLen) { - /* these are standard libjpeg structures for reading(decompression) */ - struct jpeg_decompress_struct cinfo; - /* We use our private extension JPEG error handler. - * Note that this struct must live as long as the main JPEG parameter - * struct, to avoid dangling-pointer problems. - */ - struct MyErrorMgr jerr; - /* libjpeg data structure for storing one row, that is, scanline of an image */ - JSAMPROW row_pointer[1] = {0}; - unsigned long location = 0; - unsigned int i = 0; - - bool bRet = false; - do + _hasPremultipliedAlpha = false; + + JPEGModule *jpegModule = static_cast(ModuleManager::getModule("jpeg")); + if (jpegModule) { - /* We set up the normal JPEG error routines, then override error_exit. */ - cinfo.err = jpeg_std_error(&jerr.pub); - jerr.pub.error_exit = myErrorExit; - /* Establish the setjmp return context for MyErrorExit to use. */ - if (setjmp(jerr.setjmp_buffer)) { - /* If we get here, the JPEG code has signaled an error. - * We need to clean up the JPEG object, close the input file, and return. - */ - jpeg_destroy_decompress(&cinfo); - break; - } - - /* setup decompression process and source, then read JPEG header */ - jpeg_create_decompress( &cinfo ); - -#ifndef CC_TARGET_QT5 - jpeg_mem_src( &cinfo, const_cast(data), dataLen ); -#endif /* CC_TARGET_QT5 */ - - /* reading the image header which contains image information */ -#if (JPEG_LIB_VERSION >= 90) - // libjpeg 0.9 adds stricter types. - jpeg_read_header( &cinfo, TRUE ); -#else - jpeg_read_header( &cinfo, true ); -#endif - - // we only support RGB or grayscale - if (cinfo.jpeg_color_space == JCS_GRAYSCALE) - { - _renderFormat = Texture2D::PixelFormat::I8; - }else - { - cinfo.out_color_space = JCS_RGB; - _renderFormat = Texture2D::PixelFormat::RGB888; - } - - /* Start decompression jpeg here */ - jpeg_start_decompress( &cinfo ); - - /* init image info */ - _width = cinfo.output_width; - _height = cinfo.output_height; - _preMulti = false; - row_pointer[0] = static_cast(malloc(cinfo.output_width*cinfo.output_components * sizeof(unsigned char))); - CC_BREAK_IF(! row_pointer[0]); - - _dataLen = cinfo.output_width*cinfo.output_height*cinfo.output_components; - _data = static_cast(malloc(_dataLen * sizeof(unsigned char))); - CC_BREAK_IF(! _data); - - /* now actually read the jpeg into the raw buffer */ - /* read one scan line at a time */ - while( cinfo.output_scanline < cinfo.output_height ) - { - jpeg_read_scanlines( &cinfo, row_pointer, 1 ); - for( i=0; iinitWithJPEGData(data, dataLen, dataFromJPEGInit); + _width = dataFromJPEGInit.width; + _height = dataFromJPEGInit.height; + _renderFormat = dataFromJPEGInit.renderFormat; + _dataLen = dataFromJPEGInit.dataLength; + _data = dataFromJPEGInit.data; + + return result; + } + else { - free(row_pointer[0]); - }; - return bRet; + CCLOG("jpeg module is not enabled"); + return false; + } } bool Image::initWithPngData(const unsigned char * data, ssize_t dataLen) @@ -988,7 +907,7 @@ bool Image::initWithPngData(const unsigned char * data, ssize_t dataLen) } else { - _preMulti = false; + _hasPremultipliedAlpha = false; } if (row_pointers != nullptr) @@ -1006,207 +925,66 @@ bool Image::initWithPngData(const unsigned char * data, ssize_t dataLen) return bRet; } -namespace -{ - static tmsize_t tiffReadProc(thandle_t fd, void* buf, tmsize_t size) - { - tImageSource* isource = (tImageSource*)fd; - uint8* ma; - uint64 mb; - unsigned long n; - unsigned long o; - tmsize_t p; - ma=(uint8*)buf; - mb=size; - p=0; - while (mb>0) - { - n=0x80000000UL; - if ((uint64)n>mb) - n=(unsigned long)mb; - - - if((int)(isource->offset + n) <= isource->size) - { - memcpy(ma, isource->data+isource->offset, n); - isource->offset += n; - o = n; - } - else - { - return 0; - } - - ma+=o; - mb-=o; - p+=o; - if (o!=n) - { - break; - } - } - return p; - } - - static tmsize_t tiffWriteProc(thandle_t fd, void* buf, tmsize_t size) - { - CC_UNUSED_PARAM(fd); - CC_UNUSED_PARAM(buf); - CC_UNUSED_PARAM(size); - return 0; - } - - - static uint64 tiffSeekProc(thandle_t fd, uint64 off, int whence) - { - tImageSource* isource = (tImageSource*)fd; - uint64 ret = -1; - do - { - if (whence == SEEK_SET) - { - CC_BREAK_IF(off >= (uint64)isource->size); - ret = isource->offset = (uint32)off; - } - else if (whence == SEEK_CUR) - { - CC_BREAK_IF(isource->offset + off >= (uint64)isource->size); - ret = isource->offset += (uint32)off; - } - else if (whence == SEEK_END) - { - CC_BREAK_IF(off >= (uint64)isource->size); - ret = isource->offset = (uint32)(isource->size-1 - off); - } - else - { - CC_BREAK_IF(off >= (uint64)isource->size); - ret = isource->offset = (uint32)off; - } - } while (0); - - return ret; - } - - static uint64 tiffSizeProc(thandle_t fd) - { - tImageSource* pImageSrc = (tImageSource*)fd; - return pImageSrc->size; - } - - static int tiffCloseProc(thandle_t fd) - { - CC_UNUSED_PARAM(fd); - return 0; - } - - static int tiffMapProc(thandle_t fd, void** pbase, toff_t* psize) - { - CC_UNUSED_PARAM(fd); - CC_UNUSED_PARAM(pbase); - CC_UNUSED_PARAM(psize); - return 0; - } - - static void tiffUnmapProc(thandle_t fd, void* base, toff_t size) - { - CC_UNUSED_PARAM(fd); - CC_UNUSED_PARAM(base); - CC_UNUSED_PARAM(size); - } -} - bool Image::initWithTiffData(const unsigned char * data, ssize_t dataLen) { - bool bRet = false; - do + _hasPremultipliedAlpha = true; + + TIFFModule *tiffModule = static_cast(ModuleManager::getModule("tiff")); + if (tiffModule) { - // set the read call back function - tImageSource imageSource; - imageSource.data = data; - imageSource.size = dataLen; - imageSource.offset = 0; - - TIFF* tif = TIFFClientOpen("file.tif", "r", (thandle_t)&imageSource, - tiffReadProc, tiffWriteProc, - tiffSeekProc, tiffCloseProc, tiffSizeProc, - tiffMapProc, - tiffUnmapProc); - - CC_BREAK_IF(nullptr == tif); - - uint32 w = 0, h = 0; - uint16 bitsPerSample = 0, samplePerPixel = 0, planarConfig = 0; - size_t npixels = 0; + DataFromModule dataFromTIFFInit; + bool result = tiffModule->initWithTIFFData(data, dataLen, dataFromTIFFInit); + _width = dataFromTIFFInit.width; + _height = dataFromTIFFInit.height; + _renderFormat = dataFromTIFFInit.renderFormat; + _dataLen = dataFromTIFFInit.dataLength; + _data = dataFromTIFFInit.data; - TIFFGetField(tif, TIFFTAG_IMAGEWIDTH, &w); - TIFFGetField(tif, TIFFTAG_IMAGELENGTH, &h); - TIFFGetField(tif, TIFFTAG_BITSPERSAMPLE, &bitsPerSample); - TIFFGetField(tif, TIFFTAG_SAMPLESPERPIXEL, &samplePerPixel); - TIFFGetField(tif, TIFFTAG_PLANARCONFIG, &planarConfig); - - npixels = w * h; - - _renderFormat = Texture2D::PixelFormat::RGBA8888; - _width = w; - _height = h; - - _dataLen = npixels * sizeof (uint32); - _data = static_cast(malloc(_dataLen * sizeof(unsigned char))); - - uint32* raster = (uint32*) _TIFFmalloc(npixels * sizeof (uint32)); - if (raster != nullptr) - { - if (TIFFReadRGBAImageOriented(tif, w, h, raster, ORIENTATION_TOPLEFT, 0)) - { - /* the raster data is pre-multiplied by the alpha component - after invoking TIFFReadRGBAImageOriented*/ - _preMulti = true; - - memcpy(_data, raster, npixels*sizeof (uint32)); - } - - _TIFFfree(raster); - } - - - TIFFClose(tif); - - bRet = true; - } while (0); - return bRet; + return result; + } + else + { + CCLOG("tiff module is not enabled"); + return false; + } } namespace { bool testFormatForPvr2TCSupport(PVR2TexturePixelFormat format) { - if (!Configuration::getInstance()->supportsPVRTC()) - { - if (format == PVR2TexturePixelFormat::PVRTC2BPP_RGBA || - format == PVR2TexturePixelFormat::PVRTC4BPP_RGBA) - { - return false; - } - } - return true; } bool testFormatForPvr3TCSupport(PVR3TexturePixelFormat format) { - if (!Configuration::getInstance()->supportsPVRTC()) - { - if (format == PVR3TexturePixelFormat::PVRTC2BPP_RGB || - format == PVR3TexturePixelFormat::PVRTC2BPP_RGBA || - format == PVR3TexturePixelFormat::PVRTC4BPP_RGB || - format == PVR3TexturePixelFormat::PVRTC4BPP_RGBA) - { + switch (format) { + case PVR3TexturePixelFormat::DXT1: + case PVR3TexturePixelFormat::DXT3: + case PVR3TexturePixelFormat::DXT5: + return Configuration::getInstance()->supportsS3TC(); + + case PVR3TexturePixelFormat::BGRA8888: + return Configuration::getInstance()->supportsBGRA8888(); + + case PVR3TexturePixelFormat::PVRTC2BPP_RGB: + case PVR3TexturePixelFormat::PVRTC2BPP_RGBA: + case PVR3TexturePixelFormat::PVRTC4BPP_RGB: + case PVR3TexturePixelFormat::PVRTC4BPP_RGBA: + case PVR3TexturePixelFormat::ETC1: + case PVR3TexturePixelFormat::RGBA8888: + case PVR3TexturePixelFormat::RGBA4444: + case PVR3TexturePixelFormat::RGBA5551: + case PVR3TexturePixelFormat::RGB565: + case PVR3TexturePixelFormat::RGB888: + case PVR3TexturePixelFormat::A8: + case PVR3TexturePixelFormat::L8: + case PVR3TexturePixelFormat::LA88: + return true; + + default: return false; - } } - - return true; } } @@ -1227,7 +1005,9 @@ bool Image::initWithPVRv2Data(const unsigned char * data, ssize_t dataLen) Configuration *configuration = Configuration::getInstance(); - _hasPremultipliedAlpha = false; + //can not detect the premultiplied alpha from pvr file, use _PVRHaveAlphaPremultiplied instead. + _hasPremultipliedAlpha = _PVRHaveAlphaPremultiplied; + unsigned int flags = CC_SWAP_INT32_LITTLE_TO_HOST(header->flags); PVR2TexturePixelFormat formatFlags = static_cast(flags & PVR_TEXTURE_FLAG_TYPE_MASK); bool flipped = (flags & (unsigned int)PVR2TextureFlag::VerticalFlip) ? true : false; @@ -1256,7 +1036,7 @@ bool Image::initWithPVRv2Data(const unsigned char * data, ssize_t dataLen) return false; } - auto it = Texture2D::getPixelFormatInfoMap().find(v2_pixel_formathash.at(formatFlags)); + auto it = Texture2D::getPixelFormatInfoMap().find(getDevicePixelFormat(v2_pixel_formathash.at(formatFlags))); if (it == Texture2D::getPixelFormatInfoMap().end()) { @@ -1265,6 +1045,7 @@ bool Image::initWithPVRv2Data(const unsigned char * data, ssize_t dataLen) } _renderFormat = it->first; + int bpp = it->second.bpp; //Reset num of mipmaps _numberOfMipmaps = 0; @@ -1285,29 +1066,47 @@ bool Image::initWithPVRv2Data(const unsigned char * data, ssize_t dataLen) while (dataOffset < dataLength) { switch (formatFlags) { - case PVR2TexturePixelFormat::PVRTC2BPP_RGBA: - blockSize = 8 * 4; // Pixel by pixel block size for 2bpp - widthBlocks = width / 8; - heightBlocks = height / 4; - break; - case PVR2TexturePixelFormat::PVRTC4BPP_RGBA: - blockSize = 4 * 4; // Pixel by pixel block size for 4bpp - widthBlocks = width / 4; - heightBlocks = height / 4; - break; - case PVR2TexturePixelFormat::BGRA8888: - if (Configuration::getInstance()->supportsBGRA8888() == false) - { - CCLOG("cocos2d: Image. BGRA8888 not supported on this device"); - return false; - } - default: - blockSize = 1; - widthBlocks = width; - heightBlocks = height; - break; + case PVR2TexturePixelFormat::PVRTC2BPP_RGBA: + if(!Configuration::getInstance()->supportsPVRTC()) + { + CCLOG("cocos2d: Hardware PVR decoder not present. Using software decoder"); + _unpack = true; + _mipmaps[_numberOfMipmaps].len = width*height*4; + _mipmaps[_numberOfMipmaps].address = new unsigned char[width*height*4]; + PVRTDecompressPVRTC(_data+dataOffset,width,height,_mipmaps[_numberOfMipmaps].address, true); + bpp = 2; + } + blockSize = 8 * 4; // Pixel by pixel block size for 2bpp + widthBlocks = width / 8; + heightBlocks = height / 4; + break; + case PVR2TexturePixelFormat::PVRTC4BPP_RGBA: + if(!Configuration::getInstance()->supportsPVRTC()) + { + CCLOG("cocos2d: Hardware PVR decoder not present. Using software decoder"); + _unpack = true; + _mipmaps[_numberOfMipmaps].len = width*height*4; + _mipmaps[_numberOfMipmaps].address = new unsigned char[width*height*4]; + PVRTDecompressPVRTC(_data+dataOffset,width,height,_mipmaps[_numberOfMipmaps].address, false); + bpp = 4; + } + blockSize = 4 * 4; // Pixel by pixel block size for 4bpp + widthBlocks = width / 4; + heightBlocks = height / 4; + break; + case PVR2TexturePixelFormat::BGRA8888: + if (Configuration::getInstance()->supportsBGRA8888() == false) + { + CCLOG("cocos2d: Image. BGRA8888 not supported on this device"); + return false; + } + default: + blockSize = 1; + widthBlocks = width; + heightBlocks = height; + break; } - + // Clamp to minimum number of blocks if (widthBlocks < 2) { @@ -1317,22 +1116,31 @@ bool Image::initWithPVRv2Data(const unsigned char * data, ssize_t dataLen) { heightBlocks = 2; } - - dataSize = widthBlocks * heightBlocks * ((blockSize * it->second.bpp) / 8); + + dataSize = widthBlocks * heightBlocks * ((blockSize * bpp) / 8); int packetLength = (dataLength - dataOffset); packetLength = packetLength > dataSize ? dataSize : packetLength; - + //Make record to the mipmaps array and increment counter - _mipmaps[_numberOfMipmaps].address = _data + dataOffset; - _mipmaps[_numberOfMipmaps].len = packetLength; + if(!_unpack) + { + _mipmaps[_numberOfMipmaps].address = _data + dataOffset; + _mipmaps[_numberOfMipmaps].len = packetLength; + } _numberOfMipmaps++; - + dataOffset += packetLength; - + //Update width and height to the next lower power of two width = MAX(width >> 1, 1); height = MAX(height >> 1, 1); } + + if(_unpack) + { + _data = _mipmaps[0].address; + _dataLen = _mipmaps[0].len; + } return true; } @@ -1371,7 +1179,7 @@ bool Image::initWithPVRv3Data(const unsigned char * data, ssize_t dataLen) return false; } - auto it = Texture2D::getPixelFormatInfoMap().find(v3_pixel_formathash.at(pixelFormat)); + auto it = Texture2D::getPixelFormatInfoMap().find(getDevicePixelFormat(v3_pixel_formathash.at(pixelFormat))); if (it == Texture2D::getPixelFormatInfoMap().end()) { @@ -1381,6 +1189,7 @@ bool Image::initWithPVRv3Data(const unsigned char * data, ssize_t dataLen) } _renderFormat = it->first; + int bpp = it->second.bpp; // flags int flags = CC_SWAP_INT32_LITTLE_TO_HOST(header->flags); @@ -1388,7 +1197,7 @@ bool Image::initWithPVRv3Data(const unsigned char * data, ssize_t dataLen) // PVRv3 specifies premultiply alpha in a flag -- should always respect this in PVRv3 files if (flags & (unsigned int)PVR3TextureFlag::PremultipliedAlpha) { - _preMulti = true; + _hasPremultipliedAlpha = true; } // sizing @@ -1410,29 +1219,65 @@ bool Image::initWithPVRv3Data(const unsigned char * data, ssize_t dataLen) { switch ((PVR3TexturePixelFormat)pixelFormat) { - case PVR3TexturePixelFormat::PVRTC2BPP_RGB : - case PVR3TexturePixelFormat::PVRTC2BPP_RGBA : - blockSize = 8 * 4; // Pixel by pixel block size for 2bpp - widthBlocks = width / 8; - heightBlocks = height / 4; - break; - case PVR3TexturePixelFormat::PVRTC4BPP_RGB : - case PVR3TexturePixelFormat::PVRTC4BPP_RGBA : - blockSize = 4 * 4; // Pixel by pixel block size for 4bpp - widthBlocks = width / 4; - heightBlocks = height / 4; - break; - case PVR3TexturePixelFormat::BGRA8888: - if( ! Configuration::getInstance()->supportsBGRA8888()) + case PVR3TexturePixelFormat::PVRTC2BPP_RGB : + case PVR3TexturePixelFormat::PVRTC2BPP_RGBA : + if(!Configuration::getInstance()->supportsPVRTC()) { - CCLOG("cocos2d: Image. BGRA8888 not supported on this device"); - return false; - } - default: - blockSize = 1; - widthBlocks = width; - heightBlocks = height; - break; + CCLOG("cocos2d: Hardware PVR decoder not present. Using software decoder"); + _unpack = true; + _mipmaps[i].len = width*height*4; + _mipmaps[i].address = new unsigned char[width*height*4]; + PVRTDecompressPVRTC(_data+dataOffset,width,height,_mipmaps[i].address, true); + bpp = 2; + } + blockSize = 8 * 4; // Pixel by pixel block size for 2bpp + widthBlocks = width / 8; + heightBlocks = height / 4; + break; + case PVR3TexturePixelFormat::PVRTC4BPP_RGB : + case PVR3TexturePixelFormat::PVRTC4BPP_RGBA : + if(!Configuration::getInstance()->supportsPVRTC()) + { + CCLOG("cocos2d: Hardware PVR decoder not present. Using software decoder"); + _unpack = true; + _mipmaps[i].len = width*height*4; + _mipmaps[i].address = new unsigned char[width*height*4]; + PVRTDecompressPVRTC(_data+dataOffset,width,height,_mipmaps[i].address, false); + bpp = 4; + } + blockSize = 4 * 4; // Pixel by pixel block size for 4bpp + widthBlocks = width / 4; + heightBlocks = height / 4; + break; + case PVR3TexturePixelFormat::ETC1: + if(!Configuration::getInstance()->supportsETC()) + { + CCLOG("cocos2d: Hardware ETC1 decoder not present. Using software decoder"); + int bytePerPixel = 3; + unsigned int stride = width * bytePerPixel; + _unpack = true; + _mipmaps[i].len = width*height*bytePerPixel; + _mipmaps[i].address = new unsigned char[width*height*bytePerPixel]; + if (etc1_decode_image(static_cast(_data+dataOffset), static_cast(_mipmaps[i].address), width, height, bytePerPixel, stride) != 0) + { + return false; + } + } + blockSize = 4 * 4; // Pixel by pixel block size for 4bpp + widthBlocks = width / 4; + heightBlocks = height / 4; + break; + case PVR3TexturePixelFormat::BGRA8888: + if( ! Configuration::getInstance()->supportsBGRA8888()) + { + CCLOG("cocos2d: Image. BGRA8888 not supported on this device"); + return false; + } + default: + blockSize = 1; + widthBlocks = width; + heightBlocks = height; + break; } // Clamp to minimum number of blocks @@ -1445,12 +1290,15 @@ bool Image::initWithPVRv3Data(const unsigned char * data, ssize_t dataLen) heightBlocks = 2; } - dataSize = widthBlocks * heightBlocks * ((blockSize * it->second.bpp) / 8); + dataSize = widthBlocks * heightBlocks * ((blockSize * bpp) / 8); auto packetLength = _dataLen - dataOffset; packetLength = packetLength > dataSize ? dataSize : packetLength; - _mipmaps[i].address = _data + dataOffset; - _mipmaps[i].len = static_cast(packetLength); + if(!_unpack) + { + _mipmaps[i].address = _data + dataOffset; + _mipmaps[i].len = static_cast(packetLength); + } dataOffset += packetLength; CCAssert(dataOffset <= _dataLen, "CCTexurePVR: Invalid lenght"); @@ -1459,6 +1307,12 @@ bool Image::initWithPVRv3Data(const unsigned char * data, ssize_t dataLen) width = MAX(width >> 1, 1); height = MAX(height >> 1, 1); } + + if(_unpack) + { + _data = _mipmaps[0].address; + _dataLen = _mipmaps[0].len; + } return true; } @@ -1571,7 +1425,7 @@ bool Image::initWithTGAData(tImageTGA* tgaData) _dataLen = _width * _height * tgaData->pixelDepth / 8; _fileType = Format::TGA; - _preMulti = false; + _hasPremultipliedAlpha = false; ret = true; @@ -1873,42 +1727,29 @@ bool Image::initWithPVRData(const unsigned char * data, ssize_t dataLen) bool Image::initWithWebpData(const unsigned char * data, ssize_t dataLen) { - bool bRet = false; - #if (CC_TARGET_PLATFORM == CC_PLATFORM_WP8) || (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT) CCLOG("WEBP image format not supported on WinRT or WP8"); + return false; #else - do - { - WebPDecoderConfig config; - if (WebPInitDecoderConfig(&config) == 0) break; - if (WebPGetFeatures(static_cast(data), dataLen, &config.input) != VP8_STATUS_OK) break; - if (config.input.width == 0 || config.input.height == 0) break; + WEBPModule *webpModule = static_cast(ModuleManager::getModule("webp")); + if (webpModule) + { + DataFromModule dataFromWEBPInit; + bool result = webpModule->initWithWEBPData(data, dataLen, dataFromWEBPInit); + _width = dataFromWEBPInit.width; + _height = dataFromWEBPInit.height; + _renderFormat = dataFromWEBPInit.renderFormat; + _dataLen = dataFromWEBPInit.dataLength; + _data = dataFromWEBPInit.data; - config.output.colorspace = MODE_RGBA; - _renderFormat = Texture2D::PixelFormat::RGBA8888; - _width = config.input.width; - _height = config.input.height; - - _dataLen = _width * _height * 4; - _data = static_cast(malloc(_dataLen * sizeof(unsigned char))); - - config.output.u.RGBA.rgba = static_cast(_data); - config.output.u.RGBA.stride = _width * 4; - config.output.u.RGBA.size = _dataLen; - config.output.is_external_memory = 1; - - if (WebPDecode(static_cast(data), dataLen, &config) != VP8_STATUS_OK) - { - free(_data); - _data = nullptr; - break; - } - - bRet = true; - } while (0); + return result; + } + else + { + CCLOG("webp module is not enabled"); + return false; + } #endif - return bRet; } @@ -1921,7 +1762,7 @@ bool Image::initWithRawData(const unsigned char * data, ssize_t dataLen, int wid _height = height; _width = width; - _preMulti = preMulti; + _hasPremultipliedAlpha = preMulti; _renderFormat = Texture2D::PixelFormat::RGBA8888; // only RGBA8888 supported @@ -2127,82 +1968,16 @@ bool Image::saveImageToPNG(const std::string& filePath, bool isToRGB) } bool Image::saveImageToJPG(const std::string& filePath) { - bool bRet = false; - do + JPEGModule *jpegModule = static_cast(ModuleManager::getModule("jpeg")); + if (jpegModule) { - struct jpeg_compress_struct cinfo; - struct jpeg_error_mgr jerr; - FILE * outfile; /* target file */ - JSAMPROW row_pointer[1]; /* pointer to JSAMPLE row[s] */ - int row_stride; /* physical row width in image buffer */ - - cinfo.err = jpeg_std_error(&jerr); - /* Now we can initialize the JPEG compression object. */ - jpeg_create_compress(&cinfo); - - CC_BREAK_IF((outfile = fopen(filePath.c_str(), "wb")) == nullptr); - - jpeg_stdio_dest(&cinfo, outfile); - - cinfo.image_width = _width; /* image width and height, in pixels */ - cinfo.image_height = _height; - cinfo.input_components = 3; /* # of color components per pixel */ - cinfo.in_color_space = JCS_RGB; /* colorspace of input image */ - - jpeg_set_defaults(&cinfo); - jpeg_set_quality(&cinfo, 90, TRUE); - - jpeg_start_compress(&cinfo, TRUE); - - row_stride = _width * 3; /* JSAMPLEs per row in image_buffer */ - - if (hasAlpha()) - { - unsigned char *pTempData = static_cast(malloc(_width * _height * 3 * sizeof(unsigned char))); - if (nullptr == pTempData) - { - jpeg_finish_compress(&cinfo); - jpeg_destroy_compress(&cinfo); - fclose(outfile); - break; - } - - for (int i = 0; i < _height; ++i) - { - for (int j = 0; j < _width; ++j) - - { - pTempData[(i * _width + j) * 3] = _data[(i * _width + j) * 4]; - pTempData[(i * _width + j) * 3 + 1] = _data[(i * _width + j) * 4 + 1]; - pTempData[(i * _width + j) * 3 + 2] = _data[(i * _width + j) * 4 + 2]; - } - } - - while (cinfo.next_scanline < cinfo.image_height) { - row_pointer[0] = & pTempData[cinfo.next_scanline * row_stride]; - (void) jpeg_write_scanlines(&cinfo, row_pointer, 1); - } - - if (pTempData != nullptr) - { - free(pTempData); - } - } - else - { - while (cinfo.next_scanline < cinfo.image_height) { - row_pointer[0] = & _data[cinfo.next_scanline * row_stride]; - (void) jpeg_write_scanlines(&cinfo, row_pointer, 1); - } - } - - jpeg_finish_compress(&cinfo); - fclose(outfile); - jpeg_destroy_compress(&cinfo); - - bRet = true; - } while (0); - return bRet; + return jpegModule->saveImage(filePath, this); + } + else + { + CCLOG("jpeg module is not enabled"); + return false; + } } void Image::premultipliedAlpha() @@ -2216,7 +1991,12 @@ void Image::premultipliedAlpha() fourBytes[i] = CC_RGB_PREMULTIPLY_ALPHA(p[0], p[1], p[2], p[3]); } - _preMulti = true; + _hasPremultipliedAlpha = true; +} + +void Image::setPVRImagesHavePremultipliedAlpha(bool haveAlphaPremultiplied) +{ + _PVRHaveAlphaPremultiplied = haveAlphaPremultiplied; } NS_CC_END diff --git a/cocos/platform/CCImage.h b/cocos/platform/CCImage.h index 5c37da9436..bb9e8d0014 100644 --- a/cocos/platform/CCImage.h +++ b/cocos/platform/CCImage.h @@ -26,6 +26,8 @@ THE SOFTWARE. #ifndef __CC_IMAGE_H__ #define __CC_IMAGE_H__ +#include +#include #include "base/CCRef.h" #include "renderer/CCTexture2D.h" @@ -51,6 +53,7 @@ typedef struct _MipmapInfo { unsigned char* address; int len; + _MipmapInfo():address(NULL),len(0){} }MipmapInfo; class CC_DLL Image : public Ref @@ -121,10 +124,10 @@ public: inline Texture2D::PixelFormat getRenderFormat() { return _renderFormat; } inline int getWidth() { return _width; } inline int getHeight() { return _height; } - inline bool isPremultipliedAlpha() { return _preMulti; } inline int getNumberOfMipmaps() { return _numberOfMipmaps; } inline MipmapInfo* getMipmaps() { return _mipmaps; } inline bool hasPremultipliedAlpha() { return _hasPremultipliedAlpha; } + CC_DEPRECATED_ATTRIBUTE inline bool isPremultipliedAlpha() { return _hasPremultipliedAlpha; } int getBitPerPixel(); bool hasAlpha(); @@ -137,6 +140,15 @@ public: @param isToRGB whether the image is saved as RGB format. */ bool saveToFile(const std::string &filename, bool isToRGB = true); + + + /** treats (or not) PVR files as if they have alpha premultiplied. + Since it is impossible to know at runtime if the PVR images have the alpha channel premultiplied, it is + possible load them as if they have (or not) the alpha channel premultiplied. + + By default it is disabled. + */ + static void setPVRImagesHavePremultipliedAlpha(bool haveAlphaPremultiplied); protected: bool initWithJpgData(const unsigned char * data, ssize_t dataLen); @@ -157,6 +169,7 @@ protected: void premultipliedAlpha(); + protected: /** @brief Determine how many mipmaps can we have. @@ -167,9 +180,9 @@ protected: ssize_t _dataLen; int _width; int _height; + bool _unpack; Format _fileType; Texture2D::PixelFormat _renderFormat; - bool _preMulti; MipmapInfo _mipmaps[MIPMAP_MAX]; // pointer to mipmap images int _numberOfMipmaps; // false if we cann't auto detect the image is premultiplied or not. @@ -202,6 +215,35 @@ protected: bool isATITC(const unsigned char *data, ssize_t dataLen); }; +/* Data returned from jpeg/tiff/webp module initialization + */ +typedef struct DataFromModule +{ + Texture2D::PixelFormat renderFormat; + int width; + int height; + ssize_t dataLength; + unsigned char* data; + bool hasPremultiAlpha; +} DataFromModule; + +struct JPEGModule +{ + std::function saveImage; + std::function initWithJPEGData; +}; + +struct TIFFModule +{ + std::function initWithTIFFData; +}; + +struct WEBPModule +{ + std::function initWithWEBPData; +}; + + // end of platform group /// @} diff --git a/cocos/platform/CMakeLists.txt b/cocos/platform/CMakeLists.txt index c3ab0850e5..28200922fd 100644 --- a/cocos/platform/CMakeLists.txt +++ b/cocos/platform/CMakeLists.txt @@ -31,10 +31,10 @@ include_directories( set(COCOS_PLATFORM_SRC platform/CCSAXParser.cpp platform/CCThread.cpp - platform/CCGLViewProtocol.cpp + platform/CCGLView.cpp platform/CCFileUtils.cpp platform/CCImage.cpp - platform/desktop/CCGLView.cpp + platform/desktop/CCGLViewImpl.cpp ../external/edtaa3func/edtaa3func.cpp ../external/ConvertUTF/ConvertUTFWrapper.cpp ../external/ConvertUTF/ConvertUTF.c diff --git a/cocos/platform/android/Android.mk b/cocos/platform/android/Android.mk index 1c35aa7dfc..bfc2e61672 100644 --- a/cocos/platform/android/Android.mk +++ b/cocos/platform/android/Android.mk @@ -10,7 +10,7 @@ LOCAL_SRC_FILES := \ CCApplication.cpp \ CCCommon.cpp \ CCDevice.cpp \ -CCGLView.cpp \ +CCGLViewImpl.cpp \ CCFileUtilsAndroid.cpp \ javaactivity.cpp \ jni/DPIJni.cpp \ @@ -28,13 +28,6 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH) \ $(LOCAL_PATH)/.. \ $(LOCAL_PATH)/../.. \ -LOCAL_LDLIBS := -lGLESv1_CM \ - -lGLESv2 \ - -lEGL \ - -llog \ - -lz \ - -landroid - LOCAL_EXPORT_LDLIBS := -lGLESv1_CM \ -lGLESv2 \ -lEGL \ @@ -42,12 +35,4 @@ LOCAL_EXPORT_LDLIBS := -lGLESv1_CM \ -lz \ -landroid -LOCAL_WHOLE_STATIC_LIBRARIES := cocos_png_static cocos_jpeg_static cocos_tiff_static cocos_webp_static - - include $(BUILD_STATIC_LIBRARY) - -$(call import-module,jpeg/prebuilt/android) -$(call import-module,png/prebuilt/android) -$(call import-module,tiff/prebuilt/android) -$(call import-module,webp/prebuilt/android) diff --git a/cocos/platform/android/CCApplication.cpp b/cocos/platform/android/CCApplication.cpp index 9cfaf5d8a8..b7ff8bb8db 100644 --- a/cocos/platform/android/CCApplication.cpp +++ b/cocos/platform/android/CCApplication.cpp @@ -30,7 +30,6 @@ THE SOFTWARE. #include "jni/Java_org_cocos2dx_lib_Cocos2dxHelper.h" #include "CCApplication.h" #include "base/CCDirector.h" -#include "CCGLView.h" #include #include #include @@ -68,7 +67,16 @@ int Application::run() void Application::setAnimationInterval(double interval) { - // NYI + JniMethodInfo methodInfo; + if (! JniHelper::getStaticMethodInfo(methodInfo, "org/cocos2dx/lib/Cocos2dxRenderer", "setAnimationInterval", + "(D)V")) + { + CCLOG("%s %d: error to get methodInfo", __FILE__, __LINE__); + } + else + { + methodInfo.env->CallStaticVoidMethod(methodInfo.classID, methodInfo.methodID, interval); + } } ////////////////////////////////////////////////////////////////////////// diff --git a/cocos/platform/android/CCDevice.cpp b/cocos/platform/android/CCDevice.cpp index fc5a0902f8..3ccb441d19 100644 --- a/cocos/platform/android/CCDevice.cpp +++ b/cocos/platform/android/CCDevice.cpp @@ -202,6 +202,12 @@ Data Device::getTextureDataForText(const char * text, const FontDefinition& text return ret; } + +void Device::setKeepScreenOn(bool value) +{ + setKeepScreenOnJni(value); +} + NS_CC_END #endif // CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID diff --git a/cocos/platform/android/CCFileUtilsAndroid.h b/cocos/platform/android/CCFileUtilsAndroid.h index 9639c0daed..a9bb766b92 100644 --- a/cocos/platform/android/CCFileUtilsAndroid.h +++ b/cocos/platform/android/CCFileUtilsAndroid.h @@ -56,6 +56,7 @@ public: virtual ~FileUtilsAndroid(); static void setassetmanager(AAssetManager* a); + static AAssetManager* getAssetManager() { return assetmanager; } /* override funtions */ bool init(); diff --git a/cocos/platform/android/CCGLView.cpp b/cocos/platform/android/CCGLViewImpl.cpp similarity index 80% rename from cocos/platform/android/CCGLView.cpp rename to cocos/platform/android/CCGLViewImpl.cpp index 35e88bfa4d..90fdc30df7 100644 --- a/cocos/platform/android/CCGLView.cpp +++ b/cocos/platform/android/CCGLViewImpl.cpp @@ -26,7 +26,7 @@ THE SOFTWARE. #include "base/CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID -#include "CCGLView.h" +#include "CCGLViewImpl.h" #include "base/CCDirector.h" #include "base/ccMacros.h" #include "jni/IMEJni.h" @@ -51,9 +51,9 @@ void initExtensions() { NS_CC_BEGIN -GLView* GLView::createWithRect(const std::string& viewName, Rect rect, float frameZoomFactor) +GLViewImpl* GLViewImpl::createWithRect(const std::string& viewName, Rect rect, float frameZoomFactor) { - auto ret = new GLView; + auto ret = new GLViewImpl; if(ret && ret->initWithRect(viewName, rect, frameZoomFactor)) { ret->autorelease(); return ret; @@ -62,9 +62,9 @@ GLView* GLView::createWithRect(const std::string& viewName, Rect rect, float fra return nullptr; } -GLView* GLView::create(const std::string& viewName) +GLViewImpl* GLViewImpl::create(const std::string& viewName) { - auto ret = new GLView; + auto ret = new GLViewImpl; if(ret && ret->initWithFullScreen(viewName)) { ret->autorelease(); return ret; @@ -73,9 +73,9 @@ GLView* GLView::create(const std::string& viewName) return nullptr; } -GLView* GLView::createWithFullScreen(const std::string& viewName) +GLViewImpl* GLViewImpl::createWithFullScreen(const std::string& viewName) { - auto ret = new GLView(); + auto ret = new GLViewImpl(); if(ret && ret->initWithFullScreen(viewName)) { ret->autorelease(); return ret; @@ -84,42 +84,42 @@ GLView* GLView::createWithFullScreen(const std::string& viewName) return nullptr; } -GLView::GLView() +GLViewImpl::GLViewImpl() { initExtensions(); } -GLView::~GLView() +GLViewImpl::~GLViewImpl() { } -bool GLView::initWithRect(const std::string& viewName, Rect rect, float frameZoomFactor) +bool GLViewImpl::initWithRect(const std::string& viewName, Rect rect, float frameZoomFactor) { return true; } -bool GLView::initWithFullScreen(const std::string& viewName) +bool GLViewImpl::initWithFullScreen(const std::string& viewName) { return true; } -bool GLView::isOpenGLReady() +bool GLViewImpl::isOpenGLReady() { return (_screenSize.width != 0 && _screenSize.height != 0); } -void GLView::end() +void GLViewImpl::end() { terminateProcessJNI(); } -void GLView::swapBuffers() +void GLViewImpl::swapBuffers() { } -void GLView::setIMEKeyboardState(bool bOpen) +void GLViewImpl::setIMEKeyboardState(bool bOpen) { setKeyboardStateJNI((int)bOpen); } diff --git a/cocos/platform/android/CCGLView.h b/cocos/platform/android/CCGLViewImpl.h similarity index 79% rename from cocos/platform/android/CCGLView.h rename to cocos/platform/android/CCGLViewImpl.h index 6423d7019d..820189e148 100644 --- a/cocos/platform/android/CCGLView.h +++ b/cocos/platform/android/CCGLViewImpl.h @@ -23,26 +23,26 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#ifndef __CC_EGLVIEW_ANDROID_H__ -#define __CC_EGLVIEW_ANDROID_H__ +#ifndef __CC_EGLVIEWIMPL_ANDROID_H__ +#define __CC_EGLVIEWIMPL_ANDROID_H__ #include "base/CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID #include "base/CCRef.h" #include "math/CCGeometry.h" -#include "platform/CCGLViewProtocol.h" +#include "platform/CCGLView.h" NS_CC_BEGIN -class CC_DLL GLView : public GLViewProtocol, public Ref +class CC_DLL GLViewImpl : public GLView { public: // static function - static GLView* create(const std::string &viewname); - static GLView* createWithRect(const std::string& viewName, Rect rect, float frameZoomFactor = 1.0f); - static GLView* createWithFullScreen(const std::string& viewName); + static GLViewImpl* create(const std::string &viewname); + static GLViewImpl* createWithRect(const std::string& viewName, Rect rect, float frameZoomFactor = 1.0f); + static GLViewImpl* createWithFullScreen(const std::string& viewName); bool isOpenGLReady() override; void end() override; @@ -50,8 +50,8 @@ public: void setIMEKeyboardState(bool bOpen) override; protected: - GLView(); - virtual ~GLView(); + GLViewImpl(); + virtual ~GLViewImpl(); bool initWithRect(const std::string& viewName, Rect rect, float frameZoomFactor); bool initWithFullScreen(const std::string& viewName); @@ -61,5 +61,5 @@ NS_CC_END #endif // CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID -#endif // end of __CC_EGLVIEW_ANDROID_H__ +#endif // end of __CC_EGLVIEWIMPL_ANDROID_H__ diff --git a/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxActivity.java b/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxActivity.java index 78929fb300..9ae61cc165 100644 --- a/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxActivity.java +++ b/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxActivity.java @@ -34,6 +34,7 @@ import android.os.Build; import android.os.Bundle; import android.os.Message; import android.view.ViewGroup; +import android.view.WindowManager; import android.util.Log; import android.widget.FrameLayout; import android.preference.PreferenceManager.OnActivityResultListener; @@ -58,6 +59,16 @@ public abstract class Cocos2dxActivity extends Activity implements Cocos2dxHelpe return sContext; } + public void setKeepScreenOn(boolean value) { + final boolean newValue = value; + runOnUiThread(new Runnable() { + @Override + public void run() { + mGLSurfaceView.setKeepScreenOn(newValue); + } + }); + } + protected void onLoadNativeLibraries() { try { ApplicationInfo ai = getPackageManager().getApplicationInfo(getPackageName(), PackageManager.GET_META_DATA); diff --git a/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxHelper.java b/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxHelper.java index 3cabec4822..ea102e7f73 100644 --- a/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxHelper.java +++ b/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxHelper.java @@ -167,6 +167,10 @@ public class Cocos2dxHelper { Cocos2dxHelper.sAccelerometerEnabled = false; Cocos2dxHelper.sCocos2dxAccelerometer.disable(); } + + public static void setKeepScreenOn(boolean value) { + ((Cocos2dxActivity)sActivity).setKeepScreenOn(value); + } public static void preloadBackgroundMusic(final String pPath) { Cocos2dxHelper.sCocos2dMusic.preloadBackgroundMusic(pPath); diff --git a/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxRenderer.java b/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxRenderer.java index a40d06019e..89752bae2a 100644 --- a/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxRenderer.java +++ b/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxRenderer.java @@ -82,31 +82,27 @@ public class Cocos2dxRenderer implements GLSurfaceView.Renderer { @Override public void onDrawFrame(final GL10 gl) { /* - * FPS controlling algorithm is not accurate, and it will slow down FPS - * on some devices. So comment FPS controlling code. + * No need to use algorithm in default(60 FPS) situation, + * since onDrawFrame() was called by system 60 times per second by default. */ + if (sAnimationInterval <= 1.0 / 60 * Cocos2dxRenderer.NANOSECONDSPERSECOND) { + Cocos2dxRenderer.nativeRender(); + } else { + final long now = System.nanoTime(); + final long interval = now - this.mLastTickInNanoSeconds; - /* - final long nowInNanoSeconds = System.nanoTime(); - final long interval = nowInNanoSeconds - this.mLastTickInNanoSeconds; - */ - - // should render a frame when onDrawFrame() is called or there is a - // "ghost" - Cocos2dxRenderer.nativeRender(); - - /* - // fps controlling - if (interval < Cocos2dxRenderer.sAnimationInterval) { - try { - // because we render it before, so we should sleep twice time interval - Thread.sleep((Cocos2dxRenderer.sAnimationInterval - interval) / Cocos2dxRenderer.NANOSECONDSPERMICROSECOND); - } catch (final Exception e) { + if (interval < Cocos2dxRenderer.sAnimationInterval) { + try { + Thread.sleep((Cocos2dxRenderer.sAnimationInterval - interval) / Cocos2dxRenderer.NANOSECONDSPERMICROSECOND); + } catch (final Exception e) { + } } + /* + * Render time MUST be counted in, or the FPS will slower than appointed. + */ + this.mLastTickInNanoSeconds = System.nanoTime(); + Cocos2dxRenderer.nativeRender(); } - - this.mLastTickInNanoSeconds = nowInNanoSeconds; - */ } // =========================================================== diff --git a/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxVideoView.java b/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxVideoView.java index 11ca29a137..48dc5d8d67 100644 --- a/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxVideoView.java +++ b/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxVideoView.java @@ -119,7 +119,7 @@ public class Cocos2dxVideoView extends SurfaceView implements MediaPlayerControl mViewHeight = maxHeight; if (mVideoWidth != 0 && mVideoHeight != 0) { - fixSize(mViewLeft, mViewTop, mViewWidth, mVideoHeight); + fixSize(mViewLeft, mViewTop, mViewWidth, mViewHeight); } } @@ -324,7 +324,7 @@ public class Cocos2dxVideoView extends SurfaceView implements MediaPlayerControl if (mFullScreenEnabled) { fixSize(0, 0, mFullScreenWidth, mFullScreenHeight); } else { - fixSize(mViewLeft, mViewTop, mViewWidth, mVideoHeight); + fixSize(mViewLeft, mViewTop, mViewWidth, mViewHeight); } } diff --git a/cocos/platform/android/javaactivity.cpp b/cocos/platform/android/javaactivity.cpp index 866318527f..b16482600e 100644 --- a/cocos/platform/android/javaactivity.cpp +++ b/cocos/platform/android/javaactivity.cpp @@ -32,7 +32,7 @@ THE SOFTWARE. #include "renderer/CCGLProgramCache.h" #include "renderer/CCTextureCache.h" #include "2d/CCDrawingPrimitives.h" -#include "CCGLView.h" +#include "CCGLViewImpl.h" #include "platform/android/jni/JniHelper.h" #include #include @@ -60,7 +60,7 @@ void Java_org_cocos2dx_lib_Cocos2dxRenderer_nativeInit(JNIEnv* env, jobject thi auto glview = director->getOpenGLView(); if (!glview) { - glview = cocos2d::GLView::create("Android app"); + glview = cocos2d::GLViewImpl::create("Android app"); glview->setFrameSize(w, h); director->setOpenGLView(glview); diff --git a/cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.cpp b/cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.cpp index 3449bbbc9d..ef9fac20a4 100644 --- a/cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.cpp +++ b/cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.cpp @@ -209,6 +209,16 @@ void disableAccelerometerJni() { } } +void setKeepScreenOnJni(bool value) { + JniMethodInfo t; + + if (JniHelper::getStaticMethodInfo(t, CLASS_NAME, "setKeepScreenOn", "(Z)V")) { + t.env->CallStaticVoidMethod(t.classID, t.methodID, value); + + t.env->DeleteLocalRef(t.classID); + } +} + // functions for UserDefault bool getBoolForKeyJNI(const char* key, bool defaultValue) { diff --git a/cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.h b/cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.h index 34d521a911..7044a4e5e4 100644 --- a/cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.h +++ b/cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.h @@ -39,6 +39,7 @@ extern std::string getFileDirectoryJNI(); extern void enableAccelerometerJni(); extern void disableAccelerometerJni(); extern void setAccelerometerIntervalJni(float interval); +extern void setKeepScreenOnJni(bool value); // functions for UserDefault extern bool getBoolForKeyJNI(const char* key, bool defaultValue); extern int getIntegerForKeyJNI(const char* key, int defaultValue); diff --git a/cocos/platform/android/jni/TouchesJni.cpp b/cocos/platform/android/jni/TouchesJni.cpp index 023b7fba93..b54362280f 100644 --- a/cocos/platform/android/jni/TouchesJni.cpp +++ b/cocos/platform/android/jni/TouchesJni.cpp @@ -23,7 +23,7 @@ THE SOFTWARE. ****************************************************************************/ #include "base/CCDirector.h" #include "base/CCEventKeyboard.h" -#include "CCGLView.h" +#include "CCGLViewImpl.h" #include #include diff --git a/cocos/platform/apple/CCFileUtilsApple.h b/cocos/platform/apple/CCFileUtilsApple.h index 57519eed9c..4a0e16fd96 100644 --- a/cocos/platform/apple/CCFileUtilsApple.h +++ b/cocos/platform/apple/CCFileUtilsApple.h @@ -2,19 +2,19 @@ Copyright (c) 2010-2012 cocos2d-x.org Copyright (c) 2011 Zynga Inc. 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 @@ -43,16 +43,21 @@ NS_CC_BEGIN class CC_DLL FileUtilsApple : public FileUtils { public: + FileUtilsApple(); /* override funtions */ virtual std::string getWritablePath() const override; virtual std::string getFullPathForDirectoryAndFilename(const std::string& directory, const std::string& filename) override; - + virtual ValueMap getValueMapFromFile(const std::string& filename) override; + virtual ValueMap getValueMapFromData(const char* filedata, int filesize); virtual bool writeToFile(ValueMap& dict, const std::string& fullPath) override; - + virtual ValueVector getValueVectorFromFile(const std::string& filename) override; + void setBundle(NSBundle* bundle); private: virtual bool isFileExistInternal(const std::string& filePath) const override; + NSBundle* getBundle() const; + NSBundle* _bundle; }; // end of platform group diff --git a/cocos/platform/apple/CCFileUtilsApple.mm b/cocos/platform/apple/CCFileUtilsApple.mm index 1a10ace233..79c32e43c3 100644 --- a/cocos/platform/apple/CCFileUtilsApple.mm +++ b/cocos/platform/apple/CCFileUtilsApple.mm @@ -49,7 +49,7 @@ static void addItemToArray(id item, ValueVector& array) array.push_back(Value([item UTF8String])); return; } - + // add number value into array(such as int, float, bool and so on) // the value is a number if ([item isKindOfClass:[NSNumber class]]) @@ -74,7 +74,7 @@ static void addItemToArray(id item, ValueVector& array) return; } - + // add dictionary value into array if ([item isKindOfClass:[NSDictionary class]]) { @@ -84,11 +84,11 @@ static void addItemToArray(id item, ValueVector& array) id subValue = [item objectForKey:subKey]; addValueToDict(subKey, subValue, dict); } - + array.push_back(Value(dict)); return; } - + // add array value into array if ([item isKindOfClass:[NSArray class]]) { @@ -111,48 +111,48 @@ static void addObjectToNSArray(const Value& value, NSMutableArray *array) [array addObject:element]; return; } - + //add float into array if (value.getType() == Value::Type::FLOAT) { NSNumber *number = [NSNumber numberWithFloat:value.asFloat()]; [array addObject:number]; } - + //add double into array if (value.getType() == Value::Type::DOUBLE) { NSNumber *number = [NSNumber numberWithDouble:value.asDouble()]; [array addObject:number]; } - + //add boolean into array if (value.getType() == Value::Type::BOOLEAN) { NSNumber *element = [NSNumber numberWithBool:value.asBool()]; [array addObject:element]; } - + if (value.getType() == Value::Type::INTEGER) { NSNumber *element = [NSNumber numberWithInt:value.asInt()]; [array addObject:element]; } - + //todo: add date and data support - + // add array into array if (value.getType() == Value::Type::VECTOR) { NSMutableArray *element = [NSMutableArray array]; - + ValueVector valueArray = value.asValueVector(); - + for (const auto &e : valueArray) { addObjectToNSArray(e, element); } - + [array addObject:element]; return; } - + // add dictionary value into array if (value.getType() == Value::Type::MAP) { @@ -163,7 +163,7 @@ static void addObjectToNSArray(const Value& value, NSMutableArray *array) { addObjectToNSDict(iter->first, iter->second, element); } - + [array addObject:element]; } } @@ -173,14 +173,14 @@ static void addValueToDict(id nsKey, id nsValue, ValueMap& dict) // the key must be a string CCASSERT([nsKey isKindOfClass:[NSString class]], "The key should be a string!"); std::string key = [nsKey UTF8String]; - + // the value is a string if ([nsValue isKindOfClass:[NSString class]]) { dict[key] = Value([nsValue UTF8String]); return; } - + // the value is a number if ([nsValue isKindOfClass:[NSNumber class]]) { @@ -204,12 +204,12 @@ static void addValueToDict(id nsKey, id nsValue, ValueMap& dict) return; } - + // the value is a new dictionary if ([nsValue isKindOfClass:[NSDictionary class]]) { ValueMap subDict; - + for (id subKey in [nsValue allKeys]) { id subValue = [nsValue objectForKey:subKey]; @@ -218,7 +218,7 @@ static void addValueToDict(id nsKey, id nsValue, ValueMap& dict) dict[key] = Value(subDict); return; } - + // the value is a array if ([nsValue isKindOfClass:[NSArray class]]) { @@ -231,13 +231,13 @@ static void addValueToDict(id nsKey, id nsValue, ValueMap& dict) dict[key] = Value(valueArray); return; } - + } static void addObjectToNSDict(const std::string& key, const Value& value, NSMutableDictionary *dict) { NSString *NSkey = [NSString stringWithCString:key.c_str() encoding:NSUTF8StringEncoding]; - + // the object is a Dictionary if (value.getType() == Value::Type::MAP) { @@ -247,35 +247,35 @@ static void addObjectToNSDict(const std::string& key, const Value& value, NSMuta { addObjectToNSDict(iter->first, iter->second, dictElement); } - + [dict setObject:dictElement forKey:NSkey]; return; } - + //add float into dict if (value.getType() == Value::Type::FLOAT) { NSNumber *number = [NSNumber numberWithFloat:value.asFloat()]; [dict setObject:number forKey:NSkey]; } - + //add double into dict if (value.getType() == Value::Type::DOUBLE) { NSNumber *number = [NSNumber numberWithDouble:value.asDouble()]; [dict setObject:number forKey:NSkey]; } - + //add boolean into dict if (value.getType() == Value::Type::BOOLEAN) { NSNumber *element = [NSNumber numberWithBool:value.asBool()]; [dict setObject:element forKey:NSkey]; } - + //add integer into dict if (value.getType() == Value::Type::INTEGER) { NSNumber *element = [NSNumber numberWithInt:value.asInt()]; [dict setObject:element forKey:NSkey]; } - + // the object is a String if (value.getType() == Value::Type::STRING) { @@ -283,14 +283,14 @@ static void addObjectToNSDict(const std::string& key, const Value& value, NSMuta [dict setObject:strElement forKey:NSkey]; return; } - + // the object is a Array if (value.getType() == Value::Type::VECTOR) { NSMutableArray *arrElement = [NSMutableArray array]; - + ValueVector array = value.asValueVector(); - + for(const auto& v : array) { addObjectToNSArray(v, arrElement); @@ -301,6 +301,19 @@ static void addObjectToNSDict(const std::string& key, const Value& value, NSMuta } } +FileUtilsApple::FileUtilsApple() { + _bundle = [NSBundle mainBundle]; +} + + +void FileUtilsApple::setBundle(NSBundle* bundle) { + _bundle = bundle; +} + +NSBundle* FileUtilsApple::getBundle() const { + return _bundle; +} + #pragma mark - FileUtils @@ -340,7 +353,7 @@ bool FileUtilsApple::isFileExistInternal(const std::string& filePath) const } bool ret = false; - + if (filePath[0] != '/') { std::string path; @@ -355,8 +368,8 @@ bool FileUtilsApple::isFileExistInternal(const std::string& filePath) const { file = filePath; } - - NSString* fullpath = [[NSBundle mainBundle] pathForResource:[NSString stringWithUTF8String:file.c_str()] + + NSString* fullpath = [getBundle() pathForResource:[NSString stringWithUTF8String:file.c_str()] ofType:nil inDirectory:[NSString stringWithUTF8String:path.c_str()]]; if (fullpath != nil) { @@ -370,7 +383,7 @@ bool FileUtilsApple::isFileExistInternal(const std::string& filePath) const ret = true; } } - + return ret; } @@ -378,7 +391,7 @@ std::string FileUtilsApple::getFullPathForDirectoryAndFilename(const std::string { if (directory[0] != '/') { - NSString* fullpath = [[NSBundle mainBundle] pathForResource:[NSString stringWithUTF8String:filename.c_str()] + NSString* fullpath = [getBundle() pathForResource:[NSString stringWithUTF8String:filename.c_str()] ofType:nil inDirectory:[NSString stringWithUTF8String:directory.c_str()]]; if (fullpath != nil) { @@ -401,6 +414,26 @@ ValueMap FileUtilsApple::getValueMapFromFile(const std::string& filename) std::string fullPath = fullPathForFilename(filename); NSString* path = [NSString stringWithUTF8String:fullPath.c_str()]; NSDictionary* dict = [NSDictionary dictionaryWithContentsOfFile:path]; + + ValueMap ret; + + if (dict != nil) + { + for (id key in [dict allKeys]) + { + id value = [dict objectForKey:key]; + addValueToDict(key, value, ret); + } + } + return ret; +} + +ValueMap FileUtilsApple::getValueMapFromData(const char* filedata, int filesize) +{ + NSData* file = [NSData dataWithBytes:filedata length:filesize]; + NSPropertyListFormat format; + NSError* error; + NSDictionary* dict = [NSPropertyListSerialization propertyListWithData:file options:NSPropertyListImmutable format:&format error:&error]; ValueMap ret; @@ -419,16 +452,16 @@ bool FileUtilsApple::writeToFile(ValueMap& dict, const std::string &fullPath) { //CCLOG("iOS||Mac Dictionary %d write to file %s", dict->_ID, fullPath.c_str()); NSMutableDictionary *nsDict = [NSMutableDictionary dictionary]; - + for (auto iter = dict.begin(); iter != dict.end(); ++iter) { addObjectToNSDict(iter->first, iter->second, nsDict); } - + NSString *file = [NSString stringWithUTF8String:fullPath.c_str()]; // do it atomically [nsDict writeToFile:file atomically:YES]; - + return true; } @@ -442,14 +475,14 @@ ValueVector FileUtilsApple::getValueVectorFromFile(const std::string& filename) std::string fullPath = fullPathForFilename(filename); NSString* path = [NSString stringWithUTF8String:fullPath.c_str()]; NSArray* array = [NSArray arrayWithContentsOfFile:path]; - + ValueVector ret; - + for (id value in array) { addItemToArray(value, ret); } - + return ret; } diff --git a/cocos/platform/desktop/CCGLView.cpp b/cocos/platform/desktop/CCGLViewImpl.cpp similarity index 89% rename from cocos/platform/desktop/CCGLView.cpp rename to cocos/platform/desktop/CCGLViewImpl.cpp index 4c4fbd7072..4b7eef7f6b 100644 --- a/cocos/platform/desktop/CCGLView.cpp +++ b/cocos/platform/desktop/CCGLViewImpl.cpp @@ -23,7 +23,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "CCGLView.h" +#include "CCGLViewImpl.h" +#include "CCApplication.h" #include "base/CCDirector.h" #include "base/CCTouch.h" #include "base/CCEventDispatcher.h" @@ -31,6 +32,7 @@ THE SOFTWARE. #include "base/CCEventMouse.h" #include "base/CCIMEDispatcher.h" #include "base/ccUtils.h" +#include "base/ccUTF8.h" #include @@ -95,16 +97,24 @@ public: _view->onGLFWWindowSizeFunCallback(window, width, height); } - static void setGLView(GLView* view) + static void setGLViewImpl(GLViewImpl* view) { _view = view; } + static void onGLFWWindowIconifyCallback(GLFWwindow* window, int iconified) + { + if (_view) + { + _view->onGLFWWindowIconifyCallback(window, iconified); + } + } + private: - static GLView* _view; + static GLViewImpl* _view; }; -GLView* GLFWEventHandler::_view = nullptr; +GLViewImpl* GLFWEventHandler::_view = nullptr; //////////////////////////////////////////////////// @@ -247,11 +257,11 @@ static keyCodeItem g_keyCodeStructArray[] = { }; ////////////////////////////////////////////////////////////////////////// -// implement GLView +// implement GLViewImpl ////////////////////////////////////////////////////////////////////////// -GLView::GLView() +GLViewImpl::GLViewImpl() : _captured(false) , _supportTouch(false) , _isInRetinaMonitor(false) @@ -270,22 +280,22 @@ GLView::GLView() g_keyCodeMap[item.glfwKeyCode] = item.keyCode; } - GLFWEventHandler::setGLView(this); + GLFWEventHandler::setGLViewImpl(this); glfwSetErrorCallback(GLFWEventHandler::onGLFWError); glfwInit(); } -GLView::~GLView() +GLViewImpl::~GLViewImpl() { - CCLOGINFO("deallocing GLView: %p", this); - GLFWEventHandler::setGLView(nullptr); + CCLOGINFO("deallocing GLViewImpl: %p", this); + GLFWEventHandler::setGLViewImpl(nullptr); glfwTerminate(); } -GLView* GLView::create(const std::string& viewName) +GLViewImpl* GLViewImpl::create(const std::string& viewName) { - auto ret = new GLView; + auto ret = new GLViewImpl; if(ret && ret->initWithRect(viewName, Rect(0, 0, 960, 640), 1)) { ret->autorelease(); return ret; @@ -294,9 +304,9 @@ GLView* GLView::create(const std::string& viewName) return nullptr; } -GLView* GLView::createWithRect(const std::string& viewName, Rect rect, float frameZoomFactor) +GLViewImpl* GLViewImpl::createWithRect(const std::string& viewName, Rect rect, float frameZoomFactor) { - auto ret = new GLView; + auto ret = new GLViewImpl; if(ret && ret->initWithRect(viewName, rect, frameZoomFactor)) { ret->autorelease(); return ret; @@ -305,9 +315,9 @@ GLView* GLView::createWithRect(const std::string& viewName, Rect rect, float fra return nullptr; } -GLView* GLView::createWithFullScreen(const std::string& viewName) +GLViewImpl* GLViewImpl::createWithFullScreen(const std::string& viewName) { - auto ret = new GLView(); + auto ret = new GLViewImpl(); if(ret && ret->initWithFullScreen(viewName)) { ret->autorelease(); return ret; @@ -316,9 +326,9 @@ GLView* GLView::createWithFullScreen(const std::string& viewName) return nullptr; } -GLView* GLView::createWithFullScreen(const std::string& viewName, const GLFWvidmode &videoMode, GLFWmonitor *monitor) +GLViewImpl* GLViewImpl::createWithFullScreen(const std::string& viewName, const GLFWvidmode &videoMode, GLFWmonitor *monitor) { - auto ret = new GLView(); + auto ret = new GLViewImpl(); if(ret && ret->initWithFullscreen(viewName, videoMode, monitor)) { ret->autorelease(); return ret; @@ -328,7 +338,7 @@ GLView* GLView::createWithFullScreen(const std::string& viewName, const GLFWvidm } -bool GLView::initWithRect(const std::string& viewName, Rect rect, float frameZoomFactor) +bool GLViewImpl::initWithRect(const std::string& viewName, Rect rect, float frameZoomFactor) { setViewName(viewName); @@ -351,6 +361,7 @@ bool GLView::initWithRect(const std::string& viewName, Rect rect, float frameZoo glfwSetWindowPosCallback(_mainWindow, GLFWEventHandler::onGLFWWindowPosCallback); glfwSetFramebufferSizeCallback(_mainWindow, GLFWEventHandler::onGLFWframebuffersize); glfwSetWindowSizeCallback(_mainWindow, GLFWEventHandler::onGLFWWindowSizeFunCallback); + glfwSetWindowIconifyCallback(_mainWindow, GLFWEventHandler::onGLFWWindowIconifyCallback); setFrameSize(rect.size.width, rect.size.height); @@ -375,7 +386,7 @@ bool GLView::initWithRect(const std::string& viewName, Rect rect, float frameZoo return true; } -bool GLView::initWithFullScreen(const std::string& viewName) +bool GLViewImpl::initWithFullScreen(const std::string& viewName) { //Create fullscreen window on primary monitor at its current video mode. _monitor = glfwGetPrimaryMonitor(); @@ -386,7 +397,7 @@ bool GLView::initWithFullScreen(const std::string& viewName) return initWithRect(viewName, Rect(0, 0, videoMode->width, videoMode->height), 1.0f); } -bool GLView::initWithFullscreen(const std::string &viewname, const GLFWvidmode &videoMode, GLFWmonitor *monitor) +bool GLViewImpl::initWithFullscreen(const std::string &viewname, const GLFWvidmode &videoMode, GLFWmonitor *monitor) { //Create fullscreen on specified monitor at the specified video mode. _monitor = monitor; @@ -402,29 +413,29 @@ bool GLView::initWithFullscreen(const std::string &viewname, const GLFWvidmode & return initWithRect(viewname, Rect(0, 0, videoMode.width, videoMode.height), 1.0f); } -bool GLView::isOpenGLReady() +bool GLViewImpl::isOpenGLReady() { return nullptr != _mainWindow; } -void GLView::end() +void GLViewImpl::end() { if(_mainWindow) { glfwSetWindowShouldClose(_mainWindow,1); _mainWindow = nullptr; } - // Release self. Otherwise, GLView could not be freed. + // Release self. Otherwise, GLViewImpl could not be freed. release(); } -void GLView::swapBuffers() +void GLViewImpl::swapBuffers() { if(_mainWindow) glfwSwapBuffers(_mainWindow); } -bool GLView::windowShouldClose() +bool GLViewImpl::windowShouldClose() { if(_mainWindow) return glfwWindowShouldClose(_mainWindow) ? true : false; @@ -432,13 +443,12 @@ bool GLView::windowShouldClose() return true; } -void GLView::pollEvents() +void GLViewImpl::pollEvents() { glfwPollEvents(); } - -void GLView::enableRetina(bool enabled) +void GLViewImpl::enableRetina(bool enabled) { #if (CC_TARGET_PLATFORM == CC_PLATFORM_MAC) _isRetinaEnabled = enabled; @@ -455,12 +465,12 @@ void GLView::enableRetina(bool enabled) } -void GLView::setIMEKeyboardState(bool /*bOpen*/) +void GLViewImpl::setIMEKeyboardState(bool /*bOpen*/) { } -void GLView::setFrameZoomFactor(float zoomFactor) +void GLViewImpl::setFrameZoomFactor(float zoomFactor) { CCASSERT(zoomFactor > 0.0f, "zoomFactor must be larger than 0"); @@ -473,12 +483,12 @@ void GLView::setFrameZoomFactor(float zoomFactor) updateFrameSize(); } -float GLView::getFrameZoomFactor() +float GLViewImpl::getFrameZoomFactor() const { return _frameZoomFactor; } -void GLView::updateFrameSize() +void GLViewImpl::updateFrameSize() { if (_screenSize.width > 0 && _screenSize.height > 0) { @@ -515,13 +525,13 @@ void GLView::updateFrameSize() } } -void GLView::setFrameSize(float width, float height) +void GLViewImpl::setFrameSize(float width, float height) { - GLViewProtocol::setFrameSize(width, height); + GLView::setFrameSize(width, height); updateFrameSize(); } -void GLView::setViewPortInPoints(float x , float y , float w , float h) +void GLViewImpl::setViewPortInPoints(float x , float y , float w , float h) { glViewport((GLint)(x * _scaleX * _retinaFactor * _frameZoomFactor + _viewPortRect.origin.x * _retinaFactor * _frameZoomFactor), (GLint)(y * _scaleY * _retinaFactor * _frameZoomFactor + _viewPortRect.origin.y * _retinaFactor * _frameZoomFactor), @@ -529,7 +539,7 @@ void GLView::setViewPortInPoints(float x , float y , float w , float h) (GLsizei)(h * _scaleY * _retinaFactor * _frameZoomFactor)); } -void GLView::setScissorInPoints(float x , float y , float w , float h) +void GLViewImpl::setScissorInPoints(float x , float y , float w , float h) { glScissor((GLint)(x * _scaleX * _retinaFactor * _frameZoomFactor + _viewPortRect.origin.x * _retinaFactor * _frameZoomFactor), (GLint)(y * _scaleY * _retinaFactor * _frameZoomFactor + _viewPortRect.origin.y * _retinaFactor * _frameZoomFactor), @@ -537,12 +547,12 @@ void GLView::setScissorInPoints(float x , float y , float w , float h) (GLsizei)(h * _scaleY * _retinaFactor * _frameZoomFactor)); } -void GLView::onGLFWError(int errorID, const char* errorDesc) +void GLViewImpl::onGLFWError(int errorID, const char* errorDesc) { CCLOGERROR("GLFWError #%d Happen, %s\n", errorID, errorDesc); } -void GLView::onGLFWMouseCallBack(GLFWwindow* window, int button, int action, int modify) +void GLViewImpl::onGLFWMouseCallBack(GLFWwindow* window, int button, int action, int modify) { if(GLFW_MOUSE_BUTTON_LEFT == button) { @@ -586,7 +596,7 @@ void GLView::onGLFWMouseCallBack(GLFWwindow* window, int button, int action, int } } -void GLView::onGLFWMouseMoveCallBack(GLFWwindow* window, double x, double y) +void GLViewImpl::onGLFWMouseMoveCallBack(GLFWwindow* window, double x, double y) { _mouseX = (float)x; _mouseY = (float)y; @@ -631,7 +641,7 @@ void GLView::onGLFWMouseMoveCallBack(GLFWwindow* window, double x, double y) Director::getInstance()->getEventDispatcher()->dispatchEvent(&event); } -void GLView::onGLFWMouseScrollCallback(GLFWwindow* window, double x, double y) +void GLViewImpl::onGLFWMouseScrollCallback(GLFWwindow* window, double x, double y) { EventMouse event(EventMouse::MouseEventType::MOUSE_SCROLL); //Because OpenGL and cocos2d-x uses different Y axis, we need to convert the coordinate here @@ -640,7 +650,7 @@ void GLView::onGLFWMouseScrollCallback(GLFWwindow* window, double x, double y) Director::getInstance()->getEventDispatcher()->dispatchEvent(&event); } -void GLView::onGLFWKeyCallback(GLFWwindow *window, int key, int scancode, int action, int mods) +void GLViewImpl::onGLFWKeyCallback(GLFWwindow *window, int key, int scancode, int action, int mods) { if (GLFW_REPEAT != action) { @@ -648,19 +658,27 @@ void GLView::onGLFWKeyCallback(GLFWwindow *window, int key, int scancode, int ac auto dispatcher = Director::getInstance()->getEventDispatcher(); dispatcher->dispatchEvent(&event); } + if (GLFW_RELEASE != action && g_keyCodeMap[key] == EventKeyboard::KeyCode::KEY_BACKSPACE) + { + IMEDispatcher::sharedDispatcher()->dispatchDeleteBackward(); + } } -void GLView::onGLFWCharCallback(GLFWwindow *window, unsigned int character) +void GLViewImpl::onGLFWCharCallback(GLFWwindow *window, unsigned int character) { - IMEDispatcher::sharedDispatcher()->dispatchInsertText((const char*) &character, 1); + char16_t wcharString[2] = { (char16_t) character, 0 }; + std::string utf8String; + + StringUtils::UTF16ToUTF8( wcharString, utf8String ); + IMEDispatcher::sharedDispatcher()->dispatchInsertText( utf8String.c_str(), utf8String.size() ); } -void GLView::onGLFWWindowPosCallback(GLFWwindow *windows, int x, int y) +void GLViewImpl::onGLFWWindowPosCallback(GLFWwindow *windows, int x, int y) { Director::getInstance()->setViewport(); } -void GLView::onGLFWframebuffersize(GLFWwindow* window, int w, int h) +void GLViewImpl::onGLFWframebuffersize(GLFWwindow* window, int w, int h) { float frameSizeW = _screenSize.width; float frameSizeH = _screenSize.height; @@ -689,7 +707,7 @@ void GLView::onGLFWframebuffersize(GLFWwindow* window, int w, int h) } } -void GLView::onGLFWWindowSizeFunCallback(GLFWwindow *window, int width, int height) +void GLViewImpl::onGLFWWindowSizeFunCallback(GLFWwindow *window, int width, int height) { if (_resolutionPolicy != ResolutionPolicy::UNKNOWN) { @@ -698,6 +716,18 @@ void GLView::onGLFWWindowSizeFunCallback(GLFWwindow *window, int width, int heig } } +void GLViewImpl::onGLFWWindowIconifyCallback(GLFWwindow* window, int iconified) +{ + if (iconified == GL_TRUE) + { + Application::getInstance()->applicationDidEnterBackground(); + } + else + { + Application::getInstance()->applicationWillEnterForeground(); + } +} + #if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) static bool glew_dynamic_binding() { @@ -763,7 +793,7 @@ static bool glew_dynamic_binding() #endif // helper -bool GLView::initGlew() +bool GLViewImpl::initGlew() { #if (CC_TARGET_PLATFORM != CC_PLATFORM_MAC) GLenum GlewInitResult = glewInit(); diff --git a/cocos/platform/desktop/CCGLView.h b/cocos/platform/desktop/CCGLViewImpl.h similarity index 70% rename from cocos/platform/desktop/CCGLView.h rename to cocos/platform/desktop/CCGLViewImpl.h index 57f782fb05..58e0687164 100644 --- a/cocos/platform/desktop/CCGLView.h +++ b/cocos/platform/desktop/CCGLViewImpl.h @@ -23,23 +23,43 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#ifndef __CC_EGLVIEW_DESKTOP_H__ -#define __CC_EGLVIEW_DESKTOP_H__ +#ifndef __CC_EGLViewIMPL_DESKTOP_H__ +#define __CC_EGLViewIMPL_DESKTOP_H__ #include "base/CCRef.h" #include "platform/CCCommon.h" -#include "platform/CCGLViewProtocol.h" +#include "platform/CCGLView.h" #include "glfw3.h" +#if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) +#ifndef GLFW_EXPOSE_NATIVE_WIN32 +#define GLFW_EXPOSE_NATIVE_WIN32 +#endif +#ifndef GLFW_EXPOSE_NATIVE_WGL +#define GLFW_EXPOSE_NATIVE_WGL +#endif +#include "glfw3native.h" +#endif /* (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) */ + +#if (CC_TARGET_PLATFORM == CC_PLATFORM_MAC) +#ifndef GLFW_EXPOSE_NATIVE_NSGL +#define GLFW_EXPOSE_NATIVE_NSGL +#endif +#ifndef GLFW_EXPOSE_NATIVE_COCOA +#define GLFW_EXPOSE_NATIVE_COCOA +#endif +#include "glfw3native.h" +#endif // #if (CC_TARGET_PLATFORM == CC_PLATFORM_MAC) + NS_CC_BEGIN -class CC_DLL GLView : public GLViewProtocol, public Ref +class CC_DLL GLViewImpl : public GLView { public: - static GLView* create(const std::string& viewName); - static GLView* createWithRect(const std::string& viewName, Rect size, float frameZoomFactor = 1.0f); - static GLView* createWithFullScreen(const std::string& viewName); - static GLView* createWithFullScreen(const std::string& viewName, const GLFWvidmode &videoMode, GLFWmonitor *monitor); + static GLViewImpl* create(const std::string& viewName); + static GLViewImpl* createWithRect(const std::string& viewName, Rect size, float frameZoomFactor = 1.0f); + static GLViewImpl* createWithFullScreen(const std::string& viewName); + static GLViewImpl* createWithFullScreen(const std::string& viewName, const GLFWvidmode &videoMode, GLFWmonitor *monitor); /* *frameZoomFactor for frame. This method is for debugging big resolution (e.g.new ipad) app on desktop. @@ -47,7 +67,7 @@ public: //void resize(int width, int height); - float getFrameZoomFactor(); + float getFrameZoomFactor() const; //void centerWindow(); virtual void setViewPortInPoints(float x , float y , float w , float h); @@ -79,10 +99,18 @@ public: /** Get retina factor */ int getRetinaFactor() const { return _retinaFactor; } + +#if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) + HWND getWin32Window() { return glfwGetWin32Window(_mainWindow); } +#endif /* (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) */ + +#if (CC_TARGET_PLATFORM == CC_PLATFORM_MAC) + id getCocoaWindow() { return glfwGetCocoaWindow(_mainWindow); } +#endif // #if (CC_TARGET_PLATFORM == CC_PLATFORM_MAC) -CC_CONSTRUCTOR_ACCESS: - GLView(); - virtual ~GLView(); +protected: + GLViewImpl(); + virtual ~GLViewImpl(); bool initWithRect(const std::string& viewName, Rect rect, float frameZoomFactor); bool initWithFullScreen(const std::string& viewName); @@ -103,6 +131,7 @@ protected: void onGLFWWindowPosCallback(GLFWwindow* windows, int x, int y); void onGLFWframebuffersize(GLFWwindow* window, int w, int h); void onGLFWWindowSizeFunCallback(GLFWwindow *window, int width, int height); + void onGLFWWindowIconifyCallback(GLFWwindow* window, int iconified); bool _captured; bool _supportTouch; @@ -121,9 +150,9 @@ protected: friend class GLFWEventHandler; private: - CC_DISALLOW_COPY_AND_ASSIGN(GLView); + CC_DISALLOW_COPY_AND_ASSIGN(GLViewImpl); }; NS_CC_END // end of namespace cocos2d -#endif // end of __CC_EGLVIEW_DESKTOP_H__ +#endif // end of __CC_EGLViewImpl_DESKTOP_H__ diff --git a/cocos/platform/ios/CCDevice.mm b/cocos/platform/ios/CCDevice.mm index f04767cb74..28438ea897 100644 --- a/cocos/platform/ios/CCDevice.mm +++ b/cocos/platform/ios/CCDevice.mm @@ -348,7 +348,7 @@ static bool _initWithString(const char * text, cocos2d::Device::TextAlign align, } // text color - CGContextSetRGBFillColor(context, info->tintColorR / 255.0f, info->tintColorG / 255.0f, info->tintColorB / 255.0f, 1); + CGContextSetRGBFillColor(context, info->tintColorR, info->tintColorG, info->tintColorB, 1); // move Y rendering to the top of the image CGContextTranslateCTM(context, 0.0f, (dim.height - shadowStrokePaddingY) ); CGContextScaleCTM(context, 1.0f, -1.0f); //NOTE: NSString draws in UIKit referential i.e. renders upside-down compared to CGBitmapContext referential @@ -456,13 +456,13 @@ Data Device::getTextureDataForText(const char * text, const FontDefinition& text info.shadowBlur = textDefinition._shadow._shadowBlur; info.shadowOpacity = textDefinition._shadow._shadowOpacity; info.hasStroke = textDefinition._stroke._strokeEnabled; - info.strokeColorR = textDefinition._stroke._strokeColor.r; - info.strokeColorG = textDefinition._stroke._strokeColor.g; - info.strokeColorB = textDefinition._stroke._strokeColor.b; + info.strokeColorR = textDefinition._stroke._strokeColor.r / 255.0f; + info.strokeColorG = textDefinition._stroke._strokeColor.g / 255.0f; + info.strokeColorB = textDefinition._stroke._strokeColor.b / 255.0f; info.strokeSize = textDefinition._stroke._strokeSize; - info.tintColorR = textDefinition._fontFillColor.r; - info.tintColorG = textDefinition._fontFillColor.g; - info.tintColorB = textDefinition._fontFillColor.b; + info.tintColorR = textDefinition._fontFillColor.r / 255.0f; + info.tintColorG = textDefinition._fontFillColor.g / 255.0f; + info.tintColorB = textDefinition._fontFillColor.b / 255.0f; if (! _initWithString(text, align, textDefinition._fontName.c_str(), textDefinition._fontSize, &info)) { @@ -477,6 +477,11 @@ Data Device::getTextureDataForText(const char * text, const FontDefinition& text return ret; } +void Device::setKeepScreenOn(bool value) +{ + [[UIApplication sharedApplication] setIdleTimerDisabled:YES]; +} + NS_CC_END #endif // CC_PLATFORM_IOS diff --git a/cocos/platform/ios/CCDirectorCaller.mm b/cocos/platform/ios/CCDirectorCaller.mm index 91ecfeab90..3250816d26 100644 --- a/cocos/platform/ios/CCDirectorCaller.mm +++ b/cocos/platform/ios/CCDirectorCaller.mm @@ -30,7 +30,6 @@ #import #import "CCDirectorCaller.h" #import "CCDirector.h" -#import "CCGLView.h" #import "CCEAGLView.h" static id s_sharedDirectorCaller; diff --git a/cocos/platform/ios/CCEAGLView.mm b/cocos/platform/ios/CCEAGLView.mm index fcbddd02e7..3c5c1c7b37 100644 --- a/cocos/platform/ios/CCEAGLView.mm +++ b/cocos/platform/ios/CCEAGLView.mm @@ -65,7 +65,7 @@ Copyright (C) 2008 Apple Inc. All Rights Reserved. #if CC_TARGET_PLATFORM == CC_PLATFORM_IOS #import -#import "CCGLView.h" +#import "CCGLViewImpl.h" #import "CCEAGLView.h" #import "CCES2Renderer.h" #import "CCDirector.h" @@ -73,7 +73,6 @@ Copyright (C) 2008 Apple Inc. All Rights Reserved. #import "CCTouch.h" #import "CCIMEDispatcher.h" #import "OpenGL_Internal.h" -#import "CCGLView.h" //CLASS IMPLEMENTATIONS: #define IOS_MAX_TOUCHES_COUNT 10 diff --git a/cocos/platform/ios/CCGLView.h b/cocos/platform/ios/CCGLViewImpl.h similarity index 73% rename from cocos/platform/ios/CCGLView.h rename to cocos/platform/ios/CCGLViewImpl.h index d5a62dd084..795e0077b9 100644 --- a/cocos/platform/ios/CCGLView.h +++ b/cocos/platform/ios/CCGLViewImpl.h @@ -23,35 +23,35 @@ THE SOFTWARE. ****************************************************************************/ -#ifndef __CC_EGLVIEW_IPHONE_H__ -#define __CC_EGLVIEW_IPHONE_H__ +#ifndef __CC_EGLVIEWIMPL_IPHONE_H__ +#define __CC_EGLVIEWIMPL_IPHONE_H__ #include "base/CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_IOS #include "base/CCRef.h" #include "platform/CCCommon.h" -#include "platform/CCGLViewProtocol.h" +#include "platform/CCGLView.h" NS_CC_BEGIN /** Class that represent the OpenGL View */ -class CC_DLL GLView : public GLViewProtocol, public Ref +class CC_DLL GLViewImpl : public GLView { public: - /** creates a GLView with a objective-c CCEAGLView instance */ - static GLView* createWithEAGLView(void* eaglview); + /** creates a GLViewImpl with a objective-c CCEAGLViewImpl instance */ + static GLViewImpl* createWithEAGLView(void* eaGLView); - /** creates a GLView with a title name in fullscreen mode */ - static GLView* create(const std::string& viewName); + /** creates a GLViewImpl with a title name in fullscreen mode */ + static GLViewImpl* create(const std::string& viewName); - /** creates a GLView with a title name, a rect and the zoom factor */ - static GLView* createWithRect(const std::string& viewName, Rect rect, float frameZoomFactor = 1.0f); + /** creates a GLViewImpl with a title name, a rect and the zoom factor */ + static GLViewImpl* createWithRect(const std::string& viewName, Rect rect, float frameZoomFactor = 1.0f); - /** creates a GLView with a name in fullscreen mode */ - static GLView* createWithFullScreen(const std::string& viewName); + /** creates a GLViewImpl with a name in fullscreen mode */ + static GLViewImpl* createWithFullScreen(const std::string& viewName); /** sets the content scale factor */ bool setContentScaleFactor(float contentScaleFactor); @@ -72,10 +72,10 @@ public: virtual void setIMEKeyboardState(bool bOpen) override; protected: - GLView(); - virtual ~GLView(); + GLViewImpl(); + virtual ~GLViewImpl(); - bool initWithEAGLView(void* eaglview); + bool initWithEAGLView(void* eaGLView); bool initWithRect(const std::string& viewName, Rect rect, float frameZoomFactor); bool initWithFullScreen(const std::string& viewName); @@ -87,4 +87,4 @@ NS_CC_END #endif // CC_PLATFORM_IOS -#endif // end of __CC_EGLVIEW_IPHONE_H__ +#endif // end of __CC_EGLViewImpl_IPHONE_H__ diff --git a/cocos/platform/ios/CCGLView.mm b/cocos/platform/ios/CCGLViewImpl.mm similarity index 82% rename from cocos/platform/ios/CCGLView.mm rename to cocos/platform/ios/CCGLViewImpl.mm index fa7844a2fb..567d55bc43 100644 --- a/cocos/platform/ios/CCGLView.mm +++ b/cocos/platform/ios/CCGLViewImpl.mm @@ -30,15 +30,15 @@ #include "CCEAGLView.h" #include "CCDirectorCaller.h" -#include "CCGLView.h" +#include "CCGLViewImpl.h" #include "CCSet.h" #include "base/CCTouch.h" NS_CC_BEGIN -GLView* GLView::createWithEAGLView(void *eaglview) +GLViewImpl* GLViewImpl::createWithEAGLView(void *eaglview) { - auto ret = new GLView; + auto ret = new GLViewImpl; if(ret && ret->initWithEAGLView(eaglview)) { ret->autorelease(); return ret; @@ -47,9 +47,9 @@ GLView* GLView::createWithEAGLView(void *eaglview) return nullptr; } -GLView* GLView::create(const std::string& viewName) +GLViewImpl* GLViewImpl::create(const std::string& viewName) { - auto ret = new GLView; + auto ret = new GLViewImpl; if(ret && ret->initWithFullScreen(viewName)) { ret->autorelease(); return ret; @@ -58,9 +58,9 @@ GLView* GLView::create(const std::string& viewName) return nullptr; } -GLView* GLView::createWithRect(const std::string& viewName, Rect rect, float frameZoomFactor) +GLViewImpl* GLViewImpl::createWithRect(const std::string& viewName, Rect rect, float frameZoomFactor) { - auto ret = new GLView; + auto ret = new GLViewImpl; if(ret && ret->initWithRect(viewName, rect, frameZoomFactor)) { ret->autorelease(); return ret; @@ -69,9 +69,9 @@ GLView* GLView::createWithRect(const std::string& viewName, Rect rect, float fra return nullptr; } -GLView* GLView::createWithFullScreen(const std::string& viewName) +GLViewImpl* GLViewImpl::createWithFullScreen(const std::string& viewName) { - auto ret = new GLView(); + auto ret = new GLViewImpl(); if(ret && ret->initWithFullScreen(viewName)) { ret->autorelease(); return ret; @@ -80,17 +80,17 @@ GLView* GLView::createWithFullScreen(const std::string& viewName) return nullptr; } -GLView::GLView() +GLViewImpl::GLViewImpl() { } -GLView::~GLView() +GLViewImpl::~GLViewImpl() { CCEAGLView *glview = (CCEAGLView*) _eaglview; [glview release]; } -bool GLView::initWithEAGLView(void *eaglview) +bool GLViewImpl::initWithEAGLView(void *eaglview) { _eaglview = eaglview; CCEAGLView *glview = (CCEAGLView*) _eaglview; @@ -102,7 +102,7 @@ bool GLView::initWithEAGLView(void *eaglview) return true; } -bool GLView::initWithRect(const std::string& viewName, Rect rect, float frameZoomFactor) +bool GLViewImpl::initWithRect(const std::string& viewName, Rect rect, float frameZoomFactor) { CGRect r = CGRectMake(rect.origin.x, rect.origin.y, rect.size.width, rect.size.height); CCEAGLView *eaglview = [CCEAGLView viewWithFrame: r @@ -123,7 +123,7 @@ bool GLView::initWithRect(const std::string& viewName, Rect rect, float frameZoo return true; } -bool GLView::initWithFullScreen(const std::string& viewName) +bool GLViewImpl::initWithFullScreen(const std::string& viewName) { CGRect rect = [[UIScreen mainScreen] bounds]; Rect r; @@ -135,12 +135,12 @@ bool GLView::initWithFullScreen(const std::string& viewName) return initWithRect(viewName, r, 1); } -bool GLView::isOpenGLReady() +bool GLViewImpl::isOpenGLReady() { return _eaglview != nullptr; } -bool GLView::setContentScaleFactor(float contentScaleFactor) +bool GLViewImpl::setContentScaleFactor(float contentScaleFactor) { CC_ASSERT(_resolutionPolicy == ResolutionPolicy::UNKNOWN); // cannot enable retina mode _scaleX = _scaleY = contentScaleFactor; @@ -151,7 +151,7 @@ bool GLView::setContentScaleFactor(float contentScaleFactor) return true; } -float GLView::getContentScaleFactor() const +float GLViewImpl::getContentScaleFactor() const { CCEAGLView *eaglview = (CCEAGLView*) _eaglview; @@ -162,7 +162,7 @@ float GLView::getContentScaleFactor() const return scaleFactor; } -void GLView::end() +void GLViewImpl::end() { [CCDirectorCaller destroy]; @@ -174,13 +174,13 @@ void GLView::end() } -void GLView::swapBuffers() +void GLViewImpl::swapBuffers() { CCEAGLView *eaglview = (CCEAGLView*) _eaglview; [eaglview swapBuffers]; } -void GLView::setIMEKeyboardState(bool open) +void GLViewImpl::setIMEKeyboardState(bool open) { CCEAGLView *eaglview = (CCEAGLView*) _eaglview; diff --git a/cocos/platform/linux/CCApplication.cpp b/cocos/platform/linux/CCApplication.cpp index ad4e47bc0a..14391ea3db 100644 --- a/cocos/platform/linux/CCApplication.cpp +++ b/cocos/platform/linux/CCApplication.cpp @@ -32,7 +32,6 @@ THE SOFTWARE. #include #include "base/CCDirector.h" #include "platform/CCFileUtils.h" -#include "CCGLView.h" NS_CC_BEGIN diff --git a/cocos/platform/linux/CCDevice.cpp b/cocos/platform/linux/CCDevice.cpp index 5536c87d81..24b70d05b2 100644 --- a/cocos/platform/linux/CCDevice.cpp +++ b/cocos/platform/linux/CCDevice.cpp @@ -499,6 +499,10 @@ Data Device::getTextureDataForText(const char * text, const FontDefinition& text return ret; } +void Device::setKeepScreenOn(bool value) +{ +} + NS_CC_END #endif // CC_TARGET_PLATFORM == CC_PLATFORM_LINUX diff --git a/cocos/platform/mac/CCApplication.mm b/cocos/platform/mac/CCApplication.mm index 2f352d57d5..c635d445b4 100644 --- a/cocos/platform/mac/CCApplication.mm +++ b/cocos/platform/mac/CCApplication.mm @@ -34,7 +34,6 @@ THE SOFTWARE. #include "platform/CCFileUtils.h" #include "math/CCGeometry.h" #include "base/CCDirector.h" -#include "CCGLView.h" NS_CC_BEGIN diff --git a/cocos/platform/mac/CCCommon.mm b/cocos/platform/mac/CCCommon.mm index 4e042bd14e..739628c873 100644 --- a/cocos/platform/mac/CCCommon.mm +++ b/cocos/platform/mac/CCCommon.mm @@ -29,11 +29,6 @@ THE SOFTWARE. #include "platform/CCCommon.h" #include "base/CCDirector.h" -#include "CCGLView.h" - -#define GLFW_EXPOSE_NATIVE_NSGL -#define GLFW_EXPOSE_NATIVE_COCOA -#include "glfw3native.h" #include #include @@ -58,8 +53,8 @@ void MessageBox(const char * msg, const char * title) [alert setInformativeText:tmpTitle]; [alert setAlertStyle:NSWarningAlertStyle]; - GLView* glview = Director::getInstance()->getOpenGLView(); - id window = glfwGetCocoaWindow(glview->getWindow()); + auto glview = Director::getInstance()->getOpenGLView(); + id window = glview->getCocoaWindow(); [alert beginSheetModalForWindow:window modalDelegate:[window delegate] didEndSelector:nil diff --git a/cocos/platform/mac/CCDevice.mm b/cocos/platform/mac/CCDevice.mm index 0d13a3a586..885a643bc6 100644 --- a/cocos/platform/mac/CCDevice.mm +++ b/cocos/platform/mac/CCDevice.mm @@ -59,7 +59,7 @@ typedef struct unsigned char* data; } tImageInfo; -static bool _initWithString(const char * text, Device::TextAlign align, const char * fontName, int size, tImageInfo* info, Color3B* strokeColor) +static bool _initWithString(const char * text, Device::TextAlign align, const char * fontName, int size, tImageInfo* info, const Color3B* strokeColor) { bool ret = false; @@ -68,10 +68,13 @@ static bool _initWithString(const char * text, Device::TextAlign align, const ch do { NSString * string = [NSString stringWithUTF8String:text]; + NSString * fntName = [NSString stringWithUTF8String:fontName]; + + fntName = [[fntName lastPathComponent] stringByDeletingPathExtension]; // font NSFont *font = [[NSFontManager sharedFontManager] - fontWithFamily:[NSString stringWithUTF8String:fontName] + fontWithFamily:fntName traits:NSUnboldFontMask | NSUnitalicFontMask weight:0 size:size]; @@ -118,7 +121,7 @@ static bool _initWithString(const char * text, Device::TextAlign align, const ch NSMutableString *lineBreak = [[[NSMutableString alloc] init] autorelease]; NSUInteger length = [string length]; NSRange range = NSMakeRange(0, 1); - CGSize textSize; + NSSize textSize; NSUInteger lastBreakLocation = 0; NSUInteger insertCount = 0; for (NSUInteger i = 0; i < length; i++) { @@ -128,7 +131,7 @@ static bool _initWithString(const char * text, Device::TextAlign align, const ch if ([@"!?.,-= " rangeOfString:character].location != NSNotFound) { lastBreakLocation = i + insertCount; } - textSize = [lineBreak sizeWithAttributes:tokenAttributesDict]; + //textSize = [lineBreak sizeWithAttributes:tokenAttributesDict]; if(textSize.height > info->height) break; if (textSize.width > info->width) { @@ -232,7 +235,7 @@ Data Device::getTextureDataForText(const char * text, const FontDefinition& text info.width = textDefinition._dimensions.width; info.height = textDefinition._dimensions.height; - if (! _initWithString(text, align, textDefinition._fontName.c_str(), textDefinition._fontSize, &info, nullptr)) //pStrokeColor)) + if (! _initWithString(text, align, textDefinition._fontName.c_str(), textDefinition._fontSize, &info, &textDefinition._fontFillColor)) //pStrokeColor)) { break; } @@ -244,6 +247,11 @@ Data Device::getTextureDataForText(const char * text, const FontDefinition& text return ret; } + +void Device::setKeepScreenOn(bool value) +{ +} + NS_CC_END #endif // CC_TARGET_PLATFORM == CC_PLATFORM_MAC diff --git a/cocos/platform/mac/CCPlatformDefine.h b/cocos/platform/mac/CCPlatformDefine.h index bd33ec9361..cc87086f88 100644 --- a/cocos/platform/mac/CCPlatformDefine.h +++ b/cocos/platform/mac/CCPlatformDefine.h @@ -31,7 +31,11 @@ THE SOFTWARE. #include -#define CC_DLL +#ifdef _USRDLL +#define CC_DLL __attribute__ ((visibility("default"))) +#else +#define CC_DLL +#endif #if CC_DISABLE_ASSERT > 0 #define CC_ASSERT(cond) diff --git a/cocos/platform/win32/CCApplication.cpp b/cocos/platform/win32/CCApplication.cpp index 1192732492..01dd2d82f2 100644 --- a/cocos/platform/win32/CCApplication.cpp +++ b/cocos/platform/win32/CCApplication.cpp @@ -27,7 +27,6 @@ THE SOFTWARE. #if CC_TARGET_PLATFORM == CC_PLATFORM_WIN32 #include "CCApplication.h" -#include "CCGLView.h" #include "base/CCDirector.h" #include #include "platform/CCFileUtils.h" diff --git a/cocos/platform/win32/CCDevice.cpp b/cocos/platform/win32/CCDevice.cpp index 70f7f1d1c7..ed69905ab1 100644 --- a/cocos/platform/win32/CCDevice.cpp +++ b/cocos/platform/win32/CCDevice.cpp @@ -405,7 +405,8 @@ Data Device::getTextureDataForText(const char * text, const FontDefinition& text } // draw text - SIZE size = {textDefinition._dimensions.width, textDefinition._dimensions.height}; + // does changing to SIZE here affects the font size by rounding from float? + SIZE size = {(LONG) textDefinition._dimensions.width,(LONG) textDefinition._dimensions.height}; CC_BREAK_IF(! dc.drawText(text, size, align)); int dataLen = size.cx * size.cy * 4; @@ -450,6 +451,10 @@ Data Device::getTextureDataForText(const char * text, const FontDefinition& text return ret; } +void Device::setKeepScreenOn(bool value) +{ +} + NS_CC_END #endif // CC_TARGET_PLATFORM == CC_PLATFORM_WIN32 diff --git a/cocos/platform/win32/CCGL.h b/cocos/platform/win32/CCGL.h index 4ec822b630..2ed38288bc 100644 --- a/cocos/platform/win32/CCGL.h +++ b/cocos/platform/win32/CCGL.h @@ -33,12 +33,6 @@ THE SOFTWARE. #define CC_GL_DEPTH24_STENCIL8 GL_DEPTH24_STENCIL8 -// These macros are only for making TexturePVR.cpp complied without errors since they are not included in GLEW. -#define GL_COMPRESSED_RGB_PVRTC_4BPPV1_IMG 0x8C00 -#define GL_COMPRESSED_RGB_PVRTC_2BPPV1_IMG 0x8C01 -#define GL_COMPRESSED_RGBA_PVRTC_4BPPV1_IMG 0x8C02 -#define GL_COMPRESSED_RGBA_PVRTC_2BPPV1_IMG 0x8C03 - #endif // CC_TARGET_PLATFORM == CC_PLATFORM_WIN32 #endif // __CCGL_H__ diff --git a/cocos/platform/win32/CCPlatformDefine.h b/cocos/platform/win32/CCPlatformDefine.h index f2cb37367f..354cbf80a7 100644 --- a/cocos/platform/win32/CCPlatformDefine.h +++ b/cocos/platform/win32/CCPlatformDefine.h @@ -32,13 +32,11 @@ THE SOFTWARE. #include #endif -//#if defined(_USRDLL) -// #define CC_DLL __declspec(dllexport) -//#else /* use a DLL library */ -// #define CC_DLL __declspec(dllimport) -//#endif - -#define CC_DLL +#if defined(_USRDLL) + #define CC_DLL __declspec(dllexport) +#else /* use a DLL library */ + #define CC_DLL __declspec(dllimport) +#endif #include diff --git a/cocos/platform/win32/CCStdC.h b/cocos/platform/win32/CCStdC.h index ad0be3dc4d..1a4de0d996 100644 --- a/cocos/platform/win32/CCStdC.h +++ b/cocos/platform/win32/CCStdC.h @@ -124,12 +124,14 @@ inline int vsnprintf_s(char *buffer, size_t sizeOfBuffer, size_t count, const char *format, va_list argptr) { return vsnprintf(buffer, sizeOfBuffer, format, argptr); } + +#ifndef __clang__ inline errno_t strcpy_s(char *strDestination, size_t numberOfElements, const char *strSource) { strcpy(strDestination, strSource); return 0; } - +#endif #endif // __MINGW32__ // Conflicted with cocos2d::MessageBox, so we need to undef it. diff --git a/cocos/platform/winrt/CCApplication.cpp b/cocos/platform/winrt/CCApplication.cpp index a6e5ba4b29..084ae68061 100644 --- a/cocos/platform/winrt/CCApplication.cpp +++ b/cocos/platform/winrt/CCApplication.cpp @@ -24,9 +24,9 @@ THE SOFTWARE. ****************************************************************************/ #include "CCApplication.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_WINRT -#include "platform/winrt/CCGLView.h" +#include "platform/winrt/CCGLViewImpl.h" #else -#include "platform/wp8/CCGLView.h" +#include "platform/wp8/CCGLViewImpl.h" #endif #include "base/CCDirector.h" #include @@ -75,7 +75,7 @@ int Application::run() return 0; } - GLView::sharedOpenGLView()->Run(); + GLViewImpl::sharedOpenGLView()->Run(); return 0; } diff --git a/cocos/platform/winrt/CCCommon.cpp b/cocos/platform/winrt/CCCommon.cpp index 6cd48b7507..2ba71ff75d 100644 --- a/cocos/platform/winrt/CCCommon.cpp +++ b/cocos/platform/winrt/CCCommon.cpp @@ -27,7 +27,7 @@ THE SOFTWARE. #include "CCWinRTUtils.h" #if (CC_TARGET_PLATFORM == CC_PLATFORM_WP8) -#include "platform/wp8/CCGLView.h" +#include "platform/wp8/CCGLViewImpl.h" #endif #if defined(VLD_DEBUG_MEMORY) @@ -50,7 +50,7 @@ void MessageBox(const char * pszMsg, const char * pszTitle) // Show the message dialog msg->ShowAsync(); #else - GLView::sharedOpenGLView()->ShowMessageBox(title, message); + GLViewImpl::sharedOpenGLView()->ShowMessageBox(title, message); #endif } diff --git a/cocos/platform/winrt/CCDevice.cpp b/cocos/platform/winrt/CCDevice.cpp index bbbad71687..eedd87cd87 100644 --- a/cocos/platform/winrt/CCDevice.cpp +++ b/cocos/platform/winrt/CCDevice.cpp @@ -84,7 +84,7 @@ void Device::setAccelerometerEnabled(bool isEnabled) acc.timestamp = 0; #if CC_TARGET_PLATFORM == CC_PLATFORM_WP8 - auto orientation = GLView::sharedOpenGLView()->getDeviceOrientation(); + auto orientation = GLViewImpl::sharedOpenGLView()->getDeviceOrientation(); switch (orientation) { @@ -115,7 +115,7 @@ void Device::setAccelerometerEnabled(bool isEnabled) } #endif std::shared_ptr event(new AccelerometerEvent(acc)); - cocos2d::GLView::sharedOpenGLView()->QueueEvent(event); + cocos2d::GLViewImpl::sharedOpenGLView()->QueueEvent(event); }); } else @@ -163,6 +163,10 @@ Data Device::getTextureDataForText(const char * text, const FontDefinition& text return ret; } +void Device::setKeepScreenOn(bool value) +{ +} + NS_CC_END #endif // (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT) || (CC_TARGET_PLATFORM == CC_PLATFORM_WP8) diff --git a/cocos/platform/winrt/CCFileUtilsWinRT.cpp b/cocos/platform/winrt/CCFileUtilsWinRT.cpp index 736a597504..a5b0e7214c 100644 --- a/cocos/platform/winrt/CCFileUtilsWinRT.cpp +++ b/cocos/platform/winrt/CCFileUtilsWinRT.cpp @@ -53,7 +53,7 @@ static void _checkPath() if (s_pszResourcePath.empty()) { // TODO: needs to be tested - s_pszResourcePath = convertPathFormatToUnixStyle(CCFileUtilsWinRT::getAppPath() + '\\' + "Assets\\Resources" + '\\'); + s_pszResourcePath = convertPathFormatToUnixStyle(CCFileUtilsWinRT::getAppPath() + '\\' + "Assets\\res" + '\\'); } } diff --git a/cocos/platform/winrt/CCGLView.cpp b/cocos/platform/winrt/CCGLViewImpl.cpp similarity index 85% rename from cocos/platform/winrt/CCGLView.cpp rename to cocos/platform/winrt/CCGLViewImpl.cpp index 7fb7e1b9fd..9bf0241ab6 100644 --- a/cocos/platform/winrt/CCGLView.cpp +++ b/cocos/platform/winrt/CCGLViewImpl.cpp @@ -26,7 +26,7 @@ THE SOFTWARE. #include "base/CCPlatformConfig.h" #if (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT) -#include "CCGLView.h" +#include "CCGLViewImpl.h" #include "base/ccMacros.h" #include "base/CCDirector.h" #include "base/CCTouch.h" @@ -54,7 +54,7 @@ using namespace Windows::UI::ViewManagement; NS_CC_BEGIN -static GLView* s_pEglView = NULL; +static GLViewImpl* s_pEglView = NULL; ////////////////////////////////////////////////////////////////////////// // impliment GLView @@ -165,7 +165,7 @@ void WinRTWindow::OnSuspending() void WinRTWindow::ResizeWindow() { - GLView::sharedOpenGLView()->UpdateForWindowSizeChange(); + GLViewImpl::sharedOpenGLView()->UpdateForWindowSizeChange(); } cocos2d::Vec2 WinRTWindow::GetCCPoint(PointerEventArgs^ args) { @@ -174,7 +174,7 @@ cocos2d::Vec2 WinRTWindow::GetCCPoint(PointerEventArgs^ args) { float y = getScaledDPIValue(p->Position.Y); Vec2 pt(x, y); - float zoomFactor = GLView::sharedOpenGLView()->getFrameZoomFactor(); + float zoomFactor = GLViewImpl::sharedOpenGLView()->getFrameZoomFactor(); if(zoomFactor > 0.0f) { pt.x /= zoomFactor; @@ -185,12 +185,12 @@ cocos2d::Vec2 WinRTWindow::GetCCPoint(PointerEventArgs^ args) { void WinRTWindow::ShowKeyboard(InputPane^ inputPane, InputPaneVisibilityEventArgs^ args) { - GLView::sharedOpenGLView()->ShowKeyboard(args->OccludedRect); + GLViewImpl::sharedOpenGLView()->ShowKeyboard(args->OccludedRect); } void WinRTWindow::HideKeyboard(InputPane^ inputPane, InputPaneVisibilityEventArgs^ args) { - GLView::sharedOpenGLView()->HideKeyboard(args->OccludedRect); + GLViewImpl::sharedOpenGLView()->HideKeyboard(args->OccludedRect); } void WinRTWindow::setIMEKeyboardState(bool bOpen) @@ -268,14 +268,14 @@ void WinRTWindow::OnPointerWheelChanged(CoreWindow^ sender, PointerEventArgs^ ar float direction = (float)args->CurrentPoint->Properties->MouseWheelDelta; int id = 0; Vec2 p(0.0f,0.0f); - GLView::sharedOpenGLView()->handleTouchesBegin(1, &id, &p.x, &p.y); + GLViewImpl::sharedOpenGLView()->handleTouchesBegin(1, &id, &p.x, &p.y); p.y += direction; - GLView::sharedOpenGLView()->handleTouchesMove(1, &id, &p.x, &p.y); - GLView::sharedOpenGLView()->handleTouchesEnd(1, &id, &p.x, &p.y); + GLViewImpl::sharedOpenGLView()->handleTouchesMove(1, &id, &p.x, &p.y); + GLViewImpl::sharedOpenGLView()->handleTouchesEnd(1, &id, &p.x, &p.y); } // user pressed the Back Key on the phone -void GLView::OnBackKeyPress() +void GLViewImpl::OnBackKeyPress() { #if 0 if (m_delegate) @@ -287,7 +287,7 @@ void GLView::OnBackKeyPress() } -void GLView::OnPointerPressed(PointerEventArgs^ args) +void GLViewImpl::OnPointerPressed(PointerEventArgs^ args) { #if 0 int id = args->CurrentPoint->PointerId; @@ -296,7 +296,7 @@ void GLView::OnPointerPressed(PointerEventArgs^ args) #endif } -void GLView::OnPointerMoved(PointerEventArgs^ args) +void GLViewImpl::OnPointerMoved(PointerEventArgs^ args) { #if 0 auto currentPoint = args->CurrentPoint; @@ -318,7 +318,7 @@ void GLView::OnPointerMoved(PointerEventArgs^ args) #endif } -void GLView::OnPointerReleased(PointerEventArgs^ args) +void GLViewImpl::OnPointerReleased(PointerEventArgs^ args) { #if 0 int id = args->CurrentPoint->PointerId; @@ -334,7 +334,7 @@ void WinRTWindow::OnPointerPressed(CoreWindow^ sender, PointerEventArgs^ args) { int id = args->CurrentPoint->PointerId; Vec2 pt = GetCCPoint(args); - GLView::sharedOpenGLView()->handleTouchesBegin(1, &id, &pt.x, &pt.y); + GLViewImpl::sharedOpenGLView()->handleTouchesBegin(1, &id, &pt.x, &pt.y); } void WinRTWindow::OnPointerMoved(CoreWindow^ sender, PointerEventArgs^ args) @@ -346,7 +346,7 @@ void WinRTWindow::OnPointerMoved(CoreWindow^ sender, PointerEventArgs^ args) { int id = args->CurrentPoint->PointerId; Vec2 p = GetCCPoint(args); - GLView::sharedOpenGLView()->handleTouchesMove(1, &id, &p.x, &p.y); + GLViewImpl::sharedOpenGLView()->handleTouchesMove(1, &id, &p.x, &p.y); } m_lastPoint = currentPoint->Position; m_lastPointValid = true; @@ -361,38 +361,38 @@ void WinRTWindow::OnPointerReleased(CoreWindow^ sender, PointerEventArgs^ args) { int id = args->CurrentPoint->PointerId; Vec2 pt = GetCCPoint(args); - GLView::sharedOpenGLView()->handleTouchesEnd(1, &id, &pt.x, &pt.y); + GLViewImpl::sharedOpenGLView()->handleTouchesEnd(1, &id, &pt.x, &pt.y); } void WinRTWindow::OnWindowSizeChanged(CoreWindow^ sender, WindowSizeChangedEventArgs^ args) { ResizeWindow(); - GLView::sharedOpenGLView()->UpdateForWindowSizeChange(); + GLViewImpl::sharedOpenGLView()->UpdateForWindowSizeChange(); } void WinRTWindow::OnLogicalDpiChanged(Object^ sender) { - GLView::sharedOpenGLView()->UpdateForWindowSizeChange(); + GLViewImpl::sharedOpenGLView()->UpdateForWindowSizeChange(); } void WinRTWindow::OnOrientationChanged(Object^ sender) { ResizeWindow(); - GLView::sharedOpenGLView()->UpdateForWindowSizeChange(); + GLViewImpl::sharedOpenGLView()->UpdateForWindowSizeChange(); } void WinRTWindow::OnDisplayContentsInvalidated(Object^ sender) { - GLView::sharedOpenGLView()->UpdateForWindowSizeChange(); + GLViewImpl::sharedOpenGLView()->UpdateForWindowSizeChange(); } void WinRTWindow::OnRendering(Object^ sender, Object^ args) { - GLView::sharedOpenGLView()->OnRendering(); + GLViewImpl::sharedOpenGLView()->OnRendering(); } -GLView::GLView() +GLViewImpl::GLViewImpl() : m_window(nullptr) , m_fFrameZoomFactor(1.0f) , m_bSupportTouch(false) @@ -405,7 +405,7 @@ GLView::GLView() _viewName = "Cocos2dxWinRT"; } -GLView::~GLView() +GLViewImpl::~GLViewImpl() { CC_ASSERT(this == s_pEglView); s_pEglView = NULL; @@ -413,7 +413,7 @@ GLView::~GLView() // TODO: cleanup } -bool GLView::Create(CoreWindow^ window, SwapChainBackgroundPanel^ panel) +bool GLViewImpl::Create(CoreWindow^ window, SwapChainBackgroundPanel^ panel) { bool bRet = false; m_window = window; @@ -426,25 +426,25 @@ bool GLView::Create(CoreWindow^ window, SwapChainBackgroundPanel^ panel) return bRet; } -bool GLView::isOpenGLReady() +bool GLViewImpl::isOpenGLReady() { // TODO: need to revisit this return (m_window.Get() != nullptr); } -void GLView::end() +void GLViewImpl::end() { // TODO: need to implement } -void GLView::swapBuffers() +void GLViewImpl::swapBuffers() { m_winRTWindow->swapBuffers(); } -void GLView::setIMEKeyboardState(bool bOpen) +void GLViewImpl::setIMEKeyboardState(bool bOpen) { if(m_winRTWindow) { @@ -453,12 +453,12 @@ void GLView::setIMEKeyboardState(bool bOpen) } -void GLView::resize(int width, int height) +void GLViewImpl::resize(int width, int height) { } -void GLView::setFrameZoomFactor(float fZoomFactor) +void GLViewImpl::setFrameZoomFactor(float fZoomFactor) { m_fFrameZoomFactor = fZoomFactor; resize((int) (_screenSize.width * fZoomFactor), (int) (_screenSize.height * fZoomFactor)); @@ -467,23 +467,23 @@ void GLView::setFrameZoomFactor(float fZoomFactor) } -float GLView::getFrameZoomFactor() +float GLViewImpl::getFrameZoomFactor() { return m_fFrameZoomFactor; } -void GLView::setFrameSize(float width, float height) +void GLViewImpl::setFrameSize(float width, float height) { // not implemented in WinRT. Window is always full screen // GLViewProtocol::setFrameSize(width, height); } -void GLView::centerWindow() +void GLViewImpl::centerWindow() { // not implemented in WinRT. Window is always full screen } -void GLView::OnSuspending() +void GLViewImpl::OnSuspending() { if (m_winRTWindow) { @@ -491,12 +491,12 @@ void GLView::OnSuspending() } } -GLView* GLView::sharedOpenGLView() +GLViewImpl* GLViewImpl::sharedOpenGLView() { return s_pEglView; } -int GLView::Run() +int GLViewImpl::Run() { m_running = true; @@ -504,7 +504,7 @@ int GLView::Run() }; -void GLView::OnRendering() +void GLViewImpl::OnRendering() { if(m_running && m_initialized) { @@ -512,7 +512,7 @@ void GLView::OnRendering() } } -void GLView::HideKeyboard(Windows::Foundation::Rect r) +void GLViewImpl::HideKeyboard(Windows::Foundation::Rect r) { return; // not implemented #if 0 @@ -532,7 +532,7 @@ void GLView::HideKeyboard(Windows::Foundation::Rect r) #endif } -void GLView::ShowKeyboard(Windows::Foundation::Rect r) +void GLViewImpl::ShowKeyboard(Windows::Foundation::Rect r) { return; // not implemented #if 0 @@ -554,7 +554,7 @@ void GLView::ShowKeyboard(Windows::Foundation::Rect r) } -void GLView::UpdateForWindowSizeChange() +void GLViewImpl::UpdateForWindowSizeChange() { float width = ConvertDipsToPixels(m_window->Bounds.Width); float height = ConvertDipsToPixels(m_window->Bounds.Height); @@ -562,18 +562,18 @@ void GLView::UpdateForWindowSizeChange() if(!m_initialized) { m_initialized = true; - GLViewProtocol::setFrameSize(width, height); + GLView::setFrameSize(width, height); } else { setFrameSize(width, height); Size designSize = getDesignResolutionSize(); - GLView::sharedOpenGLView()->setDesignResolutionSize(designSize.width, designSize.height, ResolutionPolicy::SHOW_ALL); + GLViewImpl::sharedOpenGLView()->setDesignResolutionSize(designSize.width, designSize.height, ResolutionPolicy::SHOW_ALL); Director::sharedDirector()->setProjection(Director::sharedDirector()->getProjection()); } } -void GLView::QueueEvent(std::shared_ptr& event) +void GLViewImpl::QueueEvent(std::shared_ptr& event) { std::lock_guard guard(mMutex); mInputEvents.push(event); diff --git a/cocos/platform/winrt/CCGLView.h b/cocos/platform/winrt/CCGLViewImpl.h similarity index 93% rename from cocos/platform/winrt/CCGLView.h rename to cocos/platform/winrt/CCGLViewImpl.h index 96b403a3c1..a678936133 100644 --- a/cocos/platform/winrt/CCGLView.h +++ b/cocos/platform/winrt/CCGLViewImpl.h @@ -23,8 +23,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#ifndef __CC_EGLVIEW_WINRT_H__ -#define __CC_EGLVIEW_WINRT_H__ +#ifndef __CC_EGLVIEWIMPL_WINRT_H__ +#define __CC_EGLVIEWIMPL_WINRT_H__ #include "base/CCPlatformConfig.h" #if (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT) @@ -33,7 +33,7 @@ THE SOFTWARE. #include "CCGL.h" #include "platform/CCCommon.h" #include "InputEvent.h" -#include "platform/CCGLViewProtocol.h" +#include "platform/CCGLView.h" #include #include @@ -46,7 +46,7 @@ THE SOFTWARE. NS_CC_BEGIN class CCEGL; -class GLView; +class GLViewImpl; ref class WinRTWindow sealed { @@ -93,14 +93,14 @@ private: ESContext m_esContext; - friend GLView; + friend GLViewImpl; }; -class CC_DLL GLView : public Ref, public GLViewProtocol +class CC_DLL GLViewImpl : public GLView { public: - GLView(); - virtual ~GLView(); + GLViewImpl(); + virtual ~GLViewImpl(); /* override functions */ virtual bool isOpenGLReady(); @@ -114,7 +114,7 @@ public: void UpdateForWindowSizeChange(); void OnRendering(); void OnSuspending(); - void GLView::QueueEvent(std::shared_ptr& event); + void GLViewImpl::QueueEvent(std::shared_ptr& event); void OnPointerPressed(Windows::UI::Core::PointerEventArgs^ args); void OnPointerMoved(Windows::UI::Core::PointerEventArgs^ args); @@ -148,7 +148,7 @@ public: /** @brief get the shared main open gl window */ - static GLView* sharedOpenGLView(); + static GLViewImpl* sharedOpenGLView(); protected: @@ -169,4 +169,4 @@ NS_CC_END #endif // (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT) -#endif // end of __CC_EGLVIEW_WINRT_H__ +#endif // end of __CC_EGLVIEWIMPL_WINRT_H__ diff --git a/cocos/platform/winrt/CCPrecompiledShaders.cpp b/cocos/platform/winrt/CCPrecompiledShaders.cpp index 3ec3131651..da7c40080b 100644 --- a/cocos/platform/winrt/CCPrecompiledShaders.cpp +++ b/cocos/platform/winrt/CCPrecompiledShaders.cpp @@ -135,6 +135,25 @@ void CCPrecompiledShaders::loadPrecompiledPrograms() #endif } +void CCPrecompiledShaders::addPrecompiledProgram(const char* key, const unsigned char* program, int programLength) +{ + std::string id = key; + PrecompiledProgram* p = nullptr; + auto it = m_precompiledPrograms.find(id); + if (it != m_precompiledPrograms.end()) + { + p = it->second; + } + else + { + p = new PrecompiledProgram(); + m_precompiledPrograms[id] = p; + } + p->key = key; + p->program = program; + p->length = programLength; +} + bool CCPrecompiledShaders::loadProgram(GLuint program, const GLchar* vShaderByteArray, const GLchar* fShaderByteArray) { std::string id = computeHash(vShaderByteArray, fShaderByteArray); diff --git a/cocos/platform/winrt/CCPrecompiledShaders.h b/cocos/platform/winrt/CCPrecompiledShaders.h index dd619b0dd9..d1dba0896a 100644 --- a/cocos/platform/winrt/CCPrecompiledShaders.h +++ b/cocos/platform/winrt/CCPrecompiledShaders.h @@ -70,6 +70,7 @@ public: */ static CCPrecompiledShaders* getInstance(); + void addPrecompiledProgram(const char* key, const unsigned char* program, int programLength); std::string addShaders(const GLchar* vShaderByteArray, const GLchar* fShaderByteArray); bool addProgram(GLuint program, const std::string& id); diff --git a/cocos/platform/winrt/InputEvent.cpp b/cocos/platform/winrt/InputEvent.cpp index ccc49a5ad0..62f0629afd 100644 --- a/cocos/platform/winrt/InputEvent.cpp +++ b/cocos/platform/winrt/InputEvent.cpp @@ -24,7 +24,7 @@ THE SOFTWARE. ****************************************************************************/ #include "InputEvent.h" -#include "CCGLView.h" +#include "CCGLViewImpl.h" #include "base/CCEventAcceleration.h" NS_CC_BEGIN @@ -57,13 +57,13 @@ void PointerEvent::execute() switch(m_type) { case PointerEventType::PointerPressed: - GLView::sharedOpenGLView()->OnPointerPressed(m_args.Get()); + GLViewImpl::sharedOpenGLView()->OnPointerPressed(m_args.Get()); break; case PointerEventType::PointerMoved: - GLView::sharedOpenGLView()->OnPointerMoved(m_args.Get()); + GLViewImpl::sharedOpenGLView()->OnPointerMoved(m_args.Get()); break; case PointerEventType::PointerReleased: - GLView::sharedOpenGLView()->OnPointerReleased(m_args.Get()); + GLViewImpl::sharedOpenGLView()->OnPointerReleased(m_args.Get()); break; } } @@ -119,7 +119,7 @@ BackButtonEvent::BackButtonEvent() void BackButtonEvent::execute() { - GLView::sharedOpenGLView()->OnBackKeyPress(); + GLViewImpl::sharedOpenGLView()->OnBackKeyPress(); } diff --git a/cocos/platform/wp8-xaml/cpp/Cocos2dRenderer.cpp b/cocos/platform/wp8-xaml/cpp/Cocos2dRenderer.cpp index 4e74c6f298..7231d15208 100644 --- a/cocos/platform/wp8-xaml/cpp/Cocos2dRenderer.cpp +++ b/cocos/platform/wp8-xaml/cpp/Cocos2dRenderer.cpp @@ -26,7 +26,7 @@ THE SOFTWARE. #include "Cocos2dRenderer.h" #include "cocos2d.h" #include "CCApplication.h" -#include "CCGLView.h" +#include "CCGLViewImpl.h" #include "AppDelegate.h" #include @@ -53,7 +53,7 @@ void Cocos2dRenderer::CreateGLResources() if(!mInitialized) { mInitialized = true; - GLView* glview = GLView::create("Test Cpp"); + GLViewImpl* glview = GLViewImpl::create("Test Cpp"); glview->Create(m_eglDisplay, m_eglContext, m_eglSurface, m_renderTargetSize.Width, m_renderTargetSize.Height,m_orientation); director->setOpenGLView(glview); CCApplication::getInstance()->run(); @@ -102,14 +102,14 @@ IAsyncAction^ Cocos2dRenderer::OnSuspending() void Cocos2dRenderer::OnUpdateDevice() { - GLView* glview = GLView::sharedOpenGLView(); - glview->UpdateDevice(m_eglDisplay, m_eglContext, m_eglSurface); + //GLView* glview = GLView::sharedOpenGLView(); + GLViewImpl::sharedOpenGLView()->UpdateDevice(m_eglDisplay, m_eglContext, m_eglSurface); } void Cocos2dRenderer::OnOrientationChanged(Windows::Graphics::Display::DisplayOrientations orientation) { DirectXBase::OnOrientationChanged(orientation); - GLView::sharedOpenGLView()->UpdateOrientation(orientation); + GLViewImpl::sharedOpenGLView()->UpdateOrientation(orientation); } // return true if eglSwapBuffers was called by OnRender() @@ -117,8 +117,8 @@ bool Cocos2dRenderer::OnRender() { if(m_loadingComplete) { - GLView* glview = GLView::sharedOpenGLView(); - glview->Render(); + //GLView* glview = GLView::sharedOpenGLView(); + GLViewImpl::sharedOpenGLView()->Render(); return true; // eglSwapBuffers was called by glview->Render(); } return false; @@ -154,7 +154,7 @@ void Cocos2dRenderer::OnCocos2dKeyEvent(Cocos2dKeyEvent event) void Cocos2dRenderer::SetXamlEventDelegate(PhoneDirect3DXamlAppComponent::Cocos2dEventDelegate^ delegate) { m_delegate = delegate; - GLView* eglView = GLView::sharedOpenGLView(); + GLViewImpl* eglView = GLViewImpl::sharedOpenGLView(); if(eglView) { eglView->SetXamlEventDelegate(delegate); @@ -164,7 +164,7 @@ void Cocos2dRenderer::SetXamlEventDelegate(PhoneDirect3DXamlAppComponent::Cocos2 void Cocos2dRenderer::SetXamlMessageBoxDelegate(PhoneDirect3DXamlAppComponent::Cocos2dMessageBoxDelegate^ delegate) { m_messageBoxDelegate = delegate; - GLView* eglView = GLView::sharedOpenGLView(); + GLViewImpl* eglView = GLViewImpl::sharedOpenGLView(); if(eglView) { eglView->SetXamlMessageBoxDelegate(delegate); @@ -174,7 +174,7 @@ void Cocos2dRenderer::SetXamlMessageBoxDelegate(PhoneDirect3DXamlAppComponent::C void Cocos2dRenderer::SetXamlEditBoxDelegate(PhoneDirect3DXamlAppComponent::Cocos2dEditBoxDelegate^ delegate) { m_editBoxDelegate = delegate; - GLView* eglView = GLView::sharedOpenGLView(); + GLViewImpl* eglView = GLViewImpl::sharedOpenGLView(); if(eglView) { eglView->SetXamlEditBoxDelegate(delegate); diff --git a/cocos/platform/wp8-xaml/cpp/Direct3DInterop.cpp b/cocos/platform/wp8-xaml/cpp/Direct3DInterop.cpp index b01ab9f2be..e14858b33d 100644 --- a/cocos/platform/wp8-xaml/cpp/Direct3DInterop.cpp +++ b/cocos/platform/wp8-xaml/cpp/Direct3DInterop.cpp @@ -90,43 +90,43 @@ IAsyncAction^ Direct3DInterop::OnSuspending() void Direct3DInterop::OnBackKeyPress() { - cocos2d::GLView::sharedOpenGLView()->QueueBackKeyPress(); + cocos2d::GLViewImpl::sharedOpenGLView()->QueueBackKeyPress(); } // Pointer Event Handlers. We need to queue up pointer events to pass them to the drawing thread void Direct3DInterop::OnPointerPressed(DrawingSurfaceManipulationHost^ sender, PointerEventArgs^ args) { - cocos2d::GLView::sharedOpenGLView()->QueuePointerEvent(cocos2d::PointerEventType::PointerPressed, args); + cocos2d::GLViewImpl::sharedOpenGLView()->QueuePointerEvent(cocos2d::PointerEventType::PointerPressed, args); } void Direct3DInterop::OnPointerMoved(DrawingSurfaceManipulationHost^ sender, PointerEventArgs^ args) { - cocos2d::GLView::sharedOpenGLView()->QueuePointerEvent(cocos2d::PointerEventType::PointerMoved, args); + cocos2d::GLViewImpl::sharedOpenGLView()->QueuePointerEvent(cocos2d::PointerEventType::PointerMoved, args); } void Direct3DInterop::OnPointerReleased(DrawingSurfaceManipulationHost^ sender, PointerEventArgs^ args) { - cocos2d::GLView::sharedOpenGLView()->QueuePointerEvent(cocos2d::PointerEventType::PointerReleased, args); + cocos2d::GLViewImpl::sharedOpenGLView()->QueuePointerEvent(cocos2d::PointerEventType::PointerReleased, args); } void Direct3DInterop::OnCocos2dKeyEvent(Cocos2dKeyEvent key) { std::shared_ptr e(new cocos2d::KeyboardEvent(key)); - cocos2d::GLView::sharedOpenGLView()->QueueEvent(e); + cocos2d::GLViewImpl::sharedOpenGLView()->QueueEvent(e); } void Direct3DInterop::OnCocos2dKeyEvent(Cocos2dKeyEvent key, Platform::String^ text) { std::shared_ptr e(new cocos2d::KeyboardEvent(key,text)); - cocos2d::GLView::sharedOpenGLView()->QueueEvent(e); + cocos2d::GLViewImpl::sharedOpenGLView()->QueueEvent(e); } void Direct3DInterop::OnCocos2dEditboxEvent(Object^ sender, Platform::String^ args, Windows::Foundation::EventHandler^ handler) { std::shared_ptr e(new EditBoxEvent(sender, args, handler)); - cocos2d::GLView::sharedOpenGLView()->QueueEvent(e); + cocos2d::GLViewImpl::sharedOpenGLView()->QueueEvent(e); } @@ -150,7 +150,7 @@ HRESULT Direct3DInterop::Draw(_In_ ID3D11Device1* device, _In_ ID3D11DeviceConte } #endif // 0 - cocos2d::GLView::sharedOpenGLView()->ProcessEvents(); + cocos2d::GLViewImpl::sharedOpenGLView()->ProcessEvents(); m_renderer->Render(); RequestAdditionalFrame(); return S_OK; diff --git a/cocos/platform/wp8/CCGLView.cpp b/cocos/platform/wp8/CCGLViewImpl.cpp similarity index 78% rename from cocos/platform/wp8/CCGLView.cpp rename to cocos/platform/wp8/CCGLViewImpl.cpp index b2350f92a5..4a35e08cbf 100644 --- a/cocos/platform/wp8/CCGLView.cpp +++ b/cocos/platform/wp8/CCGLViewImpl.cpp @@ -23,7 +23,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "CCGLView.h" +#include "CCGLViewImpl.h" #include "deprecated/CCSet.h" #include "base/ccMacros.h" #include "base/CCDirector.h" @@ -54,11 +54,11 @@ using namespace PhoneDirect3DXamlAppComponent; NS_CC_BEGIN -static GLView* s_pEglView = NULL; +static GLViewImpl* s_pEglView = NULL; -GLView* GLView::create(const std::string& viewName) +GLViewImpl* GLViewImpl::create(const std::string& viewName) { - auto ret = new GLView; + auto ret = new GLViewImpl; if(ret && ret->initWithFullScreen(viewName)) { ret->autorelease(); @@ -69,7 +69,7 @@ GLView* GLView::create(const std::string& viewName) } -GLView::GLView() +GLViewImpl::GLViewImpl() : _frameZoomFactor(1.0f) , _supportTouch(true) , _isRetina(false) @@ -91,7 +91,7 @@ GLView::GLView() _viewName = "cocos2dx"; } -GLView::~GLView() +GLViewImpl::~GLViewImpl() { CC_ASSERT(this == s_pEglView); s_pEglView = NULL; @@ -99,7 +99,7 @@ GLView::~GLView() // TODO: cleanup } -bool GLView::initWithRect(const std::string& viewName, Rect rect, float frameZoomFactor) +bool GLViewImpl::initWithRect(const std::string& viewName, Rect rect, float frameZoomFactor) { setViewName(viewName); setFrameSize(rect.size.width, rect.size.height); @@ -107,13 +107,13 @@ bool GLView::initWithRect(const std::string& viewName, Rect rect, float frameZoo return true; } -bool GLView::initWithFullScreen(const std::string& viewName) +bool GLViewImpl::initWithFullScreen(const std::string& viewName) { return initWithRect(viewName, Rect(0, 0, m_width, m_height), 1.0f); } -bool GLView::Create(EGLDisplay eglDisplay, EGLContext eglContext, EGLSurface eglSurface, float width, float height, DisplayOrientations orientation) +bool GLViewImpl::Create(EGLDisplay eglDisplay, EGLContext eglContext, EGLSurface eglSurface, float width, float height, DisplayOrientations orientation) { m_orientation = orientation; m_eglDisplay = eglDisplay; @@ -123,7 +123,7 @@ bool GLView::Create(EGLDisplay eglDisplay, EGLContext eglContext, EGLSurface egl return true; } -void GLView::UpdateDevice(EGLDisplay eglDisplay, EGLContext eglContext, EGLSurface eglSurface) +void GLViewImpl::UpdateDevice(EGLDisplay eglDisplay, EGLContext eglContext, EGLSurface eglSurface) { m_eglDisplay = eglDisplay; m_eglContext = eglContext; @@ -132,7 +132,7 @@ void GLView::UpdateDevice(EGLDisplay eglDisplay, EGLContext eglContext, EGLSurfa //UpdateForWindowSizeChange(width, height); } -void GLView::setIMEKeyboardState(bool bOpen) +void GLViewImpl::setIMEKeyboardState(bool bOpen) { if(m_delegate) { @@ -147,34 +147,34 @@ void GLView::setIMEKeyboardState(bool bOpen) } } -void GLView::swapBuffers() +void GLViewImpl::swapBuffers() { eglSwapBuffers(m_eglDisplay, m_eglSurface); } -bool GLView::isOpenGLReady() +bool GLViewImpl::isOpenGLReady() { // TODO: need to revisit this return (m_eglDisplay && m_orientation != DisplayOrientations::None); } -void GLView::end() +void GLViewImpl::end() { m_windowClosed = true; } -void GLView::OnSuspending(Platform::Object^ sender, SuspendingEventArgs^ args) +void GLViewImpl::OnSuspending(Platform::Object^ sender, SuspendingEventArgs^ args) { } -void GLView::OnResuming(Platform::Object^ sender, Platform::Object^ args) +void GLViewImpl::OnResuming(Platform::Object^ sender, Platform::Object^ args) { } // user pressed the Back Key on the phone -void GLView::OnBackKeyPress() +void GLViewImpl::OnBackKeyPress() { if(m_delegate) { @@ -182,12 +182,12 @@ void GLView::OnBackKeyPress() } } -void GLView::OnPointerPressed(CoreWindow^ sender, PointerEventArgs^ args) +void GLViewImpl::OnPointerPressed(CoreWindow^ sender, PointerEventArgs^ args) { OnPointerPressed(args); } -void GLView::OnPointerPressed(PointerEventArgs^ args) +void GLViewImpl::OnPointerPressed(PointerEventArgs^ args) { int id = args->CurrentPoint->PointerId; Vec2 pt = GetPoint(args); @@ -195,7 +195,7 @@ void GLView::OnPointerPressed(PointerEventArgs^ args) } -void GLView::OnPointerWheelChanged(CoreWindow^ sender, PointerEventArgs^ args) +void GLViewImpl::OnPointerWheelChanged(CoreWindow^ sender, PointerEventArgs^ args) { float direction = (float)args->CurrentPoint->Properties->MouseWheelDelta; int id = 0; @@ -206,22 +206,22 @@ void GLView::OnPointerWheelChanged(CoreWindow^ sender, PointerEventArgs^ args) handleTouchesEnd(1, &id, &p.x, &p.y); } -void GLView::OnVisibilityChanged(CoreWindow^ sender, VisibilityChangedEventArgs^ args) +void GLViewImpl::OnVisibilityChanged(CoreWindow^ sender, VisibilityChangedEventArgs^ args) { m_windowVisible = args->Visible; } -void GLView::OnWindowClosed(CoreWindow^ sender, CoreWindowEventArgs^ args) +void GLViewImpl::OnWindowClosed(CoreWindow^ sender, CoreWindowEventArgs^ args) { m_windowClosed = true; } -void GLView::OnPointerMoved(CoreWindow^ sender, PointerEventArgs^ args) +void GLViewImpl::OnPointerMoved(CoreWindow^ sender, PointerEventArgs^ args) { OnPointerMoved(args); } -void GLView::OnPointerMoved( PointerEventArgs^ args) +void GLViewImpl::OnPointerMoved( PointerEventArgs^ args) { auto currentPoint = args->CurrentPoint; if (currentPoint->IsInContact) @@ -241,12 +241,12 @@ void GLView::OnPointerMoved( PointerEventArgs^ args) } } -void GLView::OnPointerReleased(CoreWindow^ sender, PointerEventArgs^ args) +void GLViewImpl::OnPointerReleased(CoreWindow^ sender, PointerEventArgs^ args) { OnPointerReleased(args); } -void GLView::OnPointerReleased(PointerEventArgs^ args) +void GLViewImpl::OnPointerReleased(PointerEventArgs^ args) { int id = args->CurrentPoint->PointerId; Vec2 pt = GetPoint(args); @@ -255,46 +255,46 @@ void GLView::OnPointerReleased(PointerEventArgs^ args) -void GLView::resize(int width, int height) +void GLViewImpl::resize(int width, int height) { } -void GLView::setFrameZoomFactor(float fZoomFactor) +void GLViewImpl::setFrameZoomFactor(float fZoomFactor) { _frameZoomFactor = fZoomFactor; Director::getInstance()->setProjection(Director::getInstance()->getProjection()); //resize(m_obScreenSize.width * fZoomFactor, m_obScreenSize.height * fZoomFactor); } -float GLView::getFrameZoomFactor() +float GLViewImpl::getFrameZoomFactor() { return _frameZoomFactor; } -void GLView::centerWindow() +void GLViewImpl::centerWindow() { // not implemented in WinRT. Window is always full screen } -GLView* GLView::sharedOpenGLView() +GLViewImpl* GLViewImpl::sharedOpenGLView() { return s_pEglView; } -int GLView::Run() +int GLViewImpl::Run() { // XAML version does not have a run loop m_running = true; return 0; }; -void GLView::Render() +void GLViewImpl::Render() { OnRendering(); } -void GLView::OnRendering() +void GLViewImpl::OnRendering() { if(m_running && m_initialized) { @@ -304,7 +304,7 @@ void GLView::OnRendering() -bool GLView::ShowMessageBox(Platform::String^ title, Platform::String^ message) +bool GLViewImpl::ShowMessageBox(Platform::String^ title, Platform::String^ message) { if(m_messageBoxDelegate) { @@ -314,7 +314,7 @@ bool GLView::ShowMessageBox(Platform::String^ title, Platform::String^ message) return false; } -bool GLView::OpenXamlEditBox(Platform::String^ strPlaceHolder, Platform::String^ strText, int maxLength, int inputMode, int inputFlag, Windows::Foundation::EventHandler^ receiveHandler) +bool GLViewImpl::OpenXamlEditBox(Platform::String^ strPlaceHolder, Platform::String^ strText, int maxLength, int inputMode, int inputFlag, Windows::Foundation::EventHandler^ receiveHandler) { if(m_editBoxDelegate) { @@ -327,7 +327,7 @@ bool GLView::OpenXamlEditBox(Platform::String^ strPlaceHolder, Platform::String^ // called by orientation change from WP8 XAML -void GLView::UpdateOrientation(DisplayOrientations orientation) +void GLViewImpl::UpdateOrientation(DisplayOrientations orientation) { if(m_orientation != orientation) { @@ -337,7 +337,7 @@ void GLView::UpdateOrientation(DisplayOrientations orientation) } // called by size change from WP8 XAML -void GLView::UpdateForWindowSizeChange(float width, float height) +void GLViewImpl::UpdateForWindowSizeChange(float width, float height) { m_width = width; m_height = height; @@ -361,7 +361,7 @@ void GLViewEventHandler::OnGLFWWindowSizeFunCallback(GLFWwindow *windows, int wi } #endif -void GLView::UpdateWindowSize() +void GLViewImpl::UpdateWindowSize() { float width, height; @@ -382,7 +382,7 @@ void GLView::UpdateWindowSize() if(!m_initialized) { m_initialized = true; - GLViewProtocol::setFrameSize(width, height); + GLView::setFrameSize(width, height); } auto view = Director::getInstance()->getOpenGLView(); @@ -397,13 +397,13 @@ void GLView::UpdateWindowSize() } } -const Mat4& GLView::getOrientationMatrix() const +const Mat4& GLViewImpl::getOrientationMatrix() const { return m_orientationMatrix; }; -void GLView::UpdateOrientationMatrix() +void GLViewImpl::UpdateOrientationMatrix() { kmMat4Identity(&m_orientationMatrix); kmMat4Identity(&m_reverseOrientationMatrix); @@ -429,7 +429,7 @@ void GLView::UpdateOrientationMatrix() } } -cocos2d::Vec2 GLView::TransformToOrientation(Windows::Foundation::Point p) +cocos2d::Vec2 GLViewImpl::TransformToOrientation(Windows::Foundation::Point p) { cocos2d::Vec2 returnValue; @@ -453,7 +453,7 @@ cocos2d::Vec2 GLView::TransformToOrientation(Windows::Foundation::Point p) break; } - float zoomFactor = GLView::sharedOpenGLView()->getFrameZoomFactor(); + float zoomFactor = GLViewImpl::sharedOpenGLView()->getFrameZoomFactor(); if(zoomFactor > 0.0f) { returnValue.x /= zoomFactor; returnValue.y /= zoomFactor; @@ -464,14 +464,14 @@ cocos2d::Vec2 GLView::TransformToOrientation(Windows::Foundation::Point p) return returnValue; } -Vec2 GLView::GetPoint(PointerEventArgs^ args) { +Vec2 GLViewImpl::GetPoint(PointerEventArgs^ args) { return TransformToOrientation(args->CurrentPoint->Position); } -void GLView::setViewPortInPoints(float x , float y , float w , float h) +void GLViewImpl::setViewPortInPoints(float x , float y , float w , float h) { switch(m_orientation) { @@ -491,7 +491,7 @@ void GLView::setViewPortInPoints(float x , float y , float w , float h) } } -void GLView::setScissorInPoints(float x , float y , float w , float h) +void GLViewImpl::setScissorInPoints(float x , float y , float w , float h) { switch(m_orientation) { @@ -511,27 +511,27 @@ void GLView::setScissorInPoints(float x , float y , float w , float h) } } -void GLView::QueueBackKeyPress() +void GLViewImpl::QueueBackKeyPress() { std::lock_guard guard(mMutex); std::shared_ptr e(new BackButtonEvent()); mInputEvents.push(e); } -void GLView::QueuePointerEvent(PointerEventType type, PointerEventArgs^ args) +void GLViewImpl::QueuePointerEvent(PointerEventType type, PointerEventArgs^ args) { std::lock_guard guard(mMutex); std::shared_ptr e(new PointerEvent(type, args)); mInputEvents.push(e); } -void GLView::QueueEvent(std::shared_ptr& event) +void GLViewImpl::QueueEvent(std::shared_ptr& event) { std::lock_guard guard(mMutex); mInputEvents.push(event); } -void GLView::ProcessEvents() +void GLViewImpl::ProcessEvents() { std::lock_guard guard(mMutex); diff --git a/cocos/platform/wp8/CCGLView.h b/cocos/platform/wp8/CCGLViewImpl.h similarity index 93% rename from cocos/platform/wp8/CCGLView.h rename to cocos/platform/wp8/CCGLViewImpl.h index e9d7410c6e..c65b9f9cad 100644 --- a/cocos/platform/wp8/CCGLView.h +++ b/cocos/platform/wp8/CCGLViewImpl.h @@ -23,12 +23,12 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#ifndef __CC_EGLVIEW_WINRT_H__ -#define __CC_EGLVIEW_WINRT_H__ +#ifndef __CC_EGLVIEWIMPL_WINRT_H__ +#define __CC_EGLVIEWIMPL_WINRT_H__ #include "CCStdC.h" #include "platform/CCCommon.h" -#include "platform/CCGLViewProtocol.h" +#include "platform/CCGLView.h" #include "InputEvent.h" @@ -47,13 +47,13 @@ THE SOFTWARE. NS_CC_BEGIN -class GLView; +class GLViewImpl; -class CC_DLL GLView : public Ref, public GLViewProtocol +class CC_DLL GLViewImpl : public GLView { public: - static GLView* create(const std::string& viewName); + static GLViewImpl* create(const std::string& viewName); /* override functions */ virtual bool isOpenGLReady(); @@ -91,7 +91,7 @@ public: void QueueBackKeyPress(); void QueuePointerEvent(PointerEventType type, Windows::UI::Core::PointerEventArgs^ args); - void GLView::QueueEvent(std::shared_ptr& event); + void GLViewImpl::QueueEvent(std::shared_ptr& event); void SetXamlEventDelegate(PhoneDirect3DXamlAppComponent::Cocos2dEventDelegate^ delegate) { m_delegate = delegate; }; void SetXamlMessageBoxDelegate(PhoneDirect3DXamlAppComponent::Cocos2dMessageBoxDelegate^ delegate) { m_messageBoxDelegate = delegate; }; @@ -115,7 +115,7 @@ public: /** @brief get the shared main open gl window */ - static GLView* sharedOpenGLView(); + static GLViewImpl* sharedOpenGLView(); void ProcessEvents(); void AddPointerEvent(PointerEventType type, Windows::UI::Core::PointerEventArgs^ args); @@ -123,8 +123,8 @@ public: protected: - GLView(); - virtual ~GLView(); + GLViewImpl(); + virtual ~GLViewImpl(); bool initWithRect(const std::string& viewName, Rect rect, float frameZoomFactor); bool initWithFullScreen(const std::string& viewName); @@ -142,7 +142,7 @@ protected: private: - CC_DISALLOW_COPY_AND_ASSIGN(GLView); + CC_DISALLOW_COPY_AND_ASSIGN(GLViewImpl); void OnRendering(); void UpdateWindowSize(); @@ -187,4 +187,4 @@ private: NS_CC_END -#endif // end of __CC_EGLVIEW_WINRT_H__ +#endif // end of __CC_EGLVIEWIMPL_WINRT_H__ diff --git a/cocos/platform/wp8/shaders/precompiledshaders.h b/cocos/platform/wp8/shaders/precompiledshaders.h index ee41e8243b..3a23edfe5d 100644 --- a/cocos/platform/wp8/shaders/precompiledshaders.h +++ b/cocos/platform/wp8/shaders/precompiledshaders.h @@ -86,7 +86,7 @@ const unsigned char s_133478C5A874C1E6F59B418CE6C7C39F1AE0F873[] = { 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, 133, 0, 0, 0, 0, + 0, 0, 221, 144, 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, @@ -456,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, 133, 0, 0, 0, 0, 0, 0, +221, 144, 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, @@ -800,7 +800,7 @@ const unsigned char s_1A69A7CC77C7C8FC62799B0513816EA41FBF3BFE[] = { 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, 133, 0, 0, 0, 0, + 0, 0, 221, 144, 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, @@ -1301,7 +1301,7 @@ const unsigned char s_53938AB67AD93ABA0DDB87F3C9889304284E011E[] = { 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, 133, 0, 0, 0, 0, + 0, 0, 221, 144, 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, @@ -1675,7 +1675,7 @@ const unsigned char s_67837675F2BB48C0E926316F505FC1538228E0FA[] = { 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, 133, 0, 0, + 0, 0, 0, 0, 221, 144, 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, @@ -2070,7 +2070,7 @@ const unsigned char s_78250E25D1929D4A842050738140787BE42541C6[] = { 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, 133, + 0, 0, 0, 0, 0, 0, 221, 144, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 88, 66, 67, 100, 113, 175, 29, 164, 71, @@ -2485,7 +2485,7 @@ const unsigned char s_7B67DD242152D35ACC079265FAD9D03DC98182DE[] = { 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, 133, + 0, 0, 0, 0, 0, 0, 221, 144, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 88, 66, 67, 11, 95, 74, 206, 145, 124, @@ -2869,7 +2869,7 @@ const unsigned char s_7CE5EE84ACB6110F7FA29152ECE3344CB6D6620D[] = { 99, 111, 108, 111, 114, 0, 0, 0, 0, 2, 0, 0, 0, 96, 4, 0, 0, 192, 4, 0, 0, 0, 0, 0, - 0, 212, 133, 0, 0, 0, 0, 0, + 0, 221, 144, 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, @@ -3250,7 +3250,7 @@ const unsigned char s_7E1EEF397305D0BC2DCDBA4F2DAFBCBA1534E45C[] = { 117, 95, 99, 111, 108, 111, 114, 0, 0, 0, 0, 1, 0, 0, 0, 52, 3, 0, 0, 40, 4, 0, 0, 0, - 0, 0, 0, 212, 133, 0, 0, 0, + 0, 0, 0, 221, 144, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 88, 66, 67, 153, 8, 62, 201, 202, 170, 111, 182, 149, @@ -3584,7 +3584,7 @@ const unsigned char s_847DBFDDA6EC09C57E4ED43012AE2FB5CAC7D8D5[] = { 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, 133, 0, 0, 0, 0, 0, 0, +221, 144, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 88, 66, 67, 134, 66, 128, 226, 107, 172, 247, 161, 241, 207, 89, 240, @@ -4001,7 +4001,7 @@ const unsigned char s_92BE325B516F887D2C928EDE20ADF428DB01C038[] = { 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, 133, 0, 0, 0, 0, + 0, 0, 221, 144, 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, @@ -5038,7 +5038,7 @@ const unsigned char s_976D0E98457C40DFC2F0FBD00E30607C9E4CFDAE[] = { 99, 111, 108, 111, 114, 0, 0, 0, 0, 3, 0, 0, 0, 96, 4, 0, 0, 148, 13, 0, 0, 0, 0, 0, - 0, 212, 133, 0, 0, 0, 0, 0, + 0, 221, 144, 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, @@ -5709,7 +5709,7 @@ const unsigned char s_A2377A827972A5466DA8637681045D32DA8A817D[] = { 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, 133, 0, 0, 0, 0, 0, + 0, 221, 144, 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, @@ -6094,7 +6094,7 @@ const unsigned char s_B5E27B4F3CF7236633255B28CBA530D6EE5CED86[] = { 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, 133, 0, 0, 0, 0, 0, 0, +221, 144, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 88, 66, 67, 223, 173, 203, 80, 172, 13, 170, 215, 168, 128, 228, 5, @@ -6526,7 +6526,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, 133, 0, 0, 0, 0, + 0, 0, 221, 144, 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, @@ -6856,8 +6856,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, -133, 0, 0, 0, 0, 0, 0, 0, + 4, 0, 0, 0, 0, 0, 0, 221, +144, 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, @@ -7207,7 +7207,7 @@ const unsigned char s_F46558C274182079784898CF4968CF431593D5E2[] = { 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, 133, 0, 0, 0, 0, + 0, 0, 221, 144, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 88, 66, 67, 47, 220, 115, 183, 137, 174, 141, 96, 204, 60, @@ -7663,7 +7663,7 @@ const unsigned char s_F6BA4519AF2653A53D57FB5D5508F0D8617105D6[] = { 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, 133, 0, 0, 0, + 0, 0, 0, 221, 144, 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, diff --git a/cocos/renderer/CCBatchCommand.h b/cocos/renderer/CCBatchCommand.h index a91abdac22..05f94db160 100644 --- a/cocos/renderer/CCBatchCommand.h +++ b/cocos/renderer/CCBatchCommand.h @@ -33,7 +33,7 @@ NS_CC_BEGIN class TextureAtlas; -class BatchCommand : public RenderCommand +class CC_DLL BatchCommand : public RenderCommand { public: diff --git a/cocos/renderer/CCCustomCommand.h b/cocos/renderer/CCCustomCommand.h index a1f1ea04f2..f39dfd5331 100644 --- a/cocos/renderer/CCCustomCommand.h +++ b/cocos/renderer/CCCustomCommand.h @@ -31,7 +31,7 @@ NS_CC_BEGIN -class CustomCommand : public RenderCommand +class CC_DLL CustomCommand : public RenderCommand { public: CustomCommand(); diff --git a/cocos/renderer/CCGLProgramState.h b/cocos/renderer/CCGLProgramState.h index e0775e61be..cab3640e65 100644 --- a/cocos/renderer/CCGLProgramState.h +++ b/cocos/renderer/CCGLProgramState.h @@ -47,7 +47,7 @@ class EventCustom; // UniformValue // // -class UniformValue +class CC_DLL UniformValue { friend class GLProgram; friend class GLProgramState; @@ -99,7 +99,7 @@ protected: // VertexAttribValue // // -class VertexAttribValue +class CC_DLL VertexAttribValue { friend class GLProgram; friend class GLProgramState; @@ -143,7 +143,7 @@ protected: A GLProgram can be used by thousands of Nodes, but if different uniform values are going to be used, then each node will need its own GLProgramState */ -class GLProgramState : public Ref +class CC_DLL GLProgramState : public Ref { friend class GLProgramStateCache; public: diff --git a/cocos/renderer/CCGLProgramStateCache.h b/cocos/renderer/CCGLProgramStateCache.h index 88b6b41a9a..c2d4d44a3e 100644 --- a/cocos/renderer/CCGLProgramStateCache.h +++ b/cocos/renderer/CCGLProgramStateCache.h @@ -43,7 +43,7 @@ class GLProgramState; // GLProgramStateCache // // -class GLProgramStateCache +class CC_DLL GLProgramStateCache { public: static GLProgramStateCache* getInstance(); diff --git a/cocos/renderer/CCGroupCommand.h b/cocos/renderer/CCGroupCommand.h index 56748468f0..4d1c3732cc 100644 --- a/cocos/renderer/CCGroupCommand.h +++ b/cocos/renderer/CCGroupCommand.h @@ -48,7 +48,7 @@ protected: std::unordered_map _groupMapping; }; -class GroupCommand : public RenderCommand +class CC_DLL GroupCommand : public RenderCommand { public: GroupCommand(); diff --git a/cocos/renderer/CCMeshCommand.cpp b/cocos/renderer/CCMeshCommand.cpp index ad251cb9cc..8b69a7c3b0 100644 --- a/cocos/renderer/CCMeshCommand.cpp +++ b/cocos/renderer/CCMeshCommand.cpp @@ -41,6 +41,12 @@ NS_CC_BEGIN +//render state +static bool s_cullFaceEnabled = false; +static GLenum s_cullFace = 0; +static bool s_depthTestEnabled = false; +static bool s_depthWriteEnabled = false; + MeshCommand::MeshCommand() : _textureID(0) , _blendType(BlendFunc::DISABLE) @@ -86,7 +92,7 @@ void MeshCommand::init(float globalOrder, _primitive = primitive; _indexFormat = indexFormat; _indexCount = indexCount; - _mv = mv; + _mv.set(mv); } void MeshCommand::setCullFaceEnabled(bool enable) @@ -124,35 +130,46 @@ MeshCommand::~MeshCommand() void MeshCommand::applyRenderState() { - if (_cullFaceEnabled) + if (_cullFaceEnabled && !s_cullFaceEnabled) { glEnable(GL_CULL_FACE); - glCullFace(_cullFace); + if (s_cullFace != _cullFace) + { + glCullFace(_cullFace); + s_cullFace = _cullFace; + } + s_cullFaceEnabled = true; } - if (_depthTestEnabled) + if (_depthTestEnabled && !s_depthTestEnabled) { glEnable(GL_DEPTH_TEST); + s_depthTestEnabled = true; } - if (_depthWriteEnabled) + if (_depthWriteEnabled && !s_depthWriteEnabled) { glDepthMask(GL_TRUE); + s_depthWriteEnabled = true; } } void MeshCommand::restoreRenderState() { - if (_cullFaceEnabled) + if (s_cullFaceEnabled) { glDisable(GL_CULL_FACE); + s_cullFaceEnabled = false; } - if (_depthTestEnabled) + if (s_depthTestEnabled) { glDisable(GL_DEPTH_TEST); + s_depthTestEnabled = false; } - if (_depthWriteEnabled) + if (s_depthWriteEnabled) { glDepthMask(GL_FALSE); + s_depthWriteEnabled = false; } + s_cullFace = 0; } void MeshCommand::genMaterialID(GLuint texID, void* glProgramState, void* mesh, const BlendFunc& blend) @@ -177,8 +194,6 @@ void MeshCommand::MatrixPalleteCallBack( GLProgram* glProgram, Uniform* uniform) void MeshCommand::preBatchDraw() { - // set render state - applyRenderState(); // Set material GL::bindTexture2D(_textureID); GL::blendFunc(_blendType.src, _blendType.dst); @@ -198,6 +213,9 @@ void MeshCommand::preBatchDraw() } void MeshCommand::batchDraw() { + // set render state + applyRenderState(); + _glProgramState->setUniformVec4("u_color", _displayColor); if (_matrixPaletteSize && _matrixPalette) diff --git a/cocos/renderer/CCMeshCommand.h b/cocos/renderer/CCMeshCommand.h index d1e995da7a..fcbf7881a9 100644 --- a/cocos/renderer/CCMeshCommand.h +++ b/cocos/renderer/CCMeshCommand.h @@ -40,7 +40,7 @@ class EventListenerCustom; class EventCustom; //it is a common mesh -class MeshCommand : public RenderCommand +class CC_DLL MeshCommand : public RenderCommand { public: diff --git a/cocos/renderer/CCPrimitive.cpp b/cocos/renderer/CCPrimitive.cpp new file mode 100644 index 0000000000..8d0d27f63d --- /dev/null +++ b/cocos/renderer/CCPrimitive.cpp @@ -0,0 +1,108 @@ +/**************************************************************************** + 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 "renderer/CCPrimitive.h" + +NS_CC_BEGIN + +Primitive* Primitive::create(VertexData* verts, IndexBuffer* indices, int type) +{ + auto result = new (std::nothrow) Primitive(); + if( result && result->init(verts, indices, type)) + { + result->autorelease(); + return result; + } + + CC_SAFE_DELETE(result); + return nullptr; +} + +const VertexData* Primitive::getVertexData() const +{ + return _verts; +} + +const IndexBuffer* Primitive::getIndexData() const +{ + return _indices; +} + +Primitive::Primitive() +: _verts(nullptr) +, _indices(nullptr) +, _type(GL_POINTS) +{ +} + +Primitive::~Primitive() +{ + CC_SAFE_RELEASE_NULL(_verts); + CC_SAFE_RELEASE_NULL(_indices); +} + +bool Primitive::init(VertexData* verts, IndexBuffer* indices, int type) +{ + if( nullptr == verts ) return false; + if(verts != _verts) + { + CC_SAFE_RELEASE(_verts); + CC_SAFE_RETAIN(verts); + _verts = verts; + } + + if(indices != _indices) + { + CC_SAFE_RETAIN(indices); + CC_SAFE_RELEASE(_indices); + _indices = indices; + } + + _type = type; + + return true; +} + +void Primitive::draw() +{ + if(_verts && _indices) + { + _verts->use(); + if(_indices!= nullptr) + { + GLenum type = (_indices->getType() == IndexBuffer::IndexType::INDEX_TYPE_SHORT_16) ? GL_UNSIGNED_SHORT : GL_UNSIGNED_INT; + glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, _indices->getVBO()); + glDrawElements((GLenum)_type, _count, type, (GLvoid*)(_start * _indices->getSizePerIndex())); + } + else + { + glDrawArrays((GLenum)_type, _count, _start); + } + + glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0); + glBindBuffer(GL_ARRAY_BUFFER, 0); + } +} + +NS_CC_END diff --git a/cocos/renderer/CCPrimitive.h b/cocos/renderer/CCPrimitive.h new file mode 100644 index 0000000000..83d3aef2b3 --- /dev/null +++ b/cocos/renderer/CCPrimitive.h @@ -0,0 +1,67 @@ +/**************************************************************************** + 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_PRIMITIVE_H__ +#define __CC_PRIMITIVE_H__ + +#include "renderer/CCVertexIndexData.h" + +NS_CC_BEGIN + +class CC_DLL Primitive : public Ref +{ +public: + static Primitive* create(VertexData* verts, IndexBuffer* indices, int type); + + const VertexData* getVertexData() const; + + const IndexBuffer* getIndexData() const; + + int getType() const { return _type; } + + //called by rendering framework + void draw(); + + int getStart() const { return _start; } + int getCount() const { return _count; } + void setStart(int start) { _start = start; } + void setCount(int count) { _count = count; } + +protected: + Primitive(); + virtual ~Primitive(); + + bool init(VertexData* verts, IndexBuffer* indices, int type); + +protected: + VertexData* _verts; + IndexBuffer* _indices; + int _start; + int _count; + int _type; +}; + +NS_CC_END + +#endif //__CC_PRIMITIVE_H__ diff --git a/cocos/renderer/CCPrimitiveCommand.cpp b/cocos/renderer/CCPrimitiveCommand.cpp new file mode 100644 index 0000000000..69d6ade233 --- /dev/null +++ b/cocos/renderer/CCPrimitiveCommand.cpp @@ -0,0 +1,82 @@ +/**************************************************************************** + 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 "renderer/CCPrimitiveCommand.h" + +#include "renderer/ccGLStateCache.h" +#include "renderer/CCGLProgram.h" +#include "renderer/CCGLProgramState.h" +#include "xxhash.h" + +NS_CC_BEGIN + +PrimitiveCommand::PrimitiveCommand() +: _materialID(0) +, _textureID(0) +, _glProgramState(nullptr) +, _blendType(BlendFunc::DISABLE) +, _primitive(nullptr) +{ + _type = RenderCommand::Type::PRIMITIVE_COMMAND; +} + +PrimitiveCommand::~PrimitiveCommand() +{ +} + +void PrimitiveCommand::init(float globalOrder, GLuint textureID, GLProgramState* glProgramState, BlendFunc blendType, Primitive* primitive,const Mat4& mv) +{ + CCASSERT(glProgramState, "Invalid GLProgramState"); + CCASSERT(glProgramState->getVertexAttribsFlags() == 0, "No custom attributes are supported in PrimitiveCommand"); + CCASSERT(primitive != nullptr, "Could not render null primitive"); + + _globalOrder = globalOrder; + + _primitive = primitive; + + _mv = mv; + + if( _textureID != textureID || _blendType.src != blendType.src || _blendType.dst != blendType.dst || _glProgramState != glProgramState) { + + _textureID = textureID; + _blendType = blendType; + _glProgramState = glProgramState; + + } +} + +void PrimitiveCommand::execute() const +{ + //Set texture + GL::bindTexture2D(_textureID); + + //set blend mode + GL::blendFunc(_blendType.src, _blendType.dst); + + _glProgramState->apply(_mv); + + _primitive->draw(); +} + +NS_CC_END diff --git a/cocos/renderer/CCPrimitiveCommand.h b/cocos/renderer/CCPrimitiveCommand.h new file mode 100644 index 0000000000..402ffdbca9 --- /dev/null +++ b/cocos/renderer/CCPrimitiveCommand.h @@ -0,0 +1,60 @@ +/**************************************************************************** + 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_PRIMITIVE_COMMAND_H__ +#define _CC_PRIMITIVE_COMMAND_H__ + +#include "renderer/CCPrimitive.h" +#include "renderer/CCRenderCommand.h" + +NS_CC_BEGIN +class GLProgramState; +class CC_DLL PrimitiveCommand : public RenderCommand +{ +public: + PrimitiveCommand(); + ~PrimitiveCommand(); + + void init(float globalOrder, GLuint textureID, GLProgramState* glProgramState, BlendFunc blendType, Primitive* primitive,const Mat4& mv); + + inline uint32_t getMaterialID() const { return _materialID; } + inline GLuint getTextureID() const { return _textureID; } + inline GLProgramState* getGLProgramState() const { return _glProgramState; } + inline BlendFunc getBlendType() const { return _blendType; } + inline const Mat4& getModelView() const { return _mv; } + + void execute() const; +protected: + + uint32_t _materialID; + GLuint _textureID; + GLProgramState* _glProgramState; + BlendFunc _blendType; + Primitive* _primitive; + Mat4 _mv; +}; + +NS_CC_END + +#endif //_CC_PRIMITIVE_COMMAND_H__ diff --git a/cocos/renderer/CCQuadCommand.h b/cocos/renderer/CCQuadCommand.h index 094291d9a6..5c731b784b 100644 --- a/cocos/renderer/CCQuadCommand.h +++ b/cocos/renderer/CCQuadCommand.h @@ -32,7 +32,7 @@ NS_CC_BEGIN /** Command used to render one or more Quads */ -class QuadCommand : public RenderCommand +class CC_DLL QuadCommand : public RenderCommand { public: static const int MATERIAL_ID_DO_NOT_BATCH = 0; diff --git a/cocos/renderer/CCRenderCommand.h b/cocos/renderer/CCRenderCommand.h index 01611aea7b..77332e01b0 100644 --- a/cocos/renderer/CCRenderCommand.h +++ b/cocos/renderer/CCRenderCommand.h @@ -37,7 +37,7 @@ NS_CC_BEGIN * The `Renderer` knows how to render `RenderCommands` objects. */ -class RenderCommand +class CC_DLL RenderCommand { public: @@ -49,6 +49,7 @@ public: BATCH_COMMAND, GROUP_COMMAND, MESH_COMMAND, + PRIMITIVE_COMMAND, }; /** Get Render Command Id */ diff --git a/cocos/renderer/CCRenderer.cpp b/cocos/renderer/CCRenderer.cpp index b7c9b47e23..2eca2d9ead 100644 --- a/cocos/renderer/CCRenderer.cpp +++ b/cocos/renderer/CCRenderer.cpp @@ -30,6 +30,7 @@ #include "renderer/CCBatchCommand.h" #include "renderer/CCCustomCommand.h" #include "renderer/CCGroupCommand.h" +#include "renderer/CCPrimitiveCommand.h" #include "renderer/CCGLProgramCache.h" #include "renderer/ccGLStateCache.h" #include "renderer/CCMeshCommand.h" @@ -321,6 +322,12 @@ void Renderer::visitRenderQueue(const RenderQueue& queue) auto cmd = static_cast(command); cmd->execute(); } + else if(RenderCommand::Type::PRIMITIVE_COMMAND == commandType) + { + flush(); + auto cmd = static_cast(command); + cmd->execute(); + } else if (RenderCommand::Type::MESH_COMMAND == commandType) { flush2D(); diff --git a/cocos/renderer/CCRenderer.h b/cocos/renderer/CCRenderer.h index 7a1fd14253..0c56b989e0 100644 --- a/cocos/renderer/CCRenderer.h +++ b/cocos/renderer/CCRenderer.h @@ -72,7 +72,7 @@ class GroupCommandManager; Whenever possible prefer to use `QuadCommand` objects since the renderer will automatically batch them. */ -class Renderer +class CC_DLL Renderer { public: static const int VBO_SIZE = 65536 / 6; diff --git a/cocos/renderer/CCTexture2D.cpp b/cocos/renderer/CCTexture2D.cpp index e41a610dd5..1857c24d43 100644 --- a/cocos/renderer/CCTexture2D.cpp +++ b/cocos/renderer/CCTexture2D.cpp @@ -79,7 +79,7 @@ namespace { #endif #ifdef GL_ETC1_RGB8_OES - PixelFormatInfoMapValue(Texture2D::PixelFormat::ETC, Texture2D::PixelFormatInfo(GL_ETC1_RGB8_OES, 0xFFFFFFFF, 0xFFFFFFFF, 24, true, false)), + PixelFormatInfoMapValue(Texture2D::PixelFormat::ETC, Texture2D::PixelFormatInfo(GL_ETC1_RGB8_OES, 0xFFFFFFFF, 0xFFFFFFFF, 4, true, false)), #endif #ifdef GL_COMPRESSED_RGBA_S3TC_DXT1_EXT @@ -121,8 +121,6 @@ const Texture2D::PixelFormatInfoMap Texture2D::_pixelFormatInfoTables(TexturePix // Default is: RGBA8888 (32-bit textures) static Texture2D::PixelFormat g_defaultAlphaPixelFormat = Texture2D::PixelFormat::DEFAULT; -static bool _PVRHaveAlphaPremultiplied = false; - ////////////////////////////////////////////////////////////////////////// //conventer function @@ -779,20 +777,8 @@ bool Texture2D::initWithImage(Image *image, PixelFormat format) } // set the premultiplied tag - if (!image->hasPremultipliedAlpha()) - { - if (image->getFileType() == Image::Format::PVR) - { - _hasPremultipliedAlpha = _PVRHaveAlphaPremultiplied; - }else - { - CCLOG("wanning: We cann't find the data is premultiplied or not, we will assume it's false."); - _hasPremultipliedAlpha = false; - } - }else - { - _hasPremultipliedAlpha = image->isPremultipliedAlpha(); - } + _hasPremultipliedAlpha = image->hasPremultipliedAlpha(); + return true; } } @@ -1218,10 +1204,10 @@ void Texture2D::drawInRect(const Rect& rect) void Texture2D::PVRImagesHavePremultipliedAlpha(bool haveAlphaPremultiplied) { - _PVRHaveAlphaPremultiplied = haveAlphaPremultiplied; + Image::setPVRImagesHavePremultipliedAlpha(haveAlphaPremultiplied); } - + // // Use to apply MIN/MAG filter // diff --git a/cocos/renderer/CCTexture2D.h b/cocos/renderer/CCTexture2D.h index 97b515dc7e..9944c2b163 100644 --- a/cocos/renderer/CCTexture2D.h +++ b/cocos/renderer/CCTexture2D.h @@ -182,10 +182,12 @@ public: possible load them as if they have (or not) the alpha channel premultiplied. By default it is disabled. + + deprecated, please use Image::setPVRImagesHavePremultipliedAlpha() instead. @since v0.99.5 */ - static void PVRImagesHavePremultipliedAlpha(bool haveAlphaPremultiplied); + CC_DEPRECATED_ATTRIBUTE static void PVRImagesHavePremultipliedAlpha(bool haveAlphaPremultiplied); public: /** diff --git a/cocos/renderer/CCVertexIndexBuffer.cpp b/cocos/renderer/CCVertexIndexBuffer.cpp new file mode 100644 index 0000000000..44c1a70de9 --- /dev/null +++ b/cocos/renderer/CCVertexIndexBuffer.cpp @@ -0,0 +1,304 @@ +/**************************************************************************** + 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 "renderer/CCVertexIndexBuffer.h" +#include "base/CCEventType.h" +#include "base/CCEventListenerCustom.h" + +NS_CC_BEGIN + +#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) +bool VertexBuffer::_enableShadowCopy = true; +#else +bool VertexBuffer::_enableShadowCopy = false; +#endif + +#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) +bool IndexBuffer::_enableShadowCopy = true; +#else +bool IndexBuffer::_enableShadowCopy = false; +#endif + +VertexBuffer* VertexBuffer::create(int sizePerVertex, int vertexNumber) +{ + auto result = new (std::nothrow) VertexBuffer(); + if(result && result->init(sizePerVertex, vertexNumber)) + { + result->autorelease(); + return result; + } + CC_SAFE_DELETE(result); + return nullptr; + +} + +VertexBuffer::VertexBuffer() +: _vbo(0) +, _vertexNumber(0) +, _sizePerVertex(0) +, _recreateVBOEventListener(nullptr) +{ + +#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) + auto callBack = [this](EventCustom* event) + { + this->recreateVBO(); + }; + + _recreateVBOEventListener = Director::getInstance()->getEventDispatcher()->addCustomEventListener(EVENT_RENDERER_RECREATED, callBack); + +#endif +} + +VertexBuffer::~VertexBuffer() +{ + if(glIsBuffer(_vbo)) + { + glDeleteBuffers(1, &_vbo); + _vbo = 0; + } +#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) + Director::getInstance()->getEventDispatcher()->removeEventListener(_recreateVBOEventListener); +#endif +} + +bool VertexBuffer::init(int sizePerVertex, int vertexNumber) +{ + if(0 == sizePerVertex || 0 == vertexNumber) + return false; + _sizePerVertex = sizePerVertex; + _vertexNumber = vertexNumber; + + if(isShadowCopyEnabled()) + { + _shadowCopy.resize(sizePerVertex * _vertexNumber); + } + + glGenBuffers(1, &_vbo); + glBindBuffer(GL_ARRAY_BUFFER, _vbo); + glBufferData(GL_ARRAY_BUFFER, getSize(), nullptr, GL_STATIC_DRAW); + glBindBuffer(GL_ARRAY_BUFFER, 0); + return true; +} + +int VertexBuffer::getSizePerVertex() const +{ + return _sizePerVertex; +} + +int VertexBuffer::getVertexNumber() const +{ + return _vertexNumber; +} + +bool VertexBuffer::updateVertices(const void* verts, int count, int begin) +{ + if(count <= 0 || nullptr == verts) return false; + + if(begin < 0) + { + CCLOGERROR("Update vertices with begin = %d, will set begin to 0", begin); + begin = 0; + } + + if(count + begin > _vertexNumber) + { + CCLOGERROR("updated vertices exceed the max size of vertex buffer, will set count to _vertexNumber-begin"); + count = _vertexNumber - begin; + } + + if(isShadowCopyEnabled()) + { + memcpy(&_shadowCopy[begin * _sizePerVertex], verts, count * _sizePerVertex); + } + + glBindBuffer(GL_ARRAY_BUFFER, _vbo); + glBufferSubData(GL_ARRAY_BUFFER, begin * _sizePerVertex, count * _sizePerVertex, verts); + glBindBuffer(GL_ARRAY_BUFFER, 0); + + return true; +} + +GLuint VertexBuffer::getVBO() const +{ + return _vbo; +} + +void VertexBuffer::recreateVBO() const +{ + CCLOG("come to foreground of VertexBuffer"); + glGenBuffers(1, &_vbo); + glBindBuffer(GL_ARRAY_BUFFER, _vbo); + const void* buffer = nullptr; + if(isShadowCopyEnabled()) + { + buffer = &_shadowCopy[0]; + } + CCLOG("recreate IndexBuffer with size %d %d", getSizePerVertex(), _vertexNumber); + glBufferData(GL_ARRAY_BUFFER, _sizePerVertex * _vertexNumber, buffer, GL_STATIC_DRAW); + glBindBuffer(GL_ARRAY_BUFFER, 0); + if(!glIsBuffer(_vbo)) + { + CCLOGERROR("recreate VertexBuffer Error"); + } +} + +int VertexBuffer::getSize() const +{ + return _sizePerVertex * _vertexNumber; +} + +IndexBuffer* IndexBuffer::create(IndexType type, int number) +{ + auto result = new (std::nothrow) IndexBuffer(); + if(result && result->init(type, number)) + { + result->autorelease(); + return result; + } + CC_SAFE_DELETE(result); + return nullptr; +} + +IndexBuffer::IndexBuffer() +: _vbo(0) +, _type(IndexType::INDEX_TYPE_SHORT_16) +, _indexNumber(0) +, _recreateVBOEventListener(nullptr) +{ +#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) + auto callBack = [this](EventCustom* event) + { + this->recreateVBO(); + }; + + _recreateVBOEventListener = Director::getInstance()->getEventDispatcher()->addCustomEventListener(EVENT_RENDERER_RECREATED, callBack); +#endif +} + +IndexBuffer::~IndexBuffer() +{ + if(glIsBuffer(_vbo)) + { + glDeleteBuffers(1, &_vbo); + _vbo = 0; + } +#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) + Director::getInstance()->getEventDispatcher()->removeEventListener(_recreateVBOEventListener); +#endif +} + +bool IndexBuffer::init(IndexBuffer::IndexType type, int number) +{ + if(number <=0 ) return false; + + _type = type; + _indexNumber = number; + + glGenBuffers(1, &_vbo); + glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, _vbo); + glBufferData(GL_ELEMENT_ARRAY_BUFFER, getSize(), nullptr, GL_STATIC_DRAW); + glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0); + + if(isShadowCopyEnabled()) + { + _shadowCopy.resize(getSize()); + } + + return true; +} + +IndexBuffer::IndexType IndexBuffer::getType() const +{ + return _type; +} + +int IndexBuffer::getSizePerIndex() const +{ + return IndexType::INDEX_TYPE_SHORT_16 == _type ? 2 : 4; +} + +int IndexBuffer::getIndexNumber() const +{ + return _indexNumber; +} + +bool IndexBuffer::updateIndices(const void* indices, int count, int begin) +{ + if(count <= 0 || nullptr == indices) return false; + + if(begin < 0) + { + CCLOGERROR("Update indices with begin = %d, will set begin to 0", begin); + begin = 0; + } + + if(count + begin > _indexNumber) + { + CCLOGERROR("updated indices exceed the max size of vertex buffer, will set count to _indexNumber-begin"); + count = _indexNumber - begin; + } + + glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, _vbo); + glBufferSubData(GL_ELEMENT_ARRAY_BUFFER, begin * getSizePerIndex(), count * getSizePerIndex(), indices); + glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0); + + if(isShadowCopyEnabled()) + { + memcpy(&_shadowCopy[begin * getSizePerIndex()], indices, count * getSizePerIndex()); + } + + return true; +} + +int IndexBuffer::getSize() const +{ + return getSizePerIndex() * _indexNumber; +} + +GLuint IndexBuffer::getVBO() const +{ + return _vbo; +} + +void IndexBuffer::recreateVBO() const +{ + CCLOG("come to foreground of IndexBuffer"); + glGenBuffers(1, &_vbo); + glBindBuffer(GL_ARRAY_BUFFER, _vbo); + const void* buffer = nullptr; + if(isShadowCopyEnabled()) + { + buffer = &_shadowCopy[0]; + } + CCLOG("recreate IndexBuffer with size %d %d ", getSizePerIndex(), _indexNumber); + glBufferData(GL_ARRAY_BUFFER, getSize(), buffer, GL_STATIC_DRAW); + glBindBuffer(GL_ARRAY_BUFFER, 0); + if(!glIsBuffer(_vbo)) + { + CCLOGERROR("recreate IndexBuffer Error"); + } +} + +NS_CC_END diff --git a/cocos/renderer/CCVertexIndexBuffer.h b/cocos/renderer/CCVertexIndexBuffer.h new file mode 100644 index 0000000000..ebc21b1537 --- /dev/null +++ b/cocos/renderer/CCVertexIndexBuffer.h @@ -0,0 +1,118 @@ +/**************************************************************************** + 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_VERTEX_INDEX_BUFFER_H__ +#define __CC_VERTEX_INDEX_BUFFER_H__ + +#include "base/CCRef.h" +#include "base/CCDirector.h" + +NS_CC_BEGIN + +class EventListenerCustom; + +class CC_DLL VertexBuffer : public Ref +{ +public: + static VertexBuffer* create(int sizePerVertex, int vertexNumber); + + int getSizePerVertex() const; + int getVertexNumber() const; + bool updateVertices(const void* verts, int count, int begin); + + int getSize() const; + + GLuint getVBO() const; + +protected: + VertexBuffer(); + virtual ~VertexBuffer(); + + bool init(int sizePerVertex, int vertexNumber); +protected: + //event listener for foreground + void recreateVBO() const; + EventListenerCustom* _recreateVBOEventListener; +protected: + mutable GLuint _vbo; + int _sizePerVertex; + int _vertexNumber; + //buffer used for shadow copy + std::vector _shadowCopy; +protected: + static bool _enableShadowCopy; +public: + static bool isShadowCopyEnabled() { return _enableShadowCopy; } + static void enableShadowCopy(bool enabled) { _enableShadowCopy = enabled; } +}; + +class CC_DLL IndexBuffer : public Ref +{ +public: + enum class IndexType + { + INDEX_TYPE_SHORT_16, + INDEX_TYPE_UINT_32 + }; + +public: + static IndexBuffer* create(IndexType type, int number); + + IndexType getType() const; + int getSizePerIndex() const; + int getIndexNumber() const; + bool updateIndices(const void* indices, int count, int begin); + + int getSize() const; + + GLuint getVBO() const; + +protected: + IndexBuffer(); + virtual ~IndexBuffer(); + + bool init(IndexType type, int number); + +protected: + mutable GLuint _vbo; + IndexType _type; + int _indexNumber; + +protected: + //event listener for foreground + void recreateVBO() const; + EventListenerCustom* _recreateVBOEventListener; + //buffer used for shadow copy + std::vector _shadowCopy; +protected: + static bool _enableShadowCopy; +public: + static bool isShadowCopyEnabled() { return _enableShadowCopy; } + static void enableShadowCopy(bool enabled) { _enableShadowCopy = enabled; } +}; + + +NS_CC_END + +#endif /* __CC_VERTEX_INDEX_BUFFER_H__*/ diff --git a/cocos/renderer/CCVertexIndexData.cpp b/cocos/renderer/CCVertexIndexData.cpp new file mode 100644 index 0000000000..068230e455 --- /dev/null +++ b/cocos/renderer/CCVertexIndexData.cpp @@ -0,0 +1,132 @@ +/**************************************************************************** + 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 "renderer/CCVertexIndexData.h" +NS_CC_BEGIN + +VertexData* VertexData::create() +{ + VertexData* result = new (std::nothrow) VertexData(); + if(result) + { + result->autorelease(); + return result; + } + + CC_SAFE_DELETE(result); + return nullptr; +} + +size_t VertexData::getVertexStreamCount() const +{ + return _vertexStreams.size(); +} + +bool VertexData::setStream(VertexBuffer* buffer, const VertexStreamAttribute& stream) +{ + if( buffer == nullptr ) return false; + auto iter = _vertexStreams.find(stream._semantic); + if(iter == _vertexStreams.end()) + { + buffer->retain(); + auto& bufferAttribute = _vertexStreams[stream._semantic]; + bufferAttribute._buffer = buffer; + bufferAttribute._stream = stream; + } + else + { + buffer->retain(); + iter->second._buffer->release(); + iter->second._stream = stream; + iter->second._buffer = buffer; + } + + return true; +} + +void VertexData::removeStream(int semantic) +{ + auto iter = _vertexStreams.find(semantic); + if(iter != _vertexStreams.end()) + { + iter->second._buffer->release(); + _vertexStreams.erase(iter); + } +} + +const VertexStreamAttribute* VertexData::getStreamAttribute(int semantic) const +{ + auto iter = _vertexStreams.find(semantic); + if(iter == _vertexStreams.end()) return nullptr; + else return &iter->second._stream; +} + +VertexStreamAttribute* VertexData::getStreamAttribute(int semantic) +{ + auto iter = _vertexStreams.find(semantic); + if(iter == _vertexStreams.end()) return nullptr; + else return &iter->second._stream; +} + +VertexBuffer* VertexData::getStreamBuffer(int semantic) const +{ + auto iter = _vertexStreams.find(semantic); + if(iter == _vertexStreams.end()) return nullptr; + else return iter->second._buffer; +} + +VertexData::VertexData() +{ + +} + +VertexData::~VertexData() +{ + for(auto& element : _vertexStreams) + { + element.second._buffer->release(); + } + _vertexStreams.clear(); +} + +void VertexData::use() +{ + uint32_t flags(0); + for(auto& element : _vertexStreams) + { + flags = flags | (1 << element.second._stream._semantic); + } + + GL::enableVertexAttribs(flags); + + for(auto& element : _vertexStreams) + { + //glEnableVertexAttribArray((GLint)element.second._stream._semantic); + glBindBuffer(GL_ARRAY_BUFFER, element.second._buffer->getVBO()); + glVertexAttribPointer(GLint(element.second._stream._semantic),element.second._stream._size, + element.second._stream._type,element.second._stream._normalize, element.second._buffer->getSizePerVertex(), (GLvoid*)element.second._stream._offset); + } +} + +NS_CC_END diff --git a/cocos/renderer/CCVertexIndexData.h b/cocos/renderer/CCVertexIndexData.h new file mode 100644 index 0000000000..7af66da4cc --- /dev/null +++ b/cocos/renderer/CCVertexIndexData.h @@ -0,0 +1,90 @@ +/**************************************************************************** + 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_VERTEX_INDEX_DATA_H__ +#define __CC_VERTEX_INDEX_DATA_H__ + +#include "base/CCRef.h" +#include "renderer/CCVertexIndexBuffer.h" +#include "base/CCMap.h" +#include + +NS_CC_BEGIN + +class VertexBuffer; + +struct CC_DLL VertexStreamAttribute +{ + VertexStreamAttribute() + : _offset(0),_semantic(0),_type(0),_size(0), _normalize(false) + { + } + + VertexStreamAttribute(int offset, int semantic, int type, int size) + : _offset(offset),_semantic(semantic),_type(type),_size(size), _normalize(false) + { + } + + VertexStreamAttribute(int offset, int semantic, int type, int size, bool normalize) + : _offset(offset),_semantic(semantic),_type(type),_size(size), _normalize(normalize) + { + } + + bool _normalize; + int _offset; + int _semantic; + int _type; + int _size; +}; + +class CC_DLL VertexData : public Ref +{ +public: + static VertexData* create(); + + size_t getVertexStreamCount() const; + bool setStream(VertexBuffer* buffer, const VertexStreamAttribute& stream); + void removeStream(int semantic); + const VertexStreamAttribute* getStreamAttribute(int semantic) const; + VertexStreamAttribute* getStreamAttribute(int semantic); + + VertexBuffer* getStreamBuffer(int semantic) const; + + void use(); +protected: + VertexData(); + virtual ~VertexData(); +protected: + struct BufferAttribute + { + VertexBuffer* _buffer; + VertexStreamAttribute _stream; + }; + + std::map _vertexStreams; +}; + +NS_CC_END + +#endif //__CC_VERTEX_INDEX_DATA_H__ diff --git a/cocos/renderer/CMakeLists.txt b/cocos/renderer/CMakeLists.txt index b86e1aed6c..4e02154825 100644 --- a/cocos/renderer/CMakeLists.txt +++ b/cocos/renderer/CMakeLists.txt @@ -15,5 +15,8 @@ set(COCOS_RENDERER_SRC renderer/CCTexture2D.cpp renderer/CCTextureAtlas.cpp renderer/CCTextureCache.cpp + renderer/CCVertexIndexBuffer.cpp + renderer/CCVertexIndexData.cpp + renderer/CCPrimitive.cpp + renderer/CCPrimitiveCommand.cpp ) - diff --git a/cocos/renderer/ccGLStateCache.h b/cocos/renderer/ccGLStateCache.h index 5c3b32ca0a..8428cc77ff 100644 --- a/cocos/renderer/ccGLStateCache.h +++ b/cocos/renderer/ccGLStateCache.h @@ -51,7 +51,10 @@ enum { VERTEX_ATTRIB_FLAG_POSITION = 1 << 0, VERTEX_ATTRIB_FLAG_COLOR = 1 << 1, VERTEX_ATTRIB_FLAG_TEX_COORD = 1 << 2, - + VERTEX_ATTRIB_FLAG_NORMAL = 1 << 3, + VERTEX_ATTRIB_FLAG_BLEND_WEIGHT = 1 << 4, + VERTEX_ATTRIB_FLAG_BLEND_INDEX = 1 << 5, + VERTEX_ATTRIB_FLAG_POS_COLOR_TEX = (VERTEX_ATTRIB_FLAG_POSITION | VERTEX_ATTRIB_FLAG_COLOR | VERTEX_ATTRIB_FLAG_TEX_COORD), }; diff --git a/cocos/scripting/lua-bindings/Android.mk b/cocos/scripting/lua-bindings/Android.mk deleted file mode 100644 index aa2c13f5e3..0000000000 --- a/cocos/scripting/lua-bindings/Android.mk +++ /dev/null @@ -1,110 +0,0 @@ -LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_MODULE := cocos_lua_static - -LOCAL_MODULE_FILENAME := liblua - -LOCAL_SRC_FILES := manual/CCLuaBridge.cpp \ - manual/CCLuaEngine.cpp \ - manual/CCLuaStack.cpp \ - manual/lua_debugger.c \ - manual/CCLuaValue.cpp \ - manual/Cocos2dxLuaLoader.cpp \ - manual/CCBProxy.cpp \ - manual/Lua_web_socket.cpp \ - manual/LuaOpengl.cpp \ - manual/LuaScriptHandlerMgr.cpp \ - manual/LuaBasicConversions.cpp \ - manual/LuaSkeletonAnimation.cpp \ - manual/lua_cocos2dx_manual.cpp \ - manual/lua_cocos2dx_extension_manual.cpp \ - manual/lua_cocos2dx_coco_studio_manual.cpp \ - manual/lua_cocos2dx_ui_manual.cpp \ - manual/lua_cocos2dx_spine_manual.cpp \ - manual/lua_cocos2dx_physics_manual.cpp \ - manual/lua_cocos2dx_experimental_manual.cpp \ - manual/lua_cocos2dx_experimental_video_manual.cpp \ - manual/lua_cocos2dx_deprecated.cpp \ - manual/lua_xml_http_request.cpp \ - manual/platform/android/CCLuaJavaBridge.cpp \ - manual/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxLuaJavaBridge.cpp \ - manual/tolua_fix.cpp \ - manual/lua_extensions.c \ - auto/lua_cocos2dx_auto.cpp \ - auto/lua_cocos2dx_extension_auto.cpp \ - auto/lua_cocos2dx_studio_auto.cpp \ - auto/lua_cocos2dx_ui_auto.cpp \ - auto/lua_cocos2dx_spine_auto.cpp \ - auto/lua_cocos2dx_physics_auto.cpp \ - auto/lua_cocos2dx_experimental_auto.cpp \ - auto/lua_cocos2dx_experimental_video_auto.cpp \ - ../../../external/lua/tolua/tolua_event.c \ - ../../../external/lua/tolua/tolua_is.c \ - ../../../external/lua/tolua/tolua_map.c \ - ../../../external/lua/tolua/tolua_push.c \ - ../../../external/lua/tolua/tolua_to.c \ - ../../../external/lua/luasocket/auxiliar.c \ - ../../../external/lua/luasocket/buffer.c \ - ../../../external/lua/luasocket/except.c \ - ../../../external/lua/luasocket/inet.c \ - ../../../external/lua/luasocket/io.c \ - ../../../external/lua/luasocket/luasocket.c \ - ../../../external/lua/luasocket/mime.c \ - ../../../external/lua/luasocket/options.c \ - ../../../external/lua/luasocket/select.c \ - ../../../external/lua/luasocket/serial.c \ - ../../../external/lua/luasocket/tcp.c \ - ../../../external/lua/luasocket/timeout.c \ - ../../../external/lua/luasocket/udp.c \ - ../../../external/lua/luasocket/unix.c \ - ../../../external/lua/luasocket/usocket.c \ - ../../../external/xxtea/xxtea.cpp - - -LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../../external/lua/tolua \ - $(LOCAL_PATH)/../../../external/lua/luajit/include \ - $(LOCAL_PATH)/../../../external/lua \ - $(LOCAL_PATH)/../../../extensions \ - $(LOCAL_PATH)/../../editor-support/spine \ - $(LOCAL_PATH)/../../editor-support/cocosbuilder \ - $(LOCAL_PATH)/../../editor-support/cocostudio \ - $(LOCAL_PATH)/../../ui \ - $(LOCAL_PATH)/../../2d \ - $(LOCAL_PATH)/../../3d \ - $(LOCAL_PATH)/auto \ - $(LOCAL_PATH)/manual \ - $(LOCAL_PATH)/manual/platform/android \ - $(LOCAL_PATH)/manual/platform/android/jni \ - $(LOCAL_PATH)/../../../external/xxtea - - -LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../external/lua/tolua \ - $(LOCAL_PATH)/../../../external/lua/luajit/include \ - $(LOCAL_PATH)/../external \ - $(LOCAL_PATH)/auto \ - $(LOCAL_PATH)/manual - - -LOCAL_WHOLE_STATIC_LIBRARIES := luajit_static -LOCAL_WHOLE_STATIC_LIBRARIES += cocos_extension_static -LOCAL_WHOLE_STATIC_LIBRARIES += cocos2dx_static -LOCAL_WHOLE_STATIC_LIBRARIES += websockets_static -LOCAL_WHOLE_STATIC_LIBRARIES += cocos_network_static -LOCAL_WHOLE_STATIC_LIBRARIES += cocosbuilder_static -LOCAL_WHOLE_STATIC_LIBRARIES += cocostudio_static -LOCAL_WHOLE_STATIC_LIBRARIES += spine_static - -LOCAL_CFLAGS += -Wno-psabi -LOCAL_EXPORT_CFLAGS += -Wno-psabi - -include $(BUILD_STATIC_LIBRARY) - -$(call import-module,lua/luajit/prebuilt/android) -$(call import-module,extensions) -$(call import-module,.) -$(call import-module,websockets/prebuilt/android) -$(call import-module,network) -$(call import-module,editor-support/cocostudio) -$(call import-module,editor-support/cocosbuilder) -$(call import-module,editor-support/spine) diff --git a/cocos/scripting/lua-bindings/CMakeLists.txt b/cocos/scripting/lua-bindings/CMakeLists.txt index 1f414b9005..7da34f7b45 100644 --- a/cocos/scripting/lua-bindings/CMakeLists.txt +++ b/cocos/scripting/lua-bindings/CMakeLists.txt @@ -1,9 +1,6 @@ -set(LUABINDING_SRC +#luacocos2d +set(LIBLUACOCOS2D_SRC auto/lua_cocos2dx_auto.cpp - auto/lua_cocos2dx_extension_auto.cpp - auto/lua_cocos2dx_studio_auto.cpp - auto/lua_cocos2dx_ui_auto.cpp - auto/lua_cocos2dx_spine_auto.cpp auto/lua_cocos2dx_physics_auto.cpp auto/lua_cocos2dx_experimental_auto.cpp manual/tolua_fix.cpp @@ -12,51 +9,221 @@ set(LUABINDING_SRC manual/CCLuaStack.cpp manual/CCLuaValue.cpp manual/Cocos2dxLuaLoader.cpp - manual/CCBProxy.cpp - manual/LuaOpengl.cpp - manual/LuaScriptHandlerMgr.cpp manual/LuaBasicConversions.cpp - manual/lua_cocos2dx_manual.cpp - manual/lua_cocos2dx_extension_manual.cpp - manual/lua_cocos2dx_coco_studio_manual.cpp - manual/lua_cocos2dx_ui_manual.cpp - manual/lua_cocos2dx_spine_manual.cpp - manual/lua_cocos2dx_physics_manual.cpp - manual/lua_cocos2dx_deprecated.cpp - manual/lua_xml_http_request.cpp - manual/LuaSkeletonAnimation.cpp - manual/lua_cocos2dx_experimental_manual.cpp + manual/cocos2d/lua_cocos2dx_deprecated.cpp + manual/cocos2d/lua_cocos2dx_experimental_manual.cpp + manual/cocos2d/lua_cocos2dx_manual.cpp + manual/cocos2d/lua_cocos2dx_physics_manual.cpp + manual/cocos2d/LuaOpengl.cpp + manual/cocos2d/LuaScriptHandlerMgr.cpp ) include_directories( auto manual - ../../editor-support/cocosbuilder - ../../editor-support/cocostudio - ../../editor-support/spine - ../../ui + manual/cocos2d + manual/extension + manual/cocostudio + manual/ui ../../2d ../../3d + ../../../extensions ../../../external/lua/lua ../../../external/lua/tolua ../../../external/xxtea ) -add_library(luabinding STATIC - ${LUABINDING_SRC} +add_library(luacocos2d STATIC + ${LIBLUACOCOS2D_SRC} ) -target_link_libraries(luabinding +target_link_libraries(luacocos2d tolua lua - spine xxtea ) -set_target_properties(luabinding +set_target_properties(luacocos2d PROPERTIES ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib" LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib" ) + +#luacocosdenshion +set(LIBLUACOCOSDENSHION_SRC + auto/lua_cocos2dx_cocosdenshion_auto.cpp + manual/cocosdenshion/lua_cocos2dx_cocosdenshion_manual.cpp +) + +include_directories( + auto + manual/cocosdenshion + ../../audio/include +) + +add_library(luacocosdenshion STATIC + ${LIBLUACOCOSDENSHION_SRC} +) + +set_target_properties(luacocosdenshion + PROPERTIES + ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib" + LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib" +) + +#luanetwork +set(LIBLUANETWORK_SRC + manual/network/lua_cocos2dx_network_manual.cpp + manual/network/lua_xml_http_request.cpp +) + +include_directories( + manual/network + ../../network +) + +add_library(luanetwork STATIC + ${LIBLUANETWORK_SRC} +) + +set_target_properties(luanetwork + PROPERTIES + ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib" + LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib" +) + +#luacocosbuilder +set(LIBLUACOCOSBUILDER_SRC + auto/lua_cocos2dx_cocosbuilder_auto.cpp + manual/cocosbuilder/lua_cocos2dx_cocosbuilder_manual.cpp + manual/cocosbuilder/CCBProxy.cpp +) + +include_directories( + auto + manual/cocosbuilder + ../../editor-support/cocosbuilder +) + +add_library(luacocosbuilder STATIC + ${LIBLUACOCOSBUILDER_SRC} +) + +set_target_properties(luacocosbuilder + PROPERTIES + ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib" + LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib" +) + +#luacocostudio +set(LIBLUACOCOSTUDIO_SRC + auto/lua_cocos2dx_studio_auto.cpp + manual/cocostudio/lua_cocos2dx_coco_studio_manual.cpp +) + +include_directories( + auto + manual/cocostudio + ../../editor-support/cocostudio +) + +add_library(luacocostudio STATIC + ${LIBLUACOCOSTUDIO_SRC} +) + +set_target_properties(luacocostudio + PROPERTIES + ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib" + LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib" +) + +#luaspine +set(LIBLUASPINE_SRC + auto/lua_cocos2dx_spine_auto.cpp + manual/spine/LuaSkeletonAnimation.cpp + manual/spine/lua_cocos2dx_spine_manual.cpp +) + +include_directories( + auto + manual/spine + ../../editor-support/spine +) + +add_library(luaspine STATIC + ${LIBLUASPINE_SRC} +) + +set_target_properties(luaspine + PROPERTIES + ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib" + LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib" +) + +#luaextension +set(LIBLUAEXTENSION_SRC + auto/lua_cocos2dx_extension_auto.cpp + manual/extension/lua_cocos2dx_extension_manual.cpp +) + +include_directories( + auto + manual/extension + ../../../extensions +) + +add_library(luaextension STATIC + ${LIBLUAEXTENSION_SRC} +) + +set_target_properties(luaextension + PROPERTIES + ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib" + LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib" +) + +#luaui +set(LIBLUAUI_SRC + auto/lua_cocos2dx_ui_auto.cpp + manual/ui/lua_cocos2dx_ui_manual.cpp +) + +include_directories( + auto + manual/ui + ../../ui +) + +add_library(luaui STATIC + ${LIBLUAUI_SRC} +) + +set_target_properties(luaui + PROPERTIES + ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib" + LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib" +) + +#luacocos3d +set(LIBLUA3D_SRC + auto/lua_cocos2dx_3d_auto.cpp + manual/3d/lua_cocos2dx_3d_manual.cpp +) + +include_directories( + auto + manual/3d + ../../../3d +) + +add_library(luacocos3d STATIC + ${LIBLUA3D_SRC} +) + +set_target_properties(luacocos3d + PROPERTIES + ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib" + LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib" +) diff --git a/cocos/scripting/lua-bindings/auto/api/AttachNode.lua b/cocos/scripting/lua-bindings/auto/api/AttachNode.lua new file mode 100644 index 0000000000..dca12cf579 --- /dev/null +++ b/cocos/scripting/lua-bindings/auto/api/AttachNode.lua @@ -0,0 +1,25 @@ + +-------------------------------- +-- @module AttachNode +-- @extend Node +-- @parent_module cc + +-------------------------------- +-- @function [parent=#AttachNode] create +-- @param self +-- @param #cc.Bone3D bone3d +-- @return AttachNode#AttachNode ret (return value: cc.AttachNode) + +-------------------------------- +-- @function [parent=#AttachNode] getWorldToNodeTransform +-- @param self +-- @return mat4_table#mat4_table ret (return value: mat4_table) + +-------------------------------- +-- @function [parent=#AttachNode] visit +-- @param self +-- @param #cc.Renderer renderer +-- @param #mat4_table mat4 +-- @param #unsigned int int + +return nil diff --git a/cocos/scripting/lua-bindings/auto/api/Button.lua b/cocos/scripting/lua-bindings/auto/api/Button.lua index 01e2a2990d..b0212c1988 100644 --- a/cocos/scripting/lua-bindings/auto/api/Button.lua +++ b/cocos/scripting/lua-bindings/auto/api/Button.lua @@ -19,6 +19,11 @@ -- @param self -- @param #bool bool +-------------------------------- +-- @function [parent=#Button] getZoomScale +-- @param self +-- @return float#float ret (return value: float) + -------------------------------- -- @function [parent=#Button] getCapInsetsDisabledRenderer -- @param self @@ -120,6 +125,11 @@ -- @param self -- @param #bool bool +-------------------------------- +-- @function [parent=#Button] setZoomScale +-- @param self +-- @param #float float + -------------------------------- -- @overload self, string, string, string, int -- @overload self diff --git a/cocos/scripting/lua-bindings/auto/api/Camera.lua b/cocos/scripting/lua-bindings/auto/api/Camera.lua new file mode 100644 index 0000000000..af10889528 --- /dev/null +++ b/cocos/scripting/lua-bindings/auto/api/Camera.lua @@ -0,0 +1,83 @@ + +-------------------------------- +-- @module Camera +-- @extend Node +-- @parent_module cc + +-------------------------------- +-- @function [parent=#Camera] getProjectionMatrix +-- @param self +-- @return mat4_table#mat4_table ret (return value: mat4_table) + +-------------------------------- +-- @function [parent=#Camera] getViewProjectionMatrix +-- @param self +-- @return mat4_table#mat4_table ret (return value: mat4_table) + +-------------------------------- +-- @function [parent=#Camera] getViewMatrix +-- @param self +-- @return mat4_table#mat4_table ret (return value: mat4_table) + +-------------------------------- +-- @function [parent=#Camera] getCameraFlag +-- @param self +-- @return int#int ret (return value: int) + +-------------------------------- +-- @function [parent=#Camera] getType +-- @param self +-- @return int#int ret (return value: int) + +-------------------------------- +-- @function [parent=#Camera] lookAt +-- @param self +-- @param #vec3_table vec3 +-- @param #vec3_table vec3 + +-------------------------------- +-- @function [parent=#Camera] setCameraFlag +-- @param self +-- @param #int cameraflag + +-------------------------------- +-- @function [parent=#Camera] unproject +-- @param self +-- @param #size_table size +-- @param #vec3_table vec3 +-- @param #vec3_table vec3 + +-------------------------------- +-- @function [parent=#Camera] create +-- @param self +-- @return Camera#Camera ret (return value: cc.Camera) + +-------------------------------- +-- @function [parent=#Camera] createPerspective +-- @param self +-- @param #float float +-- @param #float float +-- @param #float float +-- @param #float float +-- @return Camera#Camera ret (return value: cc.Camera) + +-------------------------------- +-- @function [parent=#Camera] createOrthographic +-- @param self +-- @param #float float +-- @param #float float +-- @param #float float +-- @param #float float +-- @return Camera#Camera ret (return value: cc.Camera) + +-------------------------------- +-- @function [parent=#Camera] getVisitingCamera +-- @param self +-- @return Camera#Camera ret (return value: cc.Camera) + +-------------------------------- +-- @function [parent=#Camera] setPosition3D +-- @param self +-- @param #vec3_table vec3 + +return nil diff --git a/cocos/scripting/lua-bindings/auto/api/CheckBox.lua b/cocos/scripting/lua-bindings/auto/api/CheckBox.lua index fe0f55b6f8..cdbab92888 100644 --- a/cocos/scripting/lua-bindings/auto/api/CheckBox.lua +++ b/cocos/scripting/lua-bindings/auto/api/CheckBox.lua @@ -4,11 +4,6 @@ -- @extend Widget -- @parent_module ccui --------------------------------- --- @function [parent=#CheckBox] getSelectedState --- @param self --- @return bool#bool ret (return value: bool) - -------------------------------- -- @function [parent=#CheckBox] loadTextureBackGroundSelected -- @param self @@ -21,6 +16,11 @@ -- @param #string str -- @param #int texturerestype +-------------------------------- +-- @function [parent=#CheckBox] setSelected +-- @param self +-- @param #bool bool + -------------------------------- -- @function [parent=#CheckBox] addEventListener -- @param self @@ -32,6 +32,11 @@ -- @param #string str -- @param #int texturerestype +-------------------------------- +-- @function [parent=#CheckBox] isSelected +-- @param self +-- @return bool#bool ret (return value: bool) + -------------------------------- -- @function [parent=#CheckBox] loadTextures -- @param self @@ -48,11 +53,6 @@ -- @param #string str -- @param #int texturerestype --------------------------------- --- @function [parent=#CheckBox] setSelectedState --- @param self --- @param #bool bool - -------------------------------- -- @function [parent=#CheckBox] loadTextureFrontCrossDisabled -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/EventMouse.lua b/cocos/scripting/lua-bindings/auto/api/EventMouse.lua index b4327c9b51..4d991e49e3 100644 --- a/cocos/scripting/lua-bindings/auto/api/EventMouse.lua +++ b/cocos/scripting/lua-bindings/auto/api/EventMouse.lua @@ -4,22 +4,57 @@ -- @extend Event -- @parent_module cc +-------------------------------- +-- @function [parent=#EventMouse] getPreviousLocationInView +-- @param self +-- @return vec2_table#vec2_table ret (return value: vec2_table) + +-------------------------------- +-- @function [parent=#EventMouse] getLocation +-- @param self +-- @return vec2_table#vec2_table ret (return value: vec2_table) + -------------------------------- -- @function [parent=#EventMouse] getMouseButton -- @param self -- @return int#int ret (return value: int) +-------------------------------- +-- @function [parent=#EventMouse] getPreviousLocation +-- @param self +-- @return vec2_table#vec2_table ret (return value: vec2_table) + +-------------------------------- +-- @function [parent=#EventMouse] getDelta +-- @param self +-- @return vec2_table#vec2_table ret (return value: vec2_table) + -------------------------------- -- @function [parent=#EventMouse] setScrollData -- @param self -- @param #float float -- @param #float float +-------------------------------- +-- @function [parent=#EventMouse] getStartLocationInView +-- @param self +-- @return vec2_table#vec2_table ret (return value: vec2_table) + +-------------------------------- +-- @function [parent=#EventMouse] getStartLocation +-- @param self +-- @return vec2_table#vec2_table ret (return value: vec2_table) + -------------------------------- -- @function [parent=#EventMouse] setMouseButton -- @param self -- @param #int int +-------------------------------- +-- @function [parent=#EventMouse] getLocationInView +-- @param self +-- @return vec2_table#vec2_table ret (return value: vec2_table) + -------------------------------- -- @function [parent=#EventMouse] getScrollY -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/FileUtils.lua b/cocos/scripting/lua-bindings/auto/api/FileUtils.lua index 55ba23c983..465eafc67b 100644 --- a/cocos/scripting/lua-bindings/auto/api/FileUtils.lua +++ b/cocos/scripting/lua-bindings/auto/api/FileUtils.lua @@ -20,12 +20,26 @@ -- @param self -- @param #map_table map +-------------------------------- +-- @function [parent=#FileUtils] removeFile +-- @param self +-- @param #string str +-- @return bool#bool ret (return value: bool) + -------------------------------- -- @function [parent=#FileUtils] isAbsolutePath -- @param self -- @param #string str -- @return bool#bool ret (return value: bool) +-------------------------------- +-- @function [parent=#FileUtils] renameFile +-- @param self +-- @param #string str +-- @param #string str +-- @param #string str +-- @return bool#bool ret (return value: bool) + -------------------------------- -- @function [parent=#FileUtils] loadFilenameLookupDictionaryFromFile -- @param self @@ -60,11 +74,30 @@ -- @param #string str -- @return map_table#map_table ret (return value: map_table) +-------------------------------- +-- @function [parent=#FileUtils] getValueMapFromData +-- @param self +-- @param #char char +-- @param #int int +-- @return map_table#map_table ret (return value: map_table) + +-------------------------------- +-- @function [parent=#FileUtils] removeDirectory +-- @param self +-- @param #string str +-- @return bool#bool ret (return value: bool) + -------------------------------- -- @function [parent=#FileUtils] setSearchPaths -- @param self -- @param #array_table array +-------------------------------- +-- @function [parent=#FileUtils] getFileSize +-- @param self +-- @param #string str +-- @return long#long ret (return value: long) + -------------------------------- -- @function [parent=#FileUtils] setSearchResolutionsOrder -- @param self @@ -104,11 +137,23 @@ -- @param self -- @param #bool bool +-------------------------------- +-- @function [parent=#FileUtils] isDirectoryExist +-- @param self +-- @param #string str +-- @return bool#bool ret (return value: bool) + -------------------------------- -- @function [parent=#FileUtils] getSearchResolutionsOrder -- @param self -- @return array_table#array_table ret (return value: array_table) +-------------------------------- +-- @function [parent=#FileUtils] createDirectory +-- @param self +-- @param #string str +-- @return bool#bool ret (return value: bool) + -------------------------------- -- @function [parent=#FileUtils] getWritablePath -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/GLView.lua b/cocos/scripting/lua-bindings/auto/api/GLView.lua index d795962d0d..1fa8ba7aae 100644 --- a/cocos/scripting/lua-bindings/auto/api/GLView.lua +++ b/cocos/scripting/lua-bindings/auto/api/GLView.lua @@ -1,37 +1,159 @@ -------------------------------- -- @module GLView --- @extend GLViewProtocol,Ref +-- @extend Ref -- @parent_module cc -------------------------------- --- @function [parent=#GLView] createWithRect +-- @function [parent=#GLView] setFrameSize -- @param self --- @param #string str --- @param #rect_table rect -- @param #float float --- @return GLView#GLView ret (return value: cc.GLView) +-- @param #float float -------------------------------- --- @function [parent=#GLView] create +-- @function [parent=#GLView] getViewPortRect -- @param self --- @param #string str --- @return GLView#GLView ret (return value: cc.GLView) +-- @return rect_table#rect_table ret (return value: rect_table) -------------------------------- --- @function [parent=#GLView] createWithFullScreen +-- @function [parent=#GLView] setContentScaleFactor -- @param self --- @param #string str --- @return GLView#GLView ret (return value: cc.GLView) +-- @param #float float +-- @return bool#bool ret (return value: bool) + +-------------------------------- +-- @function [parent=#GLView] getContentScaleFactor +-- @param self +-- @return float#float ret (return value: float) -------------------------------- -- @function [parent=#GLView] setIMEKeyboardState -- @param self -- @param #bool bool +-------------------------------- +-- @function [parent=#GLView] setScissorInPoints +-- @param self +-- @param #float float +-- @param #float float +-- @param #float float +-- @param #float float + +-------------------------------- +-- @function [parent=#GLView] getViewName +-- @param self +-- @return string#string ret (return value: string) + -------------------------------- -- @function [parent=#GLView] isOpenGLReady -- @param self -- @return bool#bool ret (return value: bool) +-------------------------------- +-- @function [parent=#GLView] end +-- @param self + +-------------------------------- +-- @function [parent=#GLView] getScaleY +-- @param self +-- @return float#float ret (return value: float) + +-------------------------------- +-- @function [parent=#GLView] getScaleX +-- @param self +-- @return float#float ret (return value: float) + +-------------------------------- +-- @function [parent=#GLView] getVisibleOrigin +-- @param self +-- @return vec2_table#vec2_table ret (return value: vec2_table) + +-------------------------------- +-- @function [parent=#GLView] getFrameSize +-- @param self +-- @return size_table#size_table ret (return value: size_table) + +-------------------------------- +-- @function [parent=#GLView] setFrameZoomFactor +-- @param self +-- @param #float float + +-------------------------------- +-- @function [parent=#GLView] getFrameZoomFactor +-- @param self +-- @return float#float ret (return value: float) + +-------------------------------- +-- @function [parent=#GLView] getDesignResolutionSize +-- @param self +-- @return size_table#size_table ret (return value: size_table) + +-------------------------------- +-- @function [parent=#GLView] windowShouldClose +-- @param self +-- @return bool#bool ret (return value: bool) + +-------------------------------- +-- @function [parent=#GLView] swapBuffers +-- @param self + +-------------------------------- +-- @function [parent=#GLView] setDesignResolutionSize +-- @param self +-- @param #float float +-- @param #float float +-- @param #int resolutionpolicy + +-------------------------------- +-- @function [parent=#GLView] getResolutionPolicy +-- @param self +-- @return int#int ret (return value: int) + +-------------------------------- +-- @function [parent=#GLView] isRetinaDisplay +-- @param self +-- @return bool#bool ret (return value: bool) + +-------------------------------- +-- @function [parent=#GLView] setViewPortInPoints +-- @param self +-- @param #float float +-- @param #float float +-- @param #float float +-- @param #float float + +-------------------------------- +-- @function [parent=#GLView] getScissorRect +-- @param self +-- @return rect_table#rect_table ret (return value: rect_table) + +-------------------------------- +-- @function [parent=#GLView] getRetinaFactor +-- @param self +-- @return int#int ret (return value: int) + +-------------------------------- +-- @function [parent=#GLView] setViewName +-- @param self +-- @param #string str + +-------------------------------- +-- @function [parent=#GLView] getVisibleRect +-- @param self +-- @return rect_table#rect_table ret (return value: rect_table) + +-------------------------------- +-- @function [parent=#GLView] getVisibleSize +-- @param self +-- @return size_table#size_table ret (return value: size_table) + +-------------------------------- +-- @function [parent=#GLView] isScissorEnabled +-- @param self +-- @return bool#bool ret (return value: bool) + +-------------------------------- +-- @function [parent=#GLView] pollEvents +-- @param self + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/GLViewImpl.lua b/cocos/scripting/lua-bindings/auto/api/GLViewImpl.lua new file mode 100644 index 0000000000..37b80b7f7e --- /dev/null +++ b/cocos/scripting/lua-bindings/auto/api/GLViewImpl.lua @@ -0,0 +1,37 @@ + +-------------------------------- +-- @module GLViewImpl +-- @extend GLView +-- @parent_module cc + +-------------------------------- +-- @function [parent=#GLViewImpl] createWithRect +-- @param self +-- @param #string str +-- @param #rect_table rect +-- @param #float float +-- @return GLViewImpl#GLViewImpl ret (return value: cc.GLViewImpl) + +-------------------------------- +-- @function [parent=#GLViewImpl] create +-- @param self +-- @param #string str +-- @return GLViewImpl#GLViewImpl ret (return value: cc.GLViewImpl) + +-------------------------------- +-- @function [parent=#GLViewImpl] createWithFullScreen +-- @param self +-- @param #string str +-- @return GLViewImpl#GLViewImpl ret (return value: cc.GLViewImpl) + +-------------------------------- +-- @function [parent=#GLViewImpl] setIMEKeyboardState +-- @param self +-- @param #bool bool + +-------------------------------- +-- @function [parent=#GLViewImpl] isOpenGLReady +-- @param self +-- @return bool#bool ret (return value: bool) + +return nil diff --git a/cocos/scripting/lua-bindings/auto/api/GLViewProtocol.lua b/cocos/scripting/lua-bindings/auto/api/GLViewProtocol.lua deleted file mode 100644 index f9da3d2a92..0000000000 --- a/cocos/scripting/lua-bindings/auto/api/GLViewProtocol.lua +++ /dev/null @@ -1,122 +0,0 @@ - --------------------------------- --- @module GLViewProtocol --- @parent_module cc - --------------------------------- --- @function [parent=#GLViewProtocol] setFrameSize --- @param self --- @param #float float --- @param #float float - --------------------------------- --- @function [parent=#GLViewProtocol] getViewPortRect --- @param self --- @return rect_table#rect_table ret (return value: rect_table) - --------------------------------- --- @function [parent=#GLViewProtocol] setIMEKeyboardState --- @param self --- @param #bool bool - --------------------------------- --- @function [parent=#GLViewProtocol] setScissorInPoints --- @param self --- @param #float float --- @param #float float --- @param #float float --- @param #float float - --------------------------------- --- @function [parent=#GLViewProtocol] getViewName --- @param self --- @return string#string ret (return value: string) - --------------------------------- --- @function [parent=#GLViewProtocol] isOpenGLReady --- @param self --- @return bool#bool ret (return value: bool) - --------------------------------- --- @function [parent=#GLViewProtocol] end --- @param self - --------------------------------- --- @function [parent=#GLViewProtocol] getScaleY --- @param self --- @return float#float ret (return value: float) - --------------------------------- --- @function [parent=#GLViewProtocol] getScaleX --- @param self --- @return float#float ret (return value: float) - --------------------------------- --- @function [parent=#GLViewProtocol] getVisibleOrigin --- @param self --- @return vec2_table#vec2_table ret (return value: vec2_table) - --------------------------------- --- @function [parent=#GLViewProtocol] getFrameSize --- @param self --- @return size_table#size_table ret (return value: size_table) - --------------------------------- --- @function [parent=#GLViewProtocol] getDesignResolutionSize --- @param self --- @return size_table#size_table ret (return value: size_table) - --------------------------------- --- @function [parent=#GLViewProtocol] pollInputEvents --- @param self - --------------------------------- --- @function [parent=#GLViewProtocol] swapBuffers --- @param self - --------------------------------- --- @function [parent=#GLViewProtocol] setDesignResolutionSize --- @param self --- @param #float float --- @param #float float --- @param #int resolutionpolicy - --------------------------------- --- @function [parent=#GLViewProtocol] getResolutionPolicy --- @param self --- @return int#int ret (return value: int) - --------------------------------- --- @function [parent=#GLViewProtocol] setViewPortInPoints --- @param self --- @param #float float --- @param #float float --- @param #float float --- @param #float float - --------------------------------- --- @function [parent=#GLViewProtocol] getScissorRect --- @param self --- @return rect_table#rect_table ret (return value: rect_table) - --------------------------------- --- @function [parent=#GLViewProtocol] setViewName --- @param self --- @param #string str - --------------------------------- --- @function [parent=#GLViewProtocol] getVisibleRect --- @param self --- @return rect_table#rect_table ret (return value: rect_table) - --------------------------------- --- @function [parent=#GLViewProtocol] getVisibleSize --- @param self --- @return size_table#size_table ret (return value: size_table) - --------------------------------- --- @function [parent=#GLViewProtocol] isScissorEnabled --- @param self --- @return bool#bool ret (return value: bool) - -return nil diff --git a/cocos/scripting/lua-bindings/auto/api/Helper.lua b/cocos/scripting/lua-bindings/auto/api/Helper.lua index bc0337fd7b..f7d6579957 100644 --- a/cocos/scripting/lua-bindings/auto/api/Helper.lua +++ b/cocos/scripting/lua-bindings/auto/api/Helper.lua @@ -3,6 +3,14 @@ -- @module Helper -- @parent_module ccui +-------------------------------- +-- @function [parent=#Helper] getSubStringOfUTF8String +-- @param self +-- @param #string str +-- @param #unsigned long long +-- @param #unsigned long long +-- @return string#string ret (return value: string) + -------------------------------- -- @function [parent=#Helper] seekWidgetByTag -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/Image.lua b/cocos/scripting/lua-bindings/auto/api/Image.lua index b491b70e7c..4ce6cd8d50 100644 --- a/cocos/scripting/lua-bindings/auto/api/Image.lua +++ b/cocos/scripting/lua-bindings/auto/api/Image.lua @@ -16,11 +16,6 @@ -- @param #bool bool -- @return bool#bool ret (return value: bool) --------------------------------- --- @function [parent=#Image] getBitPerPixel --- @param self --- @return int#int ret (return value: int) - -------------------------------- -- @function [parent=#Image] hasAlpha -- @param self @@ -48,9 +43,9 @@ -- @return int#int ret (return value: int) -------------------------------- --- @function [parent=#Image] isPremultipliedAlpha +-- @function [parent=#Image] getBitPerPixel -- @param self --- @return bool#bool ret (return value: bool) +-- @return int#int ret (return value: int) -------------------------------- -- @function [parent=#Image] getFileType @@ -67,6 +62,11 @@ -- @param self -- @return int#int ret (return value: int) +-------------------------------- +-- @function [parent=#Image] setPVRImagesHavePremultipliedAlpha +-- @param self +-- @param #bool bool + -------------------------------- -- @function [parent=#Image] Image -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/Layout.lua b/cocos/scripting/lua-bindings/auto/api/Layout.lua index a16923e4dc..fc0c574ce7 100644 --- a/cocos/scripting/lua-bindings/auto/api/Layout.lua +++ b/cocos/scripting/lua-bindings/auto/api/Layout.lua @@ -141,6 +141,10 @@ -- @param self -- @return size_table#size_table ret (return value: size_table) +-------------------------------- +-- @function [parent=#Layout] forceDoLayout +-- @param self + -------------------------------- -- @function [parent=#Layout] getLayoutType -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/Mesh.lua b/cocos/scripting/lua-bindings/auto/api/Mesh.lua index 42b24b5016..0d6060e447 100644 --- a/cocos/scripting/lua-bindings/auto/api/Mesh.lua +++ b/cocos/scripting/lua-bindings/auto/api/Mesh.lua @@ -14,40 +14,25 @@ -- @return long#long ret (return value: long) -------------------------------- --- @function [parent=#Mesh] getIndexFormat +-- @function [parent=#Mesh] getSubMesh -- @param self --- @return int#int ret (return value: int) +-- @param #int int +-- @return SubMesh#SubMesh ret (return value: cc.SubMesh) -------------------------------- -- @function [parent=#Mesh] getVertexSizeInBytes -- @param self -- @return int#int ret (return value: int) --------------------------------- --- @function [parent=#Mesh] getPrimitiveType --- @param self --- @return int#int ret (return value: int) - --------------------------------- --- @function [parent=#Mesh] getIndexCount --- @param self --- @return long#long ret (return value: long) - -------------------------------- -- @function [parent=#Mesh] getVertexBuffer -- @param self -- @return unsigned int#unsigned int ret (return value: unsigned int) -------------------------------- --- @function [parent=#Mesh] getMeshVertexAttribute +-- @function [parent=#Mesh] getSubMeshCount -- @param self --- @param #int int --- @return MeshVertexAttrib#MeshVertexAttrib ret (return value: cc.MeshVertexAttrib) - --------------------------------- --- @function [parent=#Mesh] getIndexBuffer --- @param self --- @return unsigned int#unsigned int ret (return value: unsigned int) +-- @return long#long ret (return value: long) -------------------------------- -- @function [parent=#Mesh] hasVertexAttrib @@ -55,4 +40,10 @@ -- @param #int int -- @return bool#bool ret (return value: bool) +-------------------------------- +-- @function [parent=#Mesh] getMeshVertexAttribute +-- @param self +-- @param #int int +-- @return MeshVertexAttrib#MeshVertexAttrib ret (return value: cc.MeshVertexAttrib) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/Node.lua b/cocos/scripting/lua-bindings/auto/api/Node.lua index 33f956653b..78ed3e036e 100644 --- a/cocos/scripting/lua-bindings/auto/api/Node.lua +++ b/cocos/scripting/lua-bindings/auto/api/Node.lua @@ -16,11 +16,13 @@ -- @param #string str -------------------------------- --- @function [parent=#Node] removeComponent +-- @overload self, cc.Component +-- @overload self, string +-- @function [parent=#Node] removeComponent -- @param self -- @param #string str --- @return bool#bool ret (return value: bool) - +-- @return bool#bool ret (retunr value: bool) + -------------------------------- -- @function [parent=#Node] setPhysicsBody -- @param self @@ -84,6 +86,11 @@ -- @param self -- @param #unsigned char char +-------------------------------- +-- @function [parent=#Node] getCameraMask +-- @param self +-- @return unsigned short#unsigned short ret (return value: unsigned short) + -------------------------------- -- @function [parent=#Node] setRotation -- @param self @@ -123,6 +130,12 @@ -- @param self -- @param #int int +-------------------------------- +-- @function [parent=#Node] setCameraMask +-- @param self +-- @param #unsigned short short +-- @param #bool bool + -------------------------------- -- @function [parent=#Node] getTag -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/PageView.lua b/cocos/scripting/lua-bindings/auto/api/PageView.lua index 2e660a0635..f68253b507 100644 --- a/cocos/scripting/lua-bindings/auto/api/PageView.lua +++ b/cocos/scripting/lua-bindings/auto/api/PageView.lua @@ -4,6 +4,11 @@ -- @extend Layout -- @parent_module ccui +-------------------------------- +-- @function [parent=#PageView] getCustomScrollThreshold +-- @param self +-- @return float#float ret (return value: float) + -------------------------------- -- @function [parent=#PageView] getCurPageIndex -- @param self @@ -16,6 +21,11 @@ -- @param #long long -- @param #bool bool +-------------------------------- +-- @function [parent=#PageView] isUsingCustomScrollThreshold +-- @param self +-- @return bool#bool ret (return value: bool) + -------------------------------- -- @function [parent=#PageView] getPage -- @param self @@ -32,6 +42,16 @@ -- @param self -- @param #function func +-------------------------------- +-- @function [parent=#PageView] setUsingCustomScrollThreshold +-- @param self +-- @param #bool bool + +-------------------------------- +-- @function [parent=#PageView] setCustomScrollThreshold +-- @param self +-- @param #float float + -------------------------------- -- @function [parent=#PageView] insertPage -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/PhysicsWorld.lua b/cocos/scripting/lua-bindings/auto/api/PhysicsWorld.lua index df5c6d9783..6c16ea6dc4 100644 --- a/cocos/scripting/lua-bindings/auto/api/PhysicsWorld.lua +++ b/cocos/scripting/lua-bindings/auto/api/PhysicsWorld.lua @@ -4,9 +4,9 @@ -- @parent_module cc -------------------------------- --- @function [parent=#PhysicsWorld] getGravity +-- @function [parent=#PhysicsWorld] setGravity -- @param self --- @return vec2_table#vec2_table ret (return value: vec2_table) +-- @param #vec2_table vec2 -------------------------------- -- @function [parent=#PhysicsWorld] getAllBodies @@ -14,14 +14,28 @@ -- @return array_table#array_table ret (return value: array_table) -------------------------------- --- @function [parent=#PhysicsWorld] setGravity +-- @function [parent=#PhysicsWorld] getDebugDrawMask -- @param self --- @param #vec2_table vec2 +-- @return int#int ret (return value: int) -------------------------------- --- @function [parent=#PhysicsWorld] getSpeed +-- @function [parent=#PhysicsWorld] setAutoStep -- @param self --- @return float#float ret (return value: float) +-- @param #bool bool + +-------------------------------- +-- @function [parent=#PhysicsWorld] addJoint +-- @param self +-- @param #cc.PhysicsJoint physicsjoint + +-------------------------------- +-- @function [parent=#PhysicsWorld] removeAllJoints +-- @param self + +-------------------------------- +-- @function [parent=#PhysicsWorld] isAutoStep +-- @param self +-- @return bool#bool ret (return value: bool) -------------------------------- -- @overload self, int @@ -36,16 +50,6 @@ -- @param #cc.PhysicsJoint physicsjoint -- @param #bool bool --------------------------------- --- @function [parent=#PhysicsWorld] getUpdateRate --- @param self --- @return int#int ret (return value: int) - --------------------------------- --- @function [parent=#PhysicsWorld] setSpeed --- @param self --- @param #float float - -------------------------------- -- @function [parent=#PhysicsWorld] getShapes -- @param self @@ -53,8 +57,43 @@ -- @return array_table#array_table ret (return value: array_table) -------------------------------- --- @function [parent=#PhysicsWorld] removeAllJoints +-- @function [parent=#PhysicsWorld] step -- @param self +-- @param #float float + +-------------------------------- +-- @function [parent=#PhysicsWorld] setDebugDrawMask +-- @param self +-- @param #int int + +-------------------------------- +-- @function [parent=#PhysicsWorld] getGravity +-- @param self +-- @return vec2_table#vec2_table ret (return value: vec2_table) + +-------------------------------- +-- @function [parent=#PhysicsWorld] setUpdateRate +-- @param self +-- @param #int int + +-------------------------------- +-- @function [parent=#PhysicsWorld] getSpeed +-- @param self +-- @return float#float ret (return value: float) + +-------------------------------- +-- @function [parent=#PhysicsWorld] getUpdateRate +-- @param self +-- @return int#int ret (return value: int) + +-------------------------------- +-- @function [parent=#PhysicsWorld] removeAllBodies +-- @param self + +-------------------------------- +-- @function [parent=#PhysicsWorld] setSpeed +-- @param self +-- @param #float float -------------------------------- -- @function [parent=#PhysicsWorld] getShape @@ -62,34 +101,10 @@ -- @param #vec2_table vec2 -- @return PhysicsShape#PhysicsShape ret (return value: cc.PhysicsShape) --------------------------------- --- @function [parent=#PhysicsWorld] removeAllBodies --- @param self - --------------------------------- --- @function [parent=#PhysicsWorld] getDebugDrawMask --- @param self --- @return int#int ret (return value: int) - --------------------------------- --- @function [parent=#PhysicsWorld] setDebugDrawMask --- @param self --- @param #int int - -------------------------------- -- @function [parent=#PhysicsWorld] getBody -- @param self -- @param #int int -- @return PhysicsBody#PhysicsBody ret (return value: cc.PhysicsBody) --------------------------------- --- @function [parent=#PhysicsWorld] setUpdateRate --- @param self --- @param #int int - --------------------------------- --- @function [parent=#PhysicsWorld] addJoint --- @param self --- @param #cc.PhysicsJoint physicsjoint - return nil diff --git a/cocos/scripting/lua-bindings/auto/api/RenderTexture.lua b/cocos/scripting/lua-bindings/auto/api/RenderTexture.lua index 4717d8015e..661a25c17e 100644 --- a/cocos/scripting/lua-bindings/auto/api/RenderTexture.lua +++ b/cocos/scripting/lua-bindings/auto/api/RenderTexture.lua @@ -65,13 +65,14 @@ -- @param self -------------------------------- --- @overload self, string, int, bool --- @overload self, string, bool +-- @overload self, string, int, bool, function +-- @overload self, string, bool, function -- @function [parent=#RenderTexture] saveToFile -- @param self -- @param #string str -- @param #int format -- @param #bool bool +-- @param #function func -- @return bool#bool ret (retunr value: bool) -------------------------------- diff --git a/cocos/scripting/lua-bindings/auto/api/RotateTo.lua b/cocos/scripting/lua-bindings/auto/api/RotateTo.lua index 49f29e13b4..1631a28fbd 100644 --- a/cocos/scripting/lua-bindings/auto/api/RotateTo.lua +++ b/cocos/scripting/lua-bindings/auto/api/RotateTo.lua @@ -7,6 +7,7 @@ -------------------------------- -- @overload self, float, float -- @overload self, float, float, float +-- @overload self, float, vec3_table -- @function [parent=#RotateTo] create -- @param self -- @param #float float diff --git a/cocos/scripting/lua-bindings/auto/api/Skeleton3D.lua b/cocos/scripting/lua-bindings/auto/api/Skeleton3D.lua new file mode 100644 index 0000000000..ae57f8f9c1 --- /dev/null +++ b/cocos/scripting/lua-bindings/auto/api/Skeleton3D.lua @@ -0,0 +1,51 @@ + +-------------------------------- +-- @module Skeleton3D +-- @extend Ref +-- @parent_module cc + +-------------------------------- +-- @function [parent=#Skeleton3D] getBoneByName +-- @param self +-- @param #string str +-- @return Bone3D#Bone3D ret (return value: cc.Bone3D) + +-------------------------------- +-- @function [parent=#Skeleton3D] getRootBone +-- @param self +-- @return Bone3D#Bone3D ret (return value: cc.Bone3D) + +-------------------------------- +-- @function [parent=#Skeleton3D] updateBoneMatrix +-- @param self + +-------------------------------- +-- @function [parent=#Skeleton3D] getBoneByIndex +-- @param self +-- @param #unsigned int int +-- @return Bone3D#Bone3D ret (return value: cc.Bone3D) + +-------------------------------- +-- @function [parent=#Skeleton3D] setRootBone +-- @param self +-- @param #cc.Bone3D bone3d + +-------------------------------- +-- @function [parent=#Skeleton3D] getBoneIndex +-- @param self +-- @param #cc.Bone3D bone3d +-- @return int#int ret (return value: int) + +-------------------------------- +-- @function [parent=#Skeleton3D] getBoneCount +-- @param self +-- @return long#long ret (return value: long) + +-------------------------------- +-- @function [parent=#Skeleton3D] create +-- @param self +-- @param #string str +-- @param #string str +-- @return Skeleton3D#Skeleton3D ret (return value: cc.Skeleton3D) + +return nil diff --git a/cocos/scripting/lua-bindings/auto/api/Sprite3D.lua b/cocos/scripting/lua-bindings/auto/api/Sprite3D.lua index 1af4d44bcd..22e08d6e9a 100644 --- a/cocos/scripting/lua-bindings/auto/api/Sprite3D.lua +++ b/cocos/scripting/lua-bindings/auto/api/Sprite3D.lua @@ -4,6 +4,11 @@ -- @extend Node,BlendProtocol -- @parent_module cc +-------------------------------- +-- @function [parent=#Sprite3D] setCullFaceEnabled +-- @param self +-- @param #bool bool + -------------------------------- -- @overload self, cc.Texture2D -- @overload self, string @@ -11,6 +16,15 @@ -- @param self -- @param #string str +-------------------------------- +-- @function [parent=#Sprite3D] removeAllAttachNode +-- @param self + +-------------------------------- +-- @function [parent=#Sprite3D] setBlendFunc +-- @param self +-- @param #cc.BlendFunc blendfunc + -------------------------------- -- @function [parent=#Sprite3D] getMesh -- @param self @@ -22,9 +36,20 @@ -- @return BlendFunc#BlendFunc ret (return value: cc.BlendFunc) -------------------------------- --- @function [parent=#Sprite3D] setBlendFunc +-- @function [parent=#Sprite3D] setCullFace -- @param self --- @param #cc.BlendFunc blendfunc +-- @param #unsigned int int + +-------------------------------- +-- @function [parent=#Sprite3D] removeAttachNode +-- @param self +-- @param #string str + +-------------------------------- +-- @function [parent=#Sprite3D] getAttachNode +-- @param self +-- @param #string str +-- @return AttachNode#AttachNode ret (return value: cc.AttachNode) -------------------------------- -- @overload self, string, string @@ -35,4 +60,9 @@ -- @param #string str -- @return Sprite3D#Sprite3D ret (retunr value: cc.Sprite3D) +-------------------------------- +-- @function [parent=#Sprite3D] getBoundingBox +-- @param self +-- @return rect_table#rect_table ret (return value: rect_table) + return nil diff --git a/cocos/scripting/lua-bindings/auto/api/SpriteFrameCache.lua b/cocos/scripting/lua-bindings/auto/api/SpriteFrameCache.lua index 0d8ee97edf..33e686b786 100644 --- a/cocos/scripting/lua-bindings/auto/api/SpriteFrameCache.lua +++ b/cocos/scripting/lua-bindings/auto/api/SpriteFrameCache.lua @@ -4,6 +4,12 @@ -- @extend Ref -- @parent_module cc +-------------------------------- +-- @function [parent=#SpriteFrameCache] addSpriteFramesWithFileContent +-- @param self +-- @param #string str +-- @param #cc.Texture2D texture2d + -------------------------------- -- @overload self, string, string -- @overload self, string @@ -48,6 +54,11 @@ -- @param self -- @param #cc.Texture2D texture2d +-------------------------------- +-- @function [parent=#SpriteFrameCache] removeSpriteFramesFromFileContent +-- @param self +-- @param #string str + -------------------------------- -- @function [parent=#SpriteFrameCache] removeSpriteFrameByName -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/SubMeshState.lua b/cocos/scripting/lua-bindings/auto/api/SubMeshState.lua new file mode 100644 index 0000000000..dc01d07d2c --- /dev/null +++ b/cocos/scripting/lua-bindings/auto/api/SubMeshState.lua @@ -0,0 +1,27 @@ + +-------------------------------- +-- @module SubMeshState +-- @extend Ref +-- @parent_module cc + +-------------------------------- +-- @function [parent=#SubMeshState] setTexture +-- @param self +-- @param #cc.Texture2D texture2d + +-------------------------------- +-- @function [parent=#SubMeshState] getTexture +-- @param self +-- @return Texture2D#Texture2D ret (return value: cc.Texture2D) + +-------------------------------- +-- @function [parent=#SubMeshState] isVisible +-- @param self +-- @return bool#bool ret (return value: bool) + +-------------------------------- +-- @function [parent=#SubMeshState] setVisible +-- @param self +-- @param #bool bool + +return nil diff --git a/cocos/scripting/lua-bindings/auto/api/Text.lua b/cocos/scripting/lua-bindings/auto/api/Text.lua index 15ebbd4c3c..b6b97605b6 100644 --- a/cocos/scripting/lua-bindings/auto/api/Text.lua +++ b/cocos/scripting/lua-bindings/auto/api/Text.lua @@ -5,9 +5,32 @@ -- @parent_module ccui -------------------------------- --- @function [parent=#Text] getStringLength +-- @function [parent=#Text] enableShadow -- @param self --- @return long#long ret (return value: long) + +-------------------------------- +-- @function [parent=#Text] getFontSize +-- @param self +-- @return int#int ret (return value: int) + +-------------------------------- +-- @function [parent=#Text] getString +-- @param self +-- @return string#string ret (return value: string) + +-------------------------------- +-- @function [parent=#Text] disableEffect +-- @param self + +-------------------------------- +-- @function [parent=#Text] getTextColor +-- @param self +-- @return color4b_table#color4b_table ret (return value: color4b_table) + +-------------------------------- +-- @function [parent=#Text] setTextVerticalAlignment +-- @param self +-- @param #int textvalignment -------------------------------- -- @function [parent=#Text] setFontName @@ -19,80 +42,16 @@ -- @param self -- @param #bool bool --------------------------------- --- @function [parent=#Text] getFontSize --- @param self --- @return int#int ret (return value: int) - --------------------------------- --- @function [parent=#Text] enableOutline --- @param self --- @param #color4b_table color4b --- @param #int int - --------------------------------- --- @function [parent=#Text] getTextVerticalAlignment --- @param self --- @return int#int ret (return value: int) - --------------------------------- --- @function [parent=#Text] getString --- @param self --- @return string#string ret (return value: string) - --------------------------------- --- @function [parent=#Text] enableShadow --- @param self - -------------------------------- -- @function [parent=#Text] setString -- @param self -- @param #string str --------------------------------- --- @function [parent=#Text] getTextHorizontalAlignment --- @param self --- @return int#int ret (return value: int) - --------------------------------- --- @function [parent=#Text] setTextVerticalAlignment --- @param self --- @param #int textvalignment - --------------------------------- --- @function [parent=#Text] enableGlow --- @param self --- @param #color4b_table color4b - --------------------------------- --- @function [parent=#Text] getTextAreaSize --- @param self --- @return size_table#size_table ret (return value: size_table) - --------------------------------- --- @function [parent=#Text] setTextHorizontalAlignment --- @param self --- @param #int texthalignment - --------------------------------- --- @function [parent=#Text] setFontSize --- @param self --- @param #int int - -------------------------------- -- @function [parent=#Text] isTouchScaleChangeEnabled -- @param self -- @return bool#bool ret (return value: bool) --------------------------------- --- @function [parent=#Text] getType --- @param self --- @return int#int ret (return value: int) - --------------------------------- --- @function [parent=#Text] disableEffect --- @param self - -------------------------------- -- @function [parent=#Text] getFontName -- @param self @@ -103,6 +62,57 @@ -- @param self -- @param #size_table size +-------------------------------- +-- @function [parent=#Text] getStringLength +-- @param self +-- @return long#long ret (return value: long) + +-------------------------------- +-- @function [parent=#Text] enableOutline +-- @param self +-- @param #color4b_table color4b +-- @param #int int + +-------------------------------- +-- @function [parent=#Text] getType +-- @param self +-- @return int#int ret (return value: int) + +-------------------------------- +-- @function [parent=#Text] getTextHorizontalAlignment +-- @param self +-- @return int#int ret (return value: int) + +-------------------------------- +-- @function [parent=#Text] setFontSize +-- @param self +-- @param #int int + +-------------------------------- +-- @function [parent=#Text] setTextColor +-- @param self +-- @param #color4b_table color4b + +-------------------------------- +-- @function [parent=#Text] enableGlow +-- @param self +-- @param #color4b_table color4b + +-------------------------------- +-- @function [parent=#Text] getTextVerticalAlignment +-- @param self +-- @return int#int ret (return value: int) + +-------------------------------- +-- @function [parent=#Text] getTextAreaSize +-- @param self +-- @return size_table#size_table ret (return value: size_table) + +-------------------------------- +-- @function [parent=#Text] setTextHorizontalAlignment +-- @param self +-- @param #int texthalignment + -------------------------------- -- @overload self, string, string, int -- @overload self diff --git a/cocos/scripting/lua-bindings/auto/api/TextField.lua b/cocos/scripting/lua-bindings/auto/api/TextField.lua index b2c82a059d..c4e22b25bc 100644 --- a/cocos/scripting/lua-bindings/auto/api/TextField.lua +++ b/cocos/scripting/lua-bindings/auto/api/TextField.lua @@ -19,6 +19,11 @@ -- @param self -- @return string#string ret (return value: string) +-------------------------------- +-- @function [parent=#TextField] setPasswordStyleText +-- @param self +-- @param #char char + -------------------------------- -- @function [parent=#TextField] getDeleteBackward -- @param self @@ -92,6 +97,11 @@ -- @param self -- @param #bool bool +-------------------------------- +-- @function [parent=#TextField] getPlaceHolderColor +-- @param self +-- @return color4b_table#color4b_table ret (return value: color4b_table) + -------------------------------- -- @function [parent=#TextField] getPasswordStyleText -- @param self @@ -103,9 +113,9 @@ -- @param #bool bool -------------------------------- --- @function [parent=#TextField] setPasswordStyleText +-- @function [parent=#TextField] isPasswordEnabled -- @param self --- @param #char char +-- @return bool#bool ret (return value: bool) -------------------------------- -- @function [parent=#TextField] setDeleteBackward @@ -123,15 +133,22 @@ -- @param #string str -------------------------------- --- @function [parent=#TextField] isPasswordEnabled +-- @overload self, color4b_table +-- @overload self, color3b_table +-- @function [parent=#TextField] setPlaceHolderColor -- @param self --- @return bool#bool ret (return value: bool) - +-- @param #color3b_table color3b + -------------------------------- -- @function [parent=#TextField] setTextHorizontalAlignment -- @param self -- @param #int texthalignment +-------------------------------- +-- @function [parent=#TextField] setTextColor +-- @param self +-- @param #color4b_table color4b + -------------------------------- -- @function [parent=#TextField] getMaxLength -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/Texture2D.lua b/cocos/scripting/lua-bindings/auto/api/Texture2D.lua index 81a1947825..c7c1456291 100644 --- a/cocos/scripting/lua-bindings/auto/api/Texture2D.lua +++ b/cocos/scripting/lua-bindings/auto/api/Texture2D.lua @@ -150,11 +150,6 @@ -- @param self -- @return int#int ret (return value: int) --------------------------------- --- @function [parent=#Texture2D] PVRImagesHavePremultipliedAlpha --- @param self --- @param #bool bool - -------------------------------- -- @function [parent=#Texture2D] Texture2D -- @param self diff --git a/cocos/scripting/lua-bindings/auto/api/Widget.lua b/cocos/scripting/lua-bindings/auto/api/Widget.lua index 4cb3995919..8f3f43b6b8 100644 --- a/cocos/scripting/lua-bindings/auto/api/Widget.lua +++ b/cocos/scripting/lua-bindings/auto/api/Widget.lua @@ -29,6 +29,11 @@ -- @param self -- @return Node#Node ret (return value: cc.Node) +-------------------------------- +-- @function [parent=#Widget] setPropagateTouchEvents +-- @param self +-- @param #bool bool + -------------------------------- -- @function [parent=#Widget] getSizePercent -- @param self @@ -39,6 +44,11 @@ -- @param self -- @param #vec2_table vec2 +-------------------------------- +-- @function [parent=#Widget] setSwallowTouches +-- @param self +-- @param #bool bool + -------------------------------- -- @function [parent=#Widget] getLayoutSize -- @param self @@ -126,6 +136,11 @@ -- @param self -- @return vec2_table#vec2_table ret (return value: vec2_table) +-------------------------------- +-- @function [parent=#Widget] isFocusEnabled +-- @param self +-- @return bool#bool ret (return value: bool) + -------------------------------- -- @function [parent=#Widget] setFocused -- @param self @@ -186,6 +201,11 @@ -- @param self -- @return bool#bool ret (return value: bool) +-------------------------------- +-- @function [parent=#Widget] isPropagateTouchEvents +-- @param self +-- @return bool#bool ret (return value: bool) + -------------------------------- -- @function [parent=#Widget] getCurrentFocusedWidget -- @param self @@ -260,7 +280,7 @@ -- @param #bool bool -------------------------------- --- @function [parent=#Widget] isFocusEnabled +-- @function [parent=#Widget] isSwallowTouches -- @param self -- @return bool#bool ret (return value: bool) diff --git a/cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_3d_auto_api.lua b/cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_3d_auto_api.lua new file mode 100644 index 0000000000..0fe586cd21 --- /dev/null +++ b/cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_3d_auto_api.lua @@ -0,0 +1,39 @@ +-------------------------------- +-- @module cc + +-------------------------------------------------------- +-- the cc Sprite3D +-- @field [parent=#cc] Sprite3D#Sprite3D Sprite3D preloaded module + + +-------------------------------------------------------- +-- the cc Mesh +-- @field [parent=#cc] Mesh#Mesh Mesh preloaded module + + +-------------------------------------------------------- +-- the cc Skeleton3D +-- @field [parent=#cc] Skeleton3D#Skeleton3D Skeleton3D preloaded module + + +-------------------------------------------------------- +-- the cc Animation3D +-- @field [parent=#cc] Animation3D#Animation3D Animation3D preloaded module + + +-------------------------------------------------------- +-- the cc Animate3D +-- @field [parent=#cc] Animate3D#Animate3D Animate3D preloaded module + + +-------------------------------------------------------- +-- the cc SubMeshState +-- @field [parent=#cc] SubMeshState#SubMeshState SubMeshState preloaded module + + +-------------------------------------------------------- +-- the cc AttachNode +-- @field [parent=#cc] AttachNode#AttachNode AttachNode preloaded module + + +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 1e6649afb8..f16e53e365 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 @@ -66,6 +66,16 @@ -- @field [parent=#cc] LabelAtlas#LabelAtlas LabelAtlas preloaded module +-------------------------------------------------------- +-- the cc Scene +-- @field [parent=#cc] Scene#Scene Scene preloaded module + + +-------------------------------------------------------- +-- the cc GLView +-- @field [parent=#cc] GLView#GLView GLView preloaded module + + -------------------------------------------------------- -- the cc Director -- @field [parent=#cc] Director#Director Director preloaded module @@ -91,6 +101,11 @@ -- @field [parent=#cc] UserDefault#UserDefault UserDefault preloaded module +-------------------------------------------------------- +-- the cc Camera +-- @field [parent=#cc] Camera#Camera Camera preloaded module + + -------------------------------------------------------- -- the cc EventListenerTouchOneByOne -- @field [parent=#cc] EventListenerTouchOneByOne#EventListenerTouchOneByOne EventListenerTouchOneByOne preloaded module @@ -771,11 +786,6 @@ -- @field [parent=#cc] LayerMultiplex#LayerMultiplex LayerMultiplex preloaded module --------------------------------------------------------- --- the cc Scene --- @field [parent=#cc] Scene#Scene Scene preloaded module - - -------------------------------------------------------- -- the cc TransitionEaseScene -- @field [parent=#cc] TransitionEaseScene#TransitionEaseScene TransitionEaseScene preloaded module @@ -1137,13 +1147,8 @@ -------------------------------------------------------- --- the cc GLViewProtocol --- @field [parent=#cc] GLViewProtocol#GLViewProtocol GLViewProtocol preloaded module - - --------------------------------------------------------- --- the cc GLView --- @field [parent=#cc] GLView#GLView GLView preloaded module +-- the cc GLViewImpl +-- @field [parent=#cc] GLViewImpl#GLViewImpl GLViewImpl preloaded module -------------------------------------------------------- @@ -1201,31 +1206,6 @@ -- @field [parent=#cc] Component#Component Component preloaded module --------------------------------------------------------- --- the cc Sprite3D --- @field [parent=#cc] Sprite3D#Sprite3D Sprite3D preloaded module - - --------------------------------------------------------- --- the cc Mesh --- @field [parent=#cc] Mesh#Mesh Mesh preloaded module - - --------------------------------------------------------- --- the cc Animation3D --- @field [parent=#cc] Animation3D#Animation3D Animation3D preloaded module - - --------------------------------------------------------- --- the cc Animate3D --- @field [parent=#cc] Animate3D#Animate3D Animate3D preloaded module - - --------------------------------------------------------- --- the cc SimpleAudioEngine --- @field [parent=#cc] SimpleAudioEngine#SimpleAudioEngine SimpleAudioEngine preloaded module - - -------------------------------------------------------- -- the cc ProtectedNode -- @field [parent=#cc] ProtectedNode#ProtectedNode ProtectedNode preloaded module diff --git a/cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_cocosbuilder_auto_api.lua b/cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_cocosbuilder_auto_api.lua new file mode 100644 index 0000000000..2496259244 --- /dev/null +++ b/cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_cocosbuilder_auto_api.lua @@ -0,0 +1,14 @@ +-------------------------------- +-- @module cc + +-------------------------------------------------------- +-- the cc CCBAnimationManager +-- @field [parent=#cc] CCBAnimationManager#CCBAnimationManager CCBAnimationManager preloaded module + + +-------------------------------------------------------- +-- the cc CCBReader +-- @field [parent=#cc] CCBReader#CCBReader CCBReader preloaded module + + +return nil diff --git a/cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_cocosdenshion_auto_api.lua b/cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_cocosdenshion_auto_api.lua new file mode 100644 index 0000000000..445126e333 --- /dev/null +++ b/cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_cocosdenshion_auto_api.lua @@ -0,0 +1,9 @@ +-------------------------------- +-- @module cc + +-------------------------------------------------------- +-- the cc SimpleAudioEngine +-- @field [parent=#cc] SimpleAudioEngine#SimpleAudioEngine SimpleAudioEngine preloaded module + + +return nil diff --git a/cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_extension_auto_api.lua b/cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_extension_auto_api.lua index 3dee47c133..6798a0b06d 100644 --- a/cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_extension_auto_api.lua +++ b/cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_extension_auto_api.lua @@ -76,14 +76,4 @@ -- @field [parent=#cc] AssetsManager#AssetsManager AssetsManager preloaded module --------------------------------------------------------- --- the cc CCBAnimationManager --- @field [parent=#cc] CCBAnimationManager#CCBAnimationManager CCBAnimationManager preloaded module - - --------------------------------------------------------- --- the cc CCBReader --- @field [parent=#cc] CCBReader#CCBReader CCBReader preloaded module - - return nil diff --git a/cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_physics_auto_api.lua b/cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_physics_auto_api.lua index 2d62955ee1..1776a12400 100644 --- a/cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_physics_auto_api.lua +++ b/cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_physics_auto_api.lua @@ -1,16 +1,6 @@ -------------------------------- -- @module cc --------------------------------------------------------- --- the cc PhysicsWorld --- @field [parent=#cc] PhysicsWorld#PhysicsWorld PhysicsWorld preloaded module - - --------------------------------------------------------- --- the cc PhysicsDebugDraw --- @field [parent=#cc] PhysicsDebugDraw#PhysicsDebugDraw PhysicsDebugDraw preloaded module - - -------------------------------------------------------- -- the cc PhysicsShape -- @field [parent=#cc] PhysicsShape#PhysicsShape PhysicsShape preloaded module @@ -56,6 +46,16 @@ -- @field [parent=#cc] PhysicsBody#PhysicsBody PhysicsBody preloaded module +-------------------------------------------------------- +-- the cc PhysicsWorld +-- @field [parent=#cc] PhysicsWorld#PhysicsWorld PhysicsWorld preloaded module + + +-------------------------------------------------------- +-- the cc PhysicsDebugDraw +-- @field [parent=#cc] PhysicsDebugDraw#PhysicsDebugDraw PhysicsDebugDraw preloaded module + + -------------------------------------------------------- -- the cc PhysicsContact -- @field [parent=#cc] PhysicsContact#PhysicsContact PhysicsContact preloaded module diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_3d_auto.cpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_3d_auto.cpp new file mode 100644 index 0000000000..8869f34c70 --- /dev/null +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_3d_auto.cpp @@ -0,0 +1,1911 @@ +#include "lua_cocos2dx_3d_auto.hpp" +#include "cocos3d.h" +#include "tolua_fix.h" +#include "LuaBasicConversions.h" + + + +int lua_cocos2dx_3d_Sprite3D_setCullFaceEnabled(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_3d_Sprite3D_setCullFaceEnabled'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + bool arg0; + + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.Sprite3D:setCullFaceEnabled"); + if(!ok) + return 0; + cobj->setCullFaceEnabled(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Sprite3D:setCullFaceEnabled",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_3d_Sprite3D_setCullFaceEnabled'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_3d_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_3d_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, "cc.Sprite3D:setTexture"); + + if (!ok) { break; } + cobj->setTexture(arg0); + return 0; + } + }while(0); + ok = true; + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Sprite3D:setTexture",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_3d_Sprite3D_setTexture'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_3d_Sprite3D_removeAllAttachNode(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_3d_Sprite3D_removeAllAttachNode'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + cobj->removeAllAttachNode(); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Sprite3D:removeAllAttachNode",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_3d_Sprite3D_removeAllAttachNode'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_3d_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_3d_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", "cc.Sprite3D:setBlendFunc",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_3d_Sprite3D_setBlendFunc'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_3d_Sprite3D_getMesh(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_3d_Sprite3D_getMesh'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + cocos2d::Mesh* ret = cobj->getMesh(); + object_to_luaval(tolua_S, "cc.Mesh",(cocos2d::Mesh*)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Sprite3D:getMesh",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_3d_Sprite3D_getMesh'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_3d_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_3d_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", "cc.Sprite3D:getBlendFunc",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_3d_Sprite3D_getBlendFunc'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_3d_Sprite3D_setCullFace(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_3d_Sprite3D_setCullFace'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + unsigned int arg0; + + ok &= luaval_to_uint32(tolua_S, 2,&arg0, "cc.Sprite3D:setCullFace"); + if(!ok) + return 0; + cobj->setCullFace(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Sprite3D:setCullFace",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_3d_Sprite3D_setCullFace'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_3d_Sprite3D_removeAttachNode(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_3d_Sprite3D_removeAttachNode'", 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, "cc.Sprite3D:removeAttachNode"); + if(!ok) + return 0; + cobj->removeAttachNode(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Sprite3D:removeAttachNode",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_3d_Sprite3D_removeAttachNode'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_3d_Sprite3D_getAttachNode(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_3d_Sprite3D_getAttachNode'", 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, "cc.Sprite3D:getAttachNode"); + if(!ok) + return 0; + cocos2d::AttachNode* ret = cobj->getAttachNode(arg0); + object_to_luaval(tolua_S, "cc.AttachNode",(cocos2d::AttachNode*)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Sprite3D:getAttachNode",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_3d_Sprite3D_getAttachNode'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_3d_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, "cc.Sprite3D:create"); + if (!ok) { break; } + std::string arg1; + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.Sprite3D:create"); + 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, "cc.Sprite3D:create"); + 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", "cc.Sprite3D:create",argc, 1); + return 0; +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_3d_Sprite3D_create'.",&tolua_err); +#endif + return 0; +} +static int lua_cocos2dx_3d_Sprite3D_finalize(lua_State* tolua_S) +{ + printf("luabindings: finalizing LUA object (Sprite3D)"); + return 0; +} + +int lua_register_cocos2dx_3d_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,"setCullFaceEnabled",lua_cocos2dx_3d_Sprite3D_setCullFaceEnabled); + tolua_function(tolua_S,"setTexture",lua_cocos2dx_3d_Sprite3D_setTexture); + tolua_function(tolua_S,"removeAllAttachNode",lua_cocos2dx_3d_Sprite3D_removeAllAttachNode); + tolua_function(tolua_S,"setBlendFunc",lua_cocos2dx_3d_Sprite3D_setBlendFunc); + tolua_function(tolua_S,"getMesh",lua_cocos2dx_3d_Sprite3D_getMesh); + tolua_function(tolua_S,"getBlendFunc",lua_cocos2dx_3d_Sprite3D_getBlendFunc); + tolua_function(tolua_S,"setCullFace",lua_cocos2dx_3d_Sprite3D_setCullFace); + tolua_function(tolua_S,"removeAttachNode",lua_cocos2dx_3d_Sprite3D_removeAttachNode); + tolua_function(tolua_S,"getAttachNode",lua_cocos2dx_3d_Sprite3D_getAttachNode); + tolua_function(tolua_S,"create", lua_cocos2dx_3d_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_3d_Mesh_restore(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::Mesh* 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.Mesh",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::Mesh*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_3d_Mesh_restore'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + cobj->restore(); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Mesh:restore",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_3d_Mesh_restore'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_3d_Mesh_getMeshVertexAttribCount(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::Mesh* 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.Mesh",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::Mesh*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_3d_Mesh_getMeshVertexAttribCount'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + ssize_t ret = cobj->getMeshVertexAttribCount(); + tolua_pushnumber(tolua_S,(lua_Number)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Mesh:getMeshVertexAttribCount",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_3d_Mesh_getMeshVertexAttribCount'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_3d_Mesh_getSubMesh(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::Mesh* 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.Mesh",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::Mesh*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_3d_Mesh_getSubMesh'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + int arg0; + + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.Mesh:getSubMesh"); + if(!ok) + return 0; + cocos2d::SubMesh* ret = cobj->getSubMesh(arg0); + object_to_luaval(tolua_S, "cc.SubMesh",(cocos2d::SubMesh*)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Mesh:getSubMesh",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_3d_Mesh_getSubMesh'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_3d_Mesh_getVertexSizeInBytes(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::Mesh* 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.Mesh",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::Mesh*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_3d_Mesh_getVertexSizeInBytes'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + int ret = cobj->getVertexSizeInBytes(); + tolua_pushnumber(tolua_S,(lua_Number)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Mesh:getVertexSizeInBytes",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_3d_Mesh_getVertexSizeInBytes'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_3d_Mesh_getVertexBuffer(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::Mesh* 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.Mesh",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::Mesh*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_3d_Mesh_getVertexBuffer'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + unsigned int ret = cobj->getVertexBuffer(); + tolua_pushnumber(tolua_S,(lua_Number)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Mesh:getVertexBuffer",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_3d_Mesh_getVertexBuffer'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_3d_Mesh_getSubMeshCount(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::Mesh* 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.Mesh",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::Mesh*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_3d_Mesh_getSubMeshCount'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + ssize_t ret = cobj->getSubMeshCount(); + tolua_pushnumber(tolua_S,(lua_Number)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Mesh:getSubMeshCount",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_3d_Mesh_getSubMeshCount'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_3d_Mesh_hasVertexAttrib(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::Mesh* 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.Mesh",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::Mesh*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_3d_Mesh_hasVertexAttrib'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + int arg0; + + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.Mesh:hasVertexAttrib"); + if(!ok) + return 0; + bool ret = cobj->hasVertexAttrib(arg0); + tolua_pushboolean(tolua_S,(bool)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Mesh:hasVertexAttrib",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_3d_Mesh_hasVertexAttrib'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_3d_Mesh_getMeshVertexAttribute(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::Mesh* 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.Mesh",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::Mesh*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_3d_Mesh_getMeshVertexAttribute'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + int arg0; + + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.Mesh:getMeshVertexAttribute"); + if(!ok) + return 0; + const cocos2d::MeshVertexAttrib& ret = cobj->getMeshVertexAttribute(arg0); + mesh_vertex_attrib_to_luaval(tolua_S, ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Mesh:getMeshVertexAttribute",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_3d_Mesh_getMeshVertexAttribute'.",&tolua_err); +#endif + + return 0; +} +static int lua_cocos2dx_3d_Mesh_finalize(lua_State* tolua_S) +{ + printf("luabindings: finalizing LUA object (Mesh)"); + return 0; +} + +int lua_register_cocos2dx_3d_Mesh(lua_State* tolua_S) +{ + tolua_usertype(tolua_S,"cc.Mesh"); + tolua_cclass(tolua_S,"Mesh","cc.Mesh","cc.Ref",nullptr); + + tolua_beginmodule(tolua_S,"Mesh"); + tolua_function(tolua_S,"restore",lua_cocos2dx_3d_Mesh_restore); + tolua_function(tolua_S,"getMeshVertexAttribCount",lua_cocos2dx_3d_Mesh_getMeshVertexAttribCount); + tolua_function(tolua_S,"getSubMesh",lua_cocos2dx_3d_Mesh_getSubMesh); + tolua_function(tolua_S,"getVertexSizeInBytes",lua_cocos2dx_3d_Mesh_getVertexSizeInBytes); + tolua_function(tolua_S,"getVertexBuffer",lua_cocos2dx_3d_Mesh_getVertexBuffer); + tolua_function(tolua_S,"getSubMeshCount",lua_cocos2dx_3d_Mesh_getSubMeshCount); + tolua_function(tolua_S,"hasVertexAttrib",lua_cocos2dx_3d_Mesh_hasVertexAttrib); + tolua_function(tolua_S,"getMeshVertexAttribute",lua_cocos2dx_3d_Mesh_getMeshVertexAttribute); + tolua_endmodule(tolua_S); + std::string typeName = typeid(cocos2d::Mesh).name(); + g_luaType[typeName] = "cc.Mesh"; + g_typeCast["Mesh"] = "cc.Mesh"; + return 1; +} + +int lua_cocos2dx_3d_Skeleton3D_getBoneByName(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::Skeleton3D* 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.Skeleton3D",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::Skeleton3D*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_3d_Skeleton3D_getBoneByName'", 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, "cc.Skeleton3D:getBoneByName"); + if(!ok) + return 0; + cocos2d::Bone3D* ret = cobj->getBoneByName(arg0); + object_to_luaval(tolua_S, "cc.Bone3D",(cocos2d::Bone3D*)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Skeleton3D:getBoneByName",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_3d_Skeleton3D_getBoneByName'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_3d_Skeleton3D_getRootBone(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::Skeleton3D* 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.Skeleton3D",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::Skeleton3D*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_3d_Skeleton3D_getRootBone'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + cocos2d::Bone3D* ret = cobj->getRootBone(); + object_to_luaval(tolua_S, "cc.Bone3D",(cocos2d::Bone3D*)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Skeleton3D:getRootBone",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_3d_Skeleton3D_getRootBone'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_3d_Skeleton3D_updateBoneMatrix(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::Skeleton3D* 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.Skeleton3D",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::Skeleton3D*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_3d_Skeleton3D_updateBoneMatrix'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + cobj->updateBoneMatrix(); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Skeleton3D:updateBoneMatrix",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_3d_Skeleton3D_updateBoneMatrix'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_3d_Skeleton3D_getBoneByIndex(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::Skeleton3D* 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.Skeleton3D",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::Skeleton3D*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_3d_Skeleton3D_getBoneByIndex'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + unsigned int arg0; + + ok &= luaval_to_uint32(tolua_S, 2,&arg0, "cc.Skeleton3D:getBoneByIndex"); + if(!ok) + return 0; + cocos2d::Bone3D* ret = cobj->getBoneByIndex(arg0); + object_to_luaval(tolua_S, "cc.Bone3D",(cocos2d::Bone3D*)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Skeleton3D:getBoneByIndex",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_3d_Skeleton3D_getBoneByIndex'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_3d_Skeleton3D_setRootBone(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::Skeleton3D* 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.Skeleton3D",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::Skeleton3D*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_3d_Skeleton3D_setRootBone'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + cocos2d::Bone3D* arg0; + + ok &= luaval_to_object(tolua_S, 2, "cc.Bone3D",&arg0); + if(!ok) + return 0; + cobj->setRootBone(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Skeleton3D:setRootBone",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_3d_Skeleton3D_setRootBone'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_3d_Skeleton3D_getBoneIndex(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::Skeleton3D* 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.Skeleton3D",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::Skeleton3D*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_3d_Skeleton3D_getBoneIndex'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + cocos2d::Bone3D* arg0; + + ok &= luaval_to_object(tolua_S, 2, "cc.Bone3D",&arg0); + if(!ok) + return 0; + int ret = cobj->getBoneIndex(arg0); + tolua_pushnumber(tolua_S,(lua_Number)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Skeleton3D:getBoneIndex",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_3d_Skeleton3D_getBoneIndex'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_3d_Skeleton3D_getBoneCount(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::Skeleton3D* 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.Skeleton3D",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::Skeleton3D*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_3d_Skeleton3D_getBoneCount'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + ssize_t ret = cobj->getBoneCount(); + tolua_pushnumber(tolua_S,(lua_Number)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Skeleton3D:getBoneCount",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_3d_Skeleton3D_getBoneCount'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_3d_Skeleton3D_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.Skeleton3D",0,&tolua_err)) goto tolua_lerror; +#endif + + argc = lua_gettop(tolua_S) - 1; + + if (argc == 2) + { + std::string arg0; + std::string arg1; + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Skeleton3D:create"); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.Skeleton3D:create"); + if(!ok) + return 0; + cocos2d::Skeleton3D* ret = cocos2d::Skeleton3D::create(arg0, arg1); + object_to_luaval(tolua_S, "cc.Skeleton3D",(cocos2d::Skeleton3D*)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.Skeleton3D:create",argc, 2); + return 0; +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_3d_Skeleton3D_create'.",&tolua_err); +#endif + return 0; +} +static int lua_cocos2dx_3d_Skeleton3D_finalize(lua_State* tolua_S) +{ + printf("luabindings: finalizing LUA object (Skeleton3D)"); + return 0; +} + +int lua_register_cocos2dx_3d_Skeleton3D(lua_State* tolua_S) +{ + tolua_usertype(tolua_S,"cc.Skeleton3D"); + tolua_cclass(tolua_S,"Skeleton3D","cc.Skeleton3D","cc.Ref",nullptr); + + tolua_beginmodule(tolua_S,"Skeleton3D"); + tolua_function(tolua_S,"getBoneByName",lua_cocos2dx_3d_Skeleton3D_getBoneByName); + tolua_function(tolua_S,"getRootBone",lua_cocos2dx_3d_Skeleton3D_getRootBone); + tolua_function(tolua_S,"updateBoneMatrix",lua_cocos2dx_3d_Skeleton3D_updateBoneMatrix); + tolua_function(tolua_S,"getBoneByIndex",lua_cocos2dx_3d_Skeleton3D_getBoneByIndex); + tolua_function(tolua_S,"setRootBone",lua_cocos2dx_3d_Skeleton3D_setRootBone); + tolua_function(tolua_S,"getBoneIndex",lua_cocos2dx_3d_Skeleton3D_getBoneIndex); + tolua_function(tolua_S,"getBoneCount",lua_cocos2dx_3d_Skeleton3D_getBoneCount); + tolua_function(tolua_S,"create", lua_cocos2dx_3d_Skeleton3D_create); + tolua_endmodule(tolua_S); + std::string typeName = typeid(cocos2d::Skeleton3D).name(); + g_luaType[typeName] = "cc.Skeleton3D"; + g_typeCast["Skeleton3D"] = "cc.Skeleton3D"; + return 1; +} + +int lua_cocos2dx_3d_Animation3D_getDuration(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::Animation3D* 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.Animation3D",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::Animation3D*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_3d_Animation3D_getDuration'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + double ret = cobj->getDuration(); + tolua_pushnumber(tolua_S,(lua_Number)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Animation3D:getDuration",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_3d_Animation3D_getDuration'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_3d_Animation3D_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.Animation3D",0,&tolua_err)) goto tolua_lerror; +#endif + + argc = lua_gettop(tolua_S) - 1; + + if (argc == 1) + { + std::string arg0; + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Animation3D:create"); + if(!ok) + return 0; + cocos2d::Animation3D* ret = cocos2d::Animation3D::create(arg0); + object_to_luaval(tolua_S, "cc.Animation3D",(cocos2d::Animation3D*)ret); + return 1; + } + if (argc == 2) + { + std::string arg0; + std::string arg1; + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Animation3D:create"); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.Animation3D:create"); + if(!ok) + return 0; + cocos2d::Animation3D* ret = cocos2d::Animation3D::create(arg0, arg1); + object_to_luaval(tolua_S, "cc.Animation3D",(cocos2d::Animation3D*)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.Animation3D:create",argc, 1); + return 0; +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_3d_Animation3D_create'.",&tolua_err); +#endif + return 0; +} +static int lua_cocos2dx_3d_Animation3D_finalize(lua_State* tolua_S) +{ + printf("luabindings: finalizing LUA object (Animation3D)"); + return 0; +} + +int lua_register_cocos2dx_3d_Animation3D(lua_State* tolua_S) +{ + tolua_usertype(tolua_S,"cc.Animation3D"); + tolua_cclass(tolua_S,"Animation3D","cc.Animation3D","cc.Ref",nullptr); + + tolua_beginmodule(tolua_S,"Animation3D"); + tolua_function(tolua_S,"getDuration",lua_cocos2dx_3d_Animation3D_getDuration); + tolua_function(tolua_S,"create", lua_cocos2dx_3d_Animation3D_create); + tolua_endmodule(tolua_S); + std::string typeName = typeid(cocos2d::Animation3D).name(); + g_luaType[typeName] = "cc.Animation3D"; + g_typeCast["Animation3D"] = "cc.Animation3D"; + return 1; +} + +int lua_cocos2dx_3d_Animate3D_setSpeed(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::Animate3D* 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.Animate3D",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::Animate3D*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_3d_Animate3D_setSpeed'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + double arg0; + + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Animate3D:setSpeed"); + if(!ok) + return 0; + cobj->setSpeed(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Animate3D:setSpeed",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_3d_Animate3D_setSpeed'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_3d_Animate3D_setWeight(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::Animate3D* 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.Animate3D",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::Animate3D*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_3d_Animate3D_setWeight'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + double arg0; + + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Animate3D:setWeight"); + if(!ok) + return 0; + cobj->setWeight(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Animate3D:setWeight",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_3d_Animate3D_setWeight'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_3d_Animate3D_getSpeed(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::Animate3D* 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.Animate3D",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::Animate3D*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_3d_Animate3D_getSpeed'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + double ret = cobj->getSpeed(); + tolua_pushnumber(tolua_S,(lua_Number)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Animate3D:getSpeed",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_3d_Animate3D_getSpeed'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_3d_Animate3D_getWeight(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::Animate3D* 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.Animate3D",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::Animate3D*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_3d_Animate3D_getWeight'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + double ret = cobj->getWeight(); + tolua_pushnumber(tolua_S,(lua_Number)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Animate3D:getWeight",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_3d_Animate3D_getWeight'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_3d_Animate3D_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.Animate3D",0,&tolua_err)) goto tolua_lerror; +#endif + + argc = lua_gettop(tolua_S)-1; + + do + { + if (argc == 3) + { + cocos2d::Animation3D* arg0; + ok &= luaval_to_object(tolua_S, 2, "cc.Animation3D",&arg0); + if (!ok) { break; } + double arg1; + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.Animate3D:create"); + if (!ok) { break; } + double arg2; + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.Animate3D:create"); + if (!ok) { break; } + cocos2d::Animate3D* ret = cocos2d::Animate3D::create(arg0, arg1, arg2); + object_to_luaval(tolua_S, "cc.Animate3D",(cocos2d::Animate3D*)ret); + return 1; + } + } while (0); + ok = true; + do + { + if (argc == 1) + { + cocos2d::Animation3D* arg0; + ok &= luaval_to_object(tolua_S, 2, "cc.Animation3D",&arg0); + if (!ok) { break; } + cocos2d::Animate3D* ret = cocos2d::Animate3D::create(arg0); + object_to_luaval(tolua_S, "cc.Animate3D",(cocos2d::Animate3D*)ret); + return 1; + } + } while (0); + ok = true; + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.Animate3D:create",argc, 1); + return 0; +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_3d_Animate3D_create'.",&tolua_err); +#endif + return 0; +} +static int lua_cocos2dx_3d_Animate3D_finalize(lua_State* tolua_S) +{ + printf("luabindings: finalizing LUA object (Animate3D)"); + return 0; +} + +int lua_register_cocos2dx_3d_Animate3D(lua_State* tolua_S) +{ + tolua_usertype(tolua_S,"cc.Animate3D"); + tolua_cclass(tolua_S,"Animate3D","cc.Animate3D","cc.ActionInterval",nullptr); + + tolua_beginmodule(tolua_S,"Animate3D"); + tolua_function(tolua_S,"setSpeed",lua_cocos2dx_3d_Animate3D_setSpeed); + tolua_function(tolua_S,"setWeight",lua_cocos2dx_3d_Animate3D_setWeight); + tolua_function(tolua_S,"getSpeed",lua_cocos2dx_3d_Animate3D_getSpeed); + tolua_function(tolua_S,"getWeight",lua_cocos2dx_3d_Animate3D_getWeight); + tolua_function(tolua_S,"create", lua_cocos2dx_3d_Animate3D_create); + tolua_endmodule(tolua_S); + std::string typeName = typeid(cocos2d::Animate3D).name(); + g_luaType[typeName] = "cc.Animate3D"; + g_typeCast["Animate3D"] = "cc.Animate3D"; + return 1; +} + +int lua_cocos2dx_3d_SubMeshState_setTexture(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::SubMeshState* 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.SubMeshState",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::SubMeshState*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_3d_SubMeshState_setTexture'", 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->setTexture(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SubMeshState:setTexture",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_3d_SubMeshState_setTexture'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_3d_SubMeshState_getTexture(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::SubMeshState* 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.SubMeshState",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::SubMeshState*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_3d_SubMeshState_getTexture'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + cocos2d::Texture2D* ret = cobj->getTexture(); + object_to_luaval(tolua_S, "cc.Texture2D",(cocos2d::Texture2D*)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SubMeshState:getTexture",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_3d_SubMeshState_getTexture'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_3d_SubMeshState_isVisible(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::SubMeshState* 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.SubMeshState",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::SubMeshState*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_3d_SubMeshState_isVisible'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + bool ret = cobj->isVisible(); + tolua_pushboolean(tolua_S,(bool)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SubMeshState:isVisible",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_3d_SubMeshState_isVisible'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_3d_SubMeshState_setVisible(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::SubMeshState* 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.SubMeshState",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::SubMeshState*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_3d_SubMeshState_setVisible'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + bool arg0; + + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.SubMeshState:setVisible"); + if(!ok) + return 0; + cobj->setVisible(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SubMeshState:setVisible",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_3d_SubMeshState_setVisible'.",&tolua_err); +#endif + + return 0; +} +static int lua_cocos2dx_3d_SubMeshState_finalize(lua_State* tolua_S) +{ + printf("luabindings: finalizing LUA object (SubMeshState)"); + return 0; +} + +int lua_register_cocos2dx_3d_SubMeshState(lua_State* tolua_S) +{ + tolua_usertype(tolua_S,"cc.SubMeshState"); + tolua_cclass(tolua_S,"SubMeshState","cc.SubMeshState","cc.Ref",nullptr); + + tolua_beginmodule(tolua_S,"SubMeshState"); + tolua_function(tolua_S,"setTexture",lua_cocos2dx_3d_SubMeshState_setTexture); + tolua_function(tolua_S,"getTexture",lua_cocos2dx_3d_SubMeshState_getTexture); + tolua_function(tolua_S,"isVisible",lua_cocos2dx_3d_SubMeshState_isVisible); + tolua_function(tolua_S,"setVisible",lua_cocos2dx_3d_SubMeshState_setVisible); + tolua_endmodule(tolua_S); + std::string typeName = typeid(cocos2d::SubMeshState).name(); + g_luaType[typeName] = "cc.SubMeshState"; + g_typeCast["SubMeshState"] = "cc.SubMeshState"; + return 1; +} + +int lua_cocos2dx_3d_AttachNode_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.AttachNode",0,&tolua_err)) goto tolua_lerror; +#endif + + argc = lua_gettop(tolua_S) - 1; + + if (argc == 1) + { + cocos2d::Bone3D* arg0; + ok &= luaval_to_object(tolua_S, 2, "cc.Bone3D",&arg0); + if(!ok) + return 0; + cocos2d::AttachNode* ret = cocos2d::AttachNode::create(arg0); + object_to_luaval(tolua_S, "cc.AttachNode",(cocos2d::AttachNode*)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.AttachNode:create",argc, 1); + return 0; +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_3d_AttachNode_create'.",&tolua_err); +#endif + return 0; +} +static int lua_cocos2dx_3d_AttachNode_finalize(lua_State* tolua_S) +{ + printf("luabindings: finalizing LUA object (AttachNode)"); + return 0; +} + +int lua_register_cocos2dx_3d_AttachNode(lua_State* tolua_S) +{ + tolua_usertype(tolua_S,"cc.AttachNode"); + tolua_cclass(tolua_S,"AttachNode","cc.AttachNode","cc.Node",nullptr); + + tolua_beginmodule(tolua_S,"AttachNode"); + tolua_function(tolua_S,"create", lua_cocos2dx_3d_AttachNode_create); + tolua_endmodule(tolua_S); + std::string typeName = typeid(cocos2d::AttachNode).name(); + g_luaType[typeName] = "cc.AttachNode"; + g_typeCast["AttachNode"] = "cc.AttachNode"; + return 1; +} +TOLUA_API int register_all_cocos2dx_3d(lua_State* tolua_S) +{ + tolua_open(tolua_S); + + tolua_module(tolua_S,"cc",0); + tolua_beginmodule(tolua_S,"cc"); + + lua_register_cocos2dx_3d_Animate3D(tolua_S); + lua_register_cocos2dx_3d_Sprite3D(tolua_S); + lua_register_cocos2dx_3d_AttachNode(tolua_S); + lua_register_cocos2dx_3d_SubMeshState(tolua_S); + lua_register_cocos2dx_3d_Animation3D(tolua_S); + lua_register_cocos2dx_3d_Skeleton3D(tolua_S); + lua_register_cocos2dx_3d_Mesh(tolua_S); + + tolua_endmodule(tolua_S); + return 1; +} + diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_3d_auto.hpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_3d_auto.hpp new file mode 100644 index 0000000000..3742d98d03 --- /dev/null +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_3d_auto.hpp @@ -0,0 +1,60 @@ +#include "base/ccConfig.h" +#ifndef __cocos2dx_3d_h__ +#define __cocos2dx_3d_h__ + +#ifdef __cplusplus +extern "C" { +#endif +#include "tolua++.h" +#ifdef __cplusplus +} +#endif + +int register_all_cocos2dx_3d(lua_State* tolua_S); + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +#endif // __cocos2dx_3d_h__ diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp index 9f9266e91c..8617dfb7b3 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp @@ -1,9 +1,6 @@ #include "lua_cocos2dx_auto.hpp" #include "cocos2d.h" -#include "SimpleAudioEngine.h" #include "CCProtectedNode.h" -#include "CCAnimation3D.h" -#include "CCAnimate3D.h" #include "tolua_fix.h" #include "LuaBasicConversions.h" @@ -42,7 +39,7 @@ int lua_cocos2dx_Ref_release(lua_State* tolua_S) cobj->release(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "release",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Ref:release",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -85,7 +82,7 @@ int lua_cocos2dx_Ref_retain(lua_State* tolua_S) cobj->retain(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "retain",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Ref:retain",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -129,7 +126,7 @@ int lua_cocos2dx_Ref_getReferenceCount(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getReferenceCount",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Ref:getReferenceCount",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -194,7 +191,7 @@ int lua_cocos2dx_Console_stop(lua_State* tolua_S) cobj->stop(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "stop",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Console:stop",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -234,14 +231,14 @@ int lua_cocos2dx_Console_listenOnTCP(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.Console:listenOnTCP"); if(!ok) return 0; bool ret = cobj->listenOnTCP(arg0); tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "listenOnTCP",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Console:listenOnTCP",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -281,14 +278,14 @@ int lua_cocos2dx_Console_listenOnFileDescriptor(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.Console:listenOnFileDescriptor"); if(!ok) return 0; bool ret = cobj->listenOnFileDescriptor(arg0); tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "listenOnFileDescriptor",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Console:listenOnFileDescriptor",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -328,13 +325,13 @@ int lua_cocos2dx_Console_log(lua_State* tolua_S) { const char* arg0; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.Console:log"); arg0 = arg0_tmp.c_str(); if(!ok) return 0; cobj->log(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "log",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Console:log",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -397,13 +394,13 @@ int lua_cocos2dx_EventListener_setEnabled(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.EventListener:setEnabled"); if(!ok) return 0; cobj->setEnabled(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setEnabled",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventListener:setEnabled",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -447,7 +444,7 @@ int lua_cocos2dx_EventListener_clone(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.EventListener",(cocos2d::EventListener*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "clone",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventListener:clone",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -491,7 +488,7 @@ int lua_cocos2dx_EventListener_isEnabled(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isEnabled",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventListener:isEnabled",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -535,7 +532,7 @@ int lua_cocos2dx_EventListener_checkAvailable(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "checkAvailable",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventListener:checkAvailable",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -602,7 +599,7 @@ int lua_cocos2dx_Event_isStopped(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isStopped",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Event:isStopped",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -646,7 +643,7 @@ int lua_cocos2dx_Event_getType(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getType",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Event:getType",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -690,7 +687,7 @@ int lua_cocos2dx_Event_getCurrentTarget(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Node",(cocos2d::Node*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getCurrentTarget",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Event:getCurrentTarget",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -733,7 +730,7 @@ int lua_cocos2dx_Event_stopPropagation(lua_State* tolua_S) cobj->stopPropagation(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "stopPropagation",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Event:stopPropagation",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -809,13 +806,13 @@ int lua_cocos2dx_EventDispatcher_pauseEventListenersForTarget(lua_State* tolua_S ok &= luaval_to_object(tolua_S, 2, "cc.Node",&arg0); - ok &= luaval_to_boolean(tolua_S, 3,&arg1); + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "cc.EventDispatcher:pauseEventListenersForTarget"); if(!ok) return 0; cobj->pauseEventListenersForTarget(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "pauseEventListenersForTarget",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventDispatcher:pauseEventListenersForTarget",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -864,7 +861,7 @@ int lua_cocos2dx_EventDispatcher_addEventListenerWithSceneGraphPriority(lua_Stat cobj->addEventListenerWithSceneGraphPriority(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addEventListenerWithSceneGraphPriority",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventDispatcher:addEventListenerWithSceneGraphPriority",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -904,13 +901,13 @@ int lua_cocos2dx_EventDispatcher_setEnabled(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.EventDispatcher:setEnabled"); if(!ok) return 0; cobj->setEnabled(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setEnabled",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventDispatcher:setEnabled",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -953,13 +950,13 @@ int lua_cocos2dx_EventDispatcher_addEventListenerWithFixedPriority(lua_State* to ok &= luaval_to_object(tolua_S, 2, "cc.EventListener",&arg0); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.EventDispatcher:addEventListenerWithFixedPriority"); if(!ok) return 0; cobj->addEventListenerWithFixedPriority(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addEventListenerWithFixedPriority",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventDispatcher:addEventListenerWithFixedPriority",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -1005,7 +1002,7 @@ int lua_cocos2dx_EventDispatcher_removeEventListener(lua_State* tolua_S) cobj->removeEventListener(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeEventListener",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventDispatcher:removeEventListener",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -1058,13 +1055,13 @@ int lua_cocos2dx_EventDispatcher_resumeEventListenersForTarget(lua_State* tolua_ ok &= luaval_to_object(tolua_S, 2, "cc.Node",&arg0); - ok &= luaval_to_boolean(tolua_S, 3,&arg1); + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "cc.EventDispatcher:resumeEventListenersForTarget"); if(!ok) return 0; cobj->resumeEventListenersForTarget(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "resumeEventListenersForTarget",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventDispatcher:resumeEventListenersForTarget",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -1117,13 +1114,13 @@ int lua_cocos2dx_EventDispatcher_removeEventListenersForTarget(lua_State* tolua_ ok &= luaval_to_object(tolua_S, 2, "cc.Node",&arg0); - ok &= luaval_to_boolean(tolua_S, 3,&arg1); + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "cc.EventDispatcher:removeEventListenersForTarget"); if(!ok) return 0; cobj->removeEventListenersForTarget(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeEventListenersForTarget",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventDispatcher:removeEventListenersForTarget",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -1166,13 +1163,13 @@ int lua_cocos2dx_EventDispatcher_setPriority(lua_State* tolua_S) ok &= luaval_to_object(tolua_S, 2, "cc.EventListener",&arg0); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.EventDispatcher:setPriority"); if(!ok) return 0; cobj->setPriority(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setPriority",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventDispatcher:setPriority",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -1213,7 +1210,7 @@ int lua_cocos2dx_EventDispatcher_addCustomEventListener(lua_State* tolua_S) std::string arg0; std::function arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.EventDispatcher:addCustomEventListener"); do { // Lambda binding for lua is not supported. @@ -1226,7 +1223,7 @@ int lua_cocos2dx_EventDispatcher_addCustomEventListener(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.EventListenerCustom",(cocos2d::EventListenerCustom*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addCustomEventListener",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventDispatcher:addCustomEventListener",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -1272,7 +1269,7 @@ int lua_cocos2dx_EventDispatcher_dispatchEvent(lua_State* tolua_S) cobj->dispatchEvent(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "dispatchEvent",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventDispatcher:dispatchEvent",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -1315,7 +1312,7 @@ int lua_cocos2dx_EventDispatcher_removeAllEventListeners(lua_State* tolua_S) cobj->removeAllEventListeners(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeAllEventListeners",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventDispatcher:removeAllEventListeners",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1355,13 +1352,13 @@ int lua_cocos2dx_EventDispatcher_removeCustomEventListeners(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.EventDispatcher:removeCustomEventListeners"); if(!ok) return 0; cobj->removeCustomEventListeners(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeCustomEventListeners",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventDispatcher:removeCustomEventListeners",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -1405,7 +1402,7 @@ int lua_cocos2dx_EventDispatcher_isEnabled(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isEnabled",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventDispatcher:isEnabled",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1445,13 +1442,13 @@ int lua_cocos2dx_EventDispatcher_removeEventListenersForType(lua_State* tolua_S) { cocos2d::EventListener::Type arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.EventDispatcher:removeEventListenersForType"); if(!ok) return 0; cobj->removeEventListenersForType(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeEventListenersForType",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventDispatcher:removeEventListenersForType",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -1485,7 +1482,7 @@ int lua_cocos2dx_EventDispatcher_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.EventDispatcher"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "EventDispatcher",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventDispatcher:EventDispatcher",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1563,7 +1560,7 @@ int lua_cocos2dx_Touch_getPreviousLocationInView(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPreviousLocationInView",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Touch:getPreviousLocationInView",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1607,7 +1604,7 @@ int lua_cocos2dx_Touch_getLocation(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getLocation",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Touch:getLocation",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1651,7 +1648,7 @@ int lua_cocos2dx_Touch_getDelta(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDelta",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Touch:getDelta",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1695,7 +1692,7 @@ int lua_cocos2dx_Touch_getStartLocationInView(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getStartLocationInView",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Touch:getStartLocationInView",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1739,7 +1736,7 @@ int lua_cocos2dx_Touch_getStartLocation(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getStartLocation",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Touch:getStartLocation",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1783,7 +1780,7 @@ int lua_cocos2dx_Touch_getID(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getID",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Touch:getID",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1825,17 +1822,17 @@ int lua_cocos2dx_Touch_setTouchInfo(lua_State* tolua_S) double arg1; double arg2; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.Touch:setTouchInfo"); - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.Touch:setTouchInfo"); - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.Touch:setTouchInfo"); if(!ok) return 0; cobj->setTouchInfo(arg0, arg1, arg2); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTouchInfo",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Touch:setTouchInfo",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 @@ -1879,7 +1876,7 @@ int lua_cocos2dx_Touch_getLocationInView(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getLocationInView",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Touch:getLocationInView",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1923,7 +1920,7 @@ int lua_cocos2dx_Touch_getPreviousLocation(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPreviousLocation",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Touch:getPreviousLocation",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1957,7 +1954,7 @@ int lua_cocos2dx_Touch_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.Touch"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "Touch",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Touch:Touch",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2030,7 +2027,7 @@ int lua_cocos2dx_EventTouch_getEventCode(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getEventCode",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventTouch:getEventCode",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2070,13 +2067,13 @@ int lua_cocos2dx_EventTouch_setEventCode(lua_State* tolua_S) { cocos2d::EventTouch::EventCode arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.EventTouch:setEventCode"); if(!ok) return 0; cobj->setEventCode(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setEventCode",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventTouch:setEventCode",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2110,7 +2107,7 @@ int lua_cocos2dx_EventTouch_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.EventTouch"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "EventTouch",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventTouch:EventTouch",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2160,9 +2157,9 @@ int lua_cocos2dx_EventKeyboard_constructor(lua_State* tolua_S) cocos2d::EventKeyboard::KeyCode arg0; bool arg1; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.EventKeyboard:EventKeyboard"); - ok &= luaval_to_boolean(tolua_S, 3,&arg1); + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "cc.EventKeyboard:EventKeyboard"); if(!ok) return 0; cobj = new cocos2d::EventKeyboard(arg0, arg1); @@ -2172,7 +2169,7 @@ int lua_cocos2dx_EventKeyboard_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.EventKeyboard"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "EventKeyboard",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventKeyboard:EventKeyboard",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -2236,7 +2233,7 @@ int lua_cocos2dx_Texture2D_getMaxT(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getMaxT",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Texture2D:getMaxT",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2280,7 +2277,7 @@ int lua_cocos2dx_Texture2D_getStringForFormat(lua_State* tolua_S) tolua_pushstring(tolua_S,(const char*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getStringForFormat",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Texture2D:getStringForFormat",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2318,7 +2315,7 @@ int lua_cocos2dx_Texture2D_initWithImage(lua_State* tolua_S) if (!ok) { break; } cocos2d::Texture2D::PixelFormat arg1; - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.Texture2D:initWithImage"); if (!ok) { break; } bool ret = cobj->initWithImage(arg0, arg1); @@ -2339,7 +2336,7 @@ int lua_cocos2dx_Texture2D_initWithImage(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "initWithImage",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Texture2D:initWithImage",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2383,7 +2380,7 @@ int lua_cocos2dx_Texture2D_getMaxS(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getMaxS",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Texture2D:getMaxS",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2426,7 +2423,7 @@ int lua_cocos2dx_Texture2D_releaseGLTexture(lua_State* tolua_S) cobj->releaseGLTexture(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "releaseGLTexture",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Texture2D:releaseGLTexture",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2470,7 +2467,7 @@ int lua_cocos2dx_Texture2D_hasPremultipliedAlpha(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "hasPremultipliedAlpha",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Texture2D:hasPremultipliedAlpha",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2514,7 +2511,7 @@ int lua_cocos2dx_Texture2D_getPixelsHigh(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPixelsHigh",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Texture2D:getPixelsHigh",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2548,7 +2545,7 @@ int lua_cocos2dx_Texture2D_getBitsPerPixelForFormat(lua_State* tolua_S) do{ if (argc == 1) { cocos2d::Texture2D::PixelFormat arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.Texture2D:getBitsPerPixelForFormat"); if (!ok) { break; } unsigned int ret = cobj->getBitsPerPixelForFormat(arg0); @@ -2565,7 +2562,7 @@ int lua_cocos2dx_Texture2D_getBitsPerPixelForFormat(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getBitsPerPixelForFormat",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Texture2D:getBitsPerPixelForFormat",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2609,7 +2606,7 @@ int lua_cocos2dx_Texture2D_getName(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getName",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Texture2D:getName",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2643,11 +2640,11 @@ int lua_cocos2dx_Texture2D_initWithString(lua_State* tolua_S) 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(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.Texture2D:initWithString"); arg0 = arg0_tmp.c_str(); if (!ok) { break; } cocos2d::FontDefinition arg1; - ok &= luaval_to_fontdefinition(tolua_S, 3, &arg1); + ok &= luaval_to_fontdefinition(tolua_S, 3, &arg1, "cc.Texture2D:initWithString"); if (!ok) { break; } bool ret = cobj->initWithString(arg0, arg1); @@ -2659,15 +2656,15 @@ int lua_cocos2dx_Texture2D_initWithString(lua_State* tolua_S) do{ if (argc == 3) { const char* arg0; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.Texture2D:initWithString"); arg0 = arg0_tmp.c_str(); if (!ok) { break; } std::string arg1; - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.Texture2D:initWithString"); if (!ok) { break; } double arg2; - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.Texture2D:initWithString"); if (!ok) { break; } bool ret = cobj->initWithString(arg0, arg1, arg2); @@ -2679,19 +2676,19 @@ int lua_cocos2dx_Texture2D_initWithString(lua_State* tolua_S) do{ if (argc == 4) { const char* arg0; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.Texture2D:initWithString"); arg0 = arg0_tmp.c_str(); if (!ok) { break; } std::string arg1; - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.Texture2D:initWithString"); if (!ok) { break; } double arg2; - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.Texture2D:initWithString"); if (!ok) { break; } cocos2d::Size arg3; - ok &= luaval_to_size(tolua_S, 5, &arg3); + ok &= luaval_to_size(tolua_S, 5, &arg3, "cc.Texture2D:initWithString"); if (!ok) { break; } bool ret = cobj->initWithString(arg0, arg1, arg2, arg3); @@ -2703,23 +2700,23 @@ int lua_cocos2dx_Texture2D_initWithString(lua_State* tolua_S) do{ if (argc == 5) { const char* arg0; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.Texture2D:initWithString"); arg0 = arg0_tmp.c_str(); if (!ok) { break; } std::string arg1; - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.Texture2D:initWithString"); if (!ok) { break; } double arg2; - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.Texture2D:initWithString"); if (!ok) { break; } cocos2d::Size arg3; - ok &= luaval_to_size(tolua_S, 5, &arg3); + ok &= luaval_to_size(tolua_S, 5, &arg3, "cc.Texture2D:initWithString"); if (!ok) { break; } cocos2d::TextHAlignment arg4; - ok &= luaval_to_int32(tolua_S, 6,(int *)&arg4); + ok &= luaval_to_int32(tolua_S, 6,(int *)&arg4, "cc.Texture2D:initWithString"); if (!ok) { break; } bool ret = cobj->initWithString(arg0, arg1, arg2, arg3, arg4); @@ -2731,27 +2728,27 @@ int lua_cocos2dx_Texture2D_initWithString(lua_State* tolua_S) do{ if (argc == 6) { const char* arg0; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.Texture2D:initWithString"); arg0 = arg0_tmp.c_str(); if (!ok) { break; } std::string arg1; - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.Texture2D:initWithString"); if (!ok) { break; } double arg2; - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.Texture2D:initWithString"); if (!ok) { break; } cocos2d::Size arg3; - ok &= luaval_to_size(tolua_S, 5, &arg3); + ok &= luaval_to_size(tolua_S, 5, &arg3, "cc.Texture2D:initWithString"); if (!ok) { break; } cocos2d::TextHAlignment arg4; - ok &= luaval_to_int32(tolua_S, 6,(int *)&arg4); + ok &= luaval_to_int32(tolua_S, 6,(int *)&arg4, "cc.Texture2D:initWithString"); if (!ok) { break; } cocos2d::TextVAlignment arg5; - ok &= luaval_to_int32(tolua_S, 7,(int *)&arg5); + ok &= luaval_to_int32(tolua_S, 7,(int *)&arg5, "cc.Texture2D:initWithString"); if (!ok) { break; } bool ret = cobj->initWithString(arg0, arg1, arg2, arg3, arg4, arg5); @@ -2760,7 +2757,7 @@ int lua_cocos2dx_Texture2D_initWithString(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "initWithString",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Texture2D:initWithString",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 @@ -2800,13 +2797,13 @@ int lua_cocos2dx_Texture2D_setMaxT(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Texture2D:setMaxT"); if(!ok) return 0; cobj->setMaxT(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setMaxT",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Texture2D:setMaxT",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2846,13 +2843,13 @@ int lua_cocos2dx_Texture2D_drawInRect(lua_State* tolua_S) { cocos2d::Rect arg0; - ok &= luaval_to_rect(tolua_S, 2, &arg0); + ok &= luaval_to_rect(tolua_S, 2, &arg0, "cc.Texture2D:drawInRect"); if(!ok) return 0; cobj->drawInRect(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "drawInRect",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Texture2D:drawInRect",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2896,7 +2893,7 @@ int lua_cocos2dx_Texture2D_getContentSize(lua_State* tolua_S) size_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getContentSize",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Texture2D:getContentSize",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2939,7 +2936,7 @@ int lua_cocos2dx_Texture2D_setAliasTexParameters(lua_State* tolua_S) cobj->setAliasTexParameters(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAliasTexParameters",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Texture2D:setAliasTexParameters",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2982,7 +2979,7 @@ int lua_cocos2dx_Texture2D_setAntiAliasTexParameters(lua_State* tolua_S) cobj->setAntiAliasTexParameters(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAntiAliasTexParameters",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Texture2D:setAntiAliasTexParameters",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3025,7 +3022,7 @@ int lua_cocos2dx_Texture2D_generateMipmap(lua_State* tolua_S) cobj->generateMipmap(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "generateMipmap",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Texture2D:generateMipmap",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3069,7 +3066,7 @@ int lua_cocos2dx_Texture2D_getDescription(lua_State* tolua_S) tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDescription",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Texture2D:getDescription",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3113,7 +3110,7 @@ int lua_cocos2dx_Texture2D_getPixelFormat(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPixelFormat",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Texture2D:getPixelFormat",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3159,7 +3156,7 @@ int lua_cocos2dx_Texture2D_setGLProgram(lua_State* tolua_S) cobj->setGLProgram(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setGLProgram",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Texture2D:setGLProgram",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3203,7 +3200,7 @@ int lua_cocos2dx_Texture2D_getContentSizeInPixels(lua_State* tolua_S) size_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getContentSizeInPixels",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Texture2D:getContentSizeInPixels",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3247,7 +3244,7 @@ int lua_cocos2dx_Texture2D_getPixelsWide(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPixelsWide",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Texture2D:getPixelsWide",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3287,13 +3284,13 @@ int lua_cocos2dx_Texture2D_drawAtPoint(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.Texture2D:drawAtPoint"); if(!ok) return 0; cobj->drawAtPoint(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "drawAtPoint",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Texture2D:drawAtPoint",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3337,7 +3334,7 @@ int lua_cocos2dx_Texture2D_getGLProgram(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.GLProgram",(cocos2d::GLProgram*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getGLProgram",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Texture2D:getGLProgram",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3381,7 +3378,7 @@ int lua_cocos2dx_Texture2D_hasMipmaps(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "hasMipmaps",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Texture2D:hasMipmaps",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3421,13 +3418,13 @@ int lua_cocos2dx_Texture2D_setMaxS(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Texture2D:setMaxS"); if(!ok) return 0; cobj->setMaxS(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setMaxS",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Texture2D:setMaxS",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3455,13 +3452,13 @@ int lua_cocos2dx_Texture2D_setDefaultAlphaPixelFormat(lua_State* tolua_S) if (argc == 1) { cocos2d::Texture2D::PixelFormat arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.Texture2D:setDefaultAlphaPixelFormat"); if(!ok) return 0; cocos2d::Texture2D::setDefaultAlphaPixelFormat(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "setDefaultAlphaPixelFormat",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.Texture2D:setDefaultAlphaPixelFormat",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -3492,7 +3489,7 @@ int lua_cocos2dx_Texture2D_getDefaultAlphaPixelFormat(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "getDefaultAlphaPixelFormat",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.Texture2D:getDefaultAlphaPixelFormat",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -3500,38 +3497,6 @@ int lua_cocos2dx_Texture2D_getDefaultAlphaPixelFormat(lua_State* tolua_S) #endif return 0; } -int lua_cocos2dx_Texture2D_PVRImagesHavePremultipliedAlpha(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.Texture2D",0,&tolua_err)) goto tolua_lerror; -#endif - - argc = lua_gettop(tolua_S) - 1; - - if (argc == 1) - { - bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); - if(!ok) - return 0; - cocos2d::Texture2D::PVRImagesHavePremultipliedAlpha(arg0); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "PVRImagesHavePremultipliedAlpha",argc, 1); - return 0; -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Texture2D_PVRImagesHavePremultipliedAlpha'.",&tolua_err); -#endif - return 0; -} int lua_cocos2dx_Texture2D_constructor(lua_State* tolua_S) { int argc = 0; @@ -3556,7 +3521,7 @@ int lua_cocos2dx_Texture2D_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.Texture2D"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "Texture2D",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Texture2D:Texture2D",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3606,7 +3571,6 @@ int lua_register_cocos2dx_Texture2D(lua_State* tolua_S) tolua_function(tolua_S,"setMaxS",lua_cocos2dx_Texture2D_setMaxS); tolua_function(tolua_S,"setDefaultAlphaPixelFormat", lua_cocos2dx_Texture2D_setDefaultAlphaPixelFormat); tolua_function(tolua_S,"getDefaultAlphaPixelFormat", lua_cocos2dx_Texture2D_getDefaultAlphaPixelFormat); - tolua_function(tolua_S,"PVRImagesHavePremultipliedAlpha", lua_cocos2dx_Texture2D_PVRImagesHavePremultipliedAlpha); tolua_endmodule(tolua_S); std::string typeName = typeid(cocos2d::Texture2D).name(); g_luaType[typeName] = "cc.Texture2D"; @@ -3642,7 +3606,7 @@ int lua_cocos2dx_Node_addChild(lua_State* tolua_S) if (!ok) { break; } int arg1; - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.Node:addChild"); if (!ok) { break; } cobj->addChild(arg0, arg1); @@ -3668,11 +3632,11 @@ int lua_cocos2dx_Node_addChild(lua_State* tolua_S) if (!ok) { break; } int arg1; - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.Node:addChild"); if (!ok) { break; } int arg2; - ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2); + ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "cc.Node:addChild"); if (!ok) { break; } cobj->addChild(arg0, arg1, arg2); @@ -3687,11 +3651,11 @@ int lua_cocos2dx_Node_addChild(lua_State* tolua_S) if (!ok) { break; } int arg1; - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.Node:addChild"); if (!ok) { break; } std::string arg2; - ok &= luaval_to_std_string(tolua_S, 4,&arg2); + ok &= luaval_to_std_string(tolua_S, 4,&arg2, "cc.Node:addChild"); if (!ok) { break; } cobj->addChild(arg0, arg1, arg2); @@ -3699,7 +3663,7 @@ int lua_cocos2dx_Node_addChild(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addChild",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:addChild",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 @@ -3714,39 +3678,47 @@ int lua_cocos2dx_Node_removeComponent(lua_State* tolua_S) int argc = 0; cocos2d::Node* 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.Node",0,&tolua_err)) goto tolua_lerror; #endif - cobj = (cocos2d::Node*)tolua_tousertype(tolua_S,1,0); - #if COCOS2D_DEBUG >= 1 - if (!cobj) + if (!cobj) { tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Node_removeComponent'", nullptr); return 0; } #endif - argc = lua_gettop(tolua_S)-1; - if (argc == 1) - { - std::string arg0; + do{ + if (argc == 1) { + cocos2d::Component* arg0; + ok &= luaval_to_object(tolua_S, 2, "cc.Component",&arg0); - ok &= luaval_to_std_string(tolua_S, 2,&arg0); - if(!ok) - return 0; - bool ret = cobj->removeComponent(arg0); - tolua_pushboolean(tolua_S,(bool)ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeComponent",argc, 1); + if (!ok) { break; } + bool ret = cobj->removeComponent(arg0); + tolua_pushboolean(tolua_S,(bool)ret); + return 1; + } + }while(0); + ok = true; + do{ + if (argc == 1) { + std::string arg0; + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Node:removeComponent"); + + if (!ok) { break; } + bool ret = cobj->removeComponent(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", "cc.Node:removeComponent",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3792,7 +3764,7 @@ int lua_cocos2dx_Node_setPhysicsBody(lua_State* tolua_S) cobj->setPhysicsBody(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setPhysicsBody",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:setPhysicsBody",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3836,7 +3808,7 @@ int lua_cocos2dx_Node_getDescription(lua_State* tolua_S) tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDescription",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getDescription",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3876,13 +3848,13 @@ int lua_cocos2dx_Node_setRotationSkewY(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Node:setRotationSkewY"); if(!ok) return 0; cobj->setRotationSkewY(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setRotationSkewY",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:setRotationSkewY",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3922,13 +3894,13 @@ int lua_cocos2dx_Node_setOpacityModifyRGB(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.Node:setOpacityModifyRGB"); if(!ok) return 0; cobj->setOpacityModifyRGB(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setOpacityModifyRGB",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:setOpacityModifyRGB",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3968,13 +3940,13 @@ int lua_cocos2dx_Node_setCascadeOpacityEnabled(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.Node:setCascadeOpacityEnabled"); if(!ok) return 0; cobj->setCascadeOpacityEnabled(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setCascadeOpacityEnabled",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:setCascadeOpacityEnabled",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4021,7 +3993,7 @@ int lua_cocos2dx_Node_getChildren(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getChildren",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getChildren",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4071,7 +4043,7 @@ int lua_cocos2dx_Node_setOnExitCallback(lua_State* tolua_S) cobj->setOnExitCallback(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setOnExitCallback",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:setOnExitCallback",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4114,7 +4086,7 @@ int lua_cocos2dx_Node_pause(lua_State* tolua_S) cobj->pause(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "pause",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:pause",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4154,14 +4126,14 @@ int lua_cocos2dx_Node_convertToWorldSpaceAR(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.Node:convertToWorldSpaceAR"); if(!ok) return 0; cocos2d::Vec2 ret = cobj->convertToWorldSpaceAR(arg0); vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "convertToWorldSpaceAR",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:convertToWorldSpaceAR",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4205,7 +4177,7 @@ int lua_cocos2dx_Node_isIgnoreAnchorPointForPosition(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isIgnoreAnchorPointForPosition",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:isIgnoreAnchorPointForPosition",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4245,14 +4217,14 @@ int lua_cocos2dx_Node_getChildByName(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Node:getChildByName"); if(!ok) return 0; cocos2d::Node* ret = cobj->getChildByName(arg0); object_to_luaval(tolua_S, "cc.Node",(cocos2d::Node*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getChildByName",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getChildByName",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4292,13 +4264,13 @@ int lua_cocos2dx_Node_updateDisplayedOpacity(lua_State* tolua_S) { uint16_t arg0; - ok &= luaval_to_uint16(tolua_S, 2,&arg0); + ok &= luaval_to_uint16(tolua_S, 2,&arg0, "cc.Node:updateDisplayedOpacity"); if(!ok) return 0; cobj->updateDisplayedOpacity(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "updateDisplayedOpacity",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:updateDisplayedOpacity",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4308,6 +4280,50 @@ int lua_cocos2dx_Node_updateDisplayedOpacity(lua_State* tolua_S) return 0; } +int lua_cocos2dx_Node_getCameraMask(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::Node* 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.Node",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::Node*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Node_getCameraMask'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + unsigned short ret = cobj->getCameraMask(); + tolua_pushnumber(tolua_S,(lua_Number)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getCameraMask",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Node_getCameraMask'.",&tolua_err); +#endif + + return 0; +} int lua_cocos2dx_Node_setRotation(lua_State* tolua_S) { int argc = 0; @@ -4338,13 +4354,13 @@ int lua_cocos2dx_Node_setRotation(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Node:setRotation"); if(!ok) return 0; cobj->setRotation(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setRotation",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:setRotation",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4384,13 +4400,13 @@ int lua_cocos2dx_Node_setScaleZ(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Node:setScaleZ"); if(!ok) return 0; cobj->setScaleZ(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setScaleZ",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:setScaleZ",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4430,13 +4446,13 @@ int lua_cocos2dx_Node_setScaleY(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Node:setScaleY"); if(!ok) return 0; cobj->setScaleY(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setScaleY",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:setScaleY",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4476,13 +4492,13 @@ int lua_cocos2dx_Node_setScaleX(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Node:setScaleX"); if(!ok) return 0; cobj->setScaleX(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setScaleX",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:setScaleX",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4522,13 +4538,13 @@ int lua_cocos2dx_Node_setRotationSkewX(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Node:setRotationSkewX"); if(!ok) return 0; cobj->setRotationSkewX(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setRotationSkewX",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:setRotationSkewX",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4578,7 +4594,7 @@ int lua_cocos2dx_Node_setonEnterTransitionDidFinishCallback(lua_State* tolua_S) cobj->setonEnterTransitionDidFinishCallback(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setonEnterTransitionDidFinishCallback",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:setonEnterTransitionDidFinishCallback",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4621,7 +4637,7 @@ int lua_cocos2dx_Node_removeAllComponents(lua_State* tolua_S) cobj->removeAllComponents(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeAllComponents",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:removeAllComponents",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4661,13 +4677,13 @@ int lua_cocos2dx_Node__setLocalZOrder(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.Node:_setLocalZOrder"); if(!ok) return 0; cobj->_setLocalZOrder(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "_setLocalZOrder",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:_setLocalZOrder",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4677,6 +4693,65 @@ int lua_cocos2dx_Node__setLocalZOrder(lua_State* tolua_S) return 0; } +int lua_cocos2dx_Node_setCameraMask(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::Node* 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.Node",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::Node*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Node_setCameraMask'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + unsigned short arg0; + + ok &= luaval_to_ushort(tolua_S, 2, &arg0, "cc.Node:setCameraMask"); + if(!ok) + return 0; + cobj->setCameraMask(arg0); + return 0; + } + if (argc == 2) + { + unsigned short arg0; + bool arg1; + + ok &= luaval_to_ushort(tolua_S, 2, &arg0, "cc.Node:setCameraMask"); + + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "cc.Node:setCameraMask"); + if(!ok) + return 0; + cobj->setCameraMask(arg0, arg1); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:setCameraMask",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Node_setCameraMask'.",&tolua_err); +#endif + + return 0; +} int lua_cocos2dx_Node_getTag(lua_State* tolua_S) { int argc = 0; @@ -4711,7 +4786,7 @@ int lua_cocos2dx_Node_getTag(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTag",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getTag",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4755,7 +4830,7 @@ int lua_cocos2dx_Node_getGLProgram(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.GLProgram",(cocos2d::GLProgram*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getGLProgram",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getGLProgram",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4799,7 +4874,7 @@ int lua_cocos2dx_Node_getNodeToWorldTransform(lua_State* tolua_S) mat4_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getNodeToWorldTransform",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getNodeToWorldTransform",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4843,7 +4918,7 @@ int lua_cocos2dx_Node_getPosition3D(lua_State* tolua_S) vec3_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPosition3D",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getPosition3D",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4896,13 +4971,13 @@ int lua_cocos2dx_Node_removeChild(lua_State* tolua_S) ok &= luaval_to_object(tolua_S, 2, "cc.Node",&arg0); - ok &= luaval_to_boolean(tolua_S, 3,&arg1); + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "cc.Node:removeChild"); if(!ok) return 0; cobj->removeChild(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeChild",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:removeChild",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4942,14 +5017,14 @@ int lua_cocos2dx_Node_convertToWorldSpace(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.Node:convertToWorldSpace"); if(!ok) return 0; cocos2d::Vec2 ret = cobj->convertToWorldSpace(arg0); vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "convertToWorldSpace",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:convertToWorldSpace",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4993,7 +5068,7 @@ int lua_cocos2dx_Node_getScene(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Scene",(cocos2d::Scene*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getScene",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getScene",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -5037,7 +5112,7 @@ int lua_cocos2dx_Node_getEventDispatcher(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.EventDispatcher",(cocos2d::EventDispatcher*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getEventDispatcher",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getEventDispatcher",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -5077,13 +5152,13 @@ int lua_cocos2dx_Node_setSkewX(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Node:setSkewX"); if(!ok) return 0; cobj->setSkewX(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setSkewX",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:setSkewX",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5129,7 +5204,7 @@ int lua_cocos2dx_Node_setGLProgramState(lua_State* tolua_S) cobj->setGLProgramState(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setGLProgramState",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:setGLProgramState",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5179,7 +5254,7 @@ int lua_cocos2dx_Node_setOnEnterCallback(lua_State* tolua_S) cobj->setOnEnterCallback(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setOnEnterCallback",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:setOnEnterCallback",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5223,7 +5298,7 @@ int lua_cocos2dx_Node_getOpacity(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getOpacity",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getOpacity",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -5263,13 +5338,13 @@ int lua_cocos2dx_Node_setNormalizedPosition(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.Node:setNormalizedPosition"); if(!ok) return 0; cobj->setNormalizedPosition(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setNormalizedPosition",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:setNormalizedPosition",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5319,7 +5394,7 @@ int lua_cocos2dx_Node_setonExitTransitionDidStartCallback(lua_State* tolua_S) cobj->setonExitTransitionDidStartCallback(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setonExitTransitionDidStartCallback",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:setonExitTransitionDidStartCallback",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5366,7 +5441,7 @@ int lua_cocos2dx_Node_convertTouchToNodeSpace(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "convertTouchToNodeSpace",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:convertTouchToNodeSpace",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5400,7 +5475,7 @@ int lua_cocos2dx_Node_removeAllChildrenWithCleanup(lua_State* tolua_S) do{ if (argc == 1) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.Node:removeAllChildrenWithCleanup"); if (!ok) { break; } cobj->removeAllChildrenWithCleanup(arg0); @@ -5415,7 +5490,7 @@ int lua_cocos2dx_Node_removeAllChildrenWithCleanup(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeAllChildren",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:removeAllChildren",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -5459,7 +5534,7 @@ int lua_cocos2dx_Node_getNodeToParentAffineTransform(lua_State* tolua_S) affinetransform_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getNodeToParentAffineTransform",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getNodeToParentAffineTransform",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -5503,7 +5578,7 @@ int lua_cocos2dx_Node_isCascadeOpacityEnabled(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isCascadeOpacityEnabled",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:isCascadeOpacityEnabled",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -5549,7 +5624,7 @@ int lua_cocos2dx_Node_setParent(lua_State* tolua_S) cobj->setParent(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setParent",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:setParent",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5593,7 +5668,7 @@ int lua_cocos2dx_Node_getName(lua_State* tolua_S) tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getName",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getName",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -5637,7 +5712,7 @@ int lua_cocos2dx_Node_getRotation3D(lua_State* tolua_S) vec3_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getRotation3D",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getRotation3D",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -5681,7 +5756,7 @@ int lua_cocos2dx_Node_getNodeToParentTransform(lua_State* tolua_S) mat4_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getNodeToParentTransform",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getNodeToParentTransform",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -5728,7 +5803,7 @@ int lua_cocos2dx_Node_convertTouchToNodeSpaceAR(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "convertTouchToNodeSpaceAR",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:convertTouchToNodeSpaceAR",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5768,14 +5843,14 @@ int lua_cocos2dx_Node_convertToNodeSpace(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.Node:convertToNodeSpace"); if(!ok) return 0; cocos2d::Vec2 ret = cobj->convertToNodeSpace(arg0); vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "convertToNodeSpace",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:convertToNodeSpace",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5818,7 +5893,7 @@ int lua_cocos2dx_Node_resume(lua_State* tolua_S) cobj->resume(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "resume",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:resume",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -5862,7 +5937,7 @@ int lua_cocos2dx_Node_getPhysicsBody(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.PhysicsBody",(cocos2d::PhysicsBody*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPhysicsBody",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getPhysicsBody",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -5896,11 +5971,11 @@ int lua_cocos2dx_Node_setPosition(lua_State* tolua_S) do{ if (argc == 2) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Node:setPosition"); if (!ok) { break; } double arg1; - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.Node:setPosition"); if (!ok) { break; } cobj->setPosition(arg0, arg1); @@ -5911,7 +5986,7 @@ int lua_cocos2dx_Node_setPosition(lua_State* tolua_S) do{ if (argc == 1) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.Node:setPosition"); if (!ok) { break; } cobj->setPosition(arg0); @@ -5919,7 +5994,7 @@ int lua_cocos2dx_Node_setPosition(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setPosition",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:setPosition",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5959,13 +6034,13 @@ int lua_cocos2dx_Node_stopActionByTag(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.Node:stopActionByTag"); if(!ok) return 0; cobj->stopActionByTag(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "stopActionByTag",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:stopActionByTag",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -6008,13 +6083,13 @@ int lua_cocos2dx_Node_reorderChild(lua_State* tolua_S) ok &= luaval_to_object(tolua_S, 2, "cc.Node",&arg0); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.Node:reorderChild"); if(!ok) return 0; cobj->reorderChild(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "reorderChild",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:reorderChild",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -6054,13 +6129,13 @@ int lua_cocos2dx_Node_ignoreAnchorPointForPosition(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.Node:ignoreAnchorPointForPosition"); if(!ok) return 0; cobj->ignoreAnchorPointForPosition(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ignoreAnchorPointForPosition",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:ignoreAnchorPointForPosition",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -6100,13 +6175,13 @@ int lua_cocos2dx_Node_setSkewY(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Node:setSkewY"); if(!ok) return 0; cobj->setSkewY(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setSkewY",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:setSkewY",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -6146,13 +6221,13 @@ int lua_cocos2dx_Node_setPositionZ(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Node:setPositionZ"); if(!ok) return 0; cobj->setPositionZ(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setPositionZ",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:setPositionZ",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -6192,13 +6267,13 @@ int lua_cocos2dx_Node_setRotation3D(lua_State* tolua_S) { cocos2d::Vec3 arg0; - ok &= luaval_to_vec3(tolua_S, 2, &arg0); + ok &= luaval_to_vec3(tolua_S, 2, &arg0, "cc.Node:setRotation3D"); if(!ok) return 0; cobj->setRotation3D(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setRotation3D",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:setRotation3D",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -6238,13 +6313,13 @@ int lua_cocos2dx_Node_setPositionX(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Node:setPositionX"); if(!ok) return 0; cobj->setPositionX(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setPositionX",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:setPositionX",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -6284,13 +6359,13 @@ int lua_cocos2dx_Node_setNodeToParentTransform(lua_State* tolua_S) { cocos2d::Mat4 arg0; - ok &= luaval_to_mat4(tolua_S, 2, &arg0); + ok &= luaval_to_mat4(tolua_S, 2, &arg0, "cc.Node:setNodeToParentTransform"); if(!ok) return 0; cobj->setNodeToParentTransform(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setNodeToParentTransform",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:setNodeToParentTransform",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -6334,7 +6409,7 @@ int lua_cocos2dx_Node_getAnchorPoint(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAnchorPoint",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getAnchorPoint",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -6378,7 +6453,7 @@ int lua_cocos2dx_Node_getNumberOfRunningActions(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getNumberOfRunningActions",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getNumberOfRunningActions",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -6421,7 +6496,7 @@ int lua_cocos2dx_Node_updateTransform(lua_State* tolua_S) cobj->updateTransform(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "updateTransform",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:updateTransform",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -6467,7 +6542,7 @@ int lua_cocos2dx_Node_setGLProgram(lua_State* tolua_S) cobj->setGLProgram(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setGLProgram",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:setGLProgram",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -6511,7 +6586,7 @@ int lua_cocos2dx_Node_isVisible(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isVisible",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:isVisible",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -6555,7 +6630,7 @@ int lua_cocos2dx_Node_getChildrenCount(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getChildrenCount",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getChildrenCount",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -6595,14 +6670,14 @@ int lua_cocos2dx_Node_convertToNodeSpaceAR(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.Node:convertToNodeSpaceAR"); if(!ok) return 0; cocos2d::Vec2 ret = cobj->convertToNodeSpaceAR(arg0); vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "convertToNodeSpaceAR",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:convertToNodeSpaceAR",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -6649,7 +6724,7 @@ int lua_cocos2dx_Node_addComponent(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addComponent",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:addComponent",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -6696,7 +6771,7 @@ int lua_cocos2dx_Node_runAction(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Action",(cocos2d::Action*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "runAction",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:runAction",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -6740,7 +6815,7 @@ int lua_cocos2dx_Node_isOpacityModifyRGB(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isOpacityModifyRGB",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:isOpacityModifyRGB",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -6784,7 +6859,7 @@ int lua_cocos2dx_Node_getRotation(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getRotation",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getRotation",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -6828,7 +6903,7 @@ int lua_cocos2dx_Node_getAnchorPointInPoints(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAnchorPointInPoints",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getAnchorPointInPoints",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -6873,11 +6948,11 @@ int lua_cocos2dx_Node_visit(lua_State* tolua_S) if (!ok) { break; } cocos2d::Mat4 arg1; - ok &= luaval_to_mat4(tolua_S, 3, &arg1); + ok &= luaval_to_mat4(tolua_S, 3, &arg1, "cc.Node:visit"); if (!ok) { break; } unsigned int arg2; - ok &= luaval_to_uint32(tolua_S, 4,&arg2); + ok &= luaval_to_uint32(tolua_S, 4,&arg2, "cc.Node:visit"); if (!ok) { break; } cobj->visit(arg0, arg1, arg2); @@ -6885,7 +6960,7 @@ int lua_cocos2dx_Node_visit(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "visit",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:visit",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 @@ -6925,7 +7000,7 @@ int lua_cocos2dx_Node_removeChildByName(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Node:removeChildByName"); if(!ok) return 0; cobj->removeChildByName(arg0); @@ -6936,15 +7011,15 @@ int lua_cocos2dx_Node_removeChildByName(lua_State* tolua_S) std::string arg0; bool arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Node:removeChildByName"); - ok &= luaval_to_boolean(tolua_S, 3,&arg1); + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "cc.Node:removeChildByName"); if(!ok) return 0; cobj->removeChildByName(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeChildByName",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:removeChildByName",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -6988,7 +7063,7 @@ int lua_cocos2dx_Node_getGLProgramState(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.GLProgramState",(cocos2d::GLProgramState*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getGLProgramState",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getGLProgramState",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -7034,7 +7109,7 @@ int lua_cocos2dx_Node_setScheduler(lua_State* tolua_S) cobj->setScheduler(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setScheduler",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:setScheduler",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -7077,7 +7152,7 @@ int lua_cocos2dx_Node_stopAllActions(lua_State* tolua_S) cobj->stopAllActions(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "stopAllActions",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:stopAllActions",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -7121,7 +7196,7 @@ int lua_cocos2dx_Node_getSkewX(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getSkewX",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getSkewX",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -7165,7 +7240,7 @@ int lua_cocos2dx_Node_getSkewY(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getSkewY",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getSkewY",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -7209,7 +7284,7 @@ int lua_cocos2dx_Node_getDisplayedColor(lua_State* tolua_S) color3b_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDisplayedColor",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getDisplayedColor",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -7249,14 +7324,14 @@ int lua_cocos2dx_Node_getActionByTag(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.Node:getActionByTag"); if(!ok) return 0; cocos2d::Action* ret = cobj->getActionByTag(arg0); object_to_luaval(tolua_S, "cc.Action",(cocos2d::Action*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getActionByTag",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getActionByTag",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -7296,13 +7371,13 @@ int lua_cocos2dx_Node_setName(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Node:setName"); if(!ok) return 0; cobj->setName(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setName",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:setName",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -7336,7 +7411,7 @@ int lua_cocos2dx_Node_setAdditionalTransform(lua_State* tolua_S) do{ if (argc == 1) { cocos2d::AffineTransform arg0; - ok &= luaval_to_affinetransform(tolua_S, 2, &arg0); + ok &= luaval_to_affinetransform(tolua_S, 2, &arg0, "cc.Node:setAdditionalTransform"); if (!ok) { break; } cobj->setAdditionalTransform(arg0); @@ -7355,7 +7430,7 @@ int lua_cocos2dx_Node_setAdditionalTransform(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAdditionalTransform",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:setAdditionalTransform",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -7399,7 +7474,7 @@ int lua_cocos2dx_Node_getDisplayedOpacity(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDisplayedOpacity",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getDisplayedOpacity",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -7443,7 +7518,7 @@ int lua_cocos2dx_Node_getLocalZOrder(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getLocalZOrder",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getLocalZOrder",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -7490,7 +7565,7 @@ int lua_cocos2dx_Node_getScheduler(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getScheduler",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getScheduler",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -7534,7 +7609,7 @@ int lua_cocos2dx_Node_getParentToNodeAffineTransform(lua_State* tolua_S) affinetransform_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getParentToNodeAffineTransform",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getParentToNodeAffineTransform",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -7578,7 +7653,7 @@ int lua_cocos2dx_Node_getOrderOfArrival(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getOrderOfArrival",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getOrderOfArrival",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -7624,7 +7699,7 @@ int lua_cocos2dx_Node_setActionManager(lua_State* tolua_S) cobj->setActionManager(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setActionManager",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:setActionManager",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -7664,13 +7739,13 @@ int lua_cocos2dx_Node_setColor(lua_State* tolua_S) { cocos2d::Color3B arg0; - ok &= luaval_to_color3b(tolua_S, 2, &arg0); + ok &= luaval_to_color3b(tolua_S, 2, &arg0, "cc.Node:setColor"); if(!ok) return 0; cobj->setColor(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setColor",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:setColor",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -7714,7 +7789,7 @@ int lua_cocos2dx_Node_isRunning(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isRunning",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:isRunning",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -7761,7 +7836,7 @@ int lua_cocos2dx_Node_getParent(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getParent",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getParent",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -7805,7 +7880,7 @@ int lua_cocos2dx_Node_getPositionZ(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPositionZ",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getPositionZ",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -7849,7 +7924,7 @@ int lua_cocos2dx_Node_getPositionY(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPositionY",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getPositionY",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -7893,7 +7968,7 @@ int lua_cocos2dx_Node_getPositionX(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPositionX",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getPositionX",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -7933,7 +8008,7 @@ int lua_cocos2dx_Node_removeChildByTag(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.Node:removeChildByTag"); if(!ok) return 0; cobj->removeChildByTag(arg0); @@ -7944,15 +8019,15 @@ int lua_cocos2dx_Node_removeChildByTag(lua_State* tolua_S) int arg0; bool arg1; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.Node:removeChildByTag"); - ok &= luaval_to_boolean(tolua_S, 3,&arg1); + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "cc.Node:removeChildByTag"); if(!ok) return 0; cobj->removeChildByTag(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeChildByTag",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:removeChildByTag",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -7992,13 +8067,13 @@ int lua_cocos2dx_Node_setPositionY(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Node:setPositionY"); if(!ok) return 0; cobj->setPositionY(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setPositionY",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:setPositionY",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -8042,7 +8117,7 @@ int lua_cocos2dx_Node_getNodeToWorldAffineTransform(lua_State* tolua_S) affinetransform_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getNodeToWorldAffineTransform",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getNodeToWorldAffineTransform",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -8082,13 +8157,13 @@ int lua_cocos2dx_Node_updateDisplayedColor(lua_State* tolua_S) { cocos2d::Color3B arg0; - ok &= luaval_to_color3b(tolua_S, 2, &arg0); + ok &= luaval_to_color3b(tolua_S, 2, &arg0, "cc.Node:updateDisplayedColor"); if(!ok) return 0; cobj->updateDisplayedColor(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "updateDisplayedColor",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:updateDisplayedColor",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -8128,13 +8203,13 @@ int lua_cocos2dx_Node_setVisible(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.Node:setVisible"); if(!ok) return 0; cobj->setVisible(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setVisible",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:setVisible",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -8178,7 +8253,7 @@ int lua_cocos2dx_Node_getParentToNodeTransform(lua_State* tolua_S) mat4_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getParentToNodeTransform",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getParentToNodeTransform",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -8218,13 +8293,13 @@ int lua_cocos2dx_Node_setGlobalZOrder(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Node:setGlobalZOrder"); if(!ok) return 0; cobj->setGlobalZOrder(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setGlobalZOrder",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:setGlobalZOrder",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -8258,11 +8333,11 @@ int lua_cocos2dx_Node_setScale(lua_State* tolua_S) do{ if (argc == 2) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Node:setScale"); if (!ok) { break; } double arg1; - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.Node:setScale"); if (!ok) { break; } cobj->setScale(arg0, arg1); @@ -8273,7 +8348,7 @@ int lua_cocos2dx_Node_setScale(lua_State* tolua_S) do{ if (argc == 1) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Node:setScale"); if (!ok) { break; } cobj->setScale(arg0); @@ -8281,7 +8356,7 @@ int lua_cocos2dx_Node_setScale(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setScale",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:setScale",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -8321,14 +8396,14 @@ int lua_cocos2dx_Node_getChildByTag(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.Node:getChildByTag"); if(!ok) return 0; cocos2d::Node* ret = cobj->getChildByTag(arg0); object_to_luaval(tolua_S, "cc.Node",(cocos2d::Node*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getChildByTag",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getChildByTag",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -8368,13 +8443,13 @@ int lua_cocos2dx_Node_setOrderOfArrival(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.Node:setOrderOfArrival"); if(!ok) return 0; cobj->setOrderOfArrival(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setOrderOfArrival",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:setOrderOfArrival",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -8418,7 +8493,7 @@ int lua_cocos2dx_Node_getScaleZ(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getScaleZ",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getScaleZ",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -8462,7 +8537,7 @@ int lua_cocos2dx_Node_getScaleY(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getScaleY",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getScaleY",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -8506,7 +8581,7 @@ int lua_cocos2dx_Node_getScaleX(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getScaleX",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getScaleX",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -8546,13 +8621,13 @@ int lua_cocos2dx_Node_setLocalZOrder(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.Node:setLocalZOrder"); if(!ok) return 0; cobj->setLocalZOrder(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setLocalZOrder",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:setLocalZOrder",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -8596,7 +8671,7 @@ int lua_cocos2dx_Node_getWorldToNodeAffineTransform(lua_State* tolua_S) affinetransform_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getWorldToNodeAffineTransform",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getWorldToNodeAffineTransform",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -8636,13 +8711,13 @@ int lua_cocos2dx_Node_setCascadeColorEnabled(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.Node:setCascadeColorEnabled"); if(!ok) return 0; cobj->setCascadeColorEnabled(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setCascadeColorEnabled",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:setCascadeColorEnabled",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -8682,13 +8757,13 @@ int lua_cocos2dx_Node_setOpacity(lua_State* tolua_S) { uint16_t arg0; - ok &= luaval_to_uint16(tolua_S, 2,&arg0); + ok &= luaval_to_uint16(tolua_S, 2,&arg0, "cc.Node:setOpacity"); if(!ok) return 0; cobj->setOpacity(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setOpacity",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:setOpacity",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -8731,7 +8806,7 @@ int lua_cocos2dx_Node_cleanup(lua_State* tolua_S) cobj->cleanup(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cleanup",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:cleanup",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -8771,14 +8846,14 @@ int lua_cocos2dx_Node_getComponent(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Node:getComponent"); if(!ok) return 0; cocos2d::Component* ret = cobj->getComponent(arg0); object_to_luaval(tolua_S, "cc.Component",(cocos2d::Component*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getComponent",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getComponent",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -8822,7 +8897,7 @@ int lua_cocos2dx_Node_getContentSize(lua_State* tolua_S) size_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getContentSize",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getContentSize",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -8866,7 +8941,7 @@ int lua_cocos2dx_Node_getColor(lua_State* tolua_S) color3b_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getColor",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getColor",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -8910,7 +8985,7 @@ int lua_cocos2dx_Node_getBoundingBox(lua_State* tolua_S) rect_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getBoundingBox",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getBoundingBox",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -8956,7 +9031,7 @@ int lua_cocos2dx_Node_setEventDispatcher(lua_State* tolua_S) cobj->setEventDispatcher(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setEventDispatcher",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:setEventDispatcher",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -9000,7 +9075,7 @@ int lua_cocos2dx_Node_getGlobalZOrder(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getGlobalZOrder",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getGlobalZOrder",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -9045,11 +9120,11 @@ int lua_cocos2dx_Node_draw(lua_State* tolua_S) if (!ok) { break; } cocos2d::Mat4 arg1; - ok &= luaval_to_mat4(tolua_S, 3, &arg1); + ok &= luaval_to_mat4(tolua_S, 3, &arg1, "cc.Node:draw"); if (!ok) { break; } unsigned int arg2; - ok &= luaval_to_uint32(tolua_S, 4,&arg2); + ok &= luaval_to_uint32(tolua_S, 4,&arg2, "cc.Node:draw"); if (!ok) { break; } cobj->draw(arg0, arg1, arg2); @@ -9057,7 +9132,7 @@ int lua_cocos2dx_Node_draw(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "draw",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:draw",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 @@ -9103,7 +9178,7 @@ int lua_cocos2dx_Node_setUserObject(lua_State* tolua_S) cobj->setUserObject(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setUserObject",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:setUserObject",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -9137,7 +9212,7 @@ int lua_cocos2dx_Node_removeFromParentAndCleanup(lua_State* tolua_S) do{ if (argc == 1) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.Node:removeFromParentAndCleanup"); if (!ok) { break; } cobj->removeFromParentAndCleanup(arg0); @@ -9152,7 +9227,7 @@ int lua_cocos2dx_Node_removeFromParentAndCleanup(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeFromParent",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:removeFromParent",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -9192,13 +9267,13 @@ int lua_cocos2dx_Node_setPosition3D(lua_State* tolua_S) { cocos2d::Vec3 arg0; - ok &= luaval_to_vec3(tolua_S, 2, &arg0); + ok &= luaval_to_vec3(tolua_S, 2, &arg0, "cc.Node:setPosition3D"); if(!ok) return 0; cobj->setPosition3D(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setPosition3D",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:setPosition3D",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -9238,13 +9313,13 @@ int lua_cocos2dx_Node_update(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Node:update"); if(!ok) return 0; cobj->update(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "update",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:update",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -9287,7 +9362,7 @@ int lua_cocos2dx_Node_sortAllChildren(lua_State* tolua_S) cobj->sortAllChildren(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "sortAllChildren",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:sortAllChildren",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -9331,7 +9406,7 @@ int lua_cocos2dx_Node_getWorldToNodeTransform(lua_State* tolua_S) mat4_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getWorldToNodeTransform",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getWorldToNodeTransform",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -9375,7 +9450,7 @@ int lua_cocos2dx_Node_getScale(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getScale",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getScale",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -9419,7 +9494,7 @@ int lua_cocos2dx_Node_getNormalizedPosition(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getNormalizedPosition",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getNormalizedPosition",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -9463,7 +9538,7 @@ int lua_cocos2dx_Node_getRotationSkewX(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getRotationSkewX",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getRotationSkewX",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -9507,7 +9582,7 @@ int lua_cocos2dx_Node_getRotationSkewY(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getRotationSkewY",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getRotationSkewY",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -9547,13 +9622,13 @@ int lua_cocos2dx_Node_setTag(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.Node:setTag"); if(!ok) return 0; cobj->setTag(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTag",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:setTag",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -9597,7 +9672,7 @@ int lua_cocos2dx_Node_isCascadeColorEnabled(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isCascadeColorEnabled",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:isCascadeColorEnabled",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -9643,7 +9718,7 @@ int lua_cocos2dx_Node_stopAction(lua_State* tolua_S) cobj->stopAction(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "stopAction",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:stopAction",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -9690,7 +9765,7 @@ int lua_cocos2dx_Node_getActionManager(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getActionManager",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:getActionManager",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -9723,7 +9798,7 @@ int lua_cocos2dx_Node_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Node",(cocos2d::Node*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.Node:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -9757,6 +9832,7 @@ int lua_register_cocos2dx_Node(lua_State* tolua_S) tolua_function(tolua_S,"isIgnoreAnchorPointForPosition",lua_cocos2dx_Node_isIgnoreAnchorPointForPosition); tolua_function(tolua_S,"getChildByName",lua_cocos2dx_Node_getChildByName); tolua_function(tolua_S,"updateDisplayedOpacity",lua_cocos2dx_Node_updateDisplayedOpacity); + tolua_function(tolua_S,"getCameraMask",lua_cocos2dx_Node_getCameraMask); tolua_function(tolua_S,"setRotation",lua_cocos2dx_Node_setRotation); tolua_function(tolua_S,"setScaleZ",lua_cocos2dx_Node_setScaleZ); tolua_function(tolua_S,"setScaleY",lua_cocos2dx_Node_setScaleY); @@ -9765,6 +9841,7 @@ int lua_register_cocos2dx_Node(lua_State* tolua_S) tolua_function(tolua_S,"setonEnterTransitionDidFinishCallback",lua_cocos2dx_Node_setonEnterTransitionDidFinishCallback); tolua_function(tolua_S,"removeAllComponents",lua_cocos2dx_Node_removeAllComponents); tolua_function(tolua_S,"_setLocalZOrder",lua_cocos2dx_Node__setLocalZOrder); + tolua_function(tolua_S,"setCameraMask",lua_cocos2dx_Node_setCameraMask); tolua_function(tolua_S,"getTag",lua_cocos2dx_Node_getTag); tolua_function(tolua_S,"getGLProgram",lua_cocos2dx_Node_getGLProgram); tolua_function(tolua_S,"getNodeToWorldTransform",lua_cocos2dx_Node_getNodeToWorldTransform); @@ -9906,11 +9983,11 @@ int lua_cocos2dx_GLProgramState_setUniformTexture(lua_State* tolua_S) do{ if (argc == 2) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.GLProgramState:setUniformTexture"); if (!ok) { break; } unsigned int arg1; - ok &= luaval_to_uint32(tolua_S, 3,&arg1); + ok &= luaval_to_uint32(tolua_S, 3,&arg1, "cc.GLProgramState:setUniformTexture"); if (!ok) { break; } cobj->setUniformTexture(arg0, arg1); @@ -9921,7 +9998,7 @@ int lua_cocos2dx_GLProgramState_setUniformTexture(lua_State* tolua_S) do{ if (argc == 2) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.GLProgramState:setUniformTexture"); if (!ok) { break; } cocos2d::Texture2D* arg1; @@ -9936,7 +10013,7 @@ int lua_cocos2dx_GLProgramState_setUniformTexture(lua_State* tolua_S) do{ if (argc == 2) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.GLProgramState:setUniformTexture"); if (!ok) { break; } cocos2d::Texture2D* arg1; @@ -9951,11 +10028,11 @@ int lua_cocos2dx_GLProgramState_setUniformTexture(lua_State* tolua_S) do{ if (argc == 2) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.GLProgramState:setUniformTexture"); if (!ok) { break; } unsigned int arg1; - ok &= luaval_to_uint32(tolua_S, 3,&arg1); + ok &= luaval_to_uint32(tolua_S, 3,&arg1, "cc.GLProgramState:setUniformTexture"); if (!ok) { break; } cobj->setUniformTexture(arg0, arg1); @@ -9963,7 +10040,7 @@ int lua_cocos2dx_GLProgramState_setUniformTexture(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setUniformTexture",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLProgramState:setUniformTexture",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -9997,11 +10074,11 @@ int lua_cocos2dx_GLProgramState_setUniformMat4(lua_State* tolua_S) do{ if (argc == 2) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.GLProgramState:setUniformMat4"); if (!ok) { break; } cocos2d::Mat4 arg1; - ok &= luaval_to_mat4(tolua_S, 3, &arg1); + ok &= luaval_to_mat4(tolua_S, 3, &arg1, "cc.GLProgramState:setUniformMat4"); if (!ok) { break; } cobj->setUniformMat4(arg0, arg1); @@ -10012,11 +10089,11 @@ int lua_cocos2dx_GLProgramState_setUniformMat4(lua_State* tolua_S) do{ if (argc == 2) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.GLProgramState:setUniformMat4"); if (!ok) { break; } cocos2d::Mat4 arg1; - ok &= luaval_to_mat4(tolua_S, 3, &arg1); + ok &= luaval_to_mat4(tolua_S, 3, &arg1, "cc.GLProgramState:setUniformMat4"); if (!ok) { break; } cobj->setUniformMat4(arg0, arg1); @@ -10024,7 +10101,7 @@ int lua_cocos2dx_GLProgramState_setUniformMat4(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setUniformMat4",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLProgramState:setUniformMat4",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -10067,7 +10144,7 @@ int lua_cocos2dx_GLProgramState_applyUniforms(lua_State* tolua_S) cobj->applyUniforms(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "applyUniforms",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLProgramState:applyUniforms",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -10107,13 +10184,13 @@ int lua_cocos2dx_GLProgramState_applyGLProgram(lua_State* tolua_S) { cocos2d::Mat4 arg0; - ok &= luaval_to_mat4(tolua_S, 2, &arg0); + ok &= luaval_to_mat4(tolua_S, 2, &arg0, "cc.GLProgramState:applyGLProgram"); if(!ok) return 0; cobj->applyGLProgram(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "applyGLProgram",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLProgramState:applyGLProgram",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -10157,7 +10234,7 @@ int lua_cocos2dx_GLProgramState_getUniformCount(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getUniformCount",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLProgramState:getUniformCount",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -10204,13 +10281,13 @@ int lua_cocos2dx_GLProgramState_applyAttributes(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.GLProgramState:applyAttributes"); if(!ok) return 0; cobj->applyAttributes(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "applyAttributes",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLProgramState:applyAttributes",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -10244,11 +10321,11 @@ int lua_cocos2dx_GLProgramState_setUniformFloat(lua_State* tolua_S) do{ if (argc == 2) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.GLProgramState:setUniformFloat"); if (!ok) { break; } double arg1; - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.GLProgramState:setUniformFloat"); if (!ok) { break; } cobj->setUniformFloat(arg0, arg1); @@ -10259,11 +10336,11 @@ int lua_cocos2dx_GLProgramState_setUniformFloat(lua_State* tolua_S) do{ if (argc == 2) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.GLProgramState:setUniformFloat"); if (!ok) { break; } double arg1; - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.GLProgramState:setUniformFloat"); if (!ok) { break; } cobj->setUniformFloat(arg0, arg1); @@ -10271,7 +10348,7 @@ int lua_cocos2dx_GLProgramState_setUniformFloat(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setUniformFloat",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLProgramState:setUniformFloat",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -10305,11 +10382,11 @@ int lua_cocos2dx_GLProgramState_setUniformVec3(lua_State* tolua_S) do{ if (argc == 2) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.GLProgramState:setUniformVec3"); if (!ok) { break; } cocos2d::Vec3 arg1; - ok &= luaval_to_vec3(tolua_S, 3, &arg1); + ok &= luaval_to_vec3(tolua_S, 3, &arg1, "cc.GLProgramState:setUniformVec3"); if (!ok) { break; } cobj->setUniformVec3(arg0, arg1); @@ -10320,11 +10397,11 @@ int lua_cocos2dx_GLProgramState_setUniformVec3(lua_State* tolua_S) do{ if (argc == 2) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.GLProgramState:setUniformVec3"); if (!ok) { break; } cocos2d::Vec3 arg1; - ok &= luaval_to_vec3(tolua_S, 3, &arg1); + ok &= luaval_to_vec3(tolua_S, 3, &arg1, "cc.GLProgramState:setUniformVec3"); if (!ok) { break; } cobj->setUniformVec3(arg0, arg1); @@ -10332,7 +10409,7 @@ int lua_cocos2dx_GLProgramState_setUniformVec3(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setUniformVec3",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLProgramState:setUniformVec3",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -10366,11 +10443,11 @@ int lua_cocos2dx_GLProgramState_setUniformInt(lua_State* tolua_S) do{ if (argc == 2) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.GLProgramState:setUniformInt"); if (!ok) { break; } int arg1; - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.GLProgramState:setUniformInt"); if (!ok) { break; } cobj->setUniformInt(arg0, arg1); @@ -10381,11 +10458,11 @@ int lua_cocos2dx_GLProgramState_setUniformInt(lua_State* tolua_S) do{ if (argc == 2) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.GLProgramState:setUniformInt"); if (!ok) { break; } int arg1; - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.GLProgramState:setUniformInt"); if (!ok) { break; } cobj->setUniformInt(arg0, arg1); @@ -10393,7 +10470,7 @@ int lua_cocos2dx_GLProgramState_setUniformInt(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setUniformInt",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLProgramState:setUniformInt",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -10437,7 +10514,7 @@ int lua_cocos2dx_GLProgramState_getVertexAttribCount(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getVertexAttribCount",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLProgramState:getVertexAttribCount",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -10471,11 +10548,11 @@ int lua_cocos2dx_GLProgramState_setUniformVec4(lua_State* tolua_S) do{ if (argc == 2) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.GLProgramState:setUniformVec4"); if (!ok) { break; } cocos2d::Vec4 arg1; - ok &= luaval_to_vec4(tolua_S, 3, &arg1); + ok &= luaval_to_vec4(tolua_S, 3, &arg1, "cc.GLProgramState:setUniformVec4"); if (!ok) { break; } cobj->setUniformVec4(arg0, arg1); @@ -10486,11 +10563,11 @@ int lua_cocos2dx_GLProgramState_setUniformVec4(lua_State* tolua_S) do{ if (argc == 2) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.GLProgramState:setUniformVec4"); if (!ok) { break; } cocos2d::Vec4 arg1; - ok &= luaval_to_vec4(tolua_S, 3, &arg1); + ok &= luaval_to_vec4(tolua_S, 3, &arg1, "cc.GLProgramState:setUniformVec4"); if (!ok) { break; } cobj->setUniformVec4(arg0, arg1); @@ -10498,7 +10575,7 @@ int lua_cocos2dx_GLProgramState_setUniformVec4(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setUniformVec4",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLProgramState:setUniformVec4",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -10544,7 +10621,7 @@ int lua_cocos2dx_GLProgramState_setGLProgram(lua_State* tolua_S) cobj->setGLProgram(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setGLProgram",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLProgramState:setGLProgram",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -10578,11 +10655,11 @@ int lua_cocos2dx_GLProgramState_setUniformVec2(lua_State* tolua_S) do{ if (argc == 2) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.GLProgramState:setUniformVec2"); if (!ok) { break; } cocos2d::Vec2 arg1; - ok &= luaval_to_vec2(tolua_S, 3, &arg1); + ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.GLProgramState:setUniformVec2"); if (!ok) { break; } cobj->setUniformVec2(arg0, arg1); @@ -10593,11 +10670,11 @@ int lua_cocos2dx_GLProgramState_setUniformVec2(lua_State* tolua_S) do{ if (argc == 2) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.GLProgramState:setUniformVec2"); if (!ok) { break; } cocos2d::Vec2 arg1; - ok &= luaval_to_vec2(tolua_S, 3, &arg1); + ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.GLProgramState:setUniformVec2"); if (!ok) { break; } cobj->setUniformVec2(arg0, arg1); @@ -10605,7 +10682,7 @@ int lua_cocos2dx_GLProgramState_setUniformVec2(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setUniformVec2",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLProgramState:setUniformVec2",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -10649,7 +10726,7 @@ int lua_cocos2dx_GLProgramState_getVertexAttribsFlags(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getVertexAttribsFlags",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLProgramState:getVertexAttribsFlags",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -10689,13 +10766,13 @@ int lua_cocos2dx_GLProgramState_apply(lua_State* tolua_S) { cocos2d::Mat4 arg0; - ok &= luaval_to_mat4(tolua_S, 2, &arg0); + ok &= luaval_to_mat4(tolua_S, 2, &arg0, "cc.GLProgramState:apply"); if(!ok) return 0; cobj->apply(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "apply",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLProgramState:apply",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -10739,7 +10816,7 @@ int lua_cocos2dx_GLProgramState_getGLProgram(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.GLProgram",(cocos2d::GLProgram*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getGLProgram",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLProgramState:getGLProgram",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -10774,7 +10851,7 @@ int lua_cocos2dx_GLProgramState_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.GLProgramState",(cocos2d::GLProgramState*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.GLProgramState:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -10800,14 +10877,14 @@ int lua_cocos2dx_GLProgramState_getOrCreateWithGLProgramName(lua_State* tolua_S) if (argc == 1) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.GLProgramState:getOrCreateWithGLProgramName"); if(!ok) return 0; cocos2d::GLProgramState* ret = cocos2d::GLProgramState::getOrCreateWithGLProgramName(arg0); object_to_luaval(tolua_S, "cc.GLProgramState",(cocos2d::GLProgramState*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "getOrCreateWithGLProgramName",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.GLProgramState:getOrCreateWithGLProgramName",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -10840,7 +10917,7 @@ int lua_cocos2dx_GLProgramState_getOrCreateWithGLProgram(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.GLProgramState",(cocos2d::GLProgramState*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "getOrCreateWithGLProgram",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.GLProgramState:getOrCreateWithGLProgram",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -10919,7 +10996,7 @@ int lua_cocos2dx_AtlasNode_updateAtlasValues(lua_State* tolua_S) cobj->updateAtlasValues(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "updateAtlasValues",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.AtlasNode:updateAtlasValues",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -10963,7 +11040,7 @@ int lua_cocos2dx_AtlasNode_getTexture(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Texture2D",(cocos2d::Texture2D*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTexture",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.AtlasNode:getTexture",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -11009,7 +11086,7 @@ int lua_cocos2dx_AtlasNode_setTextureAtlas(lua_State* tolua_S) cobj->setTextureAtlas(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTextureAtlas",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.AtlasNode:setTextureAtlas",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -11053,7 +11130,7 @@ int lua_cocos2dx_AtlasNode_getTextureAtlas(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.TextureAtlas",(cocos2d::TextureAtlas*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTextureAtlas",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.AtlasNode:getTextureAtlas",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -11097,7 +11174,7 @@ int lua_cocos2dx_AtlasNode_getQuadsToDraw(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getQuadsToDraw",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.AtlasNode:getQuadsToDraw",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -11143,7 +11220,7 @@ int lua_cocos2dx_AtlasNode_setTexture(lua_State* tolua_S) cobj->setTexture(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTexture",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.AtlasNode:setTexture",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -11183,13 +11260,13 @@ int lua_cocos2dx_AtlasNode_setQuadsToDraw(lua_State* tolua_S) { ssize_t arg0; - ok &= luaval_to_ssize(tolua_S, 2, &arg0); + ok &= luaval_to_ssize(tolua_S, 2, &arg0, "cc.AtlasNode:setQuadsToDraw"); if(!ok) return 0; cobj->setQuadsToDraw(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setQuadsToDraw",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.AtlasNode:setQuadsToDraw",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -11220,17 +11297,17 @@ int lua_cocos2dx_AtlasNode_create(lua_State* tolua_S) int arg1; int arg2; int arg3; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); - ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2); - ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.AtlasNode:create"); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.AtlasNode:create"); + ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "cc.AtlasNode:create"); + ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3, "cc.AtlasNode:create"); if(!ok) return 0; cocos2d::AtlasNode* ret = cocos2d::AtlasNode::create(arg0, arg1, arg2, arg3); object_to_luaval(tolua_S, "cc.AtlasNode",(cocos2d::AtlasNode*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 4); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.AtlasNode:create",argc, 4); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -11295,13 +11372,13 @@ int lua_cocos2dx_LabelAtlas_setString(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.LabelAtlas:setString"); if(!ok) return 0; cobj->setString(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setString",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelAtlas:setString",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -11335,11 +11412,11 @@ int lua_cocos2dx_LabelAtlas_initWithString(lua_State* tolua_S) do{ if (argc == 2) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.LabelAtlas:initWithString"); if (!ok) { break; } std::string arg1; - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.LabelAtlas:initWithString"); if (!ok) { break; } bool ret = cobj->initWithString(arg0, arg1); @@ -11351,23 +11428,23 @@ int lua_cocos2dx_LabelAtlas_initWithString(lua_State* tolua_S) do{ if (argc == 5) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.LabelAtlas:initWithString"); if (!ok) { break; } std::string arg1; - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.LabelAtlas:initWithString"); if (!ok) { break; } int arg2; - ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2); + ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "cc.LabelAtlas:initWithString"); if (!ok) { break; } int arg3; - ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3); + ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3, "cc.LabelAtlas:initWithString"); if (!ok) { break; } int arg4; - ok &= luaval_to_int32(tolua_S, 6,(int *)&arg4); + ok &= luaval_to_int32(tolua_S, 6,(int *)&arg4, "cc.LabelAtlas:initWithString"); if (!ok) { break; } bool ret = cobj->initWithString(arg0, arg1, arg2, arg3, arg4); @@ -11379,7 +11456,7 @@ int lua_cocos2dx_LabelAtlas_initWithString(lua_State* tolua_S) do{ if (argc == 5) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.LabelAtlas:initWithString"); if (!ok) { break; } cocos2d::Texture2D* arg1; @@ -11387,15 +11464,15 @@ int lua_cocos2dx_LabelAtlas_initWithString(lua_State* tolua_S) if (!ok) { break; } int arg2; - ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2); + ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "cc.LabelAtlas:initWithString"); if (!ok) { break; } int arg3; - ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3); + ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3, "cc.LabelAtlas:initWithString"); if (!ok) { break; } int arg4; - ok &= luaval_to_int32(tolua_S, 6,(int *)&arg4); + ok &= luaval_to_int32(tolua_S, 6,(int *)&arg4, "cc.LabelAtlas:initWithString"); if (!ok) { break; } bool ret = cobj->initWithString(arg0, arg1, arg2, arg3, arg4); @@ -11404,7 +11481,7 @@ int lua_cocos2dx_LabelAtlas_initWithString(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "initWithString",argc, 5); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelAtlas:initWithString",argc, 5); return 0; #if COCOS2D_DEBUG >= 1 @@ -11447,7 +11524,7 @@ int lua_cocos2dx_LabelAtlas_updateAtlasValues(lua_State* tolua_S) cobj->updateAtlasValues(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "updateAtlasValues",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelAtlas:updateAtlasValues",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -11491,7 +11568,7 @@ int lua_cocos2dx_LabelAtlas_getString(lua_State* tolua_S) tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getString",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelAtlas:getString",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -11520,19 +11597,19 @@ int lua_cocos2dx_LabelAtlas_create(lua_State* tolua_S) if (argc == 5) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.LabelAtlas:create"); if (!ok) { break; } std::string arg1; - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.LabelAtlas:create"); if (!ok) { break; } int arg2; - ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2); + ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "cc.LabelAtlas:create"); if (!ok) { break; } int arg3; - ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3); + ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3, "cc.LabelAtlas:create"); if (!ok) { break; } int arg4; - ok &= luaval_to_int32(tolua_S, 6,(int *)&arg4); + ok &= luaval_to_int32(tolua_S, 6,(int *)&arg4, "cc.LabelAtlas:create"); if (!ok) { break; } cocos2d::LabelAtlas* ret = cocos2d::LabelAtlas::create(arg0, arg1, arg2, arg3, arg4); object_to_luaval(tolua_S, "cc.LabelAtlas",(cocos2d::LabelAtlas*)ret); @@ -11555,10 +11632,10 @@ int lua_cocos2dx_LabelAtlas_create(lua_State* tolua_S) if (argc == 2) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.LabelAtlas:create"); if (!ok) { break; } std::string arg1; - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.LabelAtlas:create"); if (!ok) { break; } cocos2d::LabelAtlas* ret = cocos2d::LabelAtlas::create(arg0, arg1); object_to_luaval(tolua_S, "cc.LabelAtlas",(cocos2d::LabelAtlas*)ret); @@ -11566,7 +11643,7 @@ int lua_cocos2dx_LabelAtlas_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.LabelAtlas:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -11598,6 +11675,1533 @@ int lua_register_cocos2dx_LabelAtlas(lua_State* tolua_S) return 1; } +int lua_cocos2dx_Scene_getPhysicsWorld(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::Scene* 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.Scene",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::Scene*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Scene_getPhysicsWorld'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + cocos2d::PhysicsWorld* ret = cobj->getPhysicsWorld(); + object_to_luaval(tolua_S, "cc.PhysicsWorld",(cocos2d::PhysicsWorld*)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Scene:getPhysicsWorld",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Scene_getPhysicsWorld'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_Scene_createWithSize(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.Scene",0,&tolua_err)) goto tolua_lerror; +#endif + + argc = lua_gettop(tolua_S) - 1; + + if (argc == 1) + { + cocos2d::Size arg0; + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.Scene:createWithSize"); + if(!ok) + return 0; + cocos2d::Scene* ret = cocos2d::Scene::createWithSize(arg0); + object_to_luaval(tolua_S, "cc.Scene",(cocos2d::Scene*)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.Scene:createWithSize",argc, 1); + return 0; +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Scene_createWithSize'.",&tolua_err); +#endif + return 0; +} +int lua_cocos2dx_Scene_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.Scene",0,&tolua_err)) goto tolua_lerror; +#endif + + argc = lua_gettop(tolua_S) - 1; + + if (argc == 0) + { + if(!ok) + return 0; + cocos2d::Scene* ret = cocos2d::Scene::create(); + object_to_luaval(tolua_S, "cc.Scene",(cocos2d::Scene*)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.Scene:create",argc, 0); + return 0; +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Scene_create'.",&tolua_err); +#endif + return 0; +} +int lua_cocos2dx_Scene_createWithPhysics(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.Scene",0,&tolua_err)) goto tolua_lerror; +#endif + + argc = lua_gettop(tolua_S) - 1; + + if (argc == 0) + { + if(!ok) + return 0; + cocos2d::Scene* ret = cocos2d::Scene::createWithPhysics(); + object_to_luaval(tolua_S, "cc.Scene",(cocos2d::Scene*)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.Scene:createWithPhysics",argc, 0); + return 0; +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Scene_createWithPhysics'.",&tolua_err); +#endif + return 0; +} +static int lua_cocos2dx_Scene_finalize(lua_State* tolua_S) +{ + printf("luabindings: finalizing LUA object (Scene)"); + return 0; +} + +int lua_register_cocos2dx_Scene(lua_State* tolua_S) +{ + tolua_usertype(tolua_S,"cc.Scene"); + tolua_cclass(tolua_S,"Scene","cc.Scene","cc.Node",nullptr); + + tolua_beginmodule(tolua_S,"Scene"); + tolua_function(tolua_S,"getPhysicsWorld",lua_cocos2dx_Scene_getPhysicsWorld); + tolua_function(tolua_S,"createWithSize", lua_cocos2dx_Scene_createWithSize); + tolua_function(tolua_S,"create", lua_cocos2dx_Scene_create); + tolua_function(tolua_S,"createWithPhysics", lua_cocos2dx_Scene_createWithPhysics); + tolua_endmodule(tolua_S); + std::string typeName = typeid(cocos2d::Scene).name(); + g_luaType[typeName] = "cc.Scene"; + g_typeCast["Scene"] = "cc.Scene"; + return 1; +} + +int lua_cocos2dx_GLView_setFrameSize(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::GLView* 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.GLView",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::GLView*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLView_setFrameSize'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 2) + { + double arg0; + double arg1; + + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.GLView:setFrameSize"); + + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.GLView:setFrameSize"); + if(!ok) + return 0; + cobj->setFrameSize(arg0, arg1); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLView:setFrameSize",argc, 2); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLView_setFrameSize'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_GLView_getViewPortRect(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::GLView* 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.GLView",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::GLView*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLView_getViewPortRect'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + const cocos2d::Rect& ret = cobj->getViewPortRect(); + rect_to_luaval(tolua_S, ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLView:getViewPortRect",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLView_getViewPortRect'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_GLView_setContentScaleFactor(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::GLView* 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.GLView",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::GLView*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLView_setContentScaleFactor'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + double arg0; + + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.GLView:setContentScaleFactor"); + if(!ok) + return 0; + bool ret = cobj->setContentScaleFactor(arg0); + tolua_pushboolean(tolua_S,(bool)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLView:setContentScaleFactor",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLView_setContentScaleFactor'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_GLView_getContentScaleFactor(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::GLView* 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.GLView",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::GLView*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLView_getContentScaleFactor'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + double ret = cobj->getContentScaleFactor(); + tolua_pushnumber(tolua_S,(lua_Number)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLView:getContentScaleFactor",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLView_getContentScaleFactor'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_GLView_setIMEKeyboardState(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::GLView* 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.GLView",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::GLView*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLView_setIMEKeyboardState'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + bool arg0; + + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.GLView:setIMEKeyboardState"); + if(!ok) + return 0; + cobj->setIMEKeyboardState(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLView:setIMEKeyboardState",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLView_setIMEKeyboardState'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_GLView_setScissorInPoints(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::GLView* 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.GLView",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::GLView*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLView_setScissorInPoints'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 4) + { + double arg0; + double arg1; + double arg2; + double arg3; + + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.GLView:setScissorInPoints"); + + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.GLView:setScissorInPoints"); + + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.GLView:setScissorInPoints"); + + ok &= luaval_to_number(tolua_S, 5,&arg3, "cc.GLView:setScissorInPoints"); + if(!ok) + return 0; + cobj->setScissorInPoints(arg0, arg1, arg2, arg3); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLView:setScissorInPoints",argc, 4); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLView_setScissorInPoints'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_GLView_getViewName(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::GLView* 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.GLView",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::GLView*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLView_getViewName'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + const std::string& ret = cobj->getViewName(); + tolua_pushcppstring(tolua_S,ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLView:getViewName",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLView_getViewName'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_GLView_isOpenGLReady(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::GLView* 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.GLView",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::GLView*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLView_isOpenGLReady'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + bool ret = cobj->isOpenGLReady(); + tolua_pushboolean(tolua_S,(bool)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLView:isOpenGLReady",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLView_isOpenGLReady'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_GLView_end(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::GLView* 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.GLView",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::GLView*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLView_end'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + cobj->end(); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLView:end",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLView_end'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_GLView_getScaleY(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::GLView* 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.GLView",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::GLView*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLView_getScaleY'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + double ret = cobj->getScaleY(); + tolua_pushnumber(tolua_S,(lua_Number)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLView:getScaleY",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLView_getScaleY'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_GLView_getScaleX(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::GLView* 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.GLView",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::GLView*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLView_getScaleX'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + double ret = cobj->getScaleX(); + tolua_pushnumber(tolua_S,(lua_Number)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLView:getScaleX",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLView_getScaleX'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_GLView_getVisibleOrigin(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::GLView* 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.GLView",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::GLView*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLView_getVisibleOrigin'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + cocos2d::Vec2 ret = cobj->getVisibleOrigin(); + vec2_to_luaval(tolua_S, ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLView:getVisibleOrigin",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLView_getVisibleOrigin'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_GLView_getFrameSize(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::GLView* 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.GLView",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::GLView*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLView_getFrameSize'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + const cocos2d::Size& ret = cobj->getFrameSize(); + size_to_luaval(tolua_S, ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLView:getFrameSize",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLView_getFrameSize'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_GLView_setFrameZoomFactor(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::GLView* 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.GLView",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::GLView*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLView_setFrameZoomFactor'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + double arg0; + + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.GLView:setFrameZoomFactor"); + if(!ok) + return 0; + cobj->setFrameZoomFactor(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLView:setFrameZoomFactor",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLView_setFrameZoomFactor'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_GLView_getFrameZoomFactor(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::GLView* 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.GLView",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::GLView*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLView_getFrameZoomFactor'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + double ret = cobj->getFrameZoomFactor(); + tolua_pushnumber(tolua_S,(lua_Number)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLView:getFrameZoomFactor",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLView_getFrameZoomFactor'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_GLView_getDesignResolutionSize(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::GLView* 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.GLView",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::GLView*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLView_getDesignResolutionSize'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + const cocos2d::Size& ret = cobj->getDesignResolutionSize(); + size_to_luaval(tolua_S, ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLView:getDesignResolutionSize",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLView_getDesignResolutionSize'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_GLView_windowShouldClose(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::GLView* 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.GLView",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::GLView*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLView_windowShouldClose'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + bool ret = cobj->windowShouldClose(); + tolua_pushboolean(tolua_S,(bool)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLView:windowShouldClose",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLView_windowShouldClose'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_GLView_swapBuffers(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::GLView* 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.GLView",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::GLView*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLView_swapBuffers'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + cobj->swapBuffers(); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLView:swapBuffers",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLView_swapBuffers'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_GLView_setDesignResolutionSize(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::GLView* 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.GLView",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::GLView*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLView_setDesignResolutionSize'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 3) + { + double arg0; + double arg1; + ResolutionPolicy arg2; + + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.GLView:setDesignResolutionSize"); + + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.GLView:setDesignResolutionSize"); + + ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "cc.GLView:setDesignResolutionSize"); + if(!ok) + return 0; + cobj->setDesignResolutionSize(arg0, arg1, arg2); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLView:setDesignResolutionSize",argc, 3); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLView_setDesignResolutionSize'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_GLView_getResolutionPolicy(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::GLView* 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.GLView",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::GLView*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLView_getResolutionPolicy'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + int ret = (int)cobj->getResolutionPolicy(); + tolua_pushnumber(tolua_S,(lua_Number)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLView:getResolutionPolicy",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLView_getResolutionPolicy'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_GLView_isRetinaDisplay(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::GLView* 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.GLView",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::GLView*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLView_isRetinaDisplay'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + bool ret = cobj->isRetinaDisplay(); + tolua_pushboolean(tolua_S,(bool)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLView:isRetinaDisplay",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLView_isRetinaDisplay'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_GLView_setViewPortInPoints(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::GLView* 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.GLView",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::GLView*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLView_setViewPortInPoints'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 4) + { + double arg0; + double arg1; + double arg2; + double arg3; + + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.GLView:setViewPortInPoints"); + + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.GLView:setViewPortInPoints"); + + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.GLView:setViewPortInPoints"); + + ok &= luaval_to_number(tolua_S, 5,&arg3, "cc.GLView:setViewPortInPoints"); + if(!ok) + return 0; + cobj->setViewPortInPoints(arg0, arg1, arg2, arg3); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLView:setViewPortInPoints",argc, 4); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLView_setViewPortInPoints'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_GLView_getScissorRect(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::GLView* 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.GLView",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::GLView*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLView_getScissorRect'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + cocos2d::Rect ret = cobj->getScissorRect(); + rect_to_luaval(tolua_S, ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLView:getScissorRect",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLView_getScissorRect'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_GLView_getRetinaFactor(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::GLView* 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.GLView",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::GLView*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLView_getRetinaFactor'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + int ret = cobj->getRetinaFactor(); + tolua_pushnumber(tolua_S,(lua_Number)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLView:getRetinaFactor",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLView_getRetinaFactor'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_GLView_setViewName(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::GLView* 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.GLView",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::GLView*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLView_setViewName'", 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, "cc.GLView:setViewName"); + if(!ok) + return 0; + cobj->setViewName(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLView:setViewName",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLView_setViewName'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_GLView_getVisibleRect(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::GLView* 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.GLView",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::GLView*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLView_getVisibleRect'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + cocos2d::Rect ret = cobj->getVisibleRect(); + rect_to_luaval(tolua_S, ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLView:getVisibleRect",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLView_getVisibleRect'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_GLView_getVisibleSize(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::GLView* 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.GLView",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::GLView*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLView_getVisibleSize'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + cocos2d::Size ret = cobj->getVisibleSize(); + size_to_luaval(tolua_S, ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLView:getVisibleSize",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLView_getVisibleSize'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_GLView_isScissorEnabled(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::GLView* 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.GLView",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::GLView*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLView_isScissorEnabled'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + bool ret = cobj->isScissorEnabled(); + tolua_pushboolean(tolua_S,(bool)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLView:isScissorEnabled",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLView_isScissorEnabled'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_GLView_pollEvents(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::GLView* 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.GLView",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::GLView*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLView_pollEvents'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + cobj->pollEvents(); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLView:pollEvents",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLView_pollEvents'.",&tolua_err); +#endif + + return 0; +} +static int lua_cocos2dx_GLView_finalize(lua_State* tolua_S) +{ + printf("luabindings: finalizing LUA object (GLView)"); + return 0; +} + +int lua_register_cocos2dx_GLView(lua_State* tolua_S) +{ + tolua_usertype(tolua_S,"cc.GLView"); + tolua_cclass(tolua_S,"GLView","cc.GLView","cc.Ref",nullptr); + + tolua_beginmodule(tolua_S,"GLView"); + tolua_function(tolua_S,"setFrameSize",lua_cocos2dx_GLView_setFrameSize); + tolua_function(tolua_S,"getViewPortRect",lua_cocos2dx_GLView_getViewPortRect); + tolua_function(tolua_S,"setContentScaleFactor",lua_cocos2dx_GLView_setContentScaleFactor); + tolua_function(tolua_S,"getContentScaleFactor",lua_cocos2dx_GLView_getContentScaleFactor); + tolua_function(tolua_S,"setIMEKeyboardState",lua_cocos2dx_GLView_setIMEKeyboardState); + tolua_function(tolua_S,"setScissorInPoints",lua_cocos2dx_GLView_setScissorInPoints); + tolua_function(tolua_S,"getViewName",lua_cocos2dx_GLView_getViewName); + tolua_function(tolua_S,"isOpenGLReady",lua_cocos2dx_GLView_isOpenGLReady); + tolua_function(tolua_S,"end",lua_cocos2dx_GLView_end); + tolua_function(tolua_S,"getScaleY",lua_cocos2dx_GLView_getScaleY); + tolua_function(tolua_S,"getScaleX",lua_cocos2dx_GLView_getScaleX); + tolua_function(tolua_S,"getVisibleOrigin",lua_cocos2dx_GLView_getVisibleOrigin); + tolua_function(tolua_S,"getFrameSize",lua_cocos2dx_GLView_getFrameSize); + tolua_function(tolua_S,"setFrameZoomFactor",lua_cocos2dx_GLView_setFrameZoomFactor); + tolua_function(tolua_S,"getFrameZoomFactor",lua_cocos2dx_GLView_getFrameZoomFactor); + tolua_function(tolua_S,"getDesignResolutionSize",lua_cocos2dx_GLView_getDesignResolutionSize); + tolua_function(tolua_S,"windowShouldClose",lua_cocos2dx_GLView_windowShouldClose); + tolua_function(tolua_S,"swapBuffers",lua_cocos2dx_GLView_swapBuffers); + tolua_function(tolua_S,"setDesignResolutionSize",lua_cocos2dx_GLView_setDesignResolutionSize); + tolua_function(tolua_S,"getResolutionPolicy",lua_cocos2dx_GLView_getResolutionPolicy); + tolua_function(tolua_S,"isRetinaDisplay",lua_cocos2dx_GLView_isRetinaDisplay); + tolua_function(tolua_S,"setViewPortInPoints",lua_cocos2dx_GLView_setViewPortInPoints); + tolua_function(tolua_S,"getScissorRect",lua_cocos2dx_GLView_getScissorRect); + tolua_function(tolua_S,"getRetinaFactor",lua_cocos2dx_GLView_getRetinaFactor); + tolua_function(tolua_S,"setViewName",lua_cocos2dx_GLView_setViewName); + tolua_function(tolua_S,"getVisibleRect",lua_cocos2dx_GLView_getVisibleRect); + tolua_function(tolua_S,"getVisibleSize",lua_cocos2dx_GLView_getVisibleSize); + tolua_function(tolua_S,"isScissorEnabled",lua_cocos2dx_GLView_isScissorEnabled); + tolua_function(tolua_S,"pollEvents",lua_cocos2dx_GLView_pollEvents); + tolua_endmodule(tolua_S); + std::string typeName = typeid(cocos2d::GLView).name(); + g_luaType[typeName] = "cc.GLView"; + g_typeCast["GLView"] = "cc.GLView"; + return 1; +} + int lua_cocos2dx_Director_pause(lua_State* tolua_S) { int argc = 0; @@ -11631,7 +13235,7 @@ int lua_cocos2dx_Director_pause(lua_State* tolua_S) cobj->pause(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "pause",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:pause",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -11677,7 +13281,7 @@ int lua_cocos2dx_Director_setEventDispatcher(lua_State* tolua_S) cobj->setEventDispatcher(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setEventDispatcher",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:setEventDispatcher",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -11723,7 +13327,7 @@ int lua_cocos2dx_Director_pushScene(lua_State* tolua_S) cobj->pushScene(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "pushScene",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:pushScene",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -11767,7 +13371,7 @@ int lua_cocos2dx_Director_getDeltaTime(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDeltaTime",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:getDeltaTime",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -11811,7 +13415,7 @@ int lua_cocos2dx_Director_getContentScaleFactor(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getContentScaleFactor",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:getContentScaleFactor",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -11855,7 +13459,7 @@ int lua_cocos2dx_Director_getWinSizeInPixels(lua_State* tolua_S) size_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getWinSizeInPixels",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:getWinSizeInPixels",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -11899,7 +13503,7 @@ int lua_cocos2dx_Director_getConsole(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Console",(cocos2d::Console*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getConsole",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:getConsole",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -11939,13 +13543,13 @@ int lua_cocos2dx_Director_pushMatrix(lua_State* tolua_S) { cocos2d::MATRIX_STACK_TYPE arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.Director:pushMatrix"); if(!ok) return 0; cobj->pushMatrix(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "pushMatrix",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:pushMatrix",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -11988,7 +13592,7 @@ int lua_cocos2dx_Director_setGLDefaultValues(lua_State* tolua_S) cobj->setGLDefaultValues(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setGLDefaultValues",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:setGLDefaultValues",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -12034,7 +13638,7 @@ int lua_cocos2dx_Director_setActionManager(lua_State* tolua_S) cobj->setActionManager(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setActionManager",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:setActionManager",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -12074,13 +13678,13 @@ int lua_cocos2dx_Director_setAlphaBlending(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.Director:setAlphaBlending"); if(!ok) return 0; cobj->setAlphaBlending(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAlphaBlending",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:setAlphaBlending",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -12123,7 +13727,7 @@ int lua_cocos2dx_Director_popToRootScene(lua_State* tolua_S) cobj->popToRootScene(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "popToRootScene",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:popToRootScene",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -12164,15 +13768,15 @@ int lua_cocos2dx_Director_loadMatrix(lua_State* tolua_S) cocos2d::MATRIX_STACK_TYPE arg0; cocos2d::Mat4 arg1; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.Director:loadMatrix"); - ok &= luaval_to_mat4(tolua_S, 3, &arg1); + ok &= luaval_to_mat4(tolua_S, 3, &arg1, "cc.Director:loadMatrix"); if(!ok) return 0; cobj->loadMatrix(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "loadMatrix",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:loadMatrix",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -12216,7 +13820,7 @@ int lua_cocos2dx_Director_getNotificationNode(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Node",(cocos2d::Node*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getNotificationNode",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:getNotificationNode",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -12260,7 +13864,7 @@ int lua_cocos2dx_Director_getWinSize(lua_State* tolua_S) size_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getWinSize",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:getWinSize",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -12304,7 +13908,7 @@ int lua_cocos2dx_Director_getTextureCache(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.TextureCache",(cocos2d::TextureCache*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTextureCache",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:getTextureCache",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -12348,7 +13952,7 @@ int lua_cocos2dx_Director_isSendCleanupToScene(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isSendCleanupToScene",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:isSendCleanupToScene",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -12392,7 +13996,7 @@ int lua_cocos2dx_Director_getVisibleOrigin(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getVisibleOrigin",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:getVisibleOrigin",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -12435,7 +14039,7 @@ int lua_cocos2dx_Director_mainLoop(lua_State* tolua_S) cobj->mainLoop(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "mainLoop",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:mainLoop",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -12475,13 +14079,13 @@ int lua_cocos2dx_Director_setDepthTest(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.Director:setDepthTest"); if(!ok) return 0; cobj->setDepthTest(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setDepthTest",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:setDepthTest",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -12525,7 +14129,7 @@ int lua_cocos2dx_Director_getFrameRate(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getFrameRate",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:getFrameRate",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -12569,7 +14173,7 @@ int lua_cocos2dx_Director_getSecondsPerFrame(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getSecondsPerFrame",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:getSecondsPerFrame",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -12609,14 +14213,14 @@ int lua_cocos2dx_Director_convertToUI(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.Director:convertToUI"); if(!ok) return 0; cocos2d::Vec2 ret = cobj->convertToUI(arg0); vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "convertToUI",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:convertToUI",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -12659,7 +14263,7 @@ int lua_cocos2dx_Director_setDefaultValues(lua_State* tolua_S) cobj->setDefaultValues(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setDefaultValues",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:setDefaultValues",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -12703,7 +14307,7 @@ int lua_cocos2dx_Director_init(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "init",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:init",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -12749,7 +14353,7 @@ int lua_cocos2dx_Director_setScheduler(lua_State* tolua_S) cobj->setScheduler(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setScheduler",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:setScheduler",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -12792,7 +14396,7 @@ int lua_cocos2dx_Director_startAnimation(lua_State* tolua_S) cobj->startAnimation(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "startAnimation",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:startAnimation",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -12836,7 +14440,7 @@ int lua_cocos2dx_Director_getOpenGLView(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.GLView",(cocos2d::GLView*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getOpenGLView",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:getOpenGLView",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -12880,7 +14484,7 @@ int lua_cocos2dx_Director_getRunningScene(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Scene",(cocos2d::Scene*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getRunningScene",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:getRunningScene",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -12923,7 +14527,7 @@ int lua_cocos2dx_Director_setViewport(lua_State* tolua_S) cobj->setViewport(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setViewport",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:setViewport",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -12966,7 +14570,7 @@ int lua_cocos2dx_Director_stopAnimation(lua_State* tolua_S) cobj->stopAnimation(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "stopAnimation",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:stopAnimation",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -13006,13 +14610,13 @@ int lua_cocos2dx_Director_setContentScaleFactor(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Director:setContentScaleFactor"); if(!ok) return 0; cobj->setContentScaleFactor(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setContentScaleFactor",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:setContentScaleFactor",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -13052,13 +14656,13 @@ int lua_cocos2dx_Director_popToSceneStackLevel(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.Director:popToSceneStackLevel"); if(!ok) return 0; cobj->popToSceneStackLevel(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "popToSceneStackLevel",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:popToSceneStackLevel",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -13101,7 +14705,7 @@ int lua_cocos2dx_Director_resume(lua_State* tolua_S) cobj->resume(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "resume",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:resume",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -13145,7 +14749,7 @@ int lua_cocos2dx_Director_isNextDeltaTimeZero(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isNextDeltaTimeZero",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:isNextDeltaTimeZero",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -13188,7 +14792,7 @@ int lua_cocos2dx_Director_end(lua_State* tolua_S) cobj->end(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "end",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:end",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -13234,7 +14838,7 @@ int lua_cocos2dx_Director_setOpenGLView(lua_State* tolua_S) cobj->setOpenGLView(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setOpenGLView",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:setOpenGLView",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -13274,14 +14878,14 @@ int lua_cocos2dx_Director_convertToGL(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.Director:convertToGL"); if(!ok) return 0; cocos2d::Vec2 ret = cobj->convertToGL(arg0); vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "convertToGL",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:convertToGL",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -13324,7 +14928,7 @@ int lua_cocos2dx_Director_purgeCachedData(lua_State* tolua_S) cobj->purgeCachedData(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "purgeCachedData",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:purgeCachedData",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -13368,7 +14972,7 @@ int lua_cocos2dx_Director_getTotalFrames(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTotalFrames",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:getTotalFrames",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -13414,7 +15018,7 @@ int lua_cocos2dx_Director_runWithScene(lua_State* tolua_S) cobj->runWithScene(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "runWithScene",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:runWithScene",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -13460,7 +15064,7 @@ int lua_cocos2dx_Director_setNotificationNode(lua_State* tolua_S) cobj->setNotificationNode(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setNotificationNode",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:setNotificationNode",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -13503,7 +15107,7 @@ int lua_cocos2dx_Director_drawScene(lua_State* tolua_S) cobj->drawScene(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "drawScene",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:drawScene",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -13547,7 +15151,7 @@ int lua_cocos2dx_Director_getZEye(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getZEye",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:getZEye",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -13587,14 +15191,14 @@ int lua_cocos2dx_Director_getMatrix(lua_State* tolua_S) { cocos2d::MATRIX_STACK_TYPE arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.Director:getMatrix"); if(!ok) return 0; cocos2d::Mat4 ret = cobj->getMatrix(arg0); mat4_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getMatrix",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:getMatrix",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -13637,7 +15241,7 @@ int lua_cocos2dx_Director_popScene(lua_State* tolua_S) cobj->popScene(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "popScene",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:popScene",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -13681,7 +15285,7 @@ int lua_cocos2dx_Director_isDisplayStats(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isDisplayStats",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:isDisplayStats",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -13721,13 +15325,13 @@ int lua_cocos2dx_Director_setProjection(lua_State* tolua_S) { cocos2d::Director::Projection arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.Director:setProjection"); if(!ok) return 0; cobj->setProjection(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setProjection",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:setProjection",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -13767,13 +15371,13 @@ int lua_cocos2dx_Director_loadIdentityMatrix(lua_State* tolua_S) { cocos2d::MATRIX_STACK_TYPE arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.Director:loadIdentityMatrix"); if(!ok) return 0; cobj->loadIdentityMatrix(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "loadIdentityMatrix",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:loadIdentityMatrix",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -13813,13 +15417,13 @@ int lua_cocos2dx_Director_setNextDeltaTimeZero(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.Director:setNextDeltaTimeZero"); if(!ok) return 0; cobj->setNextDeltaTimeZero(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setNextDeltaTimeZero",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:setNextDeltaTimeZero",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -13862,7 +15466,7 @@ int lua_cocos2dx_Director_resetMatrixStack(lua_State* tolua_S) cobj->resetMatrixStack(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "resetMatrixStack",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:resetMatrixStack",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -13902,13 +15506,13 @@ int lua_cocos2dx_Director_popMatrix(lua_State* tolua_S) { cocos2d::MATRIX_STACK_TYPE arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.Director:popMatrix"); if(!ok) return 0; cobj->popMatrix(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "popMatrix",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:popMatrix",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -13952,7 +15556,7 @@ int lua_cocos2dx_Director_getVisibleSize(lua_State* tolua_S) size_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getVisibleSize",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:getVisibleSize",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -13996,7 +15600,7 @@ int lua_cocos2dx_Director_getScheduler(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Scheduler",(cocos2d::Scheduler*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getScheduler",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:getScheduler",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -14036,13 +15640,13 @@ int lua_cocos2dx_Director_setAnimationInterval(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Director:setAnimationInterval"); if(!ok) return 0; cobj->setAnimationInterval(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAnimationInterval",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:setAnimationInterval",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -14086,7 +15690,7 @@ int lua_cocos2dx_Director_getAnimationInterval(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAnimationInterval",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:getAnimationInterval",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -14130,7 +15734,7 @@ int lua_cocos2dx_Director_isPaused(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isPaused",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:isPaused",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -14170,13 +15774,13 @@ int lua_cocos2dx_Director_setDisplayStats(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.Director:setDisplayStats"); if(!ok) return 0; cobj->setDisplayStats(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setDisplayStats",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:setDisplayStats",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -14220,7 +15824,7 @@ int lua_cocos2dx_Director_getEventDispatcher(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.EventDispatcher",(cocos2d::EventDispatcher*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getEventDispatcher",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:getEventDispatcher",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -14266,7 +15870,7 @@ int lua_cocos2dx_Director_replaceScene(lua_State* tolua_S) cobj->replaceScene(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "replaceScene",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:replaceScene",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -14307,15 +15911,15 @@ int lua_cocos2dx_Director_multiplyMatrix(lua_State* tolua_S) cocos2d::MATRIX_STACK_TYPE arg0; cocos2d::Mat4 arg1; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.Director:multiplyMatrix"); - ok &= luaval_to_mat4(tolua_S, 3, &arg1); + ok &= luaval_to_mat4(tolua_S, 3, &arg1, "cc.Director:multiplyMatrix"); if(!ok) return 0; cobj->multiplyMatrix(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "multiplyMatrix",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:multiplyMatrix",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -14359,7 +15963,7 @@ int lua_cocos2dx_Director_getActionManager(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.ActionManager",(cocos2d::ActionManager*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getActionManager",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Director:getActionManager",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -14392,7 +15996,7 @@ int lua_cocos2dx_Director_getInstance(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Director",(cocos2d::Director*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "getInstance",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.Director:getInstance",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -14516,7 +16120,7 @@ int lua_cocos2dx_Timer_getInterval(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getInterval",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Timer:getInterval",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -14558,17 +16162,17 @@ int lua_cocos2dx_Timer_setupTimerWithInterval(lua_State* tolua_S) unsigned int arg1; double arg2; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Timer:setupTimerWithInterval"); - ok &= luaval_to_uint32(tolua_S, 3,&arg1); + ok &= luaval_to_uint32(tolua_S, 3,&arg1, "cc.Timer:setupTimerWithInterval"); - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.Timer:setupTimerWithInterval"); if(!ok) return 0; cobj->setupTimerWithInterval(arg0, arg1, arg2); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setupTimerWithInterval",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Timer:setupTimerWithInterval",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 @@ -14608,13 +16212,13 @@ int lua_cocos2dx_Timer_setInterval(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Timer:setInterval"); if(!ok) return 0; cobj->setInterval(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setInterval",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Timer:setInterval",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -14654,13 +16258,13 @@ int lua_cocos2dx_Timer_update(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Timer:update"); if(!ok) return 0; cobj->update(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "update",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Timer:update",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -14703,7 +16307,7 @@ int lua_cocos2dx_Timer_trigger(lua_State* tolua_S) cobj->trigger(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "trigger",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Timer:trigger",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -14746,7 +16350,7 @@ int lua_cocos2dx_Timer_cancel(lua_State* tolua_S) cobj->cancel(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cancel",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Timer:cancel",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -14811,13 +16415,13 @@ int lua_cocos2dx_Scheduler_setTimeScale(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Scheduler:setTimeScale"); if(!ok) return 0; cobj->setTimeScale(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTimeScale",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Scheduler:setTimeScale",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -14861,7 +16465,7 @@ int lua_cocos2dx_Scheduler_getTimeScale(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTimeScale",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Scheduler:getTimeScale",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -14895,7 +16499,7 @@ int lua_cocos2dx_Scheduler_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.Scheduler"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "Scheduler",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Scheduler:Scheduler",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -14957,14 +16561,14 @@ int lua_cocos2dx_FileUtils_fullPathForFilename(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.FileUtils:fullPathForFilename"); if(!ok) return 0; std::string ret = cobj->fullPathForFilename(arg0); tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "fullPathForFilename",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.FileUtils:fullPathForFilename",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -15004,14 +16608,14 @@ int lua_cocos2dx_FileUtils_getStringFromFile(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.FileUtils:getStringFromFile"); if(!ok) return 0; std::string ret = cobj->getStringFromFile(arg0); tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getStringFromFile",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.FileUtils:getStringFromFile",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -15051,13 +16655,13 @@ int lua_cocos2dx_FileUtils_setFilenameLookupDictionary(lua_State* tolua_S) { cocos2d::ValueMap arg0; - ok &= luaval_to_ccvaluemap(tolua_S, 2, &arg0); + ok &= luaval_to_ccvaluemap(tolua_S, 2, &arg0, "cc.FileUtils:setFilenameLookupDictionary"); if(!ok) return 0; cobj->setFilenameLookupDictionary(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setFilenameLookupDictionary",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.FileUtils:setFilenameLookupDictionary",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -15067,6 +16671,53 @@ int lua_cocos2dx_FileUtils_setFilenameLookupDictionary(lua_State* tolua_S) return 0; } +int lua_cocos2dx_FileUtils_removeFile(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::FileUtils* 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.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_removeFile'", 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, "cc.FileUtils:removeFile"); + if(!ok) + return 0; + bool ret = cobj->removeFile(arg0); + tolua_pushboolean(tolua_S,(bool)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.FileUtils:removeFile",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_FileUtils_removeFile'.",&tolua_err); +#endif + + return 0; +} int lua_cocos2dx_FileUtils_isAbsolutePath(lua_State* tolua_S) { int argc = 0; @@ -15097,14 +16748,14 @@ int lua_cocos2dx_FileUtils_isAbsolutePath(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.FileUtils:isAbsolutePath"); if(!ok) return 0; bool ret = cobj->isAbsolutePath(arg0); tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isAbsolutePath",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.FileUtils:isAbsolutePath",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -15114,6 +16765,59 @@ int lua_cocos2dx_FileUtils_isAbsolutePath(lua_State* tolua_S) return 0; } +int lua_cocos2dx_FileUtils_renameFile(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::FileUtils* 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.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_renameFile'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 3) + { + std::string arg0; + std::string arg1; + std::string arg2; + + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.FileUtils:renameFile"); + + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.FileUtils:renameFile"); + + ok &= luaval_to_std_string(tolua_S, 4,&arg2, "cc.FileUtils:renameFile"); + if(!ok) + return 0; + bool ret = cobj->renameFile(arg0, arg1, arg2); + tolua_pushboolean(tolua_S,(bool)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.FileUtils:renameFile",argc, 3); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_FileUtils_renameFile'.",&tolua_err); +#endif + + return 0; +} int lua_cocos2dx_FileUtils_loadFilenameLookupDictionaryFromFile(lua_State* tolua_S) { int argc = 0; @@ -15144,13 +16848,13 @@ int lua_cocos2dx_FileUtils_loadFilenameLookupDictionaryFromFile(lua_State* tolua { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.FileUtils:loadFilenameLookupDictionaryFromFile"); if(!ok) return 0; cobj->loadFilenameLookupDictionaryFromFile(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "loadFilenameLookupDictionaryFromFile",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.FileUtils:loadFilenameLookupDictionaryFromFile",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -15194,7 +16898,7 @@ int lua_cocos2dx_FileUtils_isPopupNotify(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isPopupNotify",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.FileUtils:isPopupNotify",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -15234,14 +16938,14 @@ int lua_cocos2dx_FileUtils_getValueVectorFromFile(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.FileUtils:getValueVectorFromFile"); if(!ok) return 0; cocos2d::ValueVector ret = cobj->getValueVectorFromFile(arg0); ccvaluevector_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getValueVectorFromFile",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.FileUtils:getValueVectorFromFile",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -15285,7 +16989,7 @@ int lua_cocos2dx_FileUtils_getSearchPaths(lua_State* tolua_S) ccvector_std_string_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getSearchPaths",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.FileUtils:getSearchPaths",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -15326,16 +17030,16 @@ int lua_cocos2dx_FileUtils_writeToFile(lua_State* tolua_S) cocos2d::ValueMap arg0; std::string arg1; - ok &= luaval_to_ccvaluemap(tolua_S, 2, &arg0); + ok &= luaval_to_ccvaluemap(tolua_S, 2, &arg0, "cc.FileUtils:writeToFile"); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.FileUtils:writeToFile"); if(!ok) return 0; bool ret = cobj->writeToFile(arg0, arg1); tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "writeToFile",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.FileUtils:writeToFile",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -15375,14 +17079,14 @@ int lua_cocos2dx_FileUtils_getValueMapFromFile(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.FileUtils:getValueMapFromFile"); if(!ok) return 0; cocos2d::ValueMap ret = cobj->getValueMapFromFile(arg0); ccvaluemap_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getValueMapFromFile",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.FileUtils:getValueMapFromFile",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -15392,6 +17096,103 @@ int lua_cocos2dx_FileUtils_getValueMapFromFile(lua_State* tolua_S) return 0; } +int lua_cocos2dx_FileUtils_getValueMapFromData(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::FileUtils* 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.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_getValueMapFromData'", 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, "cc.FileUtils:getValueMapFromData"); arg0 = arg0_tmp.c_str(); + + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.FileUtils:getValueMapFromData"); + if(!ok) + return 0; + cocos2d::ValueMap ret = cobj->getValueMapFromData(arg0, arg1); + ccvaluemap_to_luaval(tolua_S, ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.FileUtils:getValueMapFromData",argc, 2); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_FileUtils_getValueMapFromData'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_FileUtils_removeDirectory(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::FileUtils* 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.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_removeDirectory'", 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, "cc.FileUtils:removeDirectory"); + if(!ok) + return 0; + bool ret = cobj->removeDirectory(arg0); + tolua_pushboolean(tolua_S,(bool)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.FileUtils:removeDirectory",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_FileUtils_removeDirectory'.",&tolua_err); +#endif + + return 0; +} int lua_cocos2dx_FileUtils_setSearchPaths(lua_State* tolua_S) { int argc = 0; @@ -15422,13 +17223,13 @@ int lua_cocos2dx_FileUtils_setSearchPaths(lua_State* tolua_S) { std::vector arg0; - ok &= luaval_to_std_vector_string(tolua_S, 2, &arg0); + ok &= luaval_to_std_vector_string(tolua_S, 2, &arg0, "cc.FileUtils:setSearchPaths"); if(!ok) return 0; cobj->setSearchPaths(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setSearchPaths",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.FileUtils:setSearchPaths",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -15438,6 +17239,53 @@ int lua_cocos2dx_FileUtils_setSearchPaths(lua_State* tolua_S) return 0; } +int lua_cocos2dx_FileUtils_getFileSize(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::FileUtils* 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.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_getFileSize'", 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, "cc.FileUtils:getFileSize"); + if(!ok) + return 0; + long ret = cobj->getFileSize(arg0); + tolua_pushnumber(tolua_S,(lua_Number)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.FileUtils:getFileSize",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_FileUtils_getFileSize'.",&tolua_err); +#endif + + return 0; +} int lua_cocos2dx_FileUtils_setSearchResolutionsOrder(lua_State* tolua_S) { int argc = 0; @@ -15468,13 +17316,13 @@ int lua_cocos2dx_FileUtils_setSearchResolutionsOrder(lua_State* tolua_S) { std::vector arg0; - ok &= luaval_to_std_vector_string(tolua_S, 2, &arg0); + ok &= luaval_to_std_vector_string(tolua_S, 2, &arg0, "cc.FileUtils:setSearchResolutionsOrder"); if(!ok) return 0; cobj->setSearchResolutionsOrder(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setSearchResolutionsOrder",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.FileUtils:setSearchResolutionsOrder",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -15514,7 +17362,7 @@ int lua_cocos2dx_FileUtils_addSearchResolutionsOrder(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.FileUtils:addSearchResolutionsOrder"); if(!ok) return 0; cobj->addSearchResolutionsOrder(arg0); @@ -15525,15 +17373,15 @@ int lua_cocos2dx_FileUtils_addSearchResolutionsOrder(lua_State* tolua_S) std::string arg0; bool arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.FileUtils:addSearchResolutionsOrder"); - ok &= luaval_to_boolean(tolua_S, 3,&arg1); + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "cc.FileUtils:addSearchResolutionsOrder"); if(!ok) return 0; cobj->addSearchResolutionsOrder(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addSearchResolutionsOrder",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.FileUtils:addSearchResolutionsOrder",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -15573,7 +17421,7 @@ int lua_cocos2dx_FileUtils_addSearchPath(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.FileUtils:addSearchPath"); if(!ok) return 0; cobj->addSearchPath(arg0); @@ -15584,15 +17432,15 @@ int lua_cocos2dx_FileUtils_addSearchPath(lua_State* tolua_S) std::string arg0; bool arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.FileUtils:addSearchPath"); - ok &= luaval_to_boolean(tolua_S, 3,&arg1); + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "cc.FileUtils:addSearchPath"); if(!ok) return 0; cobj->addSearchPath(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addSearchPath",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.FileUtils:addSearchPath",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -15632,14 +17480,14 @@ int lua_cocos2dx_FileUtils_isFileExist(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.FileUtils:isFileExist"); if(!ok) return 0; bool ret = cobj->isFileExist(arg0); tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isFileExist",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.FileUtils:isFileExist",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -15682,7 +17530,7 @@ int lua_cocos2dx_FileUtils_purgeCachedEntries(lua_State* tolua_S) cobj->purgeCachedEntries(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "purgeCachedEntries",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.FileUtils:purgeCachedEntries",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -15723,16 +17571,16 @@ int lua_cocos2dx_FileUtils_fullPathFromRelativeFile(lua_State* tolua_S) std::string arg0; std::string arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.FileUtils:fullPathFromRelativeFile"); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.FileUtils:fullPathFromRelativeFile"); if(!ok) return 0; std::string ret = cobj->fullPathFromRelativeFile(arg0, arg1); tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "fullPathFromRelativeFile",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.FileUtils:fullPathFromRelativeFile",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -15772,13 +17620,13 @@ int lua_cocos2dx_FileUtils_setPopupNotify(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.FileUtils:setPopupNotify"); if(!ok) return 0; cobj->setPopupNotify(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setPopupNotify",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.FileUtils:setPopupNotify",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -15788,6 +17636,53 @@ int lua_cocos2dx_FileUtils_setPopupNotify(lua_State* tolua_S) return 0; } +int lua_cocos2dx_FileUtils_isDirectoryExist(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::FileUtils* 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.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_isDirectoryExist'", 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, "cc.FileUtils:isDirectoryExist"); + if(!ok) + return 0; + bool ret = cobj->isDirectoryExist(arg0); + tolua_pushboolean(tolua_S,(bool)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.FileUtils:isDirectoryExist",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_FileUtils_isDirectoryExist'.",&tolua_err); +#endif + + return 0; +} int lua_cocos2dx_FileUtils_getSearchResolutionsOrder(lua_State* tolua_S) { int argc = 0; @@ -15822,7 +17717,7 @@ int lua_cocos2dx_FileUtils_getSearchResolutionsOrder(lua_State* tolua_S) ccvector_std_string_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getSearchResolutionsOrder",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.FileUtils:getSearchResolutionsOrder",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -15832,6 +17727,53 @@ int lua_cocos2dx_FileUtils_getSearchResolutionsOrder(lua_State* tolua_S) return 0; } +int lua_cocos2dx_FileUtils_createDirectory(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::FileUtils* 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.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_createDirectory'", 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, "cc.FileUtils:createDirectory"); + if(!ok) + return 0; + bool ret = cobj->createDirectory(arg0); + tolua_pushboolean(tolua_S,(bool)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.FileUtils:createDirectory",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_FileUtils_createDirectory'.",&tolua_err); +#endif + + return 0; +} int lua_cocos2dx_FileUtils_getWritablePath(lua_State* tolua_S) { int argc = 0; @@ -15866,7 +17808,7 @@ int lua_cocos2dx_FileUtils_getWritablePath(lua_State* tolua_S) tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getWritablePath",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.FileUtils:getWritablePath",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -15898,7 +17840,7 @@ int lua_cocos2dx_FileUtils_destroyInstance(lua_State* tolua_S) cocos2d::FileUtils::destroyInstance(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "destroyInstance",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.FileUtils:destroyInstance",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -15929,7 +17871,7 @@ int lua_cocos2dx_FileUtils_getInstance(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.FileUtils",(cocos2d::FileUtils*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "getInstance",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.FileUtils:getInstance",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -15952,14 +17894,19 @@ int lua_register_cocos2dx_FileUtils(lua_State* tolua_S) tolua_function(tolua_S,"fullPathForFilename",lua_cocos2dx_FileUtils_fullPathForFilename); tolua_function(tolua_S,"getStringFromFile",lua_cocos2dx_FileUtils_getStringFromFile); tolua_function(tolua_S,"setFilenameLookupDictionary",lua_cocos2dx_FileUtils_setFilenameLookupDictionary); + tolua_function(tolua_S,"removeFile",lua_cocos2dx_FileUtils_removeFile); tolua_function(tolua_S,"isAbsolutePath",lua_cocos2dx_FileUtils_isAbsolutePath); + tolua_function(tolua_S,"renameFile",lua_cocos2dx_FileUtils_renameFile); tolua_function(tolua_S,"loadFilenameLookup",lua_cocos2dx_FileUtils_loadFilenameLookupDictionaryFromFile); tolua_function(tolua_S,"isPopupNotify",lua_cocos2dx_FileUtils_isPopupNotify); tolua_function(tolua_S,"getValueVectorFromFile",lua_cocos2dx_FileUtils_getValueVectorFromFile); tolua_function(tolua_S,"getSearchPaths",lua_cocos2dx_FileUtils_getSearchPaths); tolua_function(tolua_S,"writeToFile",lua_cocos2dx_FileUtils_writeToFile); tolua_function(tolua_S,"getValueMapFromFile",lua_cocos2dx_FileUtils_getValueMapFromFile); + tolua_function(tolua_S,"getValueMapFromData",lua_cocos2dx_FileUtils_getValueMapFromData); + tolua_function(tolua_S,"removeDirectory",lua_cocos2dx_FileUtils_removeDirectory); tolua_function(tolua_S,"setSearchPaths",lua_cocos2dx_FileUtils_setSearchPaths); + tolua_function(tolua_S,"getFileSize",lua_cocos2dx_FileUtils_getFileSize); tolua_function(tolua_S,"setSearchResolutionsOrder",lua_cocos2dx_FileUtils_setSearchResolutionsOrder); tolua_function(tolua_S,"addSearchResolutionsOrder",lua_cocos2dx_FileUtils_addSearchResolutionsOrder); tolua_function(tolua_S,"addSearchPath",lua_cocos2dx_FileUtils_addSearchPath); @@ -15967,7 +17914,9 @@ int lua_register_cocos2dx_FileUtils(lua_State* tolua_S) tolua_function(tolua_S,"purgeCachedEntries",lua_cocos2dx_FileUtils_purgeCachedEntries); tolua_function(tolua_S,"fullPathFromRelativeFile",lua_cocos2dx_FileUtils_fullPathFromRelativeFile); tolua_function(tolua_S,"setPopupNotify",lua_cocos2dx_FileUtils_setPopupNotify); + tolua_function(tolua_S,"isDirectoryExist",lua_cocos2dx_FileUtils_isDirectoryExist); tolua_function(tolua_S,"getSearchResolutionsOrder",lua_cocos2dx_FileUtils_getSearchResolutionsOrder); + tolua_function(tolua_S,"createDirectory",lua_cocos2dx_FileUtils_createDirectory); tolua_function(tolua_S,"getWritablePath",lua_cocos2dx_FileUtils_getWritablePath); tolua_function(tolua_S,"destroyInstance", lua_cocos2dx_FileUtils_destroyInstance); tolua_function(tolua_S,"getInstance", lua_cocos2dx_FileUtils_getInstance); @@ -16009,15 +17958,15 @@ int lua_cocos2dx_UserDefault_setIntegerForKey(lua_State* tolua_S) const char* arg0; int arg1; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.UserDefault:setIntegerForKey"); arg0 = arg0_tmp.c_str(); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.UserDefault:setIntegerForKey"); 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); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.UserDefault:setIntegerForKey",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -16051,11 +18000,11 @@ int lua_cocos2dx_UserDefault_getFloatForKey(lua_State* tolua_S) 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(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.UserDefault:getFloatForKey"); arg0 = arg0_tmp.c_str(); if (!ok) { break; } double arg1; - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.UserDefault:getFloatForKey"); if (!ok) { break; } double ret = cobj->getFloatForKey(arg0, arg1); @@ -16067,7 +18016,7 @@ int lua_cocos2dx_UserDefault_getFloatForKey(lua_State* tolua_S) 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(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.UserDefault:getFloatForKey"); arg0 = arg0_tmp.c_str(); if (!ok) { break; } double ret = cobj->getFloatForKey(arg0); @@ -16076,7 +18025,7 @@ int lua_cocos2dx_UserDefault_getFloatForKey(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getFloatForKey",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.UserDefault:getFloatForKey",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -16110,11 +18059,11 @@ int lua_cocos2dx_UserDefault_getBoolForKey(lua_State* tolua_S) 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(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.UserDefault:getBoolForKey"); arg0 = arg0_tmp.c_str(); if (!ok) { break; } bool arg1; - ok &= luaval_to_boolean(tolua_S, 3,&arg1); + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "cc.UserDefault:getBoolForKey"); if (!ok) { break; } bool ret = cobj->getBoolForKey(arg0, arg1); @@ -16126,7 +18075,7 @@ int lua_cocos2dx_UserDefault_getBoolForKey(lua_State* tolua_S) 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(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.UserDefault:getBoolForKey"); arg0 = arg0_tmp.c_str(); if (!ok) { break; } bool ret = cobj->getBoolForKey(arg0); @@ -16135,7 +18084,7 @@ int lua_cocos2dx_UserDefault_getBoolForKey(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getBoolForKey",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.UserDefault:getBoolForKey",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -16176,15 +18125,15 @@ int lua_cocos2dx_UserDefault_setDoubleForKey(lua_State* tolua_S) const char* arg0; double arg1; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.UserDefault:setDoubleForKey"); arg0 = arg0_tmp.c_str(); - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.UserDefault:setDoubleForKey"); 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); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.UserDefault:setDoubleForKey",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -16225,15 +18174,15 @@ int lua_cocos2dx_UserDefault_setFloatForKey(lua_State* tolua_S) const char* arg0; double arg1; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.UserDefault:setFloatForKey"); arg0 = arg0_tmp.c_str(); - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.UserDefault:setFloatForKey"); 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); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.UserDefault:setFloatForKey",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -16267,11 +18216,11 @@ int lua_cocos2dx_UserDefault_getStringForKey(lua_State* tolua_S) 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(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.UserDefault:getStringForKey"); arg0 = arg0_tmp.c_str(); if (!ok) { break; } std::string arg1; - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.UserDefault:getStringForKey"); if (!ok) { break; } std::string ret = cobj->getStringForKey(arg0, arg1); @@ -16283,7 +18232,7 @@ int lua_cocos2dx_UserDefault_getStringForKey(lua_State* tolua_S) 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(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.UserDefault:getStringForKey"); arg0 = arg0_tmp.c_str(); if (!ok) { break; } std::string ret = cobj->getStringForKey(arg0); @@ -16292,7 +18241,7 @@ int lua_cocos2dx_UserDefault_getStringForKey(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getStringForKey",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.UserDefault:getStringForKey",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -16333,15 +18282,15 @@ int lua_cocos2dx_UserDefault_setStringForKey(lua_State* tolua_S) 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(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.UserDefault:setStringForKey"); arg0 = arg0_tmp.c_str(); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.UserDefault:setStringForKey"); 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); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.UserDefault:setStringForKey",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -16384,7 +18333,7 @@ int lua_cocos2dx_UserDefault_flush(lua_State* tolua_S) cobj->flush(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "flush",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.UserDefault:flush",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -16418,11 +18367,11 @@ int lua_cocos2dx_UserDefault_getIntegerForKey(lua_State* tolua_S) 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(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.UserDefault:getIntegerForKey"); arg0 = arg0_tmp.c_str(); if (!ok) { break; } int arg1; - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.UserDefault:getIntegerForKey"); if (!ok) { break; } int ret = cobj->getIntegerForKey(arg0, arg1); @@ -16434,7 +18383,7 @@ int lua_cocos2dx_UserDefault_getIntegerForKey(lua_State* tolua_S) 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(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.UserDefault:getIntegerForKey"); arg0 = arg0_tmp.c_str(); if (!ok) { break; } int ret = cobj->getIntegerForKey(arg0); @@ -16443,7 +18392,7 @@ int lua_cocos2dx_UserDefault_getIntegerForKey(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getIntegerForKey",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.UserDefault:getIntegerForKey",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -16477,11 +18426,11 @@ int lua_cocos2dx_UserDefault_getDoubleForKey(lua_State* tolua_S) 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(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.UserDefault:getDoubleForKey"); arg0 = arg0_tmp.c_str(); if (!ok) { break; } double arg1; - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.UserDefault:getDoubleForKey"); if (!ok) { break; } double ret = cobj->getDoubleForKey(arg0, arg1); @@ -16493,7 +18442,7 @@ int lua_cocos2dx_UserDefault_getDoubleForKey(lua_State* tolua_S) 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(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.UserDefault:getDoubleForKey"); arg0 = arg0_tmp.c_str(); if (!ok) { break; } double ret = cobj->getDoubleForKey(arg0); @@ -16502,7 +18451,7 @@ int lua_cocos2dx_UserDefault_getDoubleForKey(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDoubleForKey",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.UserDefault:getDoubleForKey",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -16543,15 +18492,15 @@ int lua_cocos2dx_UserDefault_setBoolForKey(lua_State* tolua_S) const char* arg0; bool arg1; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.UserDefault:setBoolForKey"); arg0 = arg0_tmp.c_str(); - ok &= luaval_to_boolean(tolua_S, 3,&arg1); + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "cc.UserDefault:setBoolForKey"); 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); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.UserDefault:setBoolForKey",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -16583,7 +18532,7 @@ int lua_cocos2dx_UserDefault_destroyInstance(lua_State* tolua_S) cocos2d::UserDefault::destroyInstance(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "destroyInstance",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.UserDefault:destroyInstance",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -16614,7 +18563,7 @@ int lua_cocos2dx_UserDefault_getXMLFilePath(lua_State* tolua_S) tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "getXMLFilePath",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.UserDefault:getXMLFilePath",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -16645,7 +18594,7 @@ int lua_cocos2dx_UserDefault_isXMLFileExist(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "isXMLFileExist",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.UserDefault:isXMLFileExist",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -16686,6 +18635,544 @@ int lua_register_cocos2dx_UserDefault(lua_State* tolua_S) return 1; } +int lua_cocos2dx_Camera_getProjectionMatrix(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::Camera* 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.Camera",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::Camera*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Camera_getProjectionMatrix'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + const cocos2d::Mat4& ret = cobj->getProjectionMatrix(); + mat4_to_luaval(tolua_S, ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Camera:getProjectionMatrix",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Camera_getProjectionMatrix'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_Camera_getViewProjectionMatrix(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::Camera* 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.Camera",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::Camera*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Camera_getViewProjectionMatrix'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + const cocos2d::Mat4& ret = cobj->getViewProjectionMatrix(); + mat4_to_luaval(tolua_S, ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Camera:getViewProjectionMatrix",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Camera_getViewProjectionMatrix'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_Camera_getViewMatrix(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::Camera* 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.Camera",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::Camera*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Camera_getViewMatrix'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + const cocos2d::Mat4& ret = cobj->getViewMatrix(); + mat4_to_luaval(tolua_S, ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Camera:getViewMatrix",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Camera_getViewMatrix'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_Camera_getCameraFlag(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::Camera* 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.Camera",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::Camera*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Camera_getCameraFlag'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + int ret = (int)cobj->getCameraFlag(); + tolua_pushnumber(tolua_S,(lua_Number)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Camera:getCameraFlag",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Camera_getCameraFlag'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_Camera_getType(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::Camera* 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.Camera",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::Camera*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Camera_getType'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + int ret = (int)cobj->getType(); + tolua_pushnumber(tolua_S,(lua_Number)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Camera:getType",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Camera_getType'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_Camera_lookAt(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::Camera* 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.Camera",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::Camera*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Camera_lookAt'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 2) + { + cocos2d::Vec3 arg0; + cocos2d::Vec3 arg1; + + ok &= luaval_to_vec3(tolua_S, 2, &arg0, "cc.Camera:lookAt"); + + ok &= luaval_to_vec3(tolua_S, 3, &arg1, "cc.Camera:lookAt"); + if(!ok) + return 0; + cobj->lookAt(arg0, arg1); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Camera:lookAt",argc, 2); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Camera_lookAt'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_Camera_setCameraFlag(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::Camera* 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.Camera",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::Camera*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Camera_setCameraFlag'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + cocos2d::CameraFlag arg0; + + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.Camera:setCameraFlag"); + if(!ok) + return 0; + cobj->setCameraFlag(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Camera:setCameraFlag",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Camera_setCameraFlag'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_Camera_unproject(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::Camera* 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.Camera",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::Camera*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Camera_unproject'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 3) + { + cocos2d::Size arg0; + cocos2d::Vec3* arg1; + cocos2d::Vec3* arg2; + + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.Camera:unproject"); + + ok &= luaval_to_object(tolua_S, 3, "cc.Vec3",&arg1); + + ok &= luaval_to_object(tolua_S, 4, "cc.Vec3",&arg2); + if(!ok) + return 0; + cobj->unproject(arg0, arg1, arg2); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Camera:unproject",argc, 3); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Camera_unproject'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_Camera_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.Camera",0,&tolua_err)) goto tolua_lerror; +#endif + + argc = lua_gettop(tolua_S) - 1; + + if (argc == 0) + { + if(!ok) + return 0; + cocos2d::Camera* ret = cocos2d::Camera::create(); + object_to_luaval(tolua_S, "cc.Camera",(cocos2d::Camera*)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.Camera:create",argc, 0); + return 0; +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Camera_create'.",&tolua_err); +#endif + return 0; +} +int lua_cocos2dx_Camera_createPerspective(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.Camera",0,&tolua_err)) goto tolua_lerror; +#endif + + argc = lua_gettop(tolua_S) - 1; + + if (argc == 4) + { + double arg0; + double arg1; + double arg2; + double arg3; + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Camera:createPerspective"); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.Camera:createPerspective"); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.Camera:createPerspective"); + ok &= luaval_to_number(tolua_S, 5,&arg3, "cc.Camera:createPerspective"); + if(!ok) + return 0; + cocos2d::Camera* ret = cocos2d::Camera::createPerspective(arg0, arg1, arg2, arg3); + object_to_luaval(tolua_S, "cc.Camera",(cocos2d::Camera*)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.Camera:createPerspective",argc, 4); + return 0; +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Camera_createPerspective'.",&tolua_err); +#endif + return 0; +} +int lua_cocos2dx_Camera_createOrthographic(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.Camera",0,&tolua_err)) goto tolua_lerror; +#endif + + argc = lua_gettop(tolua_S) - 1; + + if (argc == 4) + { + double arg0; + double arg1; + double arg2; + double arg3; + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Camera:createOrthographic"); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.Camera:createOrthographic"); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.Camera:createOrthographic"); + ok &= luaval_to_number(tolua_S, 5,&arg3, "cc.Camera:createOrthographic"); + if(!ok) + return 0; + cocos2d::Camera* ret = cocos2d::Camera::createOrthographic(arg0, arg1, arg2, arg3); + object_to_luaval(tolua_S, "cc.Camera",(cocos2d::Camera*)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.Camera:createOrthographic",argc, 4); + return 0; +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Camera_createOrthographic'.",&tolua_err); +#endif + return 0; +} +int lua_cocos2dx_Camera_getVisitingCamera(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.Camera",0,&tolua_err)) goto tolua_lerror; +#endif + + argc = lua_gettop(tolua_S) - 1; + + if (argc == 0) + { + if(!ok) + return 0; + const cocos2d::Camera* ret = cocos2d::Camera::getVisitingCamera(); + object_to_luaval(tolua_S, "cc.Camera",(cocos2d::Camera*)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.Camera:getVisitingCamera",argc, 0); + return 0; +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Camera_getVisitingCamera'.",&tolua_err); +#endif + return 0; +} +static int lua_cocos2dx_Camera_finalize(lua_State* tolua_S) +{ + printf("luabindings: finalizing LUA object (Camera)"); + return 0; +} + +int lua_register_cocos2dx_Camera(lua_State* tolua_S) +{ + tolua_usertype(tolua_S,"cc.Camera"); + tolua_cclass(tolua_S,"Camera","cc.Camera","cc.Node",nullptr); + + tolua_beginmodule(tolua_S,"Camera"); + tolua_function(tolua_S,"getProjectionMatrix",lua_cocos2dx_Camera_getProjectionMatrix); + tolua_function(tolua_S,"getViewProjectionMatrix",lua_cocos2dx_Camera_getViewProjectionMatrix); + tolua_function(tolua_S,"getViewMatrix",lua_cocos2dx_Camera_getViewMatrix); + tolua_function(tolua_S,"getCameraFlag",lua_cocos2dx_Camera_getCameraFlag); + tolua_function(tolua_S,"getType",lua_cocos2dx_Camera_getType); + tolua_function(tolua_S,"lookAt",lua_cocos2dx_Camera_lookAt); + tolua_function(tolua_S,"setCameraFlag",lua_cocos2dx_Camera_setCameraFlag); + tolua_function(tolua_S,"unproject",lua_cocos2dx_Camera_unproject); + tolua_function(tolua_S,"create", lua_cocos2dx_Camera_create); + tolua_function(tolua_S,"createPerspective", lua_cocos2dx_Camera_createPerspective); + tolua_function(tolua_S,"createOrthographic", lua_cocos2dx_Camera_createOrthographic); + tolua_function(tolua_S,"getVisitingCamera", lua_cocos2dx_Camera_getVisitingCamera); + tolua_endmodule(tolua_S); + std::string typeName = typeid(cocos2d::Camera).name(); + g_luaType[typeName] = "cc.Camera"; + g_typeCast["Camera"] = "cc.Camera"; + return 1; +} + int lua_cocos2dx_EventListenerTouchOneByOne_isSwallowTouches(lua_State* tolua_S) { int argc = 0; @@ -16720,7 +19207,7 @@ int lua_cocos2dx_EventListenerTouchOneByOne_isSwallowTouches(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isSwallowTouches",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventListenerTouchOneByOne:isSwallowTouches",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -16760,13 +19247,13 @@ int lua_cocos2dx_EventListenerTouchOneByOne_setSwallowTouches(lua_State* tolua_S { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.EventListenerTouchOneByOne:setSwallowTouches"); if(!ok) return 0; cobj->setSwallowTouches(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setSwallowTouches",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventListenerTouchOneByOne:setSwallowTouches",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -16835,6 +19322,94 @@ int lua_register_cocos2dx_EventListenerKeyboard(lua_State* tolua_S) return 1; } +int lua_cocos2dx_EventMouse_getPreviousLocationInView(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::EventMouse* 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.EventMouse",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::EventMouse*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_EventMouse_getPreviousLocationInView'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + cocos2d::Vec2 ret = cobj->getPreviousLocationInView(); + vec2_to_luaval(tolua_S, ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventMouse:getPreviousLocationInView",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_EventMouse_getPreviousLocationInView'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_EventMouse_getLocation(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::EventMouse* 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.EventMouse",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::EventMouse*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_EventMouse_getLocation'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + cocos2d::Vec2 ret = cobj->getLocation(); + vec2_to_luaval(tolua_S, ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventMouse:getLocation",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_EventMouse_getLocation'.",&tolua_err); +#endif + + return 0; +} int lua_cocos2dx_EventMouse_getMouseButton(lua_State* tolua_S) { int argc = 0; @@ -16869,7 +19444,7 @@ int lua_cocos2dx_EventMouse_getMouseButton(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getMouseButton",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventMouse:getMouseButton",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -16879,6 +19454,94 @@ int lua_cocos2dx_EventMouse_getMouseButton(lua_State* tolua_S) return 0; } +int lua_cocos2dx_EventMouse_getPreviousLocation(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::EventMouse* 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.EventMouse",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::EventMouse*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_EventMouse_getPreviousLocation'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + cocos2d::Vec2 ret = cobj->getPreviousLocation(); + vec2_to_luaval(tolua_S, ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventMouse:getPreviousLocation",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_EventMouse_getPreviousLocation'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_EventMouse_getDelta(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::EventMouse* 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.EventMouse",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::EventMouse*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_EventMouse_getDelta'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + cocos2d::Vec2 ret = cobj->getDelta(); + vec2_to_luaval(tolua_S, ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventMouse:getDelta",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_EventMouse_getDelta'.",&tolua_err); +#endif + + return 0; +} int lua_cocos2dx_EventMouse_setScrollData(lua_State* tolua_S) { int argc = 0; @@ -16910,15 +19573,15 @@ int lua_cocos2dx_EventMouse_setScrollData(lua_State* tolua_S) double arg0; double arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.EventMouse:setScrollData"); - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.EventMouse:setScrollData"); if(!ok) return 0; cobj->setScrollData(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setScrollData",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventMouse:setScrollData",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -16928,6 +19591,94 @@ int lua_cocos2dx_EventMouse_setScrollData(lua_State* tolua_S) return 0; } +int lua_cocos2dx_EventMouse_getStartLocationInView(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::EventMouse* 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.EventMouse",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::EventMouse*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_EventMouse_getStartLocationInView'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + cocos2d::Vec2 ret = cobj->getStartLocationInView(); + vec2_to_luaval(tolua_S, ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventMouse:getStartLocationInView",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_EventMouse_getStartLocationInView'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_EventMouse_getStartLocation(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::EventMouse* 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.EventMouse",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::EventMouse*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_EventMouse_getStartLocation'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + cocos2d::Vec2 ret = cobj->getStartLocation(); + vec2_to_luaval(tolua_S, ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventMouse:getStartLocation",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_EventMouse_getStartLocation'.",&tolua_err); +#endif + + return 0; +} int lua_cocos2dx_EventMouse_setMouseButton(lua_State* tolua_S) { int argc = 0; @@ -16958,13 +19709,13 @@ int lua_cocos2dx_EventMouse_setMouseButton(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.EventMouse:setMouseButton"); if(!ok) return 0; cobj->setMouseButton(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setMouseButton",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventMouse:setMouseButton",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -16974,6 +19725,50 @@ int lua_cocos2dx_EventMouse_setMouseButton(lua_State* tolua_S) return 0; } +int lua_cocos2dx_EventMouse_getLocationInView(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::EventMouse* 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.EventMouse",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::EventMouse*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_EventMouse_getLocationInView'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + cocos2d::Vec2 ret = cobj->getLocationInView(); + vec2_to_luaval(tolua_S, ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventMouse:getLocationInView",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_EventMouse_getLocationInView'.",&tolua_err); +#endif + + return 0; +} int lua_cocos2dx_EventMouse_getScrollY(lua_State* tolua_S) { int argc = 0; @@ -17008,7 +19803,7 @@ int lua_cocos2dx_EventMouse_getScrollY(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getScrollY",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventMouse:getScrollY",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -17052,7 +19847,7 @@ int lua_cocos2dx_EventMouse_getScrollX(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getScrollX",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventMouse:getScrollX",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -17096,7 +19891,7 @@ int lua_cocos2dx_EventMouse_getCursorX(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getCursorX",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventMouse:getCursorX",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -17140,7 +19935,7 @@ int lua_cocos2dx_EventMouse_getCursorY(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getCursorY",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventMouse:getCursorY",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -17181,15 +19976,15 @@ int lua_cocos2dx_EventMouse_setCursorPosition(lua_State* tolua_S) double arg0; double arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.EventMouse:setCursorPosition"); - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.EventMouse:setCursorPosition"); if(!ok) return 0; cobj->setCursorPosition(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setCursorPosition",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventMouse:setCursorPosition",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -17216,7 +20011,7 @@ int lua_cocos2dx_EventMouse_constructor(lua_State* tolua_S) { cocos2d::EventMouse::MouseEventType arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.EventMouse:EventMouse"); if(!ok) return 0; cobj = new cocos2d::EventMouse(arg0); @@ -17226,7 +20021,7 @@ int lua_cocos2dx_EventMouse_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.EventMouse"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "EventMouse",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventMouse:EventMouse",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -17249,9 +20044,16 @@ int lua_register_cocos2dx_EventMouse(lua_State* tolua_S) tolua_beginmodule(tolua_S,"EventMouse"); tolua_function(tolua_S,"new",lua_cocos2dx_EventMouse_constructor); + tolua_function(tolua_S,"getPreviousLocationInView",lua_cocos2dx_EventMouse_getPreviousLocationInView); + tolua_function(tolua_S,"getLocation",lua_cocos2dx_EventMouse_getLocation); tolua_function(tolua_S,"getMouseButton",lua_cocos2dx_EventMouse_getMouseButton); + tolua_function(tolua_S,"getPreviousLocation",lua_cocos2dx_EventMouse_getPreviousLocation); + tolua_function(tolua_S,"getDelta",lua_cocos2dx_EventMouse_getDelta); tolua_function(tolua_S,"setScrollData",lua_cocos2dx_EventMouse_setScrollData); + tolua_function(tolua_S,"getStartLocationInView",lua_cocos2dx_EventMouse_getStartLocationInView); + tolua_function(tolua_S,"getStartLocation",lua_cocos2dx_EventMouse_getStartLocation); tolua_function(tolua_S,"setMouseButton",lua_cocos2dx_EventMouse_setMouseButton); + tolua_function(tolua_S,"getLocationInView",lua_cocos2dx_EventMouse_getLocationInView); tolua_function(tolua_S,"getScrollY",lua_cocos2dx_EventMouse_getScrollY); tolua_function(tolua_S,"getScrollX",lua_cocos2dx_EventMouse_getScrollX); tolua_function(tolua_S,"getCursorX",lua_cocos2dx_EventMouse_getCursorX); @@ -17355,7 +20157,7 @@ int lua_cocos2dx_EventCustom_getEventName(lua_State* tolua_S) tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getEventName",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventCustom:getEventName",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -17382,7 +20184,7 @@ int lua_cocos2dx_EventCustom_constructor(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.EventCustom:EventCustom"); if(!ok) return 0; cobj = new cocos2d::EventCustom(arg0); @@ -17392,7 +20194,7 @@ int lua_cocos2dx_EventCustom_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.EventCustom"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "EventCustom",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventCustom:EventCustom",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -17472,7 +20274,7 @@ int lua_cocos2dx_EventFocus_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.EventFocus"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "EventFocus",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventFocus:EventFocus",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -17557,7 +20359,7 @@ int lua_cocos2dx_Action_startWithTarget(lua_State* tolua_S) cobj->startWithTarget(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "startWithTarget",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Action:startWithTarget",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -17603,7 +20405,7 @@ int lua_cocos2dx_Action_setOriginalTarget(lua_State* tolua_S) cobj->setOriginalTarget(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setOriginalTarget",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Action:setOriginalTarget",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -17647,7 +20449,7 @@ int lua_cocos2dx_Action_clone(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Action",(cocos2d::Action*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "clone",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Action:clone",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -17691,7 +20493,7 @@ int lua_cocos2dx_Action_getOriginalTarget(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Node",(cocos2d::Node*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getOriginalTarget",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Action:getOriginalTarget",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -17734,7 +20536,7 @@ int lua_cocos2dx_Action_stop(lua_State* tolua_S) cobj->stop(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "stop",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Action:stop",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -17774,13 +20576,13 @@ int lua_cocos2dx_Action_update(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Action:update"); if(!ok) return 0; cobj->update(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "update",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Action:update",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -17824,7 +20626,7 @@ int lua_cocos2dx_Action_getTarget(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Node",(cocos2d::Node*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTarget",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Action:getTarget",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -17864,13 +20666,13 @@ int lua_cocos2dx_Action_step(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Action:step"); if(!ok) return 0; cobj->step(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "step",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Action:step",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -17910,13 +20712,13 @@ int lua_cocos2dx_Action_setTag(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.Action:setTag"); if(!ok) return 0; cobj->setTag(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTag",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Action:setTag",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -17960,7 +20762,7 @@ int lua_cocos2dx_Action_getTag(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTag",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Action:getTag",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -18006,7 +20808,7 @@ int lua_cocos2dx_Action_setTarget(lua_State* tolua_S) cobj->setTarget(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTarget",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Action:setTarget",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -18050,7 +20852,7 @@ int lua_cocos2dx_Action_isDone(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isDone",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Action:isDone",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -18094,7 +20896,7 @@ int lua_cocos2dx_Action_reverse(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Action",(cocos2d::Action*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "reverse",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Action:reverse",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -18166,13 +20968,13 @@ int lua_cocos2dx_FiniteTimeAction_setDuration(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.FiniteTimeAction:setDuration"); if(!ok) return 0; cobj->setDuration(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setDuration",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.FiniteTimeAction:setDuration",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -18216,7 +21018,7 @@ int lua_cocos2dx_FiniteTimeAction_getDuration(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDuration",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.FiniteTimeAction:getDuration",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -18283,7 +21085,7 @@ int lua_cocos2dx_Speed_setInnerAction(lua_State* tolua_S) cobj->setInnerAction(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setInnerAction",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Speed:setInnerAction",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -18323,13 +21125,13 @@ int lua_cocos2dx_Speed_setSpeed(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Speed:setSpeed"); if(!ok) return 0; cobj->setSpeed(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setSpeed",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Speed:setSpeed",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -18373,7 +21175,7 @@ int lua_cocos2dx_Speed_getInnerAction(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.ActionInterval",(cocos2d::ActionInterval*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getInnerAction",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Speed:getInnerAction",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -18417,7 +21219,7 @@ int lua_cocos2dx_Speed_getSpeed(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getSpeed",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Speed:getSpeed",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -18447,14 +21249,14 @@ int lua_cocos2dx_Speed_create(lua_State* tolua_S) cocos2d::ActionInterval* arg0; double arg1; ok &= luaval_to_object(tolua_S, 2, "cc.ActionInterval",&arg0); - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.Speed:create"); if(!ok) return 0; cocos2d::Speed* ret = cocos2d::Speed::create(arg0, arg1); object_to_luaval(tolua_S, "cc.Speed",(cocos2d::Speed*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.Speed:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -18516,13 +21318,13 @@ int lua_cocos2dx_Follow_setBoudarySet(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.Follow:setBoudarySet"); if(!ok) return 0; cobj->setBoudarySet(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setBoudarySet",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Follow:setBoudarySet",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -18566,7 +21368,7 @@ int lua_cocos2dx_Follow_isBoundarySet(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isBoundarySet",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Follow:isBoundarySet",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -18606,14 +21408,14 @@ int lua_cocos2dx_Follow_create(lua_State* tolua_S) cocos2d::Node* arg0; cocos2d::Rect arg1; ok &= luaval_to_object(tolua_S, 2, "cc.Node",&arg0); - ok &= luaval_to_rect(tolua_S, 3, &arg1); + ok &= luaval_to_rect(tolua_S, 3, &arg1, "cc.Follow:create"); if(!ok) return 0; cocos2d::Follow* ret = cocos2d::Follow::create(arg0, arg1); object_to_luaval(tolua_S, "cc.Follow",(cocos2d::Follow*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.Follow:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -18677,7 +21479,7 @@ int lua_cocos2dx_SpriteFrame_clone(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.SpriteFrame",(cocos2d::SpriteFrame*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "clone",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SpriteFrame:clone",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -18717,13 +21519,13 @@ int lua_cocos2dx_SpriteFrame_setRotated(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.SpriteFrame:setRotated"); if(!ok) return 0; cobj->setRotated(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setRotated",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SpriteFrame:setRotated",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -18769,7 +21571,7 @@ int lua_cocos2dx_SpriteFrame_setTexture(lua_State* tolua_S) cobj->setTexture(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTexture",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SpriteFrame:setTexture",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -18813,7 +21615,7 @@ int lua_cocos2dx_SpriteFrame_getOffset(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getOffset",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SpriteFrame:getOffset",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -18853,13 +21655,13 @@ int lua_cocos2dx_SpriteFrame_setRectInPixels(lua_State* tolua_S) { cocos2d::Rect arg0; - ok &= luaval_to_rect(tolua_S, 2, &arg0); + ok &= luaval_to_rect(tolua_S, 2, &arg0, "cc.SpriteFrame:setRectInPixels"); if(!ok) return 0; cobj->setRectInPixels(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setRectInPixels",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SpriteFrame:setRectInPixels",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -18903,7 +21705,7 @@ int lua_cocos2dx_SpriteFrame_getTexture(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Texture2D",(cocos2d::Texture2D*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTexture",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SpriteFrame:getTexture",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -18947,7 +21749,7 @@ int lua_cocos2dx_SpriteFrame_getRect(lua_State* tolua_S) rect_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getRect",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SpriteFrame:getRect",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -18987,13 +21789,13 @@ int lua_cocos2dx_SpriteFrame_setOffsetInPixels(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.SpriteFrame:setOffsetInPixels"); if(!ok) return 0; cobj->setOffsetInPixels(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setOffsetInPixels",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SpriteFrame:setOffsetInPixels",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -19037,7 +21839,7 @@ int lua_cocos2dx_SpriteFrame_getRectInPixels(lua_State* tolua_S) rect_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getRectInPixels",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SpriteFrame:getRectInPixels",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -19077,13 +21879,13 @@ int lua_cocos2dx_SpriteFrame_setOriginalSize(lua_State* tolua_S) { cocos2d::Size arg0; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.SpriteFrame:setOriginalSize"); if(!ok) return 0; cobj->setOriginalSize(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setOriginalSize",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SpriteFrame:setOriginalSize",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -19127,7 +21929,7 @@ int lua_cocos2dx_SpriteFrame_getOriginalSizeInPixels(lua_State* tolua_S) size_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getOriginalSizeInPixels",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SpriteFrame:getOriginalSizeInPixels",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -19167,13 +21969,13 @@ int lua_cocos2dx_SpriteFrame_setOriginalSizeInPixels(lua_State* tolua_S) { cocos2d::Size arg0; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.SpriteFrame:setOriginalSizeInPixels"); if(!ok) return 0; cobj->setOriginalSizeInPixels(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setOriginalSizeInPixels",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SpriteFrame:setOriginalSizeInPixels",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -19213,13 +22015,13 @@ int lua_cocos2dx_SpriteFrame_setOffset(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.SpriteFrame:setOffset"); if(!ok) return 0; cobj->setOffset(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setOffset",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SpriteFrame:setOffset",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -19263,7 +22065,7 @@ int lua_cocos2dx_SpriteFrame_isRotated(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isRotated",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SpriteFrame:isRotated",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -19303,13 +22105,13 @@ int lua_cocos2dx_SpriteFrame_setRect(lua_State* tolua_S) { cocos2d::Rect arg0; - ok &= luaval_to_rect(tolua_S, 2, &arg0); + ok &= luaval_to_rect(tolua_S, 2, &arg0, "cc.SpriteFrame:setRect"); if(!ok) return 0; cobj->setRect(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setRect",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SpriteFrame:setRect",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -19353,7 +22155,7 @@ int lua_cocos2dx_SpriteFrame_getOffsetInPixels(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getOffsetInPixels",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SpriteFrame:getOffsetInPixels",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -19397,7 +22199,7 @@ int lua_cocos2dx_SpriteFrame_getOriginalSize(lua_State* tolua_S) size_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getOriginalSize",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SpriteFrame:getOriginalSize",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -19426,19 +22228,19 @@ int lua_cocos2dx_SpriteFrame_create(lua_State* tolua_S) if (argc == 5) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.SpriteFrame:create"); if (!ok) { break; } cocos2d::Rect arg1; - ok &= luaval_to_rect(tolua_S, 3, &arg1); + ok &= luaval_to_rect(tolua_S, 3, &arg1, "cc.SpriteFrame:create"); if (!ok) { break; } bool arg2; - ok &= luaval_to_boolean(tolua_S, 4,&arg2); + ok &= luaval_to_boolean(tolua_S, 4,&arg2, "cc.SpriteFrame:create"); if (!ok) { break; } cocos2d::Vec2 arg3; - ok &= luaval_to_vec2(tolua_S, 5, &arg3); + ok &= luaval_to_vec2(tolua_S, 5, &arg3, "cc.SpriteFrame:create"); if (!ok) { break; } cocos2d::Size arg4; - ok &= luaval_to_size(tolua_S, 6, &arg4); + ok &= luaval_to_size(tolua_S, 6, &arg4, "cc.SpriteFrame:create"); if (!ok) { break; } cocos2d::SpriteFrame* ret = cocos2d::SpriteFrame::create(arg0, arg1, arg2, arg3, arg4); object_to_luaval(tolua_S, "cc.SpriteFrame",(cocos2d::SpriteFrame*)ret); @@ -19451,10 +22253,10 @@ int lua_cocos2dx_SpriteFrame_create(lua_State* tolua_S) if (argc == 2) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.SpriteFrame:create"); if (!ok) { break; } cocos2d::Rect arg1; - ok &= luaval_to_rect(tolua_S, 3, &arg1); + ok &= luaval_to_rect(tolua_S, 3, &arg1, "cc.SpriteFrame:create"); if (!ok) { break; } cocos2d::SpriteFrame* ret = cocos2d::SpriteFrame::create(arg0, arg1); object_to_luaval(tolua_S, "cc.SpriteFrame",(cocos2d::SpriteFrame*)ret); @@ -19462,7 +22264,7 @@ int lua_cocos2dx_SpriteFrame_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.SpriteFrame:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -19492,16 +22294,16 @@ int lua_cocos2dx_SpriteFrame_createWithTexture(lua_State* tolua_S) ok &= luaval_to_object(tolua_S, 2, "cc.Texture2D",&arg0); if (!ok) { break; } cocos2d::Rect arg1; - ok &= luaval_to_rect(tolua_S, 3, &arg1); + ok &= luaval_to_rect(tolua_S, 3, &arg1, "cc.SpriteFrame:createWithTexture"); if (!ok) { break; } bool arg2; - ok &= luaval_to_boolean(tolua_S, 4,&arg2); + ok &= luaval_to_boolean(tolua_S, 4,&arg2, "cc.SpriteFrame:createWithTexture"); if (!ok) { break; } cocos2d::Vec2 arg3; - ok &= luaval_to_vec2(tolua_S, 5, &arg3); + ok &= luaval_to_vec2(tolua_S, 5, &arg3, "cc.SpriteFrame:createWithTexture"); if (!ok) { break; } cocos2d::Size arg4; - ok &= luaval_to_size(tolua_S, 6, &arg4); + ok &= luaval_to_size(tolua_S, 6, &arg4, "cc.SpriteFrame:createWithTexture"); if (!ok) { break; } cocos2d::SpriteFrame* ret = cocos2d::SpriteFrame::createWithTexture(arg0, arg1, arg2, arg3, arg4); object_to_luaval(tolua_S, "cc.SpriteFrame",(cocos2d::SpriteFrame*)ret); @@ -19517,7 +22319,7 @@ int lua_cocos2dx_SpriteFrame_createWithTexture(lua_State* tolua_S) ok &= luaval_to_object(tolua_S, 2, "cc.Texture2D",&arg0); if (!ok) { break; } cocos2d::Rect arg1; - ok &= luaval_to_rect(tolua_S, 3, &arg1); + ok &= luaval_to_rect(tolua_S, 3, &arg1, "cc.SpriteFrame:createWithTexture"); if (!ok) { break; } cocos2d::SpriteFrame* ret = cocos2d::SpriteFrame::createWithTexture(arg0, arg1); object_to_luaval(tolua_S, "cc.SpriteFrame",(cocos2d::SpriteFrame*)ret); @@ -19525,7 +22327,7 @@ int lua_cocos2dx_SpriteFrame_createWithTexture(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "createWithTexture",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.SpriteFrame:createWithTexture",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -19607,7 +22409,7 @@ int lua_cocos2dx_AnimationFrame_setSpriteFrame(lua_State* tolua_S) cobj->setSpriteFrame(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setSpriteFrame",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.AnimationFrame:setSpriteFrame",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -19654,7 +22456,7 @@ int lua_cocos2dx_AnimationFrame_getUserInfo(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getUserInfo",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.AnimationFrame:getUserInfo",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -19694,13 +22496,13 @@ int lua_cocos2dx_AnimationFrame_setDelayUnits(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.AnimationFrame:setDelayUnits"); if(!ok) return 0; cobj->setDelayUnits(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setDelayUnits",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.AnimationFrame:setDelayUnits",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -19744,7 +22546,7 @@ int lua_cocos2dx_AnimationFrame_clone(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.AnimationFrame",(cocos2d::AnimationFrame*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "clone",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.AnimationFrame:clone",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -19788,7 +22590,7 @@ int lua_cocos2dx_AnimationFrame_getSpriteFrame(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.SpriteFrame",(cocos2d::SpriteFrame*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getSpriteFrame",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.AnimationFrame:getSpriteFrame",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -19832,7 +22634,7 @@ int lua_cocos2dx_AnimationFrame_getDelayUnits(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDelayUnits",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.AnimationFrame:getDelayUnits",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -19872,13 +22674,13 @@ int lua_cocos2dx_AnimationFrame_setUserInfo(lua_State* tolua_S) { cocos2d::ValueMap arg0; - ok &= luaval_to_ccvaluemap(tolua_S, 2, &arg0); + ok &= luaval_to_ccvaluemap(tolua_S, 2, &arg0, "cc.AnimationFrame:setUserInfo"); if(!ok) return 0; cobj->setUserInfo(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setUserInfo",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.AnimationFrame:setUserInfo",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -19909,15 +22711,15 @@ int lua_cocos2dx_AnimationFrame_create(lua_State* tolua_S) double arg1; cocos2d::ValueMap arg2; ok &= luaval_to_object(tolua_S, 2, "cc.SpriteFrame",&arg0); - ok &= luaval_to_number(tolua_S, 3,&arg1); - ok &= luaval_to_ccvaluemap(tolua_S, 4, &arg2); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.AnimationFrame:create"); + ok &= luaval_to_ccvaluemap(tolua_S, 4, &arg2, "cc.AnimationFrame:create"); if(!ok) return 0; cocos2d::AnimationFrame* ret = cocos2d::AnimationFrame::create(arg0, arg1, arg2); object_to_luaval(tolua_S, "cc.AnimationFrame",(cocos2d::AnimationFrame*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.AnimationFrame:create",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -19986,7 +22788,7 @@ int lua_cocos2dx_Animation_getLoops(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getLoops",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Animation:getLoops",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -20032,7 +22834,7 @@ int lua_cocos2dx_Animation_addSpriteFrame(lua_State* tolua_S) cobj->addSpriteFrame(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addSpriteFrame",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Animation:addSpriteFrame",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -20072,13 +22874,13 @@ int lua_cocos2dx_Animation_setRestoreOriginalFrame(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.Animation:setRestoreOriginalFrame"); if(!ok) return 0; cobj->setRestoreOriginalFrame(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setRestoreOriginalFrame",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Animation:setRestoreOriginalFrame",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -20122,7 +22924,7 @@ int lua_cocos2dx_Animation_clone(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Animation",(cocos2d::Animation*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "clone",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Animation:clone",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -20166,7 +22968,7 @@ int lua_cocos2dx_Animation_getDuration(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDuration",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Animation:getDuration",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -20206,13 +23008,13 @@ int lua_cocos2dx_Animation_setFrames(lua_State* tolua_S) { cocos2d::Vector arg0; - ok &= luaval_to_ccvector(tolua_S, 2, &arg0); + ok &= luaval_to_ccvector(tolua_S, 2, &arg0, "cc.Animation:setFrames"); if(!ok) return 0; cobj->setFrames(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setFrames",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Animation:setFrames",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -20256,7 +23058,7 @@ int lua_cocos2dx_Animation_getFrames(lua_State* tolua_S) ccvector_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getFrames",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Animation:getFrames",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -20296,13 +23098,13 @@ int lua_cocos2dx_Animation_setLoops(lua_State* tolua_S) { unsigned int arg0; - ok &= luaval_to_uint32(tolua_S, 2,&arg0); + ok &= luaval_to_uint32(tolua_S, 2,&arg0, "cc.Animation:setLoops"); if(!ok) return 0; cobj->setLoops(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setLoops",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Animation:setLoops",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -20342,13 +23144,13 @@ int lua_cocos2dx_Animation_setDelayPerUnit(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Animation:setDelayPerUnit"); if(!ok) return 0; cobj->setDelayPerUnit(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setDelayPerUnit",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Animation:setDelayPerUnit",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -20388,13 +23190,13 @@ int lua_cocos2dx_Animation_addSpriteFrameWithFile(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Animation:addSpriteFrameWithFile"); if(!ok) return 0; cobj->addSpriteFrameWithFile(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addSpriteFrameWithFile",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Animation:addSpriteFrameWithFile",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -20438,7 +23240,7 @@ int lua_cocos2dx_Animation_getTotalDelayUnits(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTotalDelayUnits",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Animation:getTotalDelayUnits",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -20482,7 +23284,7 @@ int lua_cocos2dx_Animation_getDelayPerUnit(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDelayPerUnit",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Animation:getDelayPerUnit",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -20526,7 +23328,7 @@ int lua_cocos2dx_Animation_getRestoreOriginalFrame(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getRestoreOriginalFrame",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Animation:getRestoreOriginalFrame",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -20569,13 +23371,13 @@ int lua_cocos2dx_Animation_addSpriteFrameWithTexture(lua_State* tolua_S) ok &= luaval_to_object(tolua_S, 2, "cc.Texture2D",&arg0); - ok &= luaval_to_rect(tolua_S, 3, &arg1); + ok &= luaval_to_rect(tolua_S, 3, &arg1, "cc.Animation:addSpriteFrameWithTexture"); if(!ok) return 0; cobj->addSpriteFrameWithTexture(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addSpriteFrameWithTexture",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Animation:addSpriteFrameWithTexture",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -20604,10 +23406,10 @@ int lua_cocos2dx_Animation_create(lua_State* tolua_S) if (argc == 2) { cocos2d::Vector arg0; - ok &= luaval_to_ccvector(tolua_S, 2, &arg0); + ok &= luaval_to_ccvector(tolua_S, 2, &arg0, "cc.Animation:create"); if (!ok) { break; } double arg1; - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.Animation:create"); if (!ok) { break; } cocos2d::Animation* ret = cocos2d::Animation::create(arg0, arg1); object_to_luaval(tolua_S, "cc.Animation",(cocos2d::Animation*)ret); @@ -20620,13 +23422,13 @@ int lua_cocos2dx_Animation_create(lua_State* tolua_S) if (argc == 3) { cocos2d::Vector arg0; - ok &= luaval_to_ccvector(tolua_S, 2, &arg0); + ok &= luaval_to_ccvector(tolua_S, 2, &arg0, "cc.Animation:create"); if (!ok) { break; } double arg1; - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.Animation:create"); if (!ok) { break; } unsigned int arg2; - ok &= luaval_to_uint32(tolua_S, 4,&arg2); + ok &= luaval_to_uint32(tolua_S, 4,&arg2, "cc.Animation:create"); if (!ok) { break; } cocos2d::Animation* ret = cocos2d::Animation::create(arg0, arg1, arg2); object_to_luaval(tolua_S, "cc.Animation",(cocos2d::Animation*)ret); @@ -20644,7 +23446,7 @@ int lua_cocos2dx_Animation_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.Animation:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -20670,7 +23472,7 @@ int lua_cocos2dx_Animation_createWithSpriteFrames(lua_State* tolua_S) if (argc == 1) { cocos2d::Vector arg0; - ok &= luaval_to_ccvector(tolua_S, 2, &arg0); + ok &= luaval_to_ccvector(tolua_S, 2, &arg0, "cc.Animation:createWithSpriteFrames"); if(!ok) return 0; cocos2d::Animation* ret = cocos2d::Animation::createWithSpriteFrames(arg0); @@ -20681,8 +23483,8 @@ int lua_cocos2dx_Animation_createWithSpriteFrames(lua_State* tolua_S) { cocos2d::Vector arg0; double arg1; - ok &= luaval_to_ccvector(tolua_S, 2, &arg0); - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_ccvector(tolua_S, 2, &arg0, "cc.Animation:createWithSpriteFrames"); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.Animation:createWithSpriteFrames"); if(!ok) return 0; cocos2d::Animation* ret = cocos2d::Animation::createWithSpriteFrames(arg0, arg1); @@ -20694,16 +23496,16 @@ int lua_cocos2dx_Animation_createWithSpriteFrames(lua_State* tolua_S) cocos2d::Vector arg0; double arg1; unsigned int arg2; - ok &= luaval_to_ccvector(tolua_S, 2, &arg0); - ok &= luaval_to_number(tolua_S, 3,&arg1); - ok &= luaval_to_uint32(tolua_S, 4,&arg2); + ok &= luaval_to_ccvector(tolua_S, 2, &arg0, "cc.Animation:createWithSpriteFrames"); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.Animation:createWithSpriteFrames"); + ok &= luaval_to_uint32(tolua_S, 4,&arg2, "cc.Animation:createWithSpriteFrames"); if(!ok) return 0; cocos2d::Animation* ret = cocos2d::Animation::createWithSpriteFrames(arg0, arg1, arg2); object_to_luaval(tolua_S, "cc.Animation",(cocos2d::Animation*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createWithSpriteFrames",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.Animation:createWithSpriteFrames",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -20780,7 +23582,7 @@ int lua_cocos2dx_ActionInterval_getAmplitudeRate(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAmplitudeRate",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ActionInterval:getAmplitudeRate",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -20820,13 +23622,13 @@ int lua_cocos2dx_ActionInterval_setAmplitudeRate(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ActionInterval:setAmplitudeRate"); if(!ok) return 0; cobj->setAmplitudeRate(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAmplitudeRate",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ActionInterval:setAmplitudeRate",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -20870,7 +23672,7 @@ int lua_cocos2dx_ActionInterval_getElapsed(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getElapsed",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ActionInterval:getElapsed",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -20957,7 +23759,7 @@ int lua_cocos2dx_Repeat_setInnerAction(lua_State* tolua_S) cobj->setInnerAction(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setInnerAction",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Repeat:setInnerAction",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -21001,7 +23803,7 @@ int lua_cocos2dx_Repeat_getInnerAction(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.FiniteTimeAction",(cocos2d::FiniteTimeAction*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getInnerAction",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Repeat:getInnerAction",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -21031,14 +23833,14 @@ int lua_cocos2dx_Repeat_create(lua_State* tolua_S) cocos2d::FiniteTimeAction* arg0; unsigned int arg1; ok &= luaval_to_object(tolua_S, 2, "cc.FiniteTimeAction",&arg0); - ok &= luaval_to_uint32(tolua_S, 3,&arg1); + ok &= luaval_to_uint32(tolua_S, 3,&arg1, "cc.Repeat:create"); if(!ok) return 0; cocos2d::Repeat* ret = cocos2d::Repeat::create(arg0, arg1); object_to_luaval(tolua_S, "cc.Repeat",(cocos2d::Repeat*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.Repeat:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -21104,7 +23906,7 @@ int lua_cocos2dx_RepeatForever_setInnerAction(lua_State* tolua_S) cobj->setInnerAction(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setInnerAction",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.RepeatForever:setInnerAction",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -21148,7 +23950,7 @@ int lua_cocos2dx_RepeatForever_getInnerAction(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.ActionInterval",(cocos2d::ActionInterval*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getInnerAction",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.RepeatForever:getInnerAction",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -21183,7 +23985,7 @@ int lua_cocos2dx_RepeatForever_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.RepeatForever",(cocos2d::RepeatForever*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.RepeatForever:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -21251,10 +24053,10 @@ int lua_cocos2dx_RotateTo_create(lua_State* tolua_S) if (argc == 2) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.RotateTo:create"); if (!ok) { break; } double arg1; - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.RotateTo:create"); if (!ok) { break; } cocos2d::RotateTo* ret = cocos2d::RotateTo::create(arg0, arg1); object_to_luaval(tolua_S, "cc.RotateTo",(cocos2d::RotateTo*)ret); @@ -21267,13 +24069,13 @@ int lua_cocos2dx_RotateTo_create(lua_State* tolua_S) if (argc == 3) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.RotateTo:create"); if (!ok) { break; } double arg1; - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.RotateTo:create"); if (!ok) { break; } double arg2; - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.RotateTo:create"); if (!ok) { break; } cocos2d::RotateTo* ret = cocos2d::RotateTo::create(arg0, arg1, arg2); object_to_luaval(tolua_S, "cc.RotateTo",(cocos2d::RotateTo*)ret); @@ -21281,7 +24083,23 @@ int lua_cocos2dx_RotateTo_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 3); + do + { + if (argc == 2) + { + double arg0; + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.RotateTo:create"); + if (!ok) { break; } + cocos2d::Vec3 arg1; + ok &= luaval_to_vec3(tolua_S, 3, &arg1, "cc.RotateTo:create"); + if (!ok) { break; } + cocos2d::RotateTo* ret = cocos2d::RotateTo::create(arg0, arg1); + object_to_luaval(tolua_S, "cc.RotateTo",(cocos2d::RotateTo*)ret); + return 1; + } + } while (0); + ok = true; + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.RotateTo:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -21328,13 +24146,13 @@ int lua_cocos2dx_RotateBy_create(lua_State* tolua_S) if (argc == 3) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.RotateBy:create"); if (!ok) { break; } double arg1; - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.RotateBy:create"); if (!ok) { break; } double arg2; - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.RotateBy:create"); if (!ok) { break; } cocos2d::RotateBy* ret = cocos2d::RotateBy::create(arg0, arg1, arg2); object_to_luaval(tolua_S, "cc.RotateBy",(cocos2d::RotateBy*)ret); @@ -21347,10 +24165,10 @@ int lua_cocos2dx_RotateBy_create(lua_State* tolua_S) if (argc == 2) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.RotateBy:create"); if (!ok) { break; } double arg1; - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.RotateBy:create"); if (!ok) { break; } cocos2d::RotateBy* ret = cocos2d::RotateBy::create(arg0, arg1); object_to_luaval(tolua_S, "cc.RotateBy",(cocos2d::RotateBy*)ret); @@ -21363,10 +24181,10 @@ int lua_cocos2dx_RotateBy_create(lua_State* tolua_S) if (argc == 2) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.RotateBy:create"); if (!ok) { break; } cocos2d::Vec3 arg1; - ok &= luaval_to_vec3(tolua_S, 3, &arg1); + ok &= luaval_to_vec3(tolua_S, 3, &arg1, "cc.RotateBy:create"); if (!ok) { break; } cocos2d::RotateBy* ret = cocos2d::RotateBy::create(arg0, arg1); object_to_luaval(tolua_S, "cc.RotateBy",(cocos2d::RotateBy*)ret); @@ -21374,7 +24192,7 @@ int lua_cocos2dx_RotateBy_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.RotateBy:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -21421,15 +24239,15 @@ int lua_cocos2dx_MoveBy_create(lua_State* tolua_S) { double arg0; cocos2d::Vec2 arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); - ok &= luaval_to_vec2(tolua_S, 3, &arg1); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.MoveBy:create"); + ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.MoveBy:create"); if(!ok) return 0; cocos2d::MoveBy* ret = cocos2d::MoveBy::create(arg0, arg1); object_to_luaval(tolua_S, "cc.MoveBy",(cocos2d::MoveBy*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.MoveBy:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -21476,15 +24294,15 @@ int lua_cocos2dx_MoveTo_create(lua_State* tolua_S) { double arg0; cocos2d::Vec2 arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); - ok &= luaval_to_vec2(tolua_S, 3, &arg1); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.MoveTo:create"); + ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.MoveTo:create"); if(!ok) return 0; cocos2d::MoveTo* ret = cocos2d::MoveTo::create(arg0, arg1); object_to_luaval(tolua_S, "cc.MoveTo",(cocos2d::MoveTo*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.MoveTo:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -21532,16 +24350,16 @@ int lua_cocos2dx_SkewTo_create(lua_State* tolua_S) double arg0; double arg1; double arg2; - ok &= luaval_to_number(tolua_S, 2,&arg0); - ok &= luaval_to_number(tolua_S, 3,&arg1); - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.SkewTo:create"); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.SkewTo:create"); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.SkewTo:create"); if(!ok) return 0; cocos2d::SkewTo* ret = cocos2d::SkewTo::create(arg0, arg1, arg2); object_to_luaval(tolua_S, "cc.SkewTo",(cocos2d::SkewTo*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.SkewTo:create",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -21589,16 +24407,16 @@ int lua_cocos2dx_SkewBy_create(lua_State* tolua_S) double arg0; double arg1; double arg2; - ok &= luaval_to_number(tolua_S, 2,&arg0); - ok &= luaval_to_number(tolua_S, 3,&arg1); - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.SkewBy:create"); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.SkewBy:create"); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.SkewBy:create"); if(!ok) return 0; cocos2d::SkewBy* ret = cocos2d::SkewBy::create(arg0, arg1, arg2); object_to_luaval(tolua_S, "cc.SkewBy",(cocos2d::SkewBy*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.SkewBy:create",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -21647,17 +24465,17 @@ int lua_cocos2dx_JumpBy_create(lua_State* tolua_S) cocos2d::Vec2 arg1; double arg2; int arg3; - ok &= luaval_to_number(tolua_S, 2,&arg0); - ok &= luaval_to_vec2(tolua_S, 3, &arg1); - ok &= luaval_to_number(tolua_S, 4,&arg2); - ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.JumpBy:create"); + ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.JumpBy:create"); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.JumpBy:create"); + ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3, "cc.JumpBy:create"); if(!ok) return 0; cocos2d::JumpBy* ret = cocos2d::JumpBy::create(arg0, arg1, arg2, arg3); object_to_luaval(tolua_S, "cc.JumpBy",(cocos2d::JumpBy*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 4); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.JumpBy:create",argc, 4); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -21706,17 +24524,17 @@ int lua_cocos2dx_JumpTo_create(lua_State* tolua_S) cocos2d::Vec2 arg1; double arg2; int arg3; - ok &= luaval_to_number(tolua_S, 2,&arg0); - ok &= luaval_to_vec2(tolua_S, 3, &arg1); - ok &= luaval_to_number(tolua_S, 4,&arg2); - ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.JumpTo:create"); + ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.JumpTo:create"); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.JumpTo:create"); + ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3, "cc.JumpTo:create"); if(!ok) return 0; cocos2d::JumpTo* ret = cocos2d::JumpTo::create(arg0, arg1, arg2, arg3); object_to_luaval(tolua_S, "cc.JumpTo",(cocos2d::JumpTo*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 4); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.JumpTo:create",argc, 4); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -21801,13 +24619,13 @@ int lua_cocos2dx_ScaleTo_create(lua_State* tolua_S) if (argc == 3) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ScaleTo:create"); if (!ok) { break; } double arg1; - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.ScaleTo:create"); if (!ok) { break; } double arg2; - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.ScaleTo:create"); if (!ok) { break; } cocos2d::ScaleTo* ret = cocos2d::ScaleTo::create(arg0, arg1, arg2); object_to_luaval(tolua_S, "cc.ScaleTo",(cocos2d::ScaleTo*)ret); @@ -21820,10 +24638,10 @@ int lua_cocos2dx_ScaleTo_create(lua_State* tolua_S) if (argc == 2) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ScaleTo:create"); if (!ok) { break; } double arg1; - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.ScaleTo:create"); if (!ok) { break; } cocos2d::ScaleTo* ret = cocos2d::ScaleTo::create(arg0, arg1); object_to_luaval(tolua_S, "cc.ScaleTo",(cocos2d::ScaleTo*)ret); @@ -21836,16 +24654,16 @@ int lua_cocos2dx_ScaleTo_create(lua_State* tolua_S) if (argc == 4) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ScaleTo:create"); if (!ok) { break; } double arg1; - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.ScaleTo:create"); if (!ok) { break; } double arg2; - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.ScaleTo:create"); if (!ok) { break; } double arg3; - ok &= luaval_to_number(tolua_S, 5,&arg3); + ok &= luaval_to_number(tolua_S, 5,&arg3, "cc.ScaleTo:create"); if (!ok) { break; } cocos2d::ScaleTo* ret = cocos2d::ScaleTo::create(arg0, arg1, arg2, arg3); object_to_luaval(tolua_S, "cc.ScaleTo",(cocos2d::ScaleTo*)ret); @@ -21853,7 +24671,7 @@ int lua_cocos2dx_ScaleTo_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 4); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.ScaleTo:create",argc, 4); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -21900,13 +24718,13 @@ int lua_cocos2dx_ScaleBy_create(lua_State* tolua_S) if (argc == 3) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ScaleBy:create"); if (!ok) { break; } double arg1; - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.ScaleBy:create"); if (!ok) { break; } double arg2; - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.ScaleBy:create"); if (!ok) { break; } cocos2d::ScaleBy* ret = cocos2d::ScaleBy::create(arg0, arg1, arg2); object_to_luaval(tolua_S, "cc.ScaleBy",(cocos2d::ScaleBy*)ret); @@ -21919,10 +24737,10 @@ int lua_cocos2dx_ScaleBy_create(lua_State* tolua_S) if (argc == 2) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ScaleBy:create"); if (!ok) { break; } double arg1; - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.ScaleBy:create"); if (!ok) { break; } cocos2d::ScaleBy* ret = cocos2d::ScaleBy::create(arg0, arg1); object_to_luaval(tolua_S, "cc.ScaleBy",(cocos2d::ScaleBy*)ret); @@ -21935,16 +24753,16 @@ int lua_cocos2dx_ScaleBy_create(lua_State* tolua_S) if (argc == 4) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ScaleBy:create"); if (!ok) { break; } double arg1; - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.ScaleBy:create"); if (!ok) { break; } double arg2; - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.ScaleBy:create"); if (!ok) { break; } double arg3; - ok &= luaval_to_number(tolua_S, 5,&arg3); + ok &= luaval_to_number(tolua_S, 5,&arg3, "cc.ScaleBy:create"); if (!ok) { break; } cocos2d::ScaleBy* ret = cocos2d::ScaleBy::create(arg0, arg1, arg2, arg3); object_to_luaval(tolua_S, "cc.ScaleBy",(cocos2d::ScaleBy*)ret); @@ -21952,7 +24770,7 @@ int lua_cocos2dx_ScaleBy_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 4); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.ScaleBy:create",argc, 4); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -21999,15 +24817,15 @@ int lua_cocos2dx_Blink_create(lua_State* tolua_S) { double arg0; int arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Blink:create"); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.Blink:create"); if(!ok) return 0; cocos2d::Blink* ret = cocos2d::Blink::create(arg0, arg1); object_to_luaval(tolua_S, "cc.Blink",(cocos2d::Blink*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.Blink:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -22054,15 +24872,15 @@ int lua_cocos2dx_FadeTo_create(lua_State* tolua_S) { double arg0; uint16_t arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); - ok &= luaval_to_uint16(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.FadeTo:create"); + ok &= luaval_to_uint16(tolua_S, 3,&arg1, "cc.FadeTo:create"); if(!ok) return 0; cocos2d::FadeTo* ret = cocos2d::FadeTo::create(arg0, arg1); object_to_luaval(tolua_S, "cc.FadeTo",(cocos2d::FadeTo*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.FadeTo:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -22126,7 +24944,7 @@ int lua_cocos2dx_FadeIn_setReverseAction(lua_State* tolua_S) cobj->setReverseAction(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setReverseAction",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.FadeIn:setReverseAction",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -22154,14 +24972,14 @@ int lua_cocos2dx_FadeIn_create(lua_State* tolua_S) if (argc == 1) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.FadeIn:create"); if(!ok) return 0; cocos2d::FadeIn* ret = cocos2d::FadeIn::create(arg0); object_to_luaval(tolua_S, "cc.FadeIn",(cocos2d::FadeIn*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.FadeIn:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -22226,7 +25044,7 @@ int lua_cocos2dx_FadeOut_setReverseAction(lua_State* tolua_S) cobj->setReverseAction(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setReverseAction",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.FadeOut:setReverseAction",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -22254,14 +25072,14 @@ int lua_cocos2dx_FadeOut_create(lua_State* tolua_S) if (argc == 1) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.FadeOut:create"); if(!ok) return 0; cocos2d::FadeOut* ret = cocos2d::FadeOut::create(arg0); object_to_luaval(tolua_S, "cc.FadeOut",(cocos2d::FadeOut*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.FadeOut:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -22311,17 +25129,17 @@ int lua_cocos2dx_TintTo_create(lua_State* tolua_S) uint16_t arg1; uint16_t arg2; uint16_t arg3; - ok &= luaval_to_number(tolua_S, 2,&arg0); - ok &= luaval_to_uint16(tolua_S, 3,&arg1); - ok &= luaval_to_uint16(tolua_S, 4,&arg2); - ok &= luaval_to_uint16(tolua_S, 5,&arg3); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TintTo:create"); + ok &= luaval_to_uint16(tolua_S, 3,&arg1, "cc.TintTo:create"); + ok &= luaval_to_uint16(tolua_S, 4,&arg2, "cc.TintTo:create"); + ok &= luaval_to_uint16(tolua_S, 5,&arg3, "cc.TintTo:create"); if(!ok) return 0; cocos2d::TintTo* ret = cocos2d::TintTo::create(arg0, arg1, arg2, arg3); object_to_luaval(tolua_S, "cc.TintTo",(cocos2d::TintTo*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 4); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.TintTo:create",argc, 4); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -22370,17 +25188,17 @@ int lua_cocos2dx_TintBy_create(lua_State* tolua_S) int32_t arg1; int32_t arg2; int32_t arg3; - ok &= luaval_to_number(tolua_S, 2,&arg0); - ok &= luaval_to_int32(tolua_S, 3,&arg1); - ok &= luaval_to_int32(tolua_S, 4,&arg2); - ok &= luaval_to_int32(tolua_S, 5,&arg3); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TintBy:create"); + ok &= luaval_to_int32(tolua_S, 3,&arg1, "cc.TintBy:create"); + ok &= luaval_to_int32(tolua_S, 4,&arg2, "cc.TintBy:create"); + ok &= luaval_to_int32(tolua_S, 5,&arg3, "cc.TintBy:create"); if(!ok) return 0; cocos2d::TintBy* ret = cocos2d::TintBy::create(arg0, arg1, arg2, arg3); object_to_luaval(tolua_S, "cc.TintBy",(cocos2d::TintBy*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 4); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.TintBy:create",argc, 4); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -22426,14 +25244,14 @@ int lua_cocos2dx_DelayTime_create(lua_State* tolua_S) if (argc == 1) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.DelayTime:create"); if(!ok) return 0; cocos2d::DelayTime* ret = cocos2d::DelayTime::create(arg0); object_to_luaval(tolua_S, "cc.DelayTime",(cocos2d::DelayTime*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.DelayTime:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -22498,7 +25316,7 @@ int lua_cocos2dx_Animate_getAnimation(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAnimation",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Animate:getAnimation",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -22544,7 +25362,7 @@ int lua_cocos2dx_Animate_setAnimation(lua_State* tolua_S) cobj->setAnimation(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAnimation",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Animate:setAnimation",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -22579,7 +25397,7 @@ int lua_cocos2dx_Animate_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Animate",(cocos2d::Animate*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.Animate:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -22646,7 +25464,7 @@ int lua_cocos2dx_TargetedAction_getForcedTarget(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getForcedTarget",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TargetedAction:getForcedTarget",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -22692,7 +25510,7 @@ int lua_cocos2dx_TargetedAction_setForcedTarget(lua_State* tolua_S) cobj->setForcedTarget(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setForcedTarget",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TargetedAction:setForcedTarget",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -22729,7 +25547,7 @@ int lua_cocos2dx_TargetedAction_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.TargetedAction",(cocos2d::TargetedAction*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.TargetedAction:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -22783,15 +25601,15 @@ int lua_cocos2dx_ActionCamera_setEye(lua_State* tolua_S) do{ if (argc == 3) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ActionCamera:setEye"); if (!ok) { break; } double arg1; - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.ActionCamera:setEye"); if (!ok) { break; } double arg2; - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.ActionCamera:setEye"); if (!ok) { break; } cobj->setEye(arg0, arg1, arg2); @@ -22802,7 +25620,7 @@ int lua_cocos2dx_ActionCamera_setEye(lua_State* tolua_S) do{ if (argc == 1) { cocos2d::Vec3 arg0; - ok &= luaval_to_vec3(tolua_S, 2, &arg0); + ok &= luaval_to_vec3(tolua_S, 2, &arg0, "cc.ActionCamera:setEye"); if (!ok) { break; } cobj->setEye(arg0); @@ -22810,7 +25628,7 @@ int lua_cocos2dx_ActionCamera_setEye(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setEye",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ActionCamera:setEye",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -22854,7 +25672,7 @@ int lua_cocos2dx_ActionCamera_getEye(lua_State* tolua_S) vec3_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getEye",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ActionCamera:getEye",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -22894,13 +25712,13 @@ int lua_cocos2dx_ActionCamera_setUp(lua_State* tolua_S) { cocos2d::Vec3 arg0; - ok &= luaval_to_vec3(tolua_S, 2, &arg0); + ok &= luaval_to_vec3(tolua_S, 2, &arg0, "cc.ActionCamera:setUp"); if(!ok) return 0; cobj->setUp(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setUp",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ActionCamera:setUp",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -22944,7 +25762,7 @@ int lua_cocos2dx_ActionCamera_getCenter(lua_State* tolua_S) vec3_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getCenter",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ActionCamera:getCenter",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -22984,13 +25802,13 @@ int lua_cocos2dx_ActionCamera_setCenter(lua_State* tolua_S) { cocos2d::Vec3 arg0; - ok &= luaval_to_vec3(tolua_S, 2, &arg0); + ok &= luaval_to_vec3(tolua_S, 2, &arg0, "cc.ActionCamera:setCenter"); if(!ok) return 0; cobj->setCenter(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setCenter",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ActionCamera:setCenter",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -23034,7 +25852,7 @@ int lua_cocos2dx_ActionCamera_getUp(lua_State* tolua_S) vec3_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getUp",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ActionCamera:getUp",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -23068,7 +25886,7 @@ int lua_cocos2dx_ActionCamera_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.ActionCamera"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ActionCamera",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ActionCamera:ActionCamera",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -23128,20 +25946,20 @@ int lua_cocos2dx_OrbitCamera_create(lua_State* tolua_S) double arg4; double arg5; double arg6; - ok &= luaval_to_number(tolua_S, 2,&arg0); - ok &= luaval_to_number(tolua_S, 3,&arg1); - ok &= luaval_to_number(tolua_S, 4,&arg2); - ok &= luaval_to_number(tolua_S, 5,&arg3); - ok &= luaval_to_number(tolua_S, 6,&arg4); - ok &= luaval_to_number(tolua_S, 7,&arg5); - ok &= luaval_to_number(tolua_S, 8,&arg6); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.OrbitCamera:create"); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.OrbitCamera:create"); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.OrbitCamera:create"); + ok &= luaval_to_number(tolua_S, 5,&arg3, "cc.OrbitCamera:create"); + ok &= luaval_to_number(tolua_S, 6,&arg4, "cc.OrbitCamera:create"); + ok &= luaval_to_number(tolua_S, 7,&arg5, "cc.OrbitCamera:create"); + ok &= luaval_to_number(tolua_S, 8,&arg6, "cc.OrbitCamera:create"); if(!ok) return 0; cocos2d::OrbitCamera* ret = cocos2d::OrbitCamera::create(arg0, arg1, arg2, arg3, arg4, arg5, arg6); object_to_luaval(tolua_S, "cc.OrbitCamera",(cocos2d::OrbitCamera*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 7); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.OrbitCamera:create",argc, 7); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -23200,7 +26018,7 @@ int lua_cocos2dx_ActionManager_getActionByTag(lua_State* tolua_S) int arg0; const cocos2d::Node* arg1; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.ActionManager:getActionByTag"); ok &= luaval_to_object(tolua_S, 3, "cc.Node",&arg1); if(!ok) @@ -23209,7 +26027,7 @@ int lua_cocos2dx_ActionManager_getActionByTag(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Action",(cocos2d::Action*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getActionByTag",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ActionManager:getActionByTag",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -23250,7 +26068,7 @@ int lua_cocos2dx_ActionManager_removeActionByTag(lua_State* tolua_S) int arg0; cocos2d::Node* arg1; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.ActionManager:removeActionByTag"); ok &= luaval_to_object(tolua_S, 3, "cc.Node",&arg1); if(!ok) @@ -23258,7 +26076,7 @@ int lua_cocos2dx_ActionManager_removeActionByTag(lua_State* tolua_S) cobj->removeActionByTag(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeActionByTag",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ActionManager:removeActionByTag",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -23301,7 +26119,7 @@ int lua_cocos2dx_ActionManager_removeAllActions(lua_State* tolua_S) cobj->removeAllActions(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeAllActions",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ActionManager:removeAllActions",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -23347,13 +26165,13 @@ int lua_cocos2dx_ActionManager_addAction(lua_State* tolua_S) ok &= luaval_to_object(tolua_S, 3, "cc.Node",&arg1); - ok &= luaval_to_boolean(tolua_S, 4,&arg2); + ok &= luaval_to_boolean(tolua_S, 4,&arg2, "cc.ActionManager:addAction"); if(!ok) return 0; cobj->addAction(arg0, arg1, arg2); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addAction",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ActionManager:addAction",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 @@ -23399,7 +26217,7 @@ int lua_cocos2dx_ActionManager_resumeTarget(lua_State* tolua_S) cobj->resumeTarget(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "resumeTarget",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ActionManager:resumeTarget",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -23439,13 +26257,13 @@ int lua_cocos2dx_ActionManager_update(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ActionManager:update"); if(!ok) return 0; cobj->update(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "update",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ActionManager:update",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -23492,7 +26310,7 @@ int lua_cocos2dx_ActionManager_getNumberOfRunningActionsInTarget(lua_State* tolu tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getNumberOfRunningActionsInTarget",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ActionManager:getNumberOfRunningActionsInTarget",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -23538,7 +26356,7 @@ int lua_cocos2dx_ActionManager_removeAllActionsFromTarget(lua_State* tolua_S) cobj->removeAllActionsFromTarget(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeAllActionsFromTarget",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ActionManager:removeAllActionsFromTarget",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -23578,13 +26396,13 @@ int lua_cocos2dx_ActionManager_resumeTargets(lua_State* tolua_S) { cocos2d::Vector arg0; - ok &= luaval_to_ccvector(tolua_S, 2, &arg0); + ok &= luaval_to_ccvector(tolua_S, 2, &arg0, "cc.ActionManager:resumeTargets"); if(!ok) return 0; cobj->resumeTargets(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "resumeTargets",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ActionManager:resumeTargets",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -23630,7 +26448,7 @@ int lua_cocos2dx_ActionManager_removeAction(lua_State* tolua_S) cobj->removeAction(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeAction",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ActionManager:removeAction",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -23676,7 +26494,7 @@ int lua_cocos2dx_ActionManager_pauseTarget(lua_State* tolua_S) cobj->pauseTarget(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "pauseTarget",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ActionManager:pauseTarget",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -23720,7 +26538,7 @@ int lua_cocos2dx_ActionManager_pauseAllRunningActions(lua_State* tolua_S) ccvector_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "pauseAllRunningActions",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ActionManager:pauseAllRunningActions",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -23754,7 +26572,7 @@ int lua_cocos2dx_ActionManager_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.ActionManager"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ActionManager",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ActionManager:ActionManager",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -23830,7 +26648,7 @@ int lua_cocos2dx_ActionEase_getInnerAction(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.ActionInterval",(cocos2d::ActionInterval*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getInnerAction",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ActionEase:getInnerAction",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -23890,13 +26708,13 @@ int lua_cocos2dx_EaseRateAction_setRate(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.EaseRateAction:setRate"); if(!ok) return 0; cobj->setRate(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setRate",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EaseRateAction:setRate",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -23940,7 +26758,7 @@ int lua_cocos2dx_EaseRateAction_getRate(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getRate",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EaseRateAction:getRate",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -23991,14 +26809,14 @@ int lua_cocos2dx_EaseIn_create(lua_State* tolua_S) cocos2d::ActionInterval* arg0; double arg1; ok &= luaval_to_object(tolua_S, 2, "cc.ActionInterval",&arg0); - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.EaseIn:create"); if(!ok) return 0; cocos2d::EaseIn* ret = cocos2d::EaseIn::create(arg0, arg1); object_to_luaval(tolua_S, "cc.EaseIn",(cocos2d::EaseIn*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.EaseIn:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -24046,14 +26864,14 @@ int lua_cocos2dx_EaseOut_create(lua_State* tolua_S) cocos2d::ActionInterval* arg0; double arg1; ok &= luaval_to_object(tolua_S, 2, "cc.ActionInterval",&arg0); - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.EaseOut:create"); if(!ok) return 0; cocos2d::EaseOut* ret = cocos2d::EaseOut::create(arg0, arg1); object_to_luaval(tolua_S, "cc.EaseOut",(cocos2d::EaseOut*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.EaseOut:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -24101,14 +26919,14 @@ int lua_cocos2dx_EaseInOut_create(lua_State* tolua_S) cocos2d::ActionInterval* arg0; double arg1; ok &= luaval_to_object(tolua_S, 2, "cc.ActionInterval",&arg0); - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.EaseInOut:create"); if(!ok) return 0; cocos2d::EaseInOut* ret = cocos2d::EaseInOut::create(arg0, arg1); object_to_luaval(tolua_S, "cc.EaseInOut",(cocos2d::EaseInOut*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.EaseInOut:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -24161,7 +26979,7 @@ int lua_cocos2dx_EaseExponentialIn_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.EaseExponentialIn",(cocos2d::EaseExponentialIn*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.EaseExponentialIn:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -24214,7 +27032,7 @@ int lua_cocos2dx_EaseExponentialOut_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.EaseExponentialOut",(cocos2d::EaseExponentialOut*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.EaseExponentialOut:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -24267,7 +27085,7 @@ int lua_cocos2dx_EaseExponentialInOut_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.EaseExponentialInOut",(cocos2d::EaseExponentialInOut*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.EaseExponentialInOut:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -24320,7 +27138,7 @@ int lua_cocos2dx_EaseSineIn_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.EaseSineIn",(cocos2d::EaseSineIn*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.EaseSineIn:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -24373,7 +27191,7 @@ int lua_cocos2dx_EaseSineOut_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.EaseSineOut",(cocos2d::EaseSineOut*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.EaseSineOut:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -24426,7 +27244,7 @@ int lua_cocos2dx_EaseSineInOut_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.EaseSineInOut",(cocos2d::EaseSineInOut*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.EaseSineInOut:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -24484,13 +27302,13 @@ int lua_cocos2dx_EaseElastic_setPeriod(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.EaseElastic:setPeriod"); if(!ok) return 0; cobj->setPeriod(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setPeriod",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EaseElastic:setPeriod",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -24534,7 +27352,7 @@ int lua_cocos2dx_EaseElastic_getPeriod(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPeriod",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EaseElastic:getPeriod",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -24600,7 +27418,7 @@ int lua_cocos2dx_EaseElasticIn_create(lua_State* tolua_S) ok &= luaval_to_object(tolua_S, 2, "cc.ActionInterval",&arg0); if (!ok) { break; } double arg1; - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.EaseElasticIn:create"); if (!ok) { break; } cocos2d::EaseElasticIn* ret = cocos2d::EaseElasticIn::create(arg0, arg1); object_to_luaval(tolua_S, "cc.EaseElasticIn",(cocos2d::EaseElasticIn*)ret); @@ -24608,7 +27426,7 @@ int lua_cocos2dx_EaseElasticIn_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.EaseElasticIn:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -24671,7 +27489,7 @@ int lua_cocos2dx_EaseElasticOut_create(lua_State* tolua_S) ok &= luaval_to_object(tolua_S, 2, "cc.ActionInterval",&arg0); if (!ok) { break; } double arg1; - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.EaseElasticOut:create"); if (!ok) { break; } cocos2d::EaseElasticOut* ret = cocos2d::EaseElasticOut::create(arg0, arg1); object_to_luaval(tolua_S, "cc.EaseElasticOut",(cocos2d::EaseElasticOut*)ret); @@ -24679,7 +27497,7 @@ int lua_cocos2dx_EaseElasticOut_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.EaseElasticOut:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -24742,7 +27560,7 @@ int lua_cocos2dx_EaseElasticInOut_create(lua_State* tolua_S) ok &= luaval_to_object(tolua_S, 2, "cc.ActionInterval",&arg0); if (!ok) { break; } double arg1; - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.EaseElasticInOut:create"); if (!ok) { break; } cocos2d::EaseElasticInOut* ret = cocos2d::EaseElasticInOut::create(arg0, arg1); object_to_luaval(tolua_S, "cc.EaseElasticInOut",(cocos2d::EaseElasticInOut*)ret); @@ -24750,7 +27568,7 @@ int lua_cocos2dx_EaseElasticInOut_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.EaseElasticInOut:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -24822,7 +27640,7 @@ int lua_cocos2dx_EaseBounceIn_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.EaseBounceIn",(cocos2d::EaseBounceIn*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.EaseBounceIn:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -24875,7 +27693,7 @@ int lua_cocos2dx_EaseBounceOut_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.EaseBounceOut",(cocos2d::EaseBounceOut*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.EaseBounceOut:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -24928,7 +27746,7 @@ int lua_cocos2dx_EaseBounceInOut_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.EaseBounceInOut",(cocos2d::EaseBounceInOut*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.EaseBounceInOut:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -24981,7 +27799,7 @@ int lua_cocos2dx_EaseBackIn_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.EaseBackIn",(cocos2d::EaseBackIn*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.EaseBackIn:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -25034,7 +27852,7 @@ int lua_cocos2dx_EaseBackOut_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.EaseBackOut",(cocos2d::EaseBackOut*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.EaseBackOut:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -25087,7 +27905,7 @@ int lua_cocos2dx_EaseBackInOut_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.EaseBackInOut",(cocos2d::EaseBackInOut*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.EaseBackInOut:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -25148,19 +27966,19 @@ int lua_cocos2dx_EaseBezierAction_setBezierParamer(lua_State* tolua_S) double arg2; double arg3; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.EaseBezierAction:setBezierParamer"); - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.EaseBezierAction:setBezierParamer"); - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.EaseBezierAction:setBezierParamer"); - ok &= luaval_to_number(tolua_S, 5,&arg3); + ok &= luaval_to_number(tolua_S, 5,&arg3, "cc.EaseBezierAction:setBezierParamer"); if(!ok) return 0; cobj->setBezierParamer(arg0, arg1, arg2, arg3); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setBezierParamer",argc, 4); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EaseBezierAction:setBezierParamer",argc, 4); return 0; #if COCOS2D_DEBUG >= 1 @@ -25195,7 +28013,7 @@ int lua_cocos2dx_EaseBezierAction_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.EaseBezierAction",(cocos2d::EaseBezierAction*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.EaseBezierAction:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -25249,7 +28067,7 @@ int lua_cocos2dx_EaseQuadraticActionIn_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.EaseQuadraticActionIn",(cocos2d::EaseQuadraticActionIn*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.EaseQuadraticActionIn:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -25302,7 +28120,7 @@ int lua_cocos2dx_EaseQuadraticActionOut_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.EaseQuadraticActionOut",(cocos2d::EaseQuadraticActionOut*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.EaseQuadraticActionOut:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -25355,7 +28173,7 @@ int lua_cocos2dx_EaseQuadraticActionInOut_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.EaseQuadraticActionInOut",(cocos2d::EaseQuadraticActionInOut*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.EaseQuadraticActionInOut:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -25408,7 +28226,7 @@ int lua_cocos2dx_EaseQuarticActionIn_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.EaseQuarticActionIn",(cocos2d::EaseQuarticActionIn*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.EaseQuarticActionIn:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -25461,7 +28279,7 @@ int lua_cocos2dx_EaseQuarticActionOut_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.EaseQuarticActionOut",(cocos2d::EaseQuarticActionOut*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.EaseQuarticActionOut:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -25514,7 +28332,7 @@ int lua_cocos2dx_EaseQuarticActionInOut_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.EaseQuarticActionInOut",(cocos2d::EaseQuarticActionInOut*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.EaseQuarticActionInOut:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -25567,7 +28385,7 @@ int lua_cocos2dx_EaseQuinticActionIn_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.EaseQuinticActionIn",(cocos2d::EaseQuinticActionIn*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.EaseQuinticActionIn:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -25620,7 +28438,7 @@ int lua_cocos2dx_EaseQuinticActionOut_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.EaseQuinticActionOut",(cocos2d::EaseQuinticActionOut*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.EaseQuinticActionOut:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -25673,7 +28491,7 @@ int lua_cocos2dx_EaseQuinticActionInOut_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.EaseQuinticActionInOut",(cocos2d::EaseQuinticActionInOut*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.EaseQuinticActionInOut:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -25726,7 +28544,7 @@ int lua_cocos2dx_EaseCircleActionIn_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.EaseCircleActionIn",(cocos2d::EaseCircleActionIn*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.EaseCircleActionIn:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -25779,7 +28597,7 @@ int lua_cocos2dx_EaseCircleActionOut_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.EaseCircleActionOut",(cocos2d::EaseCircleActionOut*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.EaseCircleActionOut:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -25832,7 +28650,7 @@ int lua_cocos2dx_EaseCircleActionInOut_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.EaseCircleActionInOut",(cocos2d::EaseCircleActionInOut*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.EaseCircleActionInOut:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -25885,7 +28703,7 @@ int lua_cocos2dx_EaseCubicActionIn_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.EaseCubicActionIn",(cocos2d::EaseCubicActionIn*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.EaseCubicActionIn:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -25938,7 +28756,7 @@ int lua_cocos2dx_EaseCubicActionOut_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.EaseCubicActionOut",(cocos2d::EaseCubicActionOut*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.EaseCubicActionOut:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -25991,7 +28809,7 @@ int lua_cocos2dx_EaseCubicActionInOut_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.EaseCubicActionInOut",(cocos2d::EaseCubicActionInOut*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.EaseCubicActionInOut:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -26061,7 +28879,7 @@ int lua_cocos2dx_Show_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Show",(cocos2d::Show*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.Show:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -26112,7 +28930,7 @@ int lua_cocos2dx_Hide_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Hide",(cocos2d::Hide*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.Hide:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -26163,7 +28981,7 @@ int lua_cocos2dx_ToggleVisibility_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.ToggleVisibility",(cocos2d::ToggleVisibility*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.ToggleVisibility:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -26217,14 +29035,14 @@ int lua_cocos2dx_RemoveSelf_create(lua_State* tolua_S) if (argc == 1) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.RemoveSelf:create"); if(!ok) return 0; cocos2d::RemoveSelf* ret = cocos2d::RemoveSelf::create(arg0); object_to_luaval(tolua_S, "cc.RemoveSelf",(cocos2d::RemoveSelf*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.RemoveSelf:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -26270,14 +29088,14 @@ int lua_cocos2dx_FlipX_create(lua_State* tolua_S) if (argc == 1) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.FlipX:create"); if(!ok) return 0; cocos2d::FlipX* ret = cocos2d::FlipX::create(arg0); object_to_luaval(tolua_S, "cc.FlipX",(cocos2d::FlipX*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.FlipX:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -26323,14 +29141,14 @@ int lua_cocos2dx_FlipY_create(lua_State* tolua_S) if (argc == 1) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.FlipY:create"); if(!ok) return 0; cocos2d::FlipY* ret = cocos2d::FlipY::create(arg0); object_to_luaval(tolua_S, "cc.FlipY",(cocos2d::FlipY*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.FlipY:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -26376,14 +29194,14 @@ int lua_cocos2dx_Place_create(lua_State* tolua_S) if (argc == 1) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.Place:create"); if(!ok) return 0; cocos2d::Place* ret = cocos2d::Place::create(arg0); object_to_luaval(tolua_S, "cc.Place",(cocos2d::Place*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.Place:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -26444,7 +29262,7 @@ int lua_cocos2dx_CallFunc_execute(lua_State* tolua_S) cobj->execute(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "execute",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CallFunc:execute",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -26488,7 +29306,7 @@ int lua_cocos2dx_CallFunc_getTargetCallback(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Ref",(cocos2d::Ref*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTargetCallback",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CallFunc:getTargetCallback",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -26534,7 +29352,7 @@ int lua_cocos2dx_CallFunc_setTargetCallback(lua_State* tolua_S) cobj->setTargetCallback(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTargetCallback",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CallFunc:setTargetCallback",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -26600,7 +29418,7 @@ int lua_cocos2dx_GridAction_getGrid(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.GridBase",(cocos2d::GridBase*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getGrid",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GridAction:getGrid",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -26664,7 +29482,7 @@ int lua_cocos2dx_Grid3DAction_getGrid(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.GridBase",(cocos2d::GridBase*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getGrid",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Grid3DAction:getGrid",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -26728,7 +29546,7 @@ int lua_cocos2dx_TiledGrid3DAction_getGrid(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.GridBase",(cocos2d::GridBase*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getGrid",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TiledGrid3DAction:getGrid",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -26781,7 +29599,7 @@ int lua_cocos2dx_StopGrid_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.StopGrid",(cocos2d::StopGrid*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.StopGrid:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -26827,14 +29645,14 @@ int lua_cocos2dx_ReuseGrid_create(lua_State* tolua_S) if (argc == 1) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.ReuseGrid:create"); if(!ok) return 0; cocos2d::ReuseGrid* ret = cocos2d::ReuseGrid::create(arg0); object_to_luaval(tolua_S, "cc.ReuseGrid",(cocos2d::ReuseGrid*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.ReuseGrid:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -26896,7 +29714,7 @@ int lua_cocos2dx_Waves3D_getAmplitudeRate(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAmplitudeRate",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Waves3D:getAmplitudeRate",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -26936,13 +29754,13 @@ int lua_cocos2dx_Waves3D_setAmplitude(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Waves3D:setAmplitude"); if(!ok) return 0; cobj->setAmplitude(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAmplitude",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Waves3D:setAmplitude",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -26982,13 +29800,13 @@ int lua_cocos2dx_Waves3D_setAmplitudeRate(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Waves3D:setAmplitudeRate"); if(!ok) return 0; cobj->setAmplitudeRate(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAmplitudeRate",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Waves3D:setAmplitudeRate",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -27032,7 +29850,7 @@ int lua_cocos2dx_Waves3D_getAmplitude(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAmplitude",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Waves3D:getAmplitude",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -27063,17 +29881,17 @@ int lua_cocos2dx_Waves3D_create(lua_State* tolua_S) cocos2d::Size arg1; unsigned int arg2; double arg3; - ok &= luaval_to_number(tolua_S, 2,&arg0); - ok &= luaval_to_size(tolua_S, 3, &arg1); - ok &= luaval_to_uint32(tolua_S, 4,&arg2); - ok &= luaval_to_number(tolua_S, 5,&arg3); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Waves3D:create"); + ok &= luaval_to_size(tolua_S, 3, &arg1, "cc.Waves3D:create"); + ok &= luaval_to_uint32(tolua_S, 4,&arg2, "cc.Waves3D:create"); + ok &= luaval_to_number(tolua_S, 5,&arg3, "cc.Waves3D:create"); if(!ok) return 0; cocos2d::Waves3D* ret = cocos2d::Waves3D::create(arg0, arg1, arg2, arg3); object_to_luaval(tolua_S, "cc.Waves3D",(cocos2d::Waves3D*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 4); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.Waves3D:create",argc, 4); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -27123,14 +29941,14 @@ int lua_cocos2dx_FlipX3D_create(lua_State* tolua_S) if (argc == 1) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.FlipX3D:create"); if(!ok) return 0; cocos2d::FlipX3D* ret = cocos2d::FlipX3D::create(arg0); object_to_luaval(tolua_S, "cc.FlipX3D",(cocos2d::FlipX3D*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.FlipX3D:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -27176,14 +29994,14 @@ int lua_cocos2dx_FlipY3D_create(lua_State* tolua_S) if (argc == 1) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.FlipY3D:create"); if(!ok) return 0; cocos2d::FlipY3D* ret = cocos2d::FlipY3D::create(arg0); object_to_luaval(tolua_S, "cc.FlipY3D",(cocos2d::FlipY3D*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.FlipY3D:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -27241,13 +30059,13 @@ int lua_cocos2dx_Lens3D_setPosition(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.Lens3D:setPosition"); if(!ok) return 0; cobj->setPosition(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setPosition",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Lens3D:setPosition",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -27287,13 +30105,13 @@ int lua_cocos2dx_Lens3D_setConcave(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.Lens3D:setConcave"); if(!ok) return 0; cobj->setConcave(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setConcave",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Lens3D:setConcave",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -27333,13 +30151,13 @@ int lua_cocos2dx_Lens3D_setLensEffect(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Lens3D:setLensEffect"); if(!ok) return 0; cobj->setLensEffect(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setLensEffect",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Lens3D:setLensEffect",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -27383,7 +30201,7 @@ int lua_cocos2dx_Lens3D_getPosition(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPosition",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Lens3D:getPosition",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -27427,7 +30245,7 @@ int lua_cocos2dx_Lens3D_getLensEffect(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getLensEffect",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Lens3D:getLensEffect",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -27458,17 +30276,17 @@ int lua_cocos2dx_Lens3D_create(lua_State* tolua_S) cocos2d::Size arg1; cocos2d::Vec2 arg2; double arg3; - ok &= luaval_to_number(tolua_S, 2,&arg0); - ok &= luaval_to_size(tolua_S, 3, &arg1); - ok &= luaval_to_vec2(tolua_S, 4, &arg2); - ok &= luaval_to_number(tolua_S, 5,&arg3); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Lens3D:create"); + ok &= luaval_to_size(tolua_S, 3, &arg1, "cc.Lens3D:create"); + ok &= luaval_to_vec2(tolua_S, 4, &arg2, "cc.Lens3D:create"); + ok &= luaval_to_number(tolua_S, 5,&arg3, "cc.Lens3D:create"); if(!ok) return 0; cocos2d::Lens3D* ret = cocos2d::Lens3D::create(arg0, arg1, arg2, arg3); object_to_luaval(tolua_S, "cc.Lens3D",(cocos2d::Lens3D*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 4); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.Lens3D:create",argc, 4); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -27531,13 +30349,13 @@ int lua_cocos2dx_Ripple3D_setAmplitudeRate(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Ripple3D:setAmplitudeRate"); if(!ok) return 0; cobj->setAmplitudeRate(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAmplitudeRate",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Ripple3D:setAmplitudeRate",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -27581,7 +30399,7 @@ int lua_cocos2dx_Ripple3D_getAmplitudeRate(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAmplitudeRate",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Ripple3D:getAmplitudeRate",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -27621,13 +30439,13 @@ int lua_cocos2dx_Ripple3D_setAmplitude(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Ripple3D:setAmplitude"); if(!ok) return 0; cobj->setAmplitude(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAmplitude",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Ripple3D:setAmplitude",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -27671,7 +30489,7 @@ int lua_cocos2dx_Ripple3D_getAmplitude(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAmplitude",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Ripple3D:getAmplitude",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -27711,13 +30529,13 @@ int lua_cocos2dx_Ripple3D_setPosition(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.Ripple3D:setPosition"); if(!ok) return 0; cobj->setPosition(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setPosition",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Ripple3D:setPosition",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -27761,7 +30579,7 @@ int lua_cocos2dx_Ripple3D_getPosition(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPosition",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Ripple3D:getPosition",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -27794,19 +30612,19 @@ int lua_cocos2dx_Ripple3D_create(lua_State* tolua_S) double arg3; unsigned int arg4; double arg5; - ok &= luaval_to_number(tolua_S, 2,&arg0); - ok &= luaval_to_size(tolua_S, 3, &arg1); - ok &= luaval_to_vec2(tolua_S, 4, &arg2); - ok &= luaval_to_number(tolua_S, 5,&arg3); - ok &= luaval_to_uint32(tolua_S, 6,&arg4); - ok &= luaval_to_number(tolua_S, 7,&arg5); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Ripple3D:create"); + ok &= luaval_to_size(tolua_S, 3, &arg1, "cc.Ripple3D:create"); + ok &= luaval_to_vec2(tolua_S, 4, &arg2, "cc.Ripple3D:create"); + ok &= luaval_to_number(tolua_S, 5,&arg3, "cc.Ripple3D:create"); + ok &= luaval_to_uint32(tolua_S, 6,&arg4, "cc.Ripple3D:create"); + ok &= luaval_to_number(tolua_S, 7,&arg5, "cc.Ripple3D:create"); if(!ok) return 0; cocos2d::Ripple3D* ret = cocos2d::Ripple3D::create(arg0, arg1, arg2, arg3, arg4, arg5); object_to_luaval(tolua_S, "cc.Ripple3D",(cocos2d::Ripple3D*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 6); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.Ripple3D:create",argc, 6); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -27861,17 +30679,17 @@ int lua_cocos2dx_Shaky3D_create(lua_State* tolua_S) cocos2d::Size arg1; int arg2; bool arg3; - ok &= luaval_to_number(tolua_S, 2,&arg0); - ok &= luaval_to_size(tolua_S, 3, &arg1); - ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2); - ok &= luaval_to_boolean(tolua_S, 5,&arg3); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Shaky3D:create"); + ok &= luaval_to_size(tolua_S, 3, &arg1, "cc.Shaky3D:create"); + ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "cc.Shaky3D:create"); + ok &= luaval_to_boolean(tolua_S, 5,&arg3, "cc.Shaky3D:create"); if(!ok) return 0; cocos2d::Shaky3D* ret = cocos2d::Shaky3D::create(arg0, arg1, arg2, arg3); object_to_luaval(tolua_S, "cc.Shaky3D",(cocos2d::Shaky3D*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 4); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.Shaky3D:create",argc, 4); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -27933,7 +30751,7 @@ int lua_cocos2dx_Liquid_getAmplitudeRate(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAmplitudeRate",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Liquid:getAmplitudeRate",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -27973,13 +30791,13 @@ int lua_cocos2dx_Liquid_setAmplitude(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Liquid:setAmplitude"); if(!ok) return 0; cobj->setAmplitude(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAmplitude",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Liquid:setAmplitude",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -28019,13 +30837,13 @@ int lua_cocos2dx_Liquid_setAmplitudeRate(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Liquid:setAmplitudeRate"); if(!ok) return 0; cobj->setAmplitudeRate(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAmplitudeRate",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Liquid:setAmplitudeRate",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -28069,7 +30887,7 @@ int lua_cocos2dx_Liquid_getAmplitude(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAmplitude",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Liquid:getAmplitude",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -28100,17 +30918,17 @@ int lua_cocos2dx_Liquid_create(lua_State* tolua_S) cocos2d::Size arg1; unsigned int arg2; double arg3; - ok &= luaval_to_number(tolua_S, 2,&arg0); - ok &= luaval_to_size(tolua_S, 3, &arg1); - ok &= luaval_to_uint32(tolua_S, 4,&arg2); - ok &= luaval_to_number(tolua_S, 5,&arg3); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Liquid:create"); + ok &= luaval_to_size(tolua_S, 3, &arg1, "cc.Liquid:create"); + ok &= luaval_to_uint32(tolua_S, 4,&arg2, "cc.Liquid:create"); + ok &= luaval_to_number(tolua_S, 5,&arg3, "cc.Liquid:create"); if(!ok) return 0; cocos2d::Liquid* ret = cocos2d::Liquid::create(arg0, arg1, arg2, arg3); object_to_luaval(tolua_S, "cc.Liquid",(cocos2d::Liquid*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 4); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.Liquid:create",argc, 4); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -28176,7 +30994,7 @@ int lua_cocos2dx_Waves_getAmplitudeRate(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAmplitudeRate",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Waves:getAmplitudeRate",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -28216,13 +31034,13 @@ int lua_cocos2dx_Waves_setAmplitude(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Waves:setAmplitude"); if(!ok) return 0; cobj->setAmplitude(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAmplitude",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Waves:setAmplitude",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -28262,13 +31080,13 @@ int lua_cocos2dx_Waves_setAmplitudeRate(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Waves:setAmplitudeRate"); if(!ok) return 0; cobj->setAmplitudeRate(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAmplitudeRate",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Waves:setAmplitudeRate",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -28312,7 +31130,7 @@ int lua_cocos2dx_Waves_getAmplitude(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAmplitude",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Waves:getAmplitude",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -28345,19 +31163,19 @@ int lua_cocos2dx_Waves_create(lua_State* tolua_S) double arg3; bool arg4; bool arg5; - ok &= luaval_to_number(tolua_S, 2,&arg0); - ok &= luaval_to_size(tolua_S, 3, &arg1); - ok &= luaval_to_uint32(tolua_S, 4,&arg2); - ok &= luaval_to_number(tolua_S, 5,&arg3); - ok &= luaval_to_boolean(tolua_S, 6,&arg4); - ok &= luaval_to_boolean(tolua_S, 7,&arg5); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Waves:create"); + ok &= luaval_to_size(tolua_S, 3, &arg1, "cc.Waves:create"); + ok &= luaval_to_uint32(tolua_S, 4,&arg2, "cc.Waves:create"); + ok &= luaval_to_number(tolua_S, 5,&arg3, "cc.Waves:create"); + ok &= luaval_to_boolean(tolua_S, 6,&arg4, "cc.Waves:create"); + ok &= luaval_to_boolean(tolua_S, 7,&arg5, "cc.Waves:create"); if(!ok) return 0; cocos2d::Waves* ret = cocos2d::Waves::create(arg0, arg1, arg2, arg3, arg4, arg5); object_to_luaval(tolua_S, "cc.Waves",(cocos2d::Waves*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 6); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.Waves:create",argc, 6); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -28419,13 +31237,13 @@ int lua_cocos2dx_Twirl_setAmplitudeRate(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Twirl:setAmplitudeRate"); if(!ok) return 0; cobj->setAmplitudeRate(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAmplitudeRate",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Twirl:setAmplitudeRate",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -28469,7 +31287,7 @@ int lua_cocos2dx_Twirl_getAmplitudeRate(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAmplitudeRate",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Twirl:getAmplitudeRate",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -28509,13 +31327,13 @@ int lua_cocos2dx_Twirl_setAmplitude(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Twirl:setAmplitude"); if(!ok) return 0; cobj->setAmplitude(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAmplitude",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Twirl:setAmplitude",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -28559,7 +31377,7 @@ int lua_cocos2dx_Twirl_getAmplitude(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAmplitude",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Twirl:getAmplitude",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -28599,13 +31417,13 @@ int lua_cocos2dx_Twirl_setPosition(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.Twirl:setPosition"); if(!ok) return 0; cobj->setPosition(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setPosition",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Twirl:setPosition",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -28649,7 +31467,7 @@ int lua_cocos2dx_Twirl_getPosition(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPosition",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Twirl:getPosition",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -28681,18 +31499,18 @@ int lua_cocos2dx_Twirl_create(lua_State* tolua_S) cocos2d::Vec2 arg2; unsigned int arg3; double arg4; - ok &= luaval_to_number(tolua_S, 2,&arg0); - ok &= luaval_to_size(tolua_S, 3, &arg1); - ok &= luaval_to_vec2(tolua_S, 4, &arg2); - ok &= luaval_to_uint32(tolua_S, 5,&arg3); - ok &= luaval_to_number(tolua_S, 6,&arg4); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Twirl:create"); + ok &= luaval_to_size(tolua_S, 3, &arg1, "cc.Twirl:create"); + ok &= luaval_to_vec2(tolua_S, 4, &arg2, "cc.Twirl:create"); + ok &= luaval_to_uint32(tolua_S, 5,&arg3, "cc.Twirl:create"); + ok &= luaval_to_number(tolua_S, 6,&arg4, "cc.Twirl:create"); if(!ok) return 0; cocos2d::Twirl* ret = cocos2d::Twirl::create(arg0, arg1, arg2, arg3, arg4); object_to_luaval(tolua_S, "cc.Twirl",(cocos2d::Twirl*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 5); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.Twirl:create",argc, 5); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -28745,15 +31563,15 @@ int lua_cocos2dx_PageTurn3D_create(lua_State* tolua_S) { double arg0; cocos2d::Size arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); - ok &= luaval_to_size(tolua_S, 3, &arg1); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PageTurn3D:create"); + ok &= luaval_to_size(tolua_S, 3, &arg1, "cc.PageTurn3D:create"); if(!ok) return 0; cocos2d::PageTurn3D* ret = cocos2d::PageTurn3D::create(arg0, arg1); object_to_luaval(tolua_S, "cc.PageTurn3D",(cocos2d::PageTurn3D*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.PageTurn3D:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -28800,15 +31618,15 @@ int lua_cocos2dx_ProgressTo_create(lua_State* tolua_S) { double arg0; double arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ProgressTo:create"); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.ProgressTo:create"); if(!ok) return 0; cocos2d::ProgressTo* ret = cocos2d::ProgressTo::create(arg0, arg1); object_to_luaval(tolua_S, "cc.ProgressTo",(cocos2d::ProgressTo*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.ProgressTo:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -28856,16 +31674,16 @@ int lua_cocos2dx_ProgressFromTo_create(lua_State* tolua_S) double arg0; double arg1; double arg2; - ok &= luaval_to_number(tolua_S, 2,&arg0); - ok &= luaval_to_number(tolua_S, 3,&arg1); - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ProgressFromTo:create"); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.ProgressFromTo:create"); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.ProgressFromTo:create"); if(!ok) return 0; cocos2d::ProgressFromTo* ret = cocos2d::ProgressFromTo::create(arg0, arg1, arg2); object_to_luaval(tolua_S, "cc.ProgressFromTo",(cocos2d::ProgressFromTo*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.ProgressFromTo:create",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -28914,17 +31732,17 @@ int lua_cocos2dx_ShakyTiles3D_create(lua_State* tolua_S) cocos2d::Size arg1; int arg2; bool arg3; - ok &= luaval_to_number(tolua_S, 2,&arg0); - ok &= luaval_to_size(tolua_S, 3, &arg1); - ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2); - ok &= luaval_to_boolean(tolua_S, 5,&arg3); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ShakyTiles3D:create"); + ok &= luaval_to_size(tolua_S, 3, &arg1, "cc.ShakyTiles3D:create"); + ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "cc.ShakyTiles3D:create"); + ok &= luaval_to_boolean(tolua_S, 5,&arg3, "cc.ShakyTiles3D:create"); if(!ok) return 0; cocos2d::ShakyTiles3D* ret = cocos2d::ShakyTiles3D::create(arg0, arg1, arg2, arg3); object_to_luaval(tolua_S, "cc.ShakyTiles3D",(cocos2d::ShakyTiles3D*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 4); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.ShakyTiles3D:create",argc, 4); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -28973,17 +31791,17 @@ int lua_cocos2dx_ShatteredTiles3D_create(lua_State* tolua_S) cocos2d::Size arg1; int arg2; bool arg3; - ok &= luaval_to_number(tolua_S, 2,&arg0); - ok &= luaval_to_size(tolua_S, 3, &arg1); - ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2); - ok &= luaval_to_boolean(tolua_S, 5,&arg3); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ShatteredTiles3D:create"); + ok &= luaval_to_size(tolua_S, 3, &arg1, "cc.ShatteredTiles3D:create"); + ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "cc.ShatteredTiles3D:create"); + ok &= luaval_to_boolean(tolua_S, 5,&arg3, "cc.ShatteredTiles3D:create"); if(!ok) return 0; cocos2d::ShatteredTiles3D* ret = cocos2d::ShatteredTiles3D::create(arg0, arg1, arg2, arg3); object_to_luaval(tolua_S, "cc.ShatteredTiles3D",(cocos2d::ShatteredTiles3D*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 4); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.ShatteredTiles3D:create",argc, 4); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -29041,14 +31859,14 @@ int lua_cocos2dx_ShuffleTiles_getDelta(lua_State* tolua_S) { cocos2d::Size arg0; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.ShuffleTiles:getDelta"); if(!ok) return 0; cocos2d::Size ret = cobj->getDelta(arg0); size_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDelta",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ShuffleTiles:getDelta",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -29078,16 +31896,16 @@ int lua_cocos2dx_ShuffleTiles_create(lua_State* tolua_S) double arg0; cocos2d::Size arg1; unsigned int arg2; - ok &= luaval_to_number(tolua_S, 2,&arg0); - ok &= luaval_to_size(tolua_S, 3, &arg1); - ok &= luaval_to_uint32(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ShuffleTiles:create"); + ok &= luaval_to_size(tolua_S, 3, &arg1, "cc.ShuffleTiles:create"); + ok &= luaval_to_uint32(tolua_S, 4,&arg2, "cc.ShuffleTiles:create"); if(!ok) return 0; cocos2d::ShuffleTiles* ret = cocos2d::ShuffleTiles::create(arg0, arg1, arg2); object_to_luaval(tolua_S, "cc.ShuffleTiles",(cocos2d::ShuffleTiles*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.ShuffleTiles:create",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -29146,13 +31964,13 @@ int lua_cocos2dx_FadeOutTRTiles_turnOnTile(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.FadeOutTRTiles:turnOnTile"); if(!ok) return 0; cobj->turnOnTile(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "turnOnTile",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.FadeOutTRTiles:turnOnTile",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -29192,13 +32010,13 @@ int lua_cocos2dx_FadeOutTRTiles_turnOffTile(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.FadeOutTRTiles:turnOffTile"); if(!ok) return 0; cobj->turnOffTile(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "turnOffTile",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.FadeOutTRTiles:turnOffTile",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -29239,15 +32057,15 @@ int lua_cocos2dx_FadeOutTRTiles_transformTile(lua_State* tolua_S) cocos2d::Vec2 arg0; double arg1; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.FadeOutTRTiles:transformTile"); - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.FadeOutTRTiles:transformTile"); if(!ok) return 0; cobj->transformTile(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "transformTile",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.FadeOutTRTiles:transformTile",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -29288,16 +32106,16 @@ int lua_cocos2dx_FadeOutTRTiles_testFunc(lua_State* tolua_S) cocos2d::Size arg0; double arg1; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.FadeOutTRTiles:testFunc"); - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.FadeOutTRTiles:testFunc"); if(!ok) return 0; double ret = cobj->testFunc(arg0, arg1); tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "testFunc",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.FadeOutTRTiles:testFunc",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -29326,15 +32144,15 @@ int lua_cocos2dx_FadeOutTRTiles_create(lua_State* tolua_S) { double arg0; cocos2d::Size arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); - ok &= luaval_to_size(tolua_S, 3, &arg1); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.FadeOutTRTiles:create"); + ok &= luaval_to_size(tolua_S, 3, &arg1, "cc.FadeOutTRTiles:create"); if(!ok) return 0; cocos2d::FadeOutTRTiles* ret = cocos2d::FadeOutTRTiles::create(arg0, arg1); object_to_luaval(tolua_S, "cc.FadeOutTRTiles",(cocos2d::FadeOutTRTiles*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.FadeOutTRTiles:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -29385,15 +32203,15 @@ int lua_cocos2dx_FadeOutBLTiles_create(lua_State* tolua_S) { double arg0; cocos2d::Size arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); - ok &= luaval_to_size(tolua_S, 3, &arg1); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.FadeOutBLTiles:create"); + ok &= luaval_to_size(tolua_S, 3, &arg1, "cc.FadeOutBLTiles:create"); if(!ok) return 0; cocos2d::FadeOutBLTiles* ret = cocos2d::FadeOutBLTiles::create(arg0, arg1); object_to_luaval(tolua_S, "cc.FadeOutBLTiles",(cocos2d::FadeOutBLTiles*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.FadeOutBLTiles:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -29452,15 +32270,15 @@ int lua_cocos2dx_FadeOutUpTiles_transformTile(lua_State* tolua_S) cocos2d::Vec2 arg0; double arg1; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.FadeOutUpTiles:transformTile"); - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.FadeOutUpTiles:transformTile"); if(!ok) return 0; cobj->transformTile(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "transformTile",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.FadeOutUpTiles:transformTile",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -29489,15 +32307,15 @@ int lua_cocos2dx_FadeOutUpTiles_create(lua_State* tolua_S) { double arg0; cocos2d::Size arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); - ok &= luaval_to_size(tolua_S, 3, &arg1); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.FadeOutUpTiles:create"); + ok &= luaval_to_size(tolua_S, 3, &arg1, "cc.FadeOutUpTiles:create"); if(!ok) return 0; cocos2d::FadeOutUpTiles* ret = cocos2d::FadeOutUpTiles::create(arg0, arg1); object_to_luaval(tolua_S, "cc.FadeOutUpTiles",(cocos2d::FadeOutUpTiles*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.FadeOutUpTiles:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -29545,15 +32363,15 @@ int lua_cocos2dx_FadeOutDownTiles_create(lua_State* tolua_S) { double arg0; cocos2d::Size arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); - ok &= luaval_to_size(tolua_S, 3, &arg1); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.FadeOutDownTiles:create"); + ok &= luaval_to_size(tolua_S, 3, &arg1, "cc.FadeOutDownTiles:create"); if(!ok) return 0; cocos2d::FadeOutDownTiles* ret = cocos2d::FadeOutDownTiles::create(arg0, arg1); object_to_luaval(tolua_S, "cc.FadeOutDownTiles",(cocos2d::FadeOutDownTiles*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.FadeOutDownTiles:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -29611,13 +32429,13 @@ int lua_cocos2dx_TurnOffTiles_turnOnTile(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.TurnOffTiles:turnOnTile"); if(!ok) return 0; cobj->turnOnTile(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "turnOnTile",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TurnOffTiles:turnOnTile",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -29657,13 +32475,13 @@ int lua_cocos2dx_TurnOffTiles_turnOffTile(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.TurnOffTiles:turnOffTile"); if(!ok) return 0; cobj->turnOffTile(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "turnOffTile",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TurnOffTiles:turnOffTile",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -29692,13 +32510,13 @@ int lua_cocos2dx_TurnOffTiles_create(lua_State* tolua_S) if (argc == 3) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TurnOffTiles:create"); if (!ok) { break; } cocos2d::Size arg1; - ok &= luaval_to_size(tolua_S, 3, &arg1); + ok &= luaval_to_size(tolua_S, 3, &arg1, "cc.TurnOffTiles:create"); if (!ok) { break; } unsigned int arg2; - ok &= luaval_to_uint32(tolua_S, 4,&arg2); + ok &= luaval_to_uint32(tolua_S, 4,&arg2, "cc.TurnOffTiles:create"); if (!ok) { break; } cocos2d::TurnOffTiles* ret = cocos2d::TurnOffTiles::create(arg0, arg1, arg2); object_to_luaval(tolua_S, "cc.TurnOffTiles",(cocos2d::TurnOffTiles*)ret); @@ -29711,10 +32529,10 @@ int lua_cocos2dx_TurnOffTiles_create(lua_State* tolua_S) if (argc == 2) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TurnOffTiles:create"); if (!ok) { break; } cocos2d::Size arg1; - ok &= luaval_to_size(tolua_S, 3, &arg1); + ok &= luaval_to_size(tolua_S, 3, &arg1, "cc.TurnOffTiles:create"); if (!ok) { break; } cocos2d::TurnOffTiles* ret = cocos2d::TurnOffTiles::create(arg0, arg1); object_to_luaval(tolua_S, "cc.TurnOffTiles",(cocos2d::TurnOffTiles*)ret); @@ -29722,7 +32540,7 @@ int lua_cocos2dx_TurnOffTiles_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.TurnOffTiles:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -29786,7 +32604,7 @@ int lua_cocos2dx_WavesTiles3D_getAmplitudeRate(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAmplitudeRate",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.WavesTiles3D:getAmplitudeRate",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -29826,13 +32644,13 @@ int lua_cocos2dx_WavesTiles3D_setAmplitude(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.WavesTiles3D:setAmplitude"); if(!ok) return 0; cobj->setAmplitude(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAmplitude",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.WavesTiles3D:setAmplitude",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -29872,13 +32690,13 @@ int lua_cocos2dx_WavesTiles3D_setAmplitudeRate(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.WavesTiles3D:setAmplitudeRate"); if(!ok) return 0; cobj->setAmplitudeRate(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAmplitudeRate",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.WavesTiles3D:setAmplitudeRate",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -29922,7 +32740,7 @@ int lua_cocos2dx_WavesTiles3D_getAmplitude(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAmplitude",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.WavesTiles3D:getAmplitude",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -29953,17 +32771,17 @@ int lua_cocos2dx_WavesTiles3D_create(lua_State* tolua_S) cocos2d::Size arg1; unsigned int arg2; double arg3; - ok &= luaval_to_number(tolua_S, 2,&arg0); - ok &= luaval_to_size(tolua_S, 3, &arg1); - ok &= luaval_to_uint32(tolua_S, 4,&arg2); - ok &= luaval_to_number(tolua_S, 5,&arg3); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.WavesTiles3D:create"); + ok &= luaval_to_size(tolua_S, 3, &arg1, "cc.WavesTiles3D:create"); + ok &= luaval_to_uint32(tolua_S, 4,&arg2, "cc.WavesTiles3D:create"); + ok &= luaval_to_number(tolua_S, 5,&arg3, "cc.WavesTiles3D:create"); if(!ok) return 0; cocos2d::WavesTiles3D* ret = cocos2d::WavesTiles3D::create(arg0, arg1, arg2, arg3); object_to_luaval(tolua_S, "cc.WavesTiles3D",(cocos2d::WavesTiles3D*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 4); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.WavesTiles3D:create",argc, 4); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -30029,7 +32847,7 @@ int lua_cocos2dx_JumpTiles3D_getAmplitudeRate(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAmplitudeRate",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.JumpTiles3D:getAmplitudeRate",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -30069,13 +32887,13 @@ int lua_cocos2dx_JumpTiles3D_setAmplitude(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.JumpTiles3D:setAmplitude"); if(!ok) return 0; cobj->setAmplitude(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAmplitude",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.JumpTiles3D:setAmplitude",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -30115,13 +32933,13 @@ int lua_cocos2dx_JumpTiles3D_setAmplitudeRate(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.JumpTiles3D:setAmplitudeRate"); if(!ok) return 0; cobj->setAmplitudeRate(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAmplitudeRate",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.JumpTiles3D:setAmplitudeRate",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -30165,7 +32983,7 @@ int lua_cocos2dx_JumpTiles3D_getAmplitude(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAmplitude",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.JumpTiles3D:getAmplitude",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -30196,17 +33014,17 @@ int lua_cocos2dx_JumpTiles3D_create(lua_State* tolua_S) cocos2d::Size arg1; unsigned int arg2; double arg3; - ok &= luaval_to_number(tolua_S, 2,&arg0); - ok &= luaval_to_size(tolua_S, 3, &arg1); - ok &= luaval_to_uint32(tolua_S, 4,&arg2); - ok &= luaval_to_number(tolua_S, 5,&arg3); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.JumpTiles3D:create"); + ok &= luaval_to_size(tolua_S, 3, &arg1, "cc.JumpTiles3D:create"); + ok &= luaval_to_uint32(tolua_S, 4,&arg2, "cc.JumpTiles3D:create"); + ok &= luaval_to_number(tolua_S, 5,&arg3, "cc.JumpTiles3D:create"); if(!ok) return 0; cocos2d::JumpTiles3D* ret = cocos2d::JumpTiles3D::create(arg0, arg1, arg2, arg3); object_to_luaval(tolua_S, "cc.JumpTiles3D",(cocos2d::JumpTiles3D*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 4); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.JumpTiles3D:create",argc, 4); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -30257,15 +33075,15 @@ int lua_cocos2dx_SplitRows_create(lua_State* tolua_S) { double arg0; unsigned int arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); - ok &= luaval_to_uint32(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.SplitRows:create"); + ok &= luaval_to_uint32(tolua_S, 3,&arg1, "cc.SplitRows:create"); if(!ok) return 0; cocos2d::SplitRows* ret = cocos2d::SplitRows::create(arg0, arg1); object_to_luaval(tolua_S, "cc.SplitRows",(cocos2d::SplitRows*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.SplitRows:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -30312,15 +33130,15 @@ int lua_cocos2dx_SplitCols_create(lua_State* tolua_S) { double arg0; unsigned int arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); - ok &= luaval_to_uint32(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.SplitCols:create"); + ok &= luaval_to_uint32(tolua_S, 3,&arg1, "cc.SplitCols:create"); if(!ok) return 0; cocos2d::SplitCols* ret = cocos2d::SplitCols::create(arg0, arg1); object_to_luaval(tolua_S, "cc.SplitCols",(cocos2d::SplitCols*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.SplitCols:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -30369,17 +33187,17 @@ int lua_cocos2dx_ActionTween_create(lua_State* tolua_S) std::string arg1; double arg2; double arg3; - ok &= luaval_to_number(tolua_S, 2,&arg0); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); - ok &= luaval_to_number(tolua_S, 4,&arg2); - ok &= luaval_to_number(tolua_S, 5,&arg3); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ActionTween:create"); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.ActionTween:create"); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.ActionTween:create"); + ok &= luaval_to_number(tolua_S, 5,&arg3, "cc.ActionTween:create"); if(!ok) return 0; cocos2d::ActionTween* ret = cocos2d::ActionTween::create(arg0, arg1, arg2, arg3); object_to_luaval(tolua_S, "cc.ActionTween",(cocos2d::ActionTween*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 4); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.ActionTween:create",argc, 4); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -30441,7 +33259,7 @@ int lua_cocos2dx_CardinalSplineTo_getPoints(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.PointArray",(cocos2d::PointArray*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPoints",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CardinalSplineTo:getPoints",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -30481,13 +33299,13 @@ int lua_cocos2dx_CardinalSplineTo_updatePosition(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.CardinalSplineTo:updatePosition"); if(!ok) return 0; cobj->updatePosition(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "updatePosition",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CardinalSplineTo:updatePosition",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -30529,18 +33347,18 @@ int lua_cocos2dx_CardinalSplineTo_initWithDuration(lua_State* tolua_S) cocos2d::PointArray* arg1; double arg2; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.CardinalSplineTo:initWithDuration"); ok &= luaval_to_object(tolua_S, 3, "cc.PointArray",&arg1); - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.CardinalSplineTo:initWithDuration"); if(!ok) return 0; bool ret = cobj->initWithDuration(arg0, arg1, arg2); tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "initWithDuration",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CardinalSplineTo:initWithDuration",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 @@ -30574,7 +33392,7 @@ int lua_cocos2dx_CardinalSplineTo_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.CardinalSplineTo"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "CardinalSplineTo",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CardinalSplineTo:CardinalSplineTo",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -30631,7 +33449,7 @@ int lua_cocos2dx_CardinalSplineBy_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.CardinalSplineBy"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "CardinalSplineBy",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CardinalSplineBy:CardinalSplineBy",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -30692,7 +33510,7 @@ int lua_cocos2dx_CatmullRomTo_initWithDuration(lua_State* tolua_S) double arg0; cocos2d::PointArray* arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.CatmullRomTo:initWithDuration"); ok &= luaval_to_object(tolua_S, 3, "cc.PointArray",&arg1); if(!ok) @@ -30701,7 +33519,7 @@ int lua_cocos2dx_CatmullRomTo_initWithDuration(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "initWithDuration",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CatmullRomTo:initWithDuration",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -30762,7 +33580,7 @@ int lua_cocos2dx_CatmullRomBy_initWithDuration(lua_State* tolua_S) double arg0; cocos2d::PointArray* arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.CatmullRomBy:initWithDuration"); ok &= luaval_to_object(tolua_S, 3, "cc.PointArray",&arg1); if(!ok) @@ -30771,7 +33589,7 @@ int lua_cocos2dx_CatmullRomBy_initWithDuration(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "initWithDuration",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CatmullRomBy:initWithDuration",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -30835,21 +33653,21 @@ int lua_cocos2dx_DrawNode_drawQuadraticBezier(lua_State* tolua_S) unsigned int arg3; cocos2d::Color4F arg4; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.DrawNode:drawQuadraticBezier"); - ok &= luaval_to_vec2(tolua_S, 3, &arg1); + ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.DrawNode:drawQuadraticBezier"); - ok &= luaval_to_vec2(tolua_S, 4, &arg2); + ok &= luaval_to_vec2(tolua_S, 4, &arg2, "cc.DrawNode:drawQuadraticBezier"); - ok &= luaval_to_uint32(tolua_S, 5,&arg3); + ok &= luaval_to_uint32(tolua_S, 5,&arg3, "cc.DrawNode:drawQuadraticBezier"); - ok &=luaval_to_color4f(tolua_S, 6, &arg4); + ok &=luaval_to_color4f(tolua_S, 6, &arg4, "cc.DrawNode:drawQuadraticBezier"); if(!ok) return 0; cobj->drawQuadraticBezier(arg0, arg1, arg2, arg3, arg4); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "drawQuadraticBezier",argc, 5); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.DrawNode:drawQuadraticBezier",argc, 5); return 0; #if COCOS2D_DEBUG >= 1 @@ -30890,15 +33708,15 @@ int lua_cocos2dx_DrawNode_onDraw(lua_State* tolua_S) cocos2d::Mat4 arg0; unsigned int arg1; - ok &= luaval_to_mat4(tolua_S, 2, &arg0); + ok &= luaval_to_mat4(tolua_S, 2, &arg0, "cc.DrawNode:onDraw"); - ok &= luaval_to_uint32(tolua_S, 3,&arg1); + ok &= luaval_to_uint32(tolua_S, 3,&arg1, "cc.DrawNode:onDraw"); if(!ok) return 0; cobj->onDraw(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "onDraw",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.DrawNode:onDraw",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -30941,7 +33759,7 @@ int lua_cocos2dx_DrawNode_clear(lua_State* tolua_S) cobj->clear(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "clear",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.DrawNode:clear",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -30984,19 +33802,19 @@ int lua_cocos2dx_DrawNode_drawTriangle(lua_State* tolua_S) cocos2d::Vec2 arg2; cocos2d::Color4F arg3; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.DrawNode:drawTriangle"); - ok &= luaval_to_vec2(tolua_S, 3, &arg1); + ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.DrawNode:drawTriangle"); - ok &= luaval_to_vec2(tolua_S, 4, &arg2); + ok &= luaval_to_vec2(tolua_S, 4, &arg2, "cc.DrawNode:drawTriangle"); - ok &=luaval_to_color4f(tolua_S, 5, &arg3); + ok &=luaval_to_color4f(tolua_S, 5, &arg3, "cc.DrawNode:drawTriangle"); if(!ok) return 0; cobj->drawTriangle(arg0, arg1, arg2, arg3); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "drawTriangle",argc, 4); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.DrawNode:drawTriangle",argc, 4); return 0; #if COCOS2D_DEBUG >= 1 @@ -31038,17 +33856,17 @@ int lua_cocos2dx_DrawNode_drawDot(lua_State* tolua_S) double arg1; cocos2d::Color4F arg2; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.DrawNode:drawDot"); - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.DrawNode:drawDot"); - ok &=luaval_to_color4f(tolua_S, 4, &arg2); + ok &=luaval_to_color4f(tolua_S, 4, &arg2, "cc.DrawNode:drawDot"); if(!ok) return 0; cobj->drawDot(arg0, arg1, arg2); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "drawDot",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.DrawNode:drawDot",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 @@ -31093,23 +33911,23 @@ int lua_cocos2dx_DrawNode_drawCubicBezier(lua_State* tolua_S) unsigned int arg4; cocos2d::Color4F arg5; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.DrawNode:drawCubicBezier"); - ok &= luaval_to_vec2(tolua_S, 3, &arg1); + ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.DrawNode:drawCubicBezier"); - ok &= luaval_to_vec2(tolua_S, 4, &arg2); + ok &= luaval_to_vec2(tolua_S, 4, &arg2, "cc.DrawNode:drawCubicBezier"); - ok &= luaval_to_vec2(tolua_S, 5, &arg3); + ok &= luaval_to_vec2(tolua_S, 5, &arg3, "cc.DrawNode:drawCubicBezier"); - ok &= luaval_to_uint32(tolua_S, 6,&arg4); + ok &= luaval_to_uint32(tolua_S, 6,&arg4, "cc.DrawNode:drawCubicBezier"); - ok &=luaval_to_color4f(tolua_S, 7, &arg5); + ok &=luaval_to_color4f(tolua_S, 7, &arg5, "cc.DrawNode:drawCubicBezier"); if(!ok) return 0; cobj->drawCubicBezier(arg0, arg1, arg2, arg3, arg4, arg5); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "drawCubicBezier",argc, 6); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.DrawNode:drawCubicBezier",argc, 6); return 0; #if COCOS2D_DEBUG >= 1 @@ -31152,19 +33970,19 @@ int lua_cocos2dx_DrawNode_drawSegment(lua_State* tolua_S) double arg2; cocos2d::Color4F arg3; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.DrawNode:drawSegment"); - ok &= luaval_to_vec2(tolua_S, 3, &arg1); + ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.DrawNode:drawSegment"); - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.DrawNode:drawSegment"); - ok &=luaval_to_color4f(tolua_S, 5, &arg3); + ok &=luaval_to_color4f(tolua_S, 5, &arg3, "cc.DrawNode:drawSegment"); if(!ok) return 0; cobj->drawSegment(arg0, arg1, arg2, arg3); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "drawSegment",argc, 4); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.DrawNode:drawSegment",argc, 4); return 0; #if COCOS2D_DEBUG >= 1 @@ -31197,7 +34015,7 @@ int lua_cocos2dx_DrawNode_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.DrawNode",(cocos2d::DrawNode*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.DrawNode:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -31266,7 +34084,7 @@ int lua_cocos2dx_GLProgram_getFragmentShaderLog(lua_State* tolua_S) tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getFragmentShaderLog",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLProgram:getFragmentShaderLog",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -31307,16 +34125,16 @@ int lua_cocos2dx_GLProgram_initWithByteArrays(lua_State* tolua_S) const char* arg0; const char* arg1; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.GLProgram:initWithByteArrays"); arg0 = arg0_tmp.c_str(); - std::string arg1_tmp; ok &= luaval_to_std_string(tolua_S, 3, &arg1_tmp); arg1 = arg1_tmp.c_str(); + std::string arg1_tmp; ok &= luaval_to_std_string(tolua_S, 3, &arg1_tmp, "cc.GLProgram:initWithByteArrays"); arg1 = arg1_tmp.c_str(); if(!ok) return 0; bool ret = cobj->initWithByteArrays(arg0, arg1); tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "initWithByteArrays",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLProgram:initWithByteArrays",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -31357,16 +34175,16 @@ int lua_cocos2dx_GLProgram_initWithFilenames(lua_State* tolua_S) std::string arg0; std::string arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.GLProgram:initWithFilenames"); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.GLProgram:initWithFilenames"); if(!ok) return 0; bool ret = cobj->initWithFilenames(arg0, arg1); tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "initWithFilenames",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLProgram:initWithFilenames",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -31409,7 +34227,7 @@ int lua_cocos2dx_GLProgram_use(lua_State* tolua_S) cobj->use(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "use",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLProgram:use",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -31453,7 +34271,7 @@ int lua_cocos2dx_GLProgram_getVertexShaderLog(lua_State* tolua_S) tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getVertexShaderLog",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLProgram:getVertexShaderLog",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -31487,7 +34305,7 @@ int lua_cocos2dx_GLProgram_setUniformsForBuiltins(lua_State* tolua_S) do{ if (argc == 1) { cocos2d::Mat4 arg0; - ok &= luaval_to_mat4(tolua_S, 2, &arg0); + ok &= luaval_to_mat4(tolua_S, 2, &arg0, "cc.GLProgram:setUniformsForBuiltins"); if (!ok) { break; } cobj->setUniformsForBuiltins(arg0); @@ -31502,7 +34320,7 @@ int lua_cocos2dx_GLProgram_setUniformsForBuiltins(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setUniformsForBuiltins",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLProgram:setUniformsForBuiltins",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -31545,7 +34363,7 @@ int lua_cocos2dx_GLProgram_updateUniforms(lua_State* tolua_S) cobj->updateUniforms(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "updateUniforms",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLProgram:updateUniforms",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -31586,15 +34404,15 @@ int lua_cocos2dx_GLProgram_setUniformLocationWith1i(lua_State* tolua_S) int arg0; int arg1; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.GLProgram:setUniformLocationWith1i"); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.GLProgram:setUniformLocationWith1i"); if(!ok) return 0; cobj->setUniformLocationWith1i(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setUniformLocationWith1i",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLProgram:setUniformLocationWith1i",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -31637,7 +34455,7 @@ int lua_cocos2dx_GLProgram_reset(lua_State* tolua_S) cobj->reset(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "reset",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLProgram:reset",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -31678,15 +34496,15 @@ int lua_cocos2dx_GLProgram_bindAttribLocation(lua_State* tolua_S) std::string arg0; unsigned int arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.GLProgram:bindAttribLocation"); - ok &= luaval_to_uint32(tolua_S, 3,&arg1); + ok &= luaval_to_uint32(tolua_S, 3,&arg1, "cc.GLProgram:bindAttribLocation"); if(!ok) return 0; cobj->bindAttribLocation(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "bindAttribLocation",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLProgram:bindAttribLocation",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -31726,14 +34544,14 @@ int lua_cocos2dx_GLProgram_getAttribLocation(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.GLProgram:getAttribLocation"); if(!ok) return 0; int ret = cobj->getAttribLocation(arg0); tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAttribLocation",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLProgram:getAttribLocation",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -31777,7 +34595,7 @@ int lua_cocos2dx_GLProgram_link(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "link",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLProgram:link",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -31806,15 +34624,15 @@ int lua_cocos2dx_GLProgram_createWithByteArrays(lua_State* tolua_S) { const char* arg0; const char* arg1; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); - std::string arg1_tmp; ok &= luaval_to_std_string(tolua_S, 3, &arg1_tmp); arg1 = arg1_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.GLProgram:createWithByteArrays"); arg0 = arg0_tmp.c_str(); + std::string arg1_tmp; ok &= luaval_to_std_string(tolua_S, 3, &arg1_tmp, "cc.GLProgram:createWithByteArrays"); arg1 = arg1_tmp.c_str(); if(!ok) return 0; cocos2d::GLProgram* ret = cocos2d::GLProgram::createWithByteArrays(arg0, arg1); object_to_luaval(tolua_S, "cc.GLProgram",(cocos2d::GLProgram*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createWithByteArrays",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.GLProgram:createWithByteArrays",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -31841,15 +34659,15 @@ int lua_cocos2dx_GLProgram_createWithFilenames(lua_State* tolua_S) { std::string arg0; std::string arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.GLProgram:createWithFilenames"); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.GLProgram:createWithFilenames"); if(!ok) return 0; cocos2d::GLProgram* ret = cocos2d::GLProgram::createWithFilenames(arg0, arg1); object_to_luaval(tolua_S, "cc.GLProgram",(cocos2d::GLProgram*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createWithFilenames",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.GLProgram:createWithFilenames",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -31881,7 +34699,7 @@ int lua_cocos2dx_GLProgram_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.GLProgram"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "GLProgram",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLProgram:GLProgram",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -31961,7 +34779,7 @@ int lua_cocos2dx_SpriteBatchNode_appendChild(lua_State* tolua_S) cobj->appendChild(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "appendChild",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SpriteBatchNode:appendChild",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -32005,16 +34823,16 @@ int lua_cocos2dx_SpriteBatchNode_addSpriteWithoutQuad(lua_State* tolua_S) ok &= luaval_to_object(tolua_S, 2, "cc.Sprite",&arg0); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.SpriteBatchNode:addSpriteWithoutQuad"); - ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2); + ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "cc.SpriteBatchNode:addSpriteWithoutQuad"); if(!ok) return 0; cocos2d::SpriteBatchNode* ret = cobj->addSpriteWithoutQuad(arg0, arg1, arg2); object_to_luaval(tolua_S, "cc.SpriteBatchNode",(cocos2d::SpriteBatchNode*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addSpriteWithoutQuad",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SpriteBatchNode:addSpriteWithoutQuad",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 @@ -32054,13 +34872,13 @@ int lua_cocos2dx_SpriteBatchNode_reorderBatch(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.SpriteBatchNode:reorderBatch"); if(!ok) return 0; cobj->reorderBatch(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "reorderBatch",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SpriteBatchNode:reorderBatch",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -32100,13 +34918,13 @@ int lua_cocos2dx_SpriteBatchNode_removeAllChildrenWithCleanup(lua_State* tolua_S { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.SpriteBatchNode:removeAllChildrenWithCleanup"); if(!ok) return 0; cobj->removeAllChildrenWithCleanup(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeAllChildrenWithCleanup",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SpriteBatchNode:removeAllChildrenWithCleanup",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -32153,7 +34971,7 @@ int lua_cocos2dx_SpriteBatchNode_lowestAtlasIndexInChild(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "lowestAtlasIndexInChild",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SpriteBatchNode:lowestAtlasIndexInChild",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -32196,14 +35014,14 @@ int lua_cocos2dx_SpriteBatchNode_atlasIndexForChild(lua_State* tolua_S) ok &= luaval_to_object(tolua_S, 2, "cc.Sprite",&arg0); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.SpriteBatchNode:atlasIndexForChild"); if(!ok) return 0; ssize_t ret = cobj->atlasIndexForChild(arg0, arg1); tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "atlasIndexForChild",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SpriteBatchNode:atlasIndexForChild",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -32249,7 +35067,7 @@ int lua_cocos2dx_SpriteBatchNode_setTextureAtlas(lua_State* tolua_S) cobj->setTextureAtlas(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTextureAtlas",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SpriteBatchNode:setTextureAtlas",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -32293,7 +35111,7 @@ int lua_cocos2dx_SpriteBatchNode_getTexture(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Texture2D",(cocos2d::Texture2D*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTexture",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SpriteBatchNode:getTexture",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -32336,7 +35154,7 @@ int lua_cocos2dx_SpriteBatchNode_increaseAtlasCapacity(lua_State* tolua_S) cobj->increaseAtlasCapacity(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "increaseAtlasCapacity",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SpriteBatchNode:increaseAtlasCapacity",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -32380,7 +35198,7 @@ int lua_cocos2dx_SpriteBatchNode_getTextureAtlas(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.TextureAtlas",(cocos2d::TextureAtlas*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTextureAtlas",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SpriteBatchNode:getTextureAtlas",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -32423,13 +35241,13 @@ int lua_cocos2dx_SpriteBatchNode_insertQuadFromSprite(lua_State* tolua_S) ok &= luaval_to_object(tolua_S, 2, "cc.Sprite",&arg0); - ok &= luaval_to_ssize(tolua_S, 3, &arg1); + ok &= luaval_to_ssize(tolua_S, 3, &arg1, "cc.SpriteBatchNode:insertQuadFromSprite"); if(!ok) return 0; cobj->insertQuadFromSprite(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "insertQuadFromSprite",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SpriteBatchNode:insertQuadFromSprite",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -32475,7 +35293,7 @@ int lua_cocos2dx_SpriteBatchNode_setTexture(lua_State* tolua_S) cobj->setTexture(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTexture",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SpriteBatchNode:setTexture",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -32518,14 +35336,14 @@ int lua_cocos2dx_SpriteBatchNode_rebuildIndexInOrder(lua_State* tolua_S) ok &= luaval_to_object(tolua_S, 2, "cc.Sprite",&arg0); - ok &= luaval_to_ssize(tolua_S, 3, &arg1); + ok &= luaval_to_ssize(tolua_S, 3, &arg1, "cc.SpriteBatchNode:rebuildIndexInOrder"); if(!ok) return 0; ssize_t ret = cobj->rebuildIndexInOrder(arg0, arg1); tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "rebuildIndexInOrder",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SpriteBatchNode:rebuildIndexInOrder",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -32572,7 +35390,7 @@ int lua_cocos2dx_SpriteBatchNode_highestAtlasIndexInChild(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "highestAtlasIndexInChild",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SpriteBatchNode:highestAtlasIndexInChild",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -32613,15 +35431,15 @@ int lua_cocos2dx_SpriteBatchNode_removeChildAtIndex(lua_State* tolua_S) ssize_t arg0; bool arg1; - ok &= luaval_to_ssize(tolua_S, 2, &arg0); + ok &= luaval_to_ssize(tolua_S, 2, &arg0, "cc.SpriteBatchNode:removeChildAtIndex"); - ok &= luaval_to_boolean(tolua_S, 3,&arg1); + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "cc.SpriteBatchNode:removeChildAtIndex"); if(!ok) return 0; cobj->removeChildAtIndex(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeChildAtIndex",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SpriteBatchNode:removeChildAtIndex",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -32667,7 +35485,7 @@ int lua_cocos2dx_SpriteBatchNode_removeSpriteFromAtlas(lua_State* tolua_S) cobj->removeSpriteFromAtlas(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeSpriteFromAtlas",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SpriteBatchNode:removeSpriteFromAtlas",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -32695,7 +35513,7 @@ int lua_cocos2dx_SpriteBatchNode_create(lua_State* tolua_S) if (argc == 1) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.SpriteBatchNode:create"); if(!ok) return 0; cocos2d::SpriteBatchNode* ret = cocos2d::SpriteBatchNode::create(arg0); @@ -32706,15 +35524,15 @@ int lua_cocos2dx_SpriteBatchNode_create(lua_State* tolua_S) { std::string arg0; ssize_t arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); - ok &= luaval_to_ssize(tolua_S, 3, &arg1); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.SpriteBatchNode:create"); + ok &= luaval_to_ssize(tolua_S, 3, &arg1, "cc.SpriteBatchNode:create"); if(!ok) return 0; cocos2d::SpriteBatchNode* ret = cocos2d::SpriteBatchNode::create(arg0, arg1); object_to_luaval(tolua_S, "cc.SpriteBatchNode",(cocos2d::SpriteBatchNode*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.SpriteBatchNode:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -32752,14 +35570,14 @@ int lua_cocos2dx_SpriteBatchNode_createWithTexture(lua_State* tolua_S) cocos2d::Texture2D* arg0; ssize_t arg1; ok &= luaval_to_object(tolua_S, 2, "cc.Texture2D",&arg0); - ok &= luaval_to_ssize(tolua_S, 3, &arg1); + ok &= luaval_to_ssize(tolua_S, 3, &arg1, "cc.SpriteBatchNode:createWithTexture"); if(!ok) return 0; cocos2d::SpriteBatchNode* ret = cocos2d::SpriteBatchNode::createWithTexture(arg0, arg1); object_to_luaval(tolua_S, "cc.SpriteBatchNode",(cocos2d::SpriteBatchNode*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createWithTexture",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.SpriteBatchNode:createWithTexture",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -32838,7 +35656,7 @@ int lua_cocos2dx_Label_isClipMarginEnabled(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isClipMarginEnabled",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:isClipMarginEnabled",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -32885,7 +35703,7 @@ int lua_cocos2dx_Label_enableShadow(lua_State* tolua_S) { cocos2d::Color4B arg0; - ok &=luaval_to_color4b(tolua_S, 2, &arg0); + ok &=luaval_to_color4b(tolua_S, 2, &arg0, "cc.Label:enableShadow"); if(!ok) return 0; cobj->enableShadow(arg0); @@ -32896,9 +35714,9 @@ int lua_cocos2dx_Label_enableShadow(lua_State* tolua_S) cocos2d::Color4B arg0; cocos2d::Size arg1; - ok &=luaval_to_color4b(tolua_S, 2, &arg0); + ok &=luaval_to_color4b(tolua_S, 2, &arg0, "cc.Label:enableShadow"); - ok &= luaval_to_size(tolua_S, 3, &arg1); + ok &= luaval_to_size(tolua_S, 3, &arg1, "cc.Label:enableShadow"); if(!ok) return 0; cobj->enableShadow(arg0, arg1); @@ -32910,17 +35728,17 @@ int lua_cocos2dx_Label_enableShadow(lua_State* tolua_S) cocos2d::Size arg1; int arg2; - ok &=luaval_to_color4b(tolua_S, 2, &arg0); + ok &=luaval_to_color4b(tolua_S, 2, &arg0, "cc.Label:enableShadow"); - ok &= luaval_to_size(tolua_S, 3, &arg1); + ok &= luaval_to_size(tolua_S, 3, &arg1, "cc.Label:enableShadow"); - ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2); + ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "cc.Label:enableShadow"); if(!ok) return 0; cobj->enableShadow(arg0, arg1, arg2); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "enableShadow",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:enableShadow",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -32961,15 +35779,15 @@ int lua_cocos2dx_Label_setDimensions(lua_State* tolua_S) unsigned int arg0; unsigned int arg1; - ok &= luaval_to_uint32(tolua_S, 2,&arg0); + ok &= luaval_to_uint32(tolua_S, 2,&arg0, "cc.Label:setDimensions"); - ok &= luaval_to_uint32(tolua_S, 3,&arg1); + ok &= luaval_to_uint32(tolua_S, 3,&arg1, "cc.Label:setDimensions"); if(!ok) return 0; cobj->setDimensions(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setDimensions",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:setDimensions",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -33013,7 +35831,7 @@ int lua_cocos2dx_Label_getString(lua_State* tolua_S) tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getString",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:getString",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -33057,7 +35875,7 @@ int lua_cocos2dx_Label_getHeight(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getHeight",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:getHeight",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -33100,7 +35918,7 @@ int lua_cocos2dx_Label_disableEffect(lua_State* tolua_S) cobj->disableEffect(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "disableEffect",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:disableEffect",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -33140,14 +35958,14 @@ int lua_cocos2dx_Label_setTTFConfig(lua_State* tolua_S) { cocos2d::_ttfConfig arg0; - ok &= luaval_to_ttfconfig(tolua_S, 2, &arg0); + ok &= luaval_to_ttfconfig(tolua_S, 2, &arg0, "cc.Label:setTTFConfig"); if(!ok) return 0; bool ret = cobj->setTTFConfig(arg0); tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTTFConfig",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:setTTFConfig",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -33191,7 +36009,7 @@ int lua_cocos2dx_Label_getTextColor(lua_State* tolua_S) color4b_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTextColor",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:getTextColor",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -33231,13 +36049,13 @@ int lua_cocos2dx_Label_setWidth(lua_State* tolua_S) { unsigned int arg0; - ok &= luaval_to_uint32(tolua_S, 2,&arg0); + ok &= luaval_to_uint32(tolua_S, 2,&arg0, "cc.Label:setWidth"); if(!ok) return 0; cobj->setWidth(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setWidth",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:setWidth",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -33281,7 +36099,7 @@ int lua_cocos2dx_Label_getMaxLineWidth(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getMaxLineWidth",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:getMaxLineWidth",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -33325,7 +36143,7 @@ int lua_cocos2dx_Label_getHorizontalAlignment(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getHorizontalAlignment",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:getHorizontalAlignment",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -33365,13 +36183,13 @@ int lua_cocos2dx_Label_setClipMarginEnabled(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.Label:setClipMarginEnabled"); if(!ok) return 0; cobj->setClipMarginEnabled(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setClipMarginEnabled",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:setClipMarginEnabled",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -33411,13 +36229,13 @@ int lua_cocos2dx_Label_setString(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Label:setString"); if(!ok) return 0; cobj->setString(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setString",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:setString",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -33457,13 +36275,13 @@ int lua_cocos2dx_Label_setSystemFontName(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Label:setSystemFontName"); if(!ok) return 0; cobj->setSystemFontName(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setSystemFontName",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:setSystemFontName",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -33503,7 +36321,7 @@ int lua_cocos2dx_Label_setBMFontFilePath(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Label:setBMFontFilePath"); if(!ok) return 0; bool ret = cobj->setBMFontFilePath(arg0); @@ -33515,16 +36333,16 @@ int lua_cocos2dx_Label_setBMFontFilePath(lua_State* tolua_S) std::string arg0; cocos2d::Vec2 arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Label:setBMFontFilePath"); - ok &= luaval_to_vec2(tolua_S, 3, &arg1); + ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.Label:setBMFontFilePath"); if(!ok) return 0; bool ret = cobj->setBMFontFilePath(arg0, arg1); tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setBMFontFilePath",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:setBMFontFilePath",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -33568,7 +36386,7 @@ int lua_cocos2dx_Label_getFontAtlas(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.FontAtlas",(cocos2d::FontAtlas*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getFontAtlas",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:getFontAtlas",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -33608,13 +36426,13 @@ int lua_cocos2dx_Label_setLineHeight(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Label:setLineHeight"); if(!ok) return 0; cobj->setLineHeight(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setLineHeight",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:setLineHeight",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -33654,13 +36472,13 @@ int lua_cocos2dx_Label_setSystemFontSize(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Label:setSystemFontSize"); if(!ok) return 0; cobj->setSystemFontSize(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setSystemFontSize",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:setSystemFontSize",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -33703,7 +36521,7 @@ int lua_cocos2dx_Label_updateContent(lua_State* tolua_S) cobj->updateContent(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "updateContent",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:updateContent",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -33747,7 +36565,7 @@ int lua_cocos2dx_Label_getStringLength(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getStringLength",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:getStringLength",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -33787,13 +36605,13 @@ int lua_cocos2dx_Label_setLineBreakWithoutSpace(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.Label:setLineBreakWithoutSpace"); if(!ok) return 0; cobj->setLineBreakWithoutSpace(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setLineBreakWithoutSpace",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:setLineBreakWithoutSpace",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -33837,7 +36655,7 @@ int lua_cocos2dx_Label_getStringNumLines(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getStringNumLines",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:getStringNumLines",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -33877,7 +36695,7 @@ int lua_cocos2dx_Label_enableOutline(lua_State* tolua_S) { cocos2d::Color4B arg0; - ok &=luaval_to_color4b(tolua_S, 2, &arg0); + ok &=luaval_to_color4b(tolua_S, 2, &arg0, "cc.Label:enableOutline"); if(!ok) return 0; cobj->enableOutline(arg0); @@ -33888,15 +36706,15 @@ int lua_cocos2dx_Label_enableOutline(lua_State* tolua_S) cocos2d::Color4B arg0; int arg1; - ok &=luaval_to_color4b(tolua_S, 2, &arg0); + ok &=luaval_to_color4b(tolua_S, 2, &arg0, "cc.Label:enableOutline"); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.Label:enableOutline"); if(!ok) return 0; cobj->enableOutline(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "enableOutline",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:enableOutline",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -33940,7 +36758,7 @@ int lua_cocos2dx_Label_getAdditionalKerning(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAdditionalKerning",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:getAdditionalKerning",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -33978,15 +36796,15 @@ int lua_cocos2dx_Label_setCharMap(lua_State* tolua_S) if (!ok) { break; } int arg1; - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.Label:setCharMap"); if (!ok) { break; } int arg2; - ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2); + ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "cc.Label:setCharMap"); if (!ok) { break; } int arg3; - ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3); + ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3, "cc.Label:setCharMap"); if (!ok) { break; } bool ret = cobj->setCharMap(arg0, arg1, arg2, arg3); @@ -33998,19 +36816,19 @@ int lua_cocos2dx_Label_setCharMap(lua_State* tolua_S) do{ if (argc == 4) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Label:setCharMap"); if (!ok) { break; } int arg1; - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.Label:setCharMap"); if (!ok) { break; } int arg2; - ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2); + ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "cc.Label:setCharMap"); if (!ok) { break; } int arg3; - ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3); + ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3, "cc.Label:setCharMap"); if (!ok) { break; } bool ret = cobj->setCharMap(arg0, arg1, arg2, arg3); @@ -34022,7 +36840,7 @@ int lua_cocos2dx_Label_setCharMap(lua_State* tolua_S) do{ if (argc == 1) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Label:setCharMap"); if (!ok) { break; } bool ret = cobj->setCharMap(arg0); @@ -34031,7 +36849,7 @@ int lua_cocos2dx_Label_setCharMap(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setCharMap",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:setCharMap",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -34075,7 +36893,7 @@ int lua_cocos2dx_Label_getDimensions(lua_State* tolua_S) size_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDimensions",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:getDimensions",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -34115,13 +36933,13 @@ int lua_cocos2dx_Label_setMaxLineWidth(lua_State* tolua_S) { unsigned int arg0; - ok &= luaval_to_uint32(tolua_S, 2,&arg0); + ok &= luaval_to_uint32(tolua_S, 2,&arg0, "cc.Label:setMaxLineWidth"); if(!ok) return 0; cobj->setMaxLineWidth(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setMaxLineWidth",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:setMaxLineWidth",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -34165,7 +36983,7 @@ int lua_cocos2dx_Label_getSystemFontName(lua_State* tolua_S) tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getSystemFontName",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:getSystemFontName",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -34205,13 +37023,13 @@ int lua_cocos2dx_Label_setVerticalAlignment(lua_State* tolua_S) { cocos2d::TextVAlignment arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.Label:setVerticalAlignment"); if(!ok) return 0; cobj->setVerticalAlignment(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setVerticalAlignment",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:setVerticalAlignment",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -34255,7 +37073,7 @@ int lua_cocos2dx_Label_getLineHeight(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getLineHeight",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:getLineHeight",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -34299,7 +37117,7 @@ int lua_cocos2dx_Label_getTTFConfig(lua_State* tolua_S) ttfconfig_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTTFConfig",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:getTTFConfig",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -34343,7 +37161,7 @@ int lua_cocos2dx_Label_getVerticalAlignment(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getVerticalAlignment",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:getVerticalAlignment",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -34383,13 +37201,13 @@ int lua_cocos2dx_Label_setTextColor(lua_State* tolua_S) { cocos2d::Color4B arg0; - ok &=luaval_to_color4b(tolua_S, 2, &arg0); + ok &=luaval_to_color4b(tolua_S, 2, &arg0, "cc.Label:setTextColor"); if(!ok) return 0; cobj->setTextColor(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTextColor",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:setTextColor",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -34429,13 +37247,13 @@ int lua_cocos2dx_Label_setHeight(lua_State* tolua_S) { unsigned int arg0; - ok &= luaval_to_uint32(tolua_S, 2,&arg0); + ok &= luaval_to_uint32(tolua_S, 2,&arg0, "cc.Label:setHeight"); if(!ok) return 0; cobj->setHeight(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setHeight",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:setHeight",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -34479,7 +37297,7 @@ int lua_cocos2dx_Label_getWidth(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getWidth",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:getWidth",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -34519,13 +37337,13 @@ int lua_cocos2dx_Label_enableGlow(lua_State* tolua_S) { cocos2d::Color4B arg0; - ok &=luaval_to_color4b(tolua_S, 2, &arg0); + ok &=luaval_to_color4b(tolua_S, 2, &arg0, "cc.Label:enableGlow"); if(!ok) return 0; cobj->enableGlow(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "enableGlow",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:enableGlow",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -34565,14 +37383,14 @@ int lua_cocos2dx_Label_getLetter(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.Label:getLetter"); if(!ok) return 0; cocos2d::Sprite* ret = cobj->getLetter(arg0); object_to_luaval(tolua_S, "cc.Sprite",(cocos2d::Sprite*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getLetter",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:getLetter",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -34612,13 +37430,13 @@ int lua_cocos2dx_Label_setAdditionalKerning(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Label:setAdditionalKerning"); if(!ok) return 0; cobj->setAdditionalKerning(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAdditionalKerning",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:setAdditionalKerning",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -34662,7 +37480,7 @@ int lua_cocos2dx_Label_getSystemFontSize(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getSystemFontSize",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:getSystemFontSize",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -34706,7 +37524,7 @@ int lua_cocos2dx_Label_getTextAlignment(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTextAlignment",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:getTextAlignment",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -34750,7 +37568,7 @@ int lua_cocos2dx_Label_getBMFontFilePath(lua_State* tolua_S) tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getBMFontFilePath",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:getBMFontFilePath",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -34790,13 +37608,13 @@ int lua_cocos2dx_Label_setHorizontalAlignment(lua_State* tolua_S) { cocos2d::TextHAlignment arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.Label:setHorizontalAlignment"); if(!ok) return 0; cobj->setHorizontalAlignment(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setHorizontalAlignment",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:setHorizontalAlignment",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -34830,11 +37648,11 @@ int lua_cocos2dx_Label_setAlignment(lua_State* tolua_S) do{ if (argc == 2) { cocos2d::TextHAlignment arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.Label:setAlignment"); if (!ok) { break; } cocos2d::TextVAlignment arg1; - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.Label:setAlignment"); if (!ok) { break; } cobj->setAlignment(arg0, arg1); @@ -34845,7 +37663,7 @@ int lua_cocos2dx_Label_setAlignment(lua_State* tolua_S) do{ if (argc == 1) { cocos2d::TextHAlignment arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.Label:setAlignment"); if (!ok) { break; } cobj->setAlignment(arg0); @@ -34853,7 +37671,7 @@ int lua_cocos2dx_Label_setAlignment(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAlignment",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Label:setAlignment",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -34882,8 +37700,8 @@ int lua_cocos2dx_Label_createWithBMFont(lua_State* tolua_S) { std::string arg0; std::string arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Label:createWithBMFont"); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.Label:createWithBMFont"); if(!ok) return 0; cocos2d::Label* ret = cocos2d::Label::createWithBMFont(arg0, arg1); @@ -34895,9 +37713,9 @@ int lua_cocos2dx_Label_createWithBMFont(lua_State* tolua_S) std::string arg0; std::string arg1; cocos2d::TextHAlignment arg2; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); - ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Label:createWithBMFont"); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.Label:createWithBMFont"); + ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "cc.Label:createWithBMFont"); if(!ok) return 0; cocos2d::Label* ret = cocos2d::Label::createWithBMFont(arg0, arg1, arg2); @@ -34910,10 +37728,10 @@ int lua_cocos2dx_Label_createWithBMFont(lua_State* tolua_S) std::string arg1; cocos2d::TextHAlignment arg2; int arg3; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); - ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2); - ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Label:createWithBMFont"); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.Label:createWithBMFont"); + ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "cc.Label:createWithBMFont"); + ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3, "cc.Label:createWithBMFont"); if(!ok) return 0; cocos2d::Label* ret = cocos2d::Label::createWithBMFont(arg0, arg1, arg2, arg3); @@ -34927,18 +37745,18 @@ int lua_cocos2dx_Label_createWithBMFont(lua_State* tolua_S) cocos2d::TextHAlignment arg2; int arg3; cocos2d::Vec2 arg4; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); - ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2); - ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3); - ok &= luaval_to_vec2(tolua_S, 6, &arg4); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Label:createWithBMFont"); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.Label:createWithBMFont"); + ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "cc.Label:createWithBMFont"); + ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3, "cc.Label:createWithBMFont"); + ok &= luaval_to_vec2(tolua_S, 6, &arg4, "cc.Label:createWithBMFont"); if(!ok) return 0; cocos2d::Label* ret = cocos2d::Label::createWithBMFont(arg0, arg1, arg2, arg3, arg4); object_to_luaval(tolua_S, "cc.Label",(cocos2d::Label*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createWithBMFont",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.Label:createWithBMFont",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -34969,7 +37787,7 @@ int lua_cocos2dx_Label_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Label",(cocos2d::Label*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.Label:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -34999,13 +37817,13 @@ int lua_cocos2dx_Label_createWithCharMap(lua_State* tolua_S) ok &= luaval_to_object(tolua_S, 2, "cc.Texture2D",&arg0); if (!ok) { break; } int arg1; - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.Label:createWithCharMap"); if (!ok) { break; } int arg2; - ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2); + ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "cc.Label:createWithCharMap"); if (!ok) { break; } int arg3; - ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3); + ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3, "cc.Label:createWithCharMap"); if (!ok) { break; } cocos2d::Label* ret = cocos2d::Label::createWithCharMap(arg0, arg1, arg2, arg3); object_to_luaval(tolua_S, "cc.Label",(cocos2d::Label*)ret); @@ -35018,16 +37836,16 @@ int lua_cocos2dx_Label_createWithCharMap(lua_State* tolua_S) if (argc == 4) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Label:createWithCharMap"); if (!ok) { break; } int arg1; - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.Label:createWithCharMap"); if (!ok) { break; } int arg2; - ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2); + ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "cc.Label:createWithCharMap"); if (!ok) { break; } int arg3; - ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3); + ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3, "cc.Label:createWithCharMap"); if (!ok) { break; } cocos2d::Label* ret = cocos2d::Label::createWithCharMap(arg0, arg1, arg2, arg3); object_to_luaval(tolua_S, "cc.Label",(cocos2d::Label*)ret); @@ -35040,7 +37858,7 @@ int lua_cocos2dx_Label_createWithCharMap(lua_State* tolua_S) if (argc == 1) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Label:createWithCharMap"); if (!ok) { break; } cocos2d::Label* ret = cocos2d::Label::createWithCharMap(arg0); object_to_luaval(tolua_S, "cc.Label",(cocos2d::Label*)ret); @@ -35048,7 +37866,7 @@ int lua_cocos2dx_Label_createWithCharMap(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "createWithCharMap",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.Label:createWithCharMap",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -35076,9 +37894,9 @@ int lua_cocos2dx_Label_createWithSystemFont(lua_State* tolua_S) std::string arg0; std::string arg1; double arg2; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Label:createWithSystemFont"); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.Label:createWithSystemFont"); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.Label:createWithSystemFont"); if(!ok) return 0; cocos2d::Label* ret = cocos2d::Label::createWithSystemFont(arg0, arg1, arg2); @@ -35091,10 +37909,10 @@ int lua_cocos2dx_Label_createWithSystemFont(lua_State* tolua_S) std::string arg1; double arg2; cocos2d::Size arg3; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); - ok &= luaval_to_number(tolua_S, 4,&arg2); - ok &= luaval_to_size(tolua_S, 5, &arg3); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Label:createWithSystemFont"); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.Label:createWithSystemFont"); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.Label:createWithSystemFont"); + ok &= luaval_to_size(tolua_S, 5, &arg3, "cc.Label:createWithSystemFont"); if(!ok) return 0; cocos2d::Label* ret = cocos2d::Label::createWithSystemFont(arg0, arg1, arg2, arg3); @@ -35108,11 +37926,11 @@ int lua_cocos2dx_Label_createWithSystemFont(lua_State* tolua_S) double arg2; cocos2d::Size arg3; cocos2d::TextHAlignment arg4; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); - ok &= luaval_to_number(tolua_S, 4,&arg2); - ok &= luaval_to_size(tolua_S, 5, &arg3); - ok &= luaval_to_int32(tolua_S, 6,(int *)&arg4); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Label:createWithSystemFont"); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.Label:createWithSystemFont"); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.Label:createWithSystemFont"); + ok &= luaval_to_size(tolua_S, 5, &arg3, "cc.Label:createWithSystemFont"); + ok &= luaval_to_int32(tolua_S, 6,(int *)&arg4, "cc.Label:createWithSystemFont"); if(!ok) return 0; cocos2d::Label* ret = cocos2d::Label::createWithSystemFont(arg0, arg1, arg2, arg3, arg4); @@ -35127,19 +37945,19 @@ int lua_cocos2dx_Label_createWithSystemFont(lua_State* tolua_S) cocos2d::Size arg3; cocos2d::TextHAlignment arg4; cocos2d::TextVAlignment arg5; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); - ok &= luaval_to_number(tolua_S, 4,&arg2); - ok &= luaval_to_size(tolua_S, 5, &arg3); - ok &= luaval_to_int32(tolua_S, 6,(int *)&arg4); - ok &= luaval_to_int32(tolua_S, 7,(int *)&arg5); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Label:createWithSystemFont"); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.Label:createWithSystemFont"); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.Label:createWithSystemFont"); + ok &= luaval_to_size(tolua_S, 5, &arg3, "cc.Label:createWithSystemFont"); + ok &= luaval_to_int32(tolua_S, 6,(int *)&arg4, "cc.Label:createWithSystemFont"); + ok &= luaval_to_int32(tolua_S, 7,(int *)&arg5, "cc.Label:createWithSystemFont"); if(!ok) return 0; cocos2d::Label* ret = cocos2d::Label::createWithSystemFont(arg0, arg1, arg2, arg3, arg4, arg5); object_to_luaval(tolua_S, "cc.Label",(cocos2d::Label*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createWithSystemFont",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.Label:createWithSystemFont",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -35236,7 +38054,7 @@ int lua_cocos2dx_Layer_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Layer",(cocos2d::Layer*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.Layer:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -35295,15 +38113,15 @@ int lua_cocos2dx_LayerColor_changeWidthAndHeight(lua_State* tolua_S) double arg0; double arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.LayerColor:changeWidthAndHeight"); - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.LayerColor:changeWidthAndHeight"); if(!ok) return 0; cobj->changeWidthAndHeight(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "changeWidthAndHeight",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LayerColor:changeWidthAndHeight",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -35343,13 +38161,13 @@ int lua_cocos2dx_LayerColor_changeHeight(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.LayerColor:changeHeight"); if(!ok) return 0; cobj->changeHeight(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "changeHeight",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LayerColor:changeHeight",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -35389,13 +38207,13 @@ int lua_cocos2dx_LayerColor_changeWidth(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.LayerColor:changeWidth"); if(!ok) return 0; cobj->changeWidth(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "changeWidth",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LayerColor:changeWidth",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -35424,13 +38242,13 @@ int lua_cocos2dx_LayerColor_create(lua_State* tolua_S) if (argc == 3) { cocos2d::Color4B arg0; - ok &=luaval_to_color4b(tolua_S, 2, &arg0); + ok &=luaval_to_color4b(tolua_S, 2, &arg0, "cc.LayerColor:create"); if (!ok) { break; } double arg1; - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.LayerColor:create"); if (!ok) { break; } double arg2; - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.LayerColor:create"); if (!ok) { break; } cocos2d::LayerColor* ret = cocos2d::LayerColor::create(arg0, arg1, arg2); object_to_luaval(tolua_S, "cc.LayerColor",(cocos2d::LayerColor*)ret); @@ -35453,7 +38271,7 @@ int lua_cocos2dx_LayerColor_create(lua_State* tolua_S) if (argc == 1) { cocos2d::Color4B arg0; - ok &=luaval_to_color4b(tolua_S, 2, &arg0); + ok &=luaval_to_color4b(tolua_S, 2, &arg0, "cc.LayerColor:create"); if (!ok) { break; } cocos2d::LayerColor* ret = cocos2d::LayerColor::create(arg0); object_to_luaval(tolua_S, "cc.LayerColor",(cocos2d::LayerColor*)ret); @@ -35461,7 +38279,7 @@ int lua_cocos2dx_LayerColor_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.LayerColor:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -35526,7 +38344,7 @@ int lua_cocos2dx_LayerGradient_getStartColor(lua_State* tolua_S) color3b_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getStartColor",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LayerGradient:getStartColor",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -35570,7 +38388,7 @@ int lua_cocos2dx_LayerGradient_isCompressedInterpolation(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isCompressedInterpolation",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LayerGradient:isCompressedInterpolation",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -35614,7 +38432,7 @@ int lua_cocos2dx_LayerGradient_getStartOpacity(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getStartOpacity",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LayerGradient:getStartOpacity",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -35654,13 +38472,13 @@ int lua_cocos2dx_LayerGradient_setVector(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.LayerGradient:setVector"); if(!ok) return 0; cobj->setVector(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setVector",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LayerGradient:setVector",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -35700,13 +38518,13 @@ int lua_cocos2dx_LayerGradient_setStartOpacity(lua_State* tolua_S) { uint16_t arg0; - ok &= luaval_to_uint16(tolua_S, 2,&arg0); + ok &= luaval_to_uint16(tolua_S, 2,&arg0, "cc.LayerGradient:setStartOpacity"); if(!ok) return 0; cobj->setStartOpacity(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setStartOpacity",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LayerGradient:setStartOpacity",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -35746,13 +38564,13 @@ int lua_cocos2dx_LayerGradient_setCompressedInterpolation(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.LayerGradient:setCompressedInterpolation"); if(!ok) return 0; cobj->setCompressedInterpolation(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setCompressedInterpolation",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LayerGradient:setCompressedInterpolation",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -35792,13 +38610,13 @@ int lua_cocos2dx_LayerGradient_setEndOpacity(lua_State* tolua_S) { uint16_t arg0; - ok &= luaval_to_uint16(tolua_S, 2,&arg0); + ok &= luaval_to_uint16(tolua_S, 2,&arg0, "cc.LayerGradient:setEndOpacity"); if(!ok) return 0; cobj->setEndOpacity(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setEndOpacity",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LayerGradient:setEndOpacity",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -35842,7 +38660,7 @@ int lua_cocos2dx_LayerGradient_getVector(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getVector",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LayerGradient:getVector",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -35882,13 +38700,13 @@ int lua_cocos2dx_LayerGradient_setEndColor(lua_State* tolua_S) { cocos2d::Color3B arg0; - ok &= luaval_to_color3b(tolua_S, 2, &arg0); + ok &= luaval_to_color3b(tolua_S, 2, &arg0, "cc.LayerGradient:setEndColor"); if(!ok) return 0; cobj->setEndColor(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setEndColor",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LayerGradient:setEndColor",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -35932,7 +38750,7 @@ int lua_cocos2dx_LayerGradient_getEndColor(lua_State* tolua_S) color3b_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getEndColor",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LayerGradient:getEndColor",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -35976,7 +38794,7 @@ int lua_cocos2dx_LayerGradient_getEndOpacity(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getEndOpacity",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LayerGradient:getEndOpacity",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -36016,13 +38834,13 @@ int lua_cocos2dx_LayerGradient_setStartColor(lua_State* tolua_S) { cocos2d::Color3B arg0; - ok &= luaval_to_color3b(tolua_S, 2, &arg0); + ok &= luaval_to_color3b(tolua_S, 2, &arg0, "cc.LayerGradient:setStartColor"); if(!ok) return 0; cobj->setStartColor(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setStartColor",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LayerGradient:setStartColor",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -36051,10 +38869,10 @@ int lua_cocos2dx_LayerGradient_create(lua_State* tolua_S) if (argc == 2) { cocos2d::Color4B arg0; - ok &=luaval_to_color4b(tolua_S, 2, &arg0); + ok &=luaval_to_color4b(tolua_S, 2, &arg0, "cc.LayerGradient:create"); if (!ok) { break; } cocos2d::Color4B arg1; - ok &=luaval_to_color4b(tolua_S, 3, &arg1); + ok &=luaval_to_color4b(tolua_S, 3, &arg1, "cc.LayerGradient:create"); if (!ok) { break; } cocos2d::LayerGradient* ret = cocos2d::LayerGradient::create(arg0, arg1); object_to_luaval(tolua_S, "cc.LayerGradient",(cocos2d::LayerGradient*)ret); @@ -36077,13 +38895,13 @@ int lua_cocos2dx_LayerGradient_create(lua_State* tolua_S) if (argc == 3) { cocos2d::Color4B arg0; - ok &=luaval_to_color4b(tolua_S, 2, &arg0); + ok &=luaval_to_color4b(tolua_S, 2, &arg0, "cc.LayerGradient:create"); if (!ok) { break; } cocos2d::Color4B arg1; - ok &=luaval_to_color4b(tolua_S, 3, &arg1); + ok &=luaval_to_color4b(tolua_S, 3, &arg1, "cc.LayerGradient:create"); if (!ok) { break; } cocos2d::Vec2 arg2; - ok &= luaval_to_vec2(tolua_S, 4, &arg2); + ok &= luaval_to_vec2(tolua_S, 4, &arg2, "cc.LayerGradient:create"); if (!ok) { break; } cocos2d::LayerGradient* ret = cocos2d::LayerGradient::create(arg0, arg1, arg2); object_to_luaval(tolua_S, "cc.LayerGradient",(cocos2d::LayerGradient*)ret); @@ -36091,7 +38909,7 @@ int lua_cocos2dx_LayerGradient_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.LayerGradient:create",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -36161,13 +38979,13 @@ int lua_cocos2dx_LayerMultiplex_switchToAndReleaseMe(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.LayerMultiplex:switchToAndReleaseMe"); if(!ok) return 0; cobj->switchToAndReleaseMe(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "switchToAndReleaseMe",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LayerMultiplex:switchToAndReleaseMe",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -36213,7 +39031,7 @@ int lua_cocos2dx_LayerMultiplex_addLayer(lua_State* tolua_S) cobj->addLayer(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addLayer",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LayerMultiplex:addLayer",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -36253,13 +39071,13 @@ int lua_cocos2dx_LayerMultiplex_switchTo(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.LayerMultiplex:switchTo"); if(!ok) return 0; cobj->switchTo(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "switchTo",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LayerMultiplex:switchTo",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -36291,168 +39109,6 @@ int lua_register_cocos2dx_LayerMultiplex(lua_State* tolua_S) return 1; } -int lua_cocos2dx_Scene_getPhysicsWorld(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::Scene* 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.Scene",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::Scene*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Scene_getPhysicsWorld'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - cocos2d::PhysicsWorld* ret = cobj->getPhysicsWorld(); - object_to_luaval(tolua_S, "cc.PhysicsWorld",(cocos2d::PhysicsWorld*)ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPhysicsWorld",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Scene_getPhysicsWorld'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_Scene_createWithSize(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.Scene",0,&tolua_err)) goto tolua_lerror; -#endif - - argc = lua_gettop(tolua_S) - 1; - - if (argc == 1) - { - cocos2d::Size arg0; - ok &= luaval_to_size(tolua_S, 2, &arg0); - if(!ok) - return 0; - cocos2d::Scene* ret = cocos2d::Scene::createWithSize(arg0); - object_to_luaval(tolua_S, "cc.Scene",(cocos2d::Scene*)ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createWithSize",argc, 1); - return 0; -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Scene_createWithSize'.",&tolua_err); -#endif - return 0; -} -int lua_cocos2dx_Scene_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.Scene",0,&tolua_err)) goto tolua_lerror; -#endif - - argc = lua_gettop(tolua_S) - 1; - - if (argc == 0) - { - if(!ok) - return 0; - cocos2d::Scene* ret = cocos2d::Scene::create(); - object_to_luaval(tolua_S, "cc.Scene",(cocos2d::Scene*)ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); - return 0; -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Scene_create'.",&tolua_err); -#endif - return 0; -} -int lua_cocos2dx_Scene_createWithPhysics(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.Scene",0,&tolua_err)) goto tolua_lerror; -#endif - - argc = lua_gettop(tolua_S) - 1; - - if (argc == 0) - { - if(!ok) - return 0; - cocos2d::Scene* ret = cocos2d::Scene::createWithPhysics(); - object_to_luaval(tolua_S, "cc.Scene",(cocos2d::Scene*)ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createWithPhysics",argc, 0); - return 0; -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Scene_createWithPhysics'.",&tolua_err); -#endif - return 0; -} -static int lua_cocos2dx_Scene_finalize(lua_State* tolua_S) -{ - printf("luabindings: finalizing LUA object (Scene)"); - return 0; -} - -int lua_register_cocos2dx_Scene(lua_State* tolua_S) -{ - tolua_usertype(tolua_S,"cc.Scene"); - tolua_cclass(tolua_S,"Scene","cc.Scene","cc.Node",nullptr); - - tolua_beginmodule(tolua_S,"Scene"); - tolua_function(tolua_S,"getPhysicsWorld",lua_cocos2dx_Scene_getPhysicsWorld); - tolua_function(tolua_S,"createWithSize", lua_cocos2dx_Scene_createWithSize); - tolua_function(tolua_S,"create", lua_cocos2dx_Scene_create); - tolua_function(tolua_S,"createWithPhysics", lua_cocos2dx_Scene_createWithPhysics); - tolua_endmodule(tolua_S); - std::string typeName = typeid(cocos2d::Scene).name(); - g_luaType[typeName] = "cc.Scene"; - g_typeCast["Scene"] = "cc.Scene"; - return 1; -} - int lua_cocos2dx_TransitionEaseScene_easeActionWithAction(lua_State* tolua_S) { int argc = 0; @@ -36490,7 +39146,7 @@ int lua_cocos2dx_TransitionEaseScene_easeActionWithAction(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.ActionInterval",(cocos2d::ActionInterval*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "easeActionWithAction",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TransitionEaseScene:easeActionWithAction",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -36553,7 +39209,7 @@ int lua_cocos2dx_TransitionScene_finish(lua_State* tolua_S) cobj->finish(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "finish",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TransitionScene:finish",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -36596,7 +39252,7 @@ int lua_cocos2dx_TransitionScene_hideOutShowIn(lua_State* tolua_S) cobj->hideOutShowIn(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "hideOutShowIn",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TransitionScene:hideOutShowIn",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -36625,7 +39281,7 @@ int lua_cocos2dx_TransitionScene_create(lua_State* tolua_S) { double arg0; cocos2d::Scene* arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TransitionScene:create"); ok &= luaval_to_object(tolua_S, 3, "cc.Scene",&arg1); if(!ok) return 0; @@ -36633,7 +39289,7 @@ int lua_cocos2dx_TransitionScene_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.TransitionScene",(cocos2d::TransitionScene*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.TransitionScene:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -36683,16 +39339,16 @@ int lua_cocos2dx_TransitionSceneOriented_create(lua_State* tolua_S) double arg0; cocos2d::Scene* arg1; cocos2d::TransitionScene::Orientation arg2; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TransitionSceneOriented:create"); ok &= luaval_to_object(tolua_S, 3, "cc.Scene",&arg1); - ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2); + ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "cc.TransitionSceneOriented:create"); if(!ok) return 0; cocos2d::TransitionSceneOriented* ret = cocos2d::TransitionSceneOriented::create(arg0, arg1, arg2); object_to_luaval(tolua_S, "cc.TransitionSceneOriented",(cocos2d::TransitionSceneOriented*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.TransitionSceneOriented:create",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -36739,7 +39395,7 @@ int lua_cocos2dx_TransitionRotoZoom_create(lua_State* tolua_S) { double arg0; cocos2d::Scene* arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TransitionRotoZoom:create"); ok &= luaval_to_object(tolua_S, 3, "cc.Scene",&arg1); if(!ok) return 0; @@ -36747,7 +39403,7 @@ int lua_cocos2dx_TransitionRotoZoom_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.TransitionRotoZoom",(cocos2d::TransitionRotoZoom*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.TransitionRotoZoom:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -36794,7 +39450,7 @@ int lua_cocos2dx_TransitionJumpZoom_create(lua_State* tolua_S) { double arg0; cocos2d::Scene* arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TransitionJumpZoom:create"); ok &= luaval_to_object(tolua_S, 3, "cc.Scene",&arg1); if(!ok) return 0; @@ -36802,7 +39458,7 @@ int lua_cocos2dx_TransitionJumpZoom_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.TransitionJumpZoom",(cocos2d::TransitionJumpZoom*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.TransitionJumpZoom:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -36864,7 +39520,7 @@ int lua_cocos2dx_TransitionMoveInL_action(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.ActionInterval",(cocos2d::ActionInterval*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "action",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TransitionMoveInL:action",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -36911,7 +39567,7 @@ int lua_cocos2dx_TransitionMoveInL_easeActionWithAction(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.ActionInterval",(cocos2d::ActionInterval*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "easeActionWithAction",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TransitionMoveInL:easeActionWithAction",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -36940,7 +39596,7 @@ int lua_cocos2dx_TransitionMoveInL_create(lua_State* tolua_S) { double arg0; cocos2d::Scene* arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TransitionMoveInL:create"); ok &= luaval_to_object(tolua_S, 3, "cc.Scene",&arg1); if(!ok) return 0; @@ -36948,7 +39604,7 @@ int lua_cocos2dx_TransitionMoveInL_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.TransitionMoveInL",(cocos2d::TransitionMoveInL*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.TransitionMoveInL:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -36997,7 +39653,7 @@ int lua_cocos2dx_TransitionMoveInR_create(lua_State* tolua_S) { double arg0; cocos2d::Scene* arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TransitionMoveInR:create"); ok &= luaval_to_object(tolua_S, 3, "cc.Scene",&arg1); if(!ok) return 0; @@ -37005,7 +39661,7 @@ int lua_cocos2dx_TransitionMoveInR_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.TransitionMoveInR",(cocos2d::TransitionMoveInR*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.TransitionMoveInR:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -37052,7 +39708,7 @@ int lua_cocos2dx_TransitionMoveInT_create(lua_State* tolua_S) { double arg0; cocos2d::Scene* arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TransitionMoveInT:create"); ok &= luaval_to_object(tolua_S, 3, "cc.Scene",&arg1); if(!ok) return 0; @@ -37060,7 +39716,7 @@ int lua_cocos2dx_TransitionMoveInT_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.TransitionMoveInT",(cocos2d::TransitionMoveInT*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.TransitionMoveInT:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -37107,7 +39763,7 @@ int lua_cocos2dx_TransitionMoveInB_create(lua_State* tolua_S) { double arg0; cocos2d::Scene* arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TransitionMoveInB:create"); ok &= luaval_to_object(tolua_S, 3, "cc.Scene",&arg1); if(!ok) return 0; @@ -37115,7 +39771,7 @@ int lua_cocos2dx_TransitionMoveInB_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.TransitionMoveInB",(cocos2d::TransitionMoveInB*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.TransitionMoveInB:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -37177,7 +39833,7 @@ int lua_cocos2dx_TransitionSlideInL_action(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.ActionInterval",(cocos2d::ActionInterval*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "action",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TransitionSlideInL:action",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -37224,7 +39880,7 @@ int lua_cocos2dx_TransitionSlideInL_easeActionWithAction(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.ActionInterval",(cocos2d::ActionInterval*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "easeActionWithAction",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TransitionSlideInL:easeActionWithAction",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -37253,7 +39909,7 @@ int lua_cocos2dx_TransitionSlideInL_create(lua_State* tolua_S) { double arg0; cocos2d::Scene* arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TransitionSlideInL:create"); ok &= luaval_to_object(tolua_S, 3, "cc.Scene",&arg1); if(!ok) return 0; @@ -37261,7 +39917,7 @@ int lua_cocos2dx_TransitionSlideInL_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.TransitionSlideInL",(cocos2d::TransitionSlideInL*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.TransitionSlideInL:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -37325,7 +39981,7 @@ int lua_cocos2dx_TransitionSlideInR_action(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.ActionInterval",(cocos2d::ActionInterval*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "action",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TransitionSlideInR:action",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -37354,7 +40010,7 @@ int lua_cocos2dx_TransitionSlideInR_create(lua_State* tolua_S) { double arg0; cocos2d::Scene* arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TransitionSlideInR:create"); ok &= luaval_to_object(tolua_S, 3, "cc.Scene",&arg1); if(!ok) return 0; @@ -37362,7 +40018,7 @@ int lua_cocos2dx_TransitionSlideInR_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.TransitionSlideInR",(cocos2d::TransitionSlideInR*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.TransitionSlideInR:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -37425,7 +40081,7 @@ int lua_cocos2dx_TransitionSlideInB_action(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.ActionInterval",(cocos2d::ActionInterval*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "action",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TransitionSlideInB:action",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -37454,7 +40110,7 @@ int lua_cocos2dx_TransitionSlideInB_create(lua_State* tolua_S) { double arg0; cocos2d::Scene* arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TransitionSlideInB:create"); ok &= luaval_to_object(tolua_S, 3, "cc.Scene",&arg1); if(!ok) return 0; @@ -37462,7 +40118,7 @@ int lua_cocos2dx_TransitionSlideInB_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.TransitionSlideInB",(cocos2d::TransitionSlideInB*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.TransitionSlideInB:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -37525,7 +40181,7 @@ int lua_cocos2dx_TransitionSlideInT_action(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.ActionInterval",(cocos2d::ActionInterval*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "action",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TransitionSlideInT:action",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -37554,7 +40210,7 @@ int lua_cocos2dx_TransitionSlideInT_create(lua_State* tolua_S) { double arg0; cocos2d::Scene* arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TransitionSlideInT:create"); ok &= luaval_to_object(tolua_S, 3, "cc.Scene",&arg1); if(!ok) return 0; @@ -37562,7 +40218,7 @@ int lua_cocos2dx_TransitionSlideInT_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.TransitionSlideInT",(cocos2d::TransitionSlideInT*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.TransitionSlideInT:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -37628,7 +40284,7 @@ int lua_cocos2dx_TransitionShrinkGrow_easeActionWithAction(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.ActionInterval",(cocos2d::ActionInterval*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "easeActionWithAction",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TransitionShrinkGrow:easeActionWithAction",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -37657,7 +40313,7 @@ int lua_cocos2dx_TransitionShrinkGrow_create(lua_State* tolua_S) { double arg0; cocos2d::Scene* arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TransitionShrinkGrow:create"); ok &= luaval_to_object(tolua_S, 3, "cc.Scene",&arg1); if(!ok) return 0; @@ -37665,7 +40321,7 @@ int lua_cocos2dx_TransitionShrinkGrow_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.TransitionShrinkGrow",(cocos2d::TransitionShrinkGrow*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.TransitionShrinkGrow:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -37713,7 +40369,7 @@ int lua_cocos2dx_TransitionFlipX_create(lua_State* tolua_S) if (argc == 2) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TransitionFlipX:create"); if (!ok) { break; } cocos2d::Scene* arg1; ok &= luaval_to_object(tolua_S, 3, "cc.Scene",&arg1); @@ -37729,13 +40385,13 @@ int lua_cocos2dx_TransitionFlipX_create(lua_State* tolua_S) if (argc == 3) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TransitionFlipX:create"); if (!ok) { break; } cocos2d::Scene* arg1; ok &= luaval_to_object(tolua_S, 3, "cc.Scene",&arg1); if (!ok) { break; } cocos2d::TransitionScene::Orientation arg2; - ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2); + ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "cc.TransitionFlipX:create"); if (!ok) { break; } cocos2d::TransitionFlipX* ret = cocos2d::TransitionFlipX::create(arg0, arg1, arg2); object_to_luaval(tolua_S, "cc.TransitionFlipX",(cocos2d::TransitionFlipX*)ret); @@ -37743,7 +40399,7 @@ int lua_cocos2dx_TransitionFlipX_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.TransitionFlipX:create",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -37790,7 +40446,7 @@ int lua_cocos2dx_TransitionFlipY_create(lua_State* tolua_S) if (argc == 2) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TransitionFlipY:create"); if (!ok) { break; } cocos2d::Scene* arg1; ok &= luaval_to_object(tolua_S, 3, "cc.Scene",&arg1); @@ -37806,13 +40462,13 @@ int lua_cocos2dx_TransitionFlipY_create(lua_State* tolua_S) if (argc == 3) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TransitionFlipY:create"); if (!ok) { break; } cocos2d::Scene* arg1; ok &= luaval_to_object(tolua_S, 3, "cc.Scene",&arg1); if (!ok) { break; } cocos2d::TransitionScene::Orientation arg2; - ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2); + ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "cc.TransitionFlipY:create"); if (!ok) { break; } cocos2d::TransitionFlipY* ret = cocos2d::TransitionFlipY::create(arg0, arg1, arg2); object_to_luaval(tolua_S, "cc.TransitionFlipY",(cocos2d::TransitionFlipY*)ret); @@ -37820,7 +40476,7 @@ int lua_cocos2dx_TransitionFlipY_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.TransitionFlipY:create",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -37867,7 +40523,7 @@ int lua_cocos2dx_TransitionFlipAngular_create(lua_State* tolua_S) if (argc == 2) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TransitionFlipAngular:create"); if (!ok) { break; } cocos2d::Scene* arg1; ok &= luaval_to_object(tolua_S, 3, "cc.Scene",&arg1); @@ -37883,13 +40539,13 @@ int lua_cocos2dx_TransitionFlipAngular_create(lua_State* tolua_S) if (argc == 3) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TransitionFlipAngular:create"); if (!ok) { break; } cocos2d::Scene* arg1; ok &= luaval_to_object(tolua_S, 3, "cc.Scene",&arg1); if (!ok) { break; } cocos2d::TransitionScene::Orientation arg2; - ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2); + ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "cc.TransitionFlipAngular:create"); if (!ok) { break; } cocos2d::TransitionFlipAngular* ret = cocos2d::TransitionFlipAngular::create(arg0, arg1, arg2); object_to_luaval(tolua_S, "cc.TransitionFlipAngular",(cocos2d::TransitionFlipAngular*)ret); @@ -37897,7 +40553,7 @@ int lua_cocos2dx_TransitionFlipAngular_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.TransitionFlipAngular:create",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -37944,7 +40600,7 @@ int lua_cocos2dx_TransitionZoomFlipX_create(lua_State* tolua_S) if (argc == 2) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TransitionZoomFlipX:create"); if (!ok) { break; } cocos2d::Scene* arg1; ok &= luaval_to_object(tolua_S, 3, "cc.Scene",&arg1); @@ -37960,13 +40616,13 @@ int lua_cocos2dx_TransitionZoomFlipX_create(lua_State* tolua_S) if (argc == 3) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TransitionZoomFlipX:create"); if (!ok) { break; } cocos2d::Scene* arg1; ok &= luaval_to_object(tolua_S, 3, "cc.Scene",&arg1); if (!ok) { break; } cocos2d::TransitionScene::Orientation arg2; - ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2); + ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "cc.TransitionZoomFlipX:create"); if (!ok) { break; } cocos2d::TransitionZoomFlipX* ret = cocos2d::TransitionZoomFlipX::create(arg0, arg1, arg2); object_to_luaval(tolua_S, "cc.TransitionZoomFlipX",(cocos2d::TransitionZoomFlipX*)ret); @@ -37974,7 +40630,7 @@ int lua_cocos2dx_TransitionZoomFlipX_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.TransitionZoomFlipX:create",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -38021,7 +40677,7 @@ int lua_cocos2dx_TransitionZoomFlipY_create(lua_State* tolua_S) if (argc == 2) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TransitionZoomFlipY:create"); if (!ok) { break; } cocos2d::Scene* arg1; ok &= luaval_to_object(tolua_S, 3, "cc.Scene",&arg1); @@ -38037,13 +40693,13 @@ int lua_cocos2dx_TransitionZoomFlipY_create(lua_State* tolua_S) if (argc == 3) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TransitionZoomFlipY:create"); if (!ok) { break; } cocos2d::Scene* arg1; ok &= luaval_to_object(tolua_S, 3, "cc.Scene",&arg1); if (!ok) { break; } cocos2d::TransitionScene::Orientation arg2; - ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2); + ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "cc.TransitionZoomFlipY:create"); if (!ok) { break; } cocos2d::TransitionZoomFlipY* ret = cocos2d::TransitionZoomFlipY::create(arg0, arg1, arg2); object_to_luaval(tolua_S, "cc.TransitionZoomFlipY",(cocos2d::TransitionZoomFlipY*)ret); @@ -38051,7 +40707,7 @@ int lua_cocos2dx_TransitionZoomFlipY_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.TransitionZoomFlipY:create",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -38098,7 +40754,7 @@ int lua_cocos2dx_TransitionZoomFlipAngular_create(lua_State* tolua_S) if (argc == 2) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TransitionZoomFlipAngular:create"); if (!ok) { break; } cocos2d::Scene* arg1; ok &= luaval_to_object(tolua_S, 3, "cc.Scene",&arg1); @@ -38114,13 +40770,13 @@ int lua_cocos2dx_TransitionZoomFlipAngular_create(lua_State* tolua_S) if (argc == 3) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TransitionZoomFlipAngular:create"); if (!ok) { break; } cocos2d::Scene* arg1; ok &= luaval_to_object(tolua_S, 3, "cc.Scene",&arg1); if (!ok) { break; } cocos2d::TransitionScene::Orientation arg2; - ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2); + ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "cc.TransitionZoomFlipAngular:create"); if (!ok) { break; } cocos2d::TransitionZoomFlipAngular* ret = cocos2d::TransitionZoomFlipAngular::create(arg0, arg1, arg2); object_to_luaval(tolua_S, "cc.TransitionZoomFlipAngular",(cocos2d::TransitionZoomFlipAngular*)ret); @@ -38128,7 +40784,7 @@ int lua_cocos2dx_TransitionZoomFlipAngular_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.TransitionZoomFlipAngular:create",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -38175,7 +40831,7 @@ int lua_cocos2dx_TransitionFade_create(lua_State* tolua_S) if (argc == 2) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TransitionFade:create"); if (!ok) { break; } cocos2d::Scene* arg1; ok &= luaval_to_object(tolua_S, 3, "cc.Scene",&arg1); @@ -38191,13 +40847,13 @@ int lua_cocos2dx_TransitionFade_create(lua_State* tolua_S) if (argc == 3) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TransitionFade:create"); if (!ok) { break; } cocos2d::Scene* arg1; ok &= luaval_to_object(tolua_S, 3, "cc.Scene",&arg1); if (!ok) { break; } cocos2d::Color3B arg2; - ok &= luaval_to_color3b(tolua_S, 4, &arg2); + ok &= luaval_to_color3b(tolua_S, 4, &arg2, "cc.TransitionFade:create"); if (!ok) { break; } cocos2d::TransitionFade* ret = cocos2d::TransitionFade::create(arg0, arg1, arg2); object_to_luaval(tolua_S, "cc.TransitionFade",(cocos2d::TransitionFade*)ret); @@ -38205,7 +40861,7 @@ int lua_cocos2dx_TransitionFade_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.TransitionFade:create",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -38252,7 +40908,7 @@ int lua_cocos2dx_TransitionCrossFade_create(lua_State* tolua_S) { double arg0; cocos2d::Scene* arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TransitionCrossFade:create"); ok &= luaval_to_object(tolua_S, 3, "cc.Scene",&arg1); if(!ok) return 0; @@ -38260,7 +40916,7 @@ int lua_cocos2dx_TransitionCrossFade_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.TransitionCrossFade",(cocos2d::TransitionCrossFade*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.TransitionCrossFade:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -38325,7 +40981,7 @@ int lua_cocos2dx_TransitionTurnOffTiles_easeActionWithAction(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.ActionInterval",(cocos2d::ActionInterval*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "easeActionWithAction",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TransitionTurnOffTiles:easeActionWithAction",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -38354,7 +41010,7 @@ int lua_cocos2dx_TransitionTurnOffTiles_create(lua_State* tolua_S) { double arg0; cocos2d::Scene* arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TransitionTurnOffTiles:create"); ok &= luaval_to_object(tolua_S, 3, "cc.Scene",&arg1); if(!ok) return 0; @@ -38362,7 +41018,7 @@ int lua_cocos2dx_TransitionTurnOffTiles_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.TransitionTurnOffTiles",(cocos2d::TransitionTurnOffTiles*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.TransitionTurnOffTiles:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -38425,7 +41081,7 @@ int lua_cocos2dx_TransitionSplitCols_action(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.ActionInterval",(cocos2d::ActionInterval*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "action",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TransitionSplitCols:action",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -38472,7 +41128,7 @@ int lua_cocos2dx_TransitionSplitCols_easeActionWithAction(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.ActionInterval",(cocos2d::ActionInterval*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "easeActionWithAction",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TransitionSplitCols:easeActionWithAction",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -38501,7 +41157,7 @@ int lua_cocos2dx_TransitionSplitCols_create(lua_State* tolua_S) { double arg0; cocos2d::Scene* arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TransitionSplitCols:create"); ok &= luaval_to_object(tolua_S, 3, "cc.Scene",&arg1); if(!ok) return 0; @@ -38509,7 +41165,7 @@ int lua_cocos2dx_TransitionSplitCols_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.TransitionSplitCols",(cocos2d::TransitionSplitCols*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.TransitionSplitCols:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -38558,7 +41214,7 @@ int lua_cocos2dx_TransitionSplitRows_create(lua_State* tolua_S) { double arg0; cocos2d::Scene* arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TransitionSplitRows:create"); ok &= luaval_to_object(tolua_S, 3, "cc.Scene",&arg1); if(!ok) return 0; @@ -38566,7 +41222,7 @@ int lua_cocos2dx_TransitionSplitRows_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.TransitionSplitRows",(cocos2d::TransitionSplitRows*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.TransitionSplitRows:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -38631,7 +41287,7 @@ int lua_cocos2dx_TransitionFadeTR_easeActionWithAction(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.ActionInterval",(cocos2d::ActionInterval*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "easeActionWithAction",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TransitionFadeTR:easeActionWithAction",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -38671,14 +41327,14 @@ int lua_cocos2dx_TransitionFadeTR_actionWithSize(lua_State* tolua_S) { cocos2d::Size arg0; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.TransitionFadeTR:actionWithSize"); if(!ok) return 0; cocos2d::ActionInterval* ret = cobj->actionWithSize(arg0); object_to_luaval(tolua_S, "cc.ActionInterval",(cocos2d::ActionInterval*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "actionWithSize",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TransitionFadeTR:actionWithSize",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -38707,7 +41363,7 @@ int lua_cocos2dx_TransitionFadeTR_create(lua_State* tolua_S) { double arg0; cocos2d::Scene* arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TransitionFadeTR:create"); ok &= luaval_to_object(tolua_S, 3, "cc.Scene",&arg1); if(!ok) return 0; @@ -38715,7 +41371,7 @@ int lua_cocos2dx_TransitionFadeTR_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.TransitionFadeTR",(cocos2d::TransitionFadeTR*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.TransitionFadeTR:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -38764,7 +41420,7 @@ int lua_cocos2dx_TransitionFadeBL_create(lua_State* tolua_S) { double arg0; cocos2d::Scene* arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TransitionFadeBL:create"); ok &= luaval_to_object(tolua_S, 3, "cc.Scene",&arg1); if(!ok) return 0; @@ -38772,7 +41428,7 @@ int lua_cocos2dx_TransitionFadeBL_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.TransitionFadeBL",(cocos2d::TransitionFadeBL*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.TransitionFadeBL:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -38819,7 +41475,7 @@ int lua_cocos2dx_TransitionFadeUp_create(lua_State* tolua_S) { double arg0; cocos2d::Scene* arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TransitionFadeUp:create"); ok &= luaval_to_object(tolua_S, 3, "cc.Scene",&arg1); if(!ok) return 0; @@ -38827,7 +41483,7 @@ int lua_cocos2dx_TransitionFadeUp_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.TransitionFadeUp",(cocos2d::TransitionFadeUp*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.TransitionFadeUp:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -38874,7 +41530,7 @@ int lua_cocos2dx_TransitionFadeDown_create(lua_State* tolua_S) { double arg0; cocos2d::Scene* arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TransitionFadeDown:create"); ok &= luaval_to_object(tolua_S, 3, "cc.Scene",&arg1); if(!ok) return 0; @@ -38882,7 +41538,7 @@ int lua_cocos2dx_TransitionFadeDown_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.TransitionFadeDown",(cocos2d::TransitionFadeDown*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.TransitionFadeDown:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -38940,14 +41596,14 @@ int lua_cocos2dx_TransitionPageTurn_actionWithSize(lua_State* tolua_S) { cocos2d::Size arg0; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.TransitionPageTurn:actionWithSize"); if(!ok) return 0; cocos2d::ActionInterval* ret = cobj->actionWithSize(arg0); object_to_luaval(tolua_S, "cc.ActionInterval",(cocos2d::ActionInterval*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "actionWithSize",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TransitionPageTurn:actionWithSize",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -38989,18 +41645,18 @@ int lua_cocos2dx_TransitionPageTurn_initWithDuration(lua_State* tolua_S) cocos2d::Scene* arg1; bool arg2; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TransitionPageTurn:initWithDuration"); ok &= luaval_to_object(tolua_S, 3, "cc.Scene",&arg1); - ok &= luaval_to_boolean(tolua_S, 4,&arg2); + ok &= luaval_to_boolean(tolua_S, 4,&arg2, "cc.TransitionPageTurn:initWithDuration"); if(!ok) return 0; bool ret = cobj->initWithDuration(arg0, arg1, arg2); tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "initWithDuration",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TransitionPageTurn:initWithDuration",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 @@ -39030,16 +41686,16 @@ int lua_cocos2dx_TransitionPageTurn_create(lua_State* tolua_S) double arg0; cocos2d::Scene* arg1; bool arg2; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TransitionPageTurn:create"); ok &= luaval_to_object(tolua_S, 3, "cc.Scene",&arg1); - ok &= luaval_to_boolean(tolua_S, 4,&arg2); + ok &= luaval_to_boolean(tolua_S, 4,&arg2, "cc.TransitionPageTurn:create"); if(!ok) return 0; cocos2d::TransitionPageTurn* ret = cocos2d::TransitionPageTurn::create(arg0, arg1, arg2); object_to_luaval(tolua_S, "cc.TransitionPageTurn",(cocos2d::TransitionPageTurn*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.TransitionPageTurn:create",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -39088,7 +41744,7 @@ int lua_cocos2dx_TransitionProgress_create(lua_State* tolua_S) { double arg0; cocos2d::Scene* arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TransitionProgress:create"); ok &= luaval_to_object(tolua_S, 3, "cc.Scene",&arg1); if(!ok) return 0; @@ -39096,7 +41752,7 @@ int lua_cocos2dx_TransitionProgress_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.TransitionProgress",(cocos2d::TransitionProgress*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.TransitionProgress:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -39143,7 +41799,7 @@ int lua_cocos2dx_TransitionProgressRadialCCW_create(lua_State* tolua_S) { double arg0; cocos2d::Scene* arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TransitionProgressRadialCCW:create"); ok &= luaval_to_object(tolua_S, 3, "cc.Scene",&arg1); if(!ok) return 0; @@ -39151,7 +41807,7 @@ int lua_cocos2dx_TransitionProgressRadialCCW_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.TransitionProgressRadialCCW",(cocos2d::TransitionProgressRadialCCW*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.TransitionProgressRadialCCW:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -39198,7 +41854,7 @@ int lua_cocos2dx_TransitionProgressRadialCW_create(lua_State* tolua_S) { double arg0; cocos2d::Scene* arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TransitionProgressRadialCW:create"); ok &= luaval_to_object(tolua_S, 3, "cc.Scene",&arg1); if(!ok) return 0; @@ -39206,7 +41862,7 @@ int lua_cocos2dx_TransitionProgressRadialCW_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.TransitionProgressRadialCW",(cocos2d::TransitionProgressRadialCW*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.TransitionProgressRadialCW:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -39253,7 +41909,7 @@ int lua_cocos2dx_TransitionProgressHorizontal_create(lua_State* tolua_S) { double arg0; cocos2d::Scene* arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TransitionProgressHorizontal:create"); ok &= luaval_to_object(tolua_S, 3, "cc.Scene",&arg1); if(!ok) return 0; @@ -39261,7 +41917,7 @@ int lua_cocos2dx_TransitionProgressHorizontal_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.TransitionProgressHorizontal",(cocos2d::TransitionProgressHorizontal*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.TransitionProgressHorizontal:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -39308,7 +41964,7 @@ int lua_cocos2dx_TransitionProgressVertical_create(lua_State* tolua_S) { double arg0; cocos2d::Scene* arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TransitionProgressVertical:create"); ok &= luaval_to_object(tolua_S, 3, "cc.Scene",&arg1); if(!ok) return 0; @@ -39316,7 +41972,7 @@ int lua_cocos2dx_TransitionProgressVertical_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.TransitionProgressVertical",(cocos2d::TransitionProgressVertical*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.TransitionProgressVertical:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -39363,7 +42019,7 @@ int lua_cocos2dx_TransitionProgressInOut_create(lua_State* tolua_S) { double arg0; cocos2d::Scene* arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TransitionProgressInOut:create"); ok &= luaval_to_object(tolua_S, 3, "cc.Scene",&arg1); if(!ok) return 0; @@ -39371,7 +42027,7 @@ int lua_cocos2dx_TransitionProgressInOut_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.TransitionProgressInOut",(cocos2d::TransitionProgressInOut*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.TransitionProgressInOut:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -39418,7 +42074,7 @@ int lua_cocos2dx_TransitionProgressOutIn_create(lua_State* tolua_S) { double arg0; cocos2d::Scene* arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.TransitionProgressOutIn:create"); ok &= luaval_to_object(tolua_S, 3, "cc.Scene",&arg1); if(!ok) return 0; @@ -39426,7 +42082,7 @@ int lua_cocos2dx_TransitionProgressOutIn_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.TransitionProgressOutIn",(cocos2d::TransitionProgressOutIn*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.TransitionProgressOutIn:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -39484,13 +42140,13 @@ int lua_cocos2dx_MenuItem_setEnabled(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.MenuItem:setEnabled"); if(!ok) return 0; cobj->setEnabled(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setEnabled",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.MenuItem:setEnabled",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -39533,7 +42189,7 @@ int lua_cocos2dx_MenuItem_activate(lua_State* tolua_S) cobj->activate(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "activate",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.MenuItem:activate",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -39577,7 +42233,7 @@ int lua_cocos2dx_MenuItem_isEnabled(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isEnabled",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.MenuItem:isEnabled",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -39620,7 +42276,7 @@ int lua_cocos2dx_MenuItem_selected(lua_State* tolua_S) cobj->selected(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "selected",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.MenuItem:selected",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -39664,7 +42320,7 @@ int lua_cocos2dx_MenuItem_isSelected(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isSelected",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.MenuItem:isSelected",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -39707,7 +42363,7 @@ int lua_cocos2dx_MenuItem_unselected(lua_State* tolua_S) cobj->unselected(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "unselected",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.MenuItem:unselected",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -39751,7 +42407,7 @@ int lua_cocos2dx_MenuItem_rect(lua_State* tolua_S) rect_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "rect",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.MenuItem:rect",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -39821,7 +42477,7 @@ int lua_cocos2dx_MenuItemLabel_getDisabledColor(lua_State* tolua_S) color3b_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDisabledColor",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.MenuItemLabel:getDisabledColor",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -39861,13 +42517,13 @@ int lua_cocos2dx_MenuItemLabel_setString(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.MenuItemLabel:setString"); if(!ok) return 0; cobj->setString(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setString",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.MenuItemLabel:setString",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -39913,7 +42569,7 @@ int lua_cocos2dx_MenuItemLabel_setLabel(lua_State* tolua_S) cobj->setLabel(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setLabel",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.MenuItemLabel:setLabel",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -39953,13 +42609,13 @@ int lua_cocos2dx_MenuItemLabel_setDisabledColor(lua_State* tolua_S) { cocos2d::Color3B arg0; - ok &= luaval_to_color3b(tolua_S, 2, &arg0); + ok &= luaval_to_color3b(tolua_S, 2, &arg0, "cc.MenuItemLabel:setDisabledColor"); if(!ok) return 0; cobj->setDisabledColor(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setDisabledColor",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.MenuItemLabel:setDisabledColor",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -40003,7 +42659,7 @@ int lua_cocos2dx_MenuItemLabel_getLabel(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Node",(cocos2d::Node*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getLabel",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.MenuItemLabel:getLabel",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -40090,7 +42746,7 @@ int lua_cocos2dx_MenuItemFont_getFontSizeObj(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getFontSizeObj",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.MenuItemFont:getFontSizeObj",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -40134,7 +42790,7 @@ int lua_cocos2dx_MenuItemFont_getFontNameObj(lua_State* tolua_S) tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getFontNameObj",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.MenuItemFont:getFontNameObj",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -40174,13 +42830,13 @@ int lua_cocos2dx_MenuItemFont_setFontSizeObj(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.MenuItemFont:setFontSizeObj"); if(!ok) return 0; cobj->setFontSizeObj(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setFontSizeObj",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.MenuItemFont:setFontSizeObj",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -40220,13 +42876,13 @@ int lua_cocos2dx_MenuItemFont_setFontNameObj(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.MenuItemFont:setFontNameObj"); if(!ok) return 0; cobj->setFontNameObj(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setFontNameObj",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.MenuItemFont:setFontNameObj",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -40254,13 +42910,13 @@ int lua_cocos2dx_MenuItemFont_setFontName(lua_State* tolua_S) if (argc == 1) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.MenuItemFont:setFontName"); if(!ok) return 0; cocos2d::MenuItemFont::setFontName(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "setFontName",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.MenuItemFont:setFontName",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -40291,7 +42947,7 @@ int lua_cocos2dx_MenuItemFont_getFontSize(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "getFontSize",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.MenuItemFont:getFontSize",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -40322,7 +42978,7 @@ int lua_cocos2dx_MenuItemFont_getFontName(lua_State* tolua_S) tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "getFontName",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.MenuItemFont:getFontName",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -40348,13 +43004,13 @@ int lua_cocos2dx_MenuItemFont_setFontSize(lua_State* tolua_S) if (argc == 1) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.MenuItemFont:setFontSize"); if(!ok) return 0; cocos2d::MenuItemFont::setFontSize(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "setFontSize",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.MenuItemFont:setFontSize",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -40419,13 +43075,13 @@ int lua_cocos2dx_MenuItemSprite_setEnabled(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.MenuItemSprite:setEnabled"); if(!ok) return 0; cobj->setEnabled(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setEnabled",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.MenuItemSprite:setEnabled",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -40468,7 +43124,7 @@ int lua_cocos2dx_MenuItemSprite_selected(lua_State* tolua_S) cobj->selected(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "selected",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.MenuItemSprite:selected",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -40514,7 +43170,7 @@ int lua_cocos2dx_MenuItemSprite_setNormalImage(lua_State* tolua_S) cobj->setNormalImage(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setNormalImage",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.MenuItemSprite:setNormalImage",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -40560,7 +43216,7 @@ int lua_cocos2dx_MenuItemSprite_setDisabledImage(lua_State* tolua_S) cobj->setDisabledImage(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setDisabledImage",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.MenuItemSprite:setDisabledImage",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -40606,7 +43262,7 @@ int lua_cocos2dx_MenuItemSprite_setSelectedImage(lua_State* tolua_S) cobj->setSelectedImage(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setSelectedImage",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.MenuItemSprite:setSelectedImage",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -40650,7 +43306,7 @@ int lua_cocos2dx_MenuItemSprite_getDisabledImage(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Node",(cocos2d::Node*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDisabledImage",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.MenuItemSprite:getDisabledImage",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -40694,7 +43350,7 @@ int lua_cocos2dx_MenuItemSprite_getSelectedImage(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Node",(cocos2d::Node*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getSelectedImage",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.MenuItemSprite:getSelectedImage",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -40738,7 +43394,7 @@ int lua_cocos2dx_MenuItemSprite_getNormalImage(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Node",(cocos2d::Node*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getNormalImage",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.MenuItemSprite:getNormalImage",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -40781,7 +43437,7 @@ int lua_cocos2dx_MenuItemSprite_unselected(lua_State* tolua_S) cobj->unselected(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "unselected",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.MenuItemSprite:unselected",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -40855,7 +43511,7 @@ int lua_cocos2dx_MenuItemImage_setDisabledSpriteFrame(lua_State* tolua_S) cobj->setDisabledSpriteFrame(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setDisabledSpriteFrame",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.MenuItemImage:setDisabledSpriteFrame",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -40901,7 +43557,7 @@ int lua_cocos2dx_MenuItemImage_setSelectedSpriteFrame(lua_State* tolua_S) cobj->setSelectedSpriteFrame(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setSelectedSpriteFrame",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.MenuItemImage:setSelectedSpriteFrame",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -40947,7 +43603,7 @@ int lua_cocos2dx_MenuItemImage_setNormalSpriteFrame(lua_State* tolua_S) cobj->setNormalSpriteFrame(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setNormalSpriteFrame",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.MenuItemImage:setNormalSpriteFrame",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -41009,13 +43665,13 @@ int lua_cocos2dx_MenuItemToggle_setSubItems(lua_State* tolua_S) { cocos2d::Vector arg0; - ok &= luaval_to_ccvector(tolua_S, 2, &arg0); + ok &= luaval_to_ccvector(tolua_S, 2, &arg0, "cc.MenuItemToggle:setSubItems"); if(!ok) return 0; cobj->setSubItems(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setSubItems",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.MenuItemToggle:setSubItems",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -41059,7 +43715,7 @@ int lua_cocos2dx_MenuItemToggle_getSelectedIndex(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getSelectedIndex",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.MenuItemToggle:getSelectedIndex",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -41105,7 +43761,7 @@ int lua_cocos2dx_MenuItemToggle_addSubItem(lua_State* tolua_S) cobj->addSubItem(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addSubItem",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.MenuItemToggle:addSubItem",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -41149,7 +43805,7 @@ int lua_cocos2dx_MenuItemToggle_getSelectedItem(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.MenuItem",(cocos2d::MenuItem*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getSelectedItem",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.MenuItemToggle:getSelectedItem",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -41189,13 +43845,13 @@ int lua_cocos2dx_MenuItemToggle_setSelectedIndex(lua_State* tolua_S) { unsigned int arg0; - ok &= luaval_to_uint32(tolua_S, 2,&arg0); + ok &= luaval_to_uint32(tolua_S, 2,&arg0, "cc.MenuItemToggle:setSelectedIndex"); if(!ok) return 0; cobj->setSelectedIndex(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setSelectedIndex",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.MenuItemToggle:setSelectedIndex",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -41259,13 +43915,13 @@ int lua_cocos2dx_Menu_setEnabled(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.Menu:setEnabled"); if(!ok) return 0; cobj->setEnabled(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setEnabled",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Menu:setEnabled",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -41308,7 +43964,7 @@ int lua_cocos2dx_Menu_alignItemsVertically(lua_State* tolua_S) cobj->alignItemsVertically(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "alignItemsVertically",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Menu:alignItemsVertically",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -41352,7 +44008,7 @@ int lua_cocos2dx_Menu_isEnabled(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isEnabled",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Menu:isEnabled",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -41392,13 +44048,13 @@ int lua_cocos2dx_Menu_alignItemsHorizontallyWithPadding(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Menu:alignItemsHorizontallyWithPadding"); if(!ok) return 0; cobj->alignItemsHorizontallyWithPadding(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "alignItemsHorizontallyWithPadding",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Menu:alignItemsHorizontallyWithPadding",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -41438,13 +44094,13 @@ int lua_cocos2dx_Menu_alignItemsVerticallyWithPadding(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Menu:alignItemsVerticallyWithPadding"); if(!ok) return 0; cobj->alignItemsVerticallyWithPadding(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "alignItemsVerticallyWithPadding",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Menu:alignItemsVerticallyWithPadding",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -41487,7 +44143,7 @@ int lua_cocos2dx_Menu_alignItemsHorizontally(lua_State* tolua_S) cobj->alignItemsHorizontally(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "alignItemsHorizontally",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Menu:alignItemsHorizontally",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -41556,7 +44212,7 @@ int lua_cocos2dx_ClippingNode_isInverted(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isInverted",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ClippingNode:isInverted",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -41596,13 +44252,13 @@ int lua_cocos2dx_ClippingNode_setInverted(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.ClippingNode:setInverted"); if(!ok) return 0; cobj->setInverted(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setInverted",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ClippingNode:setInverted",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -41648,7 +44304,7 @@ int lua_cocos2dx_ClippingNode_setStencil(lua_State* tolua_S) cobj->setStencil(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setStencil",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ClippingNode:setStencil",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -41692,7 +44348,7 @@ int lua_cocos2dx_ClippingNode_getAlphaThreshold(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAlphaThreshold",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ClippingNode:getAlphaThreshold",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -41736,7 +44392,7 @@ int lua_cocos2dx_ClippingNode_getStencil(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Node",(cocos2d::Node*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getStencil",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ClippingNode:getStencil",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -41776,13 +44432,13 @@ int lua_cocos2dx_ClippingNode_setAlphaThreshold(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ClippingNode:setAlphaThreshold"); if(!ok) return 0; cobj->setAlphaThreshold(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAlphaThreshold",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ClippingNode:setAlphaThreshold",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -41829,7 +44485,7 @@ int lua_cocos2dx_ClippingNode_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.ClippingNode:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -41896,7 +44552,7 @@ int lua_cocos2dx_MotionStreak_reset(lua_State* tolua_S) cobj->reset(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "reset",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.MotionStreak:reset",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -41942,7 +44598,7 @@ int lua_cocos2dx_MotionStreak_setTexture(lua_State* tolua_S) cobj->setTexture(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTexture",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.MotionStreak:setTexture",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -41986,7 +44642,7 @@ int lua_cocos2dx_MotionStreak_getTexture(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Texture2D",(cocos2d::Texture2D*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTexture",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.MotionStreak:getTexture",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -42026,13 +44682,13 @@ int lua_cocos2dx_MotionStreak_tintWithColor(lua_State* tolua_S) { cocos2d::Color3B arg0; - ok &= luaval_to_color3b(tolua_S, 2, &arg0); + ok &= luaval_to_color3b(tolua_S, 2, &arg0, "cc.MotionStreak:tintWithColor"); if(!ok) return 0; cobj->tintWithColor(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "tintWithColor",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.MotionStreak:tintWithColor",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -42072,13 +44728,13 @@ int lua_cocos2dx_MotionStreak_setStartingPositionInitialized(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.MotionStreak:setStartingPositionInitialized"); if(!ok) return 0; cobj->setStartingPositionInitialized(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setStartingPositionInitialized",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.MotionStreak:setStartingPositionInitialized",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -42122,7 +44778,7 @@ int lua_cocos2dx_MotionStreak_isStartingPositionInitialized(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isStartingPositionInitialized",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.MotionStreak:isStartingPositionInitialized",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -42166,7 +44822,7 @@ int lua_cocos2dx_MotionStreak_isFastMode(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isFastMode",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.MotionStreak:isFastMode",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -42206,13 +44862,13 @@ int lua_cocos2dx_MotionStreak_setFastMode(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.MotionStreak:setFastMode"); if(!ok) return 0; cobj->setFastMode(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setFastMode",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.MotionStreak:setFastMode",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -42241,16 +44897,16 @@ int lua_cocos2dx_MotionStreak_create(lua_State* tolua_S) if (argc == 5) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.MotionStreak:create"); if (!ok) { break; } double arg1; - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.MotionStreak:create"); if (!ok) { break; } double arg2; - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.MotionStreak:create"); if (!ok) { break; } cocos2d::Color3B arg3; - ok &= luaval_to_color3b(tolua_S, 5, &arg3); + ok &= luaval_to_color3b(tolua_S, 5, &arg3, "cc.MotionStreak:create"); if (!ok) { break; } cocos2d::Texture2D* arg4; ok &= luaval_to_object(tolua_S, 6, "cc.Texture2D",&arg4); @@ -42266,19 +44922,19 @@ int lua_cocos2dx_MotionStreak_create(lua_State* tolua_S) if (argc == 5) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.MotionStreak:create"); if (!ok) { break; } double arg1; - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.MotionStreak:create"); if (!ok) { break; } double arg2; - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.MotionStreak:create"); if (!ok) { break; } cocos2d::Color3B arg3; - ok &= luaval_to_color3b(tolua_S, 5, &arg3); + ok &= luaval_to_color3b(tolua_S, 5, &arg3, "cc.MotionStreak:create"); if (!ok) { break; } std::string arg4; - ok &= luaval_to_std_string(tolua_S, 6,&arg4); + ok &= luaval_to_std_string(tolua_S, 6,&arg4, "cc.MotionStreak:create"); if (!ok) { break; } cocos2d::MotionStreak* ret = cocos2d::MotionStreak::create(arg0, arg1, arg2, arg3, arg4); object_to_luaval(tolua_S, "cc.MotionStreak",(cocos2d::MotionStreak*)ret); @@ -42286,7 +44942,7 @@ int lua_cocos2dx_MotionStreak_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 5); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.MotionStreak:create",argc, 5); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -42357,7 +45013,7 @@ int lua_cocos2dx_Sprite_setSpriteFrame(lua_State* tolua_S) do{ if (argc == 1) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Sprite:setSpriteFrame"); if (!ok) { break; } cobj->setSpriteFrame(arg0); @@ -42365,7 +45021,7 @@ int lua_cocos2dx_Sprite_setSpriteFrame(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setSpriteFrame",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Sprite:setSpriteFrame",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -42410,7 +45066,7 @@ int lua_cocos2dx_Sprite_setTexture(lua_State* tolua_S) do{ if (argc == 1) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Sprite:setTexture"); if (!ok) { break; } cobj->setTexture(arg0); @@ -42418,7 +45074,7 @@ int lua_cocos2dx_Sprite_setTexture(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTexture",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Sprite:setTexture",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -42462,7 +45118,7 @@ int lua_cocos2dx_Sprite_getTexture(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Texture2D",(cocos2d::Texture2D*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTexture",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Sprite:getTexture",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -42502,13 +45158,13 @@ int lua_cocos2dx_Sprite_setFlippedY(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.Sprite:setFlippedY"); if(!ok) return 0; cobj->setFlippedY(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setFlippedY",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Sprite:setFlippedY",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -42548,13 +45204,13 @@ int lua_cocos2dx_Sprite_setFlippedX(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.Sprite:setFlippedX"); if(!ok) return 0; cobj->setFlippedX(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setFlippedX",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Sprite:setFlippedX",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -42598,7 +45254,7 @@ int lua_cocos2dx_Sprite_getBatchNode(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.SpriteBatchNode",(cocos2d::SpriteBatchNode*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getBatchNode",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Sprite:getBatchNode",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -42642,7 +45298,7 @@ int lua_cocos2dx_Sprite_getOffsetPosition(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getOffsetPosition",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Sprite:getOffsetPosition",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -42682,13 +45338,13 @@ int lua_cocos2dx_Sprite_removeAllChildrenWithCleanup(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.Sprite:removeAllChildrenWithCleanup"); if(!ok) return 0; cobj->removeAllChildrenWithCleanup(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeAllChildrenWithCleanup",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Sprite:removeAllChildrenWithCleanup",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -42731,7 +45387,7 @@ int lua_cocos2dx_Sprite_updateTransform(lua_State* tolua_S) cobj->updateTransform(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "updateTransform",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Sprite:updateTransform",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -42765,15 +45421,15 @@ int lua_cocos2dx_Sprite_setTextureRect(lua_State* tolua_S) do{ if (argc == 3) { cocos2d::Rect arg0; - ok &= luaval_to_rect(tolua_S, 2, &arg0); + ok &= luaval_to_rect(tolua_S, 2, &arg0, "cc.Sprite:setTextureRect"); if (!ok) { break; } bool arg1; - ok &= luaval_to_boolean(tolua_S, 3,&arg1); + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "cc.Sprite:setTextureRect"); if (!ok) { break; } cocos2d::Size arg2; - ok &= luaval_to_size(tolua_S, 4, &arg2); + ok &= luaval_to_size(tolua_S, 4, &arg2, "cc.Sprite:setTextureRect"); if (!ok) { break; } cobj->setTextureRect(arg0, arg1, arg2); @@ -42784,7 +45440,7 @@ int lua_cocos2dx_Sprite_setTextureRect(lua_State* tolua_S) do{ if (argc == 1) { cocos2d::Rect arg0; - ok &= luaval_to_rect(tolua_S, 2, &arg0); + ok &= luaval_to_rect(tolua_S, 2, &arg0, "cc.Sprite:setTextureRect"); if (!ok) { break; } cobj->setTextureRect(arg0); @@ -42792,7 +45448,7 @@ int lua_cocos2dx_Sprite_setTextureRect(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTextureRect",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Sprite:setTextureRect",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -42839,7 +45495,7 @@ int lua_cocos2dx_Sprite_isFrameDisplayed(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isFrameDisplayed",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Sprite:isFrameDisplayed",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -42883,7 +45539,7 @@ int lua_cocos2dx_Sprite_getAtlasIndex(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAtlasIndex",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Sprite:getAtlasIndex",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -42929,7 +45585,7 @@ int lua_cocos2dx_Sprite_setBatchNode(lua_State* tolua_S) cobj->setBatchNode(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setBatchNode",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Sprite:setBatchNode",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -42970,15 +45626,15 @@ int lua_cocos2dx_Sprite_setDisplayFrameWithAnimationName(lua_State* tolua_S) std::string arg0; ssize_t arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Sprite:setDisplayFrameWithAnimationName"); - ok &= luaval_to_ssize(tolua_S, 3, &arg1); + ok &= luaval_to_ssize(tolua_S, 3, &arg1, "cc.Sprite:setDisplayFrameWithAnimationName"); if(!ok) return 0; cobj->setDisplayFrameWithAnimationName(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setDisplayFrameWithAnimationName",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Sprite:setDisplayFrameWithAnimationName",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -43024,7 +45680,7 @@ int lua_cocos2dx_Sprite_setTextureAtlas(lua_State* tolua_S) cobj->setTextureAtlas(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTextureAtlas",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Sprite:setTextureAtlas",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -43068,7 +45724,7 @@ int lua_cocos2dx_Sprite_getSpriteFrame(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.SpriteFrame",(cocos2d::SpriteFrame*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getSpriteFrame",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Sprite:getSpriteFrame",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -43112,7 +45768,7 @@ int lua_cocos2dx_Sprite_isDirty(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isDirty",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Sprite:isDirty",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -43152,13 +45808,13 @@ int lua_cocos2dx_Sprite_setAtlasIndex(lua_State* tolua_S) { ssize_t arg0; - ok &= luaval_to_ssize(tolua_S, 2, &arg0); + ok &= luaval_to_ssize(tolua_S, 2, &arg0, "cc.Sprite:setAtlasIndex"); if(!ok) return 0; cobj->setAtlasIndex(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAtlasIndex",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Sprite:setAtlasIndex",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -43198,13 +45854,13 @@ int lua_cocos2dx_Sprite_setDirty(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.Sprite:setDirty"); if(!ok) return 0; cobj->setDirty(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setDirty",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Sprite:setDirty",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -43248,7 +45904,7 @@ int lua_cocos2dx_Sprite_isTextureRectRotated(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isTextureRectRotated",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Sprite:isTextureRectRotated",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -43292,7 +45948,7 @@ int lua_cocos2dx_Sprite_getTextureRect(lua_State* tolua_S) rect_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTextureRect",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Sprite:getTextureRect",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -43336,7 +45992,7 @@ int lua_cocos2dx_Sprite_getTextureAtlas(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.TextureAtlas",(cocos2d::TextureAtlas*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTextureAtlas",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Sprite:getTextureAtlas",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -43380,7 +46036,7 @@ int lua_cocos2dx_Sprite_isFlippedX(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isFlippedX",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Sprite:isFlippedX",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -43424,7 +46080,7 @@ int lua_cocos2dx_Sprite_isFlippedY(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isFlippedY",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Sprite:isFlippedY",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -43464,13 +46120,13 @@ int lua_cocos2dx_Sprite_setVertexRect(lua_State* tolua_S) { cocos2d::Rect arg0; - ok &= luaval_to_rect(tolua_S, 2, &arg0); + ok &= luaval_to_rect(tolua_S, 2, &arg0, "cc.Sprite:setVertexRect"); if(!ok) return 0; cobj->setVertexRect(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setVertexRect",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Sprite:setVertexRect",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -43499,7 +46155,7 @@ int lua_cocos2dx_Sprite_create(lua_State* tolua_S) if (argc == 1) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Sprite:create"); if (!ok) { break; } cocos2d::Sprite* ret = cocos2d::Sprite::create(arg0); object_to_luaval(tolua_S, "cc.Sprite",(cocos2d::Sprite*)ret); @@ -43522,10 +46178,10 @@ int lua_cocos2dx_Sprite_create(lua_State* tolua_S) if (argc == 2) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Sprite:create"); if (!ok) { break; } cocos2d::Rect arg1; - ok &= luaval_to_rect(tolua_S, 3, &arg1); + ok &= luaval_to_rect(tolua_S, 3, &arg1, "cc.Sprite:create"); if (!ok) { break; } cocos2d::Sprite* ret = cocos2d::Sprite::create(arg0, arg1); object_to_luaval(tolua_S, "cc.Sprite",(cocos2d::Sprite*)ret); @@ -43533,7 +46189,7 @@ int lua_cocos2dx_Sprite_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.Sprite:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -43563,7 +46219,7 @@ int lua_cocos2dx_Sprite_createWithTexture(lua_State* tolua_S) ok &= luaval_to_object(tolua_S, 2, "cc.Texture2D",&arg0); if (!ok) { break; } cocos2d::Rect arg1; - ok &= luaval_to_rect(tolua_S, 3, &arg1); + ok &= luaval_to_rect(tolua_S, 3, &arg1, "cc.Sprite:createWithTexture"); if (!ok) { break; } cocos2d::Sprite* ret = cocos2d::Sprite::createWithTexture(arg0, arg1); object_to_luaval(tolua_S, "cc.Sprite",(cocos2d::Sprite*)ret); @@ -43579,10 +46235,10 @@ int lua_cocos2dx_Sprite_createWithTexture(lua_State* tolua_S) ok &= luaval_to_object(tolua_S, 2, "cc.Texture2D",&arg0); if (!ok) { break; } cocos2d::Rect arg1; - ok &= luaval_to_rect(tolua_S, 3, &arg1); + ok &= luaval_to_rect(tolua_S, 3, &arg1, "cc.Sprite:createWithTexture"); if (!ok) { break; } bool arg2; - ok &= luaval_to_boolean(tolua_S, 4,&arg2); + ok &= luaval_to_boolean(tolua_S, 4,&arg2, "cc.Sprite:createWithTexture"); if (!ok) { break; } cocos2d::Sprite* ret = cocos2d::Sprite::createWithTexture(arg0, arg1, arg2); object_to_luaval(tolua_S, "cc.Sprite",(cocos2d::Sprite*)ret); @@ -43603,7 +46259,7 @@ int lua_cocos2dx_Sprite_createWithTexture(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "createWithTexture",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.Sprite:createWithTexture",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -43629,14 +46285,14 @@ int lua_cocos2dx_Sprite_createWithSpriteFrameName(lua_State* tolua_S) if (argc == 1) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Sprite:createWithSpriteFrameName"); if(!ok) return 0; cocos2d::Sprite* ret = cocos2d::Sprite::createWithSpriteFrameName(arg0); object_to_luaval(tolua_S, "cc.Sprite",(cocos2d::Sprite*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createWithSpriteFrameName",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.Sprite:createWithSpriteFrameName",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -43669,7 +46325,7 @@ int lua_cocos2dx_Sprite_createWithSpriteFrame(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Sprite",(cocos2d::Sprite*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createWithSpriteFrame",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.Sprite:createWithSpriteFrame",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -43759,7 +46415,7 @@ int lua_cocos2dx_ProgressTimer_isReverseDirection(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isReverseDirection",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ProgressTimer:isReverseDirection",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -43799,13 +46455,13 @@ int lua_cocos2dx_ProgressTimer_setBarChangeRate(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.ProgressTimer:setBarChangeRate"); if(!ok) return 0; cobj->setBarChangeRate(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setBarChangeRate",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ProgressTimer:setBarChangeRate",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -43849,7 +46505,7 @@ int lua_cocos2dx_ProgressTimer_getPercentage(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPercentage",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ProgressTimer:getPercentage",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -43895,7 +46551,7 @@ int lua_cocos2dx_ProgressTimer_setSprite(lua_State* tolua_S) cobj->setSprite(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setSprite",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ProgressTimer:setSprite",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -43939,7 +46595,7 @@ int lua_cocos2dx_ProgressTimer_getType(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getType",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ProgressTimer:getType",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -43983,7 +46639,7 @@ int lua_cocos2dx_ProgressTimer_getSprite(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Sprite",(cocos2d::Sprite*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getSprite",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ProgressTimer:getSprite",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -44023,13 +46679,13 @@ int lua_cocos2dx_ProgressTimer_setMidpoint(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.ProgressTimer:setMidpoint"); if(!ok) return 0; cobj->setMidpoint(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setMidpoint",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ProgressTimer:setMidpoint",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -44073,7 +46729,7 @@ int lua_cocos2dx_ProgressTimer_getBarChangeRate(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getBarChangeRate",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ProgressTimer:getBarChangeRate",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -44107,7 +46763,7 @@ int lua_cocos2dx_ProgressTimer_setReverseDirection(lua_State* tolua_S) do{ if (argc == 1) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.ProgressTimer:setReverseDirection"); if (!ok) { break; } cobj->setReverseDirection(arg0); @@ -44118,7 +46774,7 @@ int lua_cocos2dx_ProgressTimer_setReverseDirection(lua_State* tolua_S) do{ if (argc == 1) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.ProgressTimer:setReverseDirection"); if (!ok) { break; } cobj->setReverseProgress(arg0); @@ -44126,7 +46782,7 @@ int lua_cocos2dx_ProgressTimer_setReverseDirection(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setReverseProgress",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ProgressTimer:setReverseProgress",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -44170,7 +46826,7 @@ int lua_cocos2dx_ProgressTimer_getMidpoint(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getMidpoint",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ProgressTimer:getMidpoint",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -44210,13 +46866,13 @@ int lua_cocos2dx_ProgressTimer_setPercentage(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ProgressTimer:setPercentage"); if(!ok) return 0; cobj->setPercentage(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setPercentage",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ProgressTimer:setPercentage",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -44256,13 +46912,13 @@ int lua_cocos2dx_ProgressTimer_setType(lua_State* tolua_S) { cocos2d::ProgressTimer::Type arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.ProgressTimer:setType"); if(!ok) return 0; cobj->setType(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setType",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ProgressTimer:setType",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -44297,7 +46953,7 @@ int lua_cocos2dx_ProgressTimer_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.ProgressTimer",(cocos2d::ProgressTimer*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.ProgressTimer:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -44371,7 +47027,7 @@ int lua_cocos2dx_Image_hasPremultipliedAlpha(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "hasPremultipliedAlpha",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Image:hasPremultipliedAlpha",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -44411,7 +47067,7 @@ int lua_cocos2dx_Image_saveToFile(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Image:saveToFile"); if(!ok) return 0; bool ret = cobj->saveToFile(arg0); @@ -44423,16 +47079,16 @@ int lua_cocos2dx_Image_saveToFile(lua_State* tolua_S) std::string arg0; bool arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Image:saveToFile"); - ok &= luaval_to_boolean(tolua_S, 3,&arg1); + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "cc.Image:saveToFile"); if(!ok) return 0; bool ret = cobj->saveToFile(arg0, arg1); tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "saveToFile",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Image:saveToFile",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -44442,50 +47098,6 @@ int lua_cocos2dx_Image_saveToFile(lua_State* tolua_S) return 0; } -int lua_cocos2dx_Image_getBitPerPixel(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::Image* 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.Image",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::Image*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Image_getBitPerPixel'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - int ret = cobj->getBitPerPixel(); - tolua_pushnumber(tolua_S,(lua_Number)ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getBitPerPixel",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Image_getBitPerPixel'.",&tolua_err); -#endif - - return 0; -} int lua_cocos2dx_Image_hasAlpha(lua_State* tolua_S) { int argc = 0; @@ -44520,7 +47132,7 @@ int lua_cocos2dx_Image_hasAlpha(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "hasAlpha",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Image:hasAlpha",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -44564,7 +47176,7 @@ int lua_cocos2dx_Image_isCompressed(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isCompressed",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Image:isCompressed",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -44608,7 +47220,7 @@ int lua_cocos2dx_Image_getHeight(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getHeight",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Image:getHeight",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -44648,14 +47260,14 @@ int lua_cocos2dx_Image_initWithImageFile(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Image:initWithImageFile"); if(!ok) return 0; bool ret = cobj->initWithImageFile(arg0); tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "initWithImageFile",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Image:initWithImageFile",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -44699,7 +47311,7 @@ int lua_cocos2dx_Image_getWidth(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getWidth",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Image:getWidth",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -44709,7 +47321,7 @@ int lua_cocos2dx_Image_getWidth(lua_State* tolua_S) return 0; } -int lua_cocos2dx_Image_isPremultipliedAlpha(lua_State* tolua_S) +int lua_cocos2dx_Image_getBitPerPixel(lua_State* tolua_S) { int argc = 0; cocos2d::Image* cobj = nullptr; @@ -44729,7 +47341,7 @@ int lua_cocos2dx_Image_isPremultipliedAlpha(lua_State* tolua_S) #if COCOS2D_DEBUG >= 1 if (!cobj) { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Image_isPremultipliedAlpha'", nullptr); + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Image_getBitPerPixel'", nullptr); return 0; } #endif @@ -44739,16 +47351,16 @@ int lua_cocos2dx_Image_isPremultipliedAlpha(lua_State* tolua_S) { if(!ok) return 0; - bool ret = cobj->isPremultipliedAlpha(); - tolua_pushboolean(tolua_S,(bool)ret); + int ret = cobj->getBitPerPixel(); + tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isPremultipliedAlpha",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Image:getBitPerPixel",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Image_isPremultipliedAlpha'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Image_getBitPerPixel'.",&tolua_err); #endif return 0; @@ -44787,7 +47399,7 @@ int lua_cocos2dx_Image_getFileType(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getFileType",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Image:getFileType",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -44831,7 +47443,7 @@ int lua_cocos2dx_Image_getNumberOfMipmaps(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getNumberOfMipmaps",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Image:getNumberOfMipmaps",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -44875,7 +47487,7 @@ int lua_cocos2dx_Image_getRenderFormat(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getRenderFormat",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Image:getRenderFormat",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -44885,6 +47497,38 @@ int lua_cocos2dx_Image_getRenderFormat(lua_State* tolua_S) return 0; } +int lua_cocos2dx_Image_setPVRImagesHavePremultipliedAlpha(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.Image",0,&tolua_err)) goto tolua_lerror; +#endif + + argc = lua_gettop(tolua_S) - 1; + + if (argc == 1) + { + bool arg0; + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.Image:setPVRImagesHavePremultipliedAlpha"); + if(!ok) + return 0; + cocos2d::Image::setPVRImagesHavePremultipliedAlpha(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.Image:setPVRImagesHavePremultipliedAlpha",argc, 1); + return 0; +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Image_setPVRImagesHavePremultipliedAlpha'.",&tolua_err); +#endif + return 0; +} int lua_cocos2dx_Image_constructor(lua_State* tolua_S) { int argc = 0; @@ -44909,7 +47553,7 @@ int lua_cocos2dx_Image_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.Image"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "Image",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Image:Image",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -44934,16 +47578,16 @@ int lua_register_cocos2dx_Image(lua_State* tolua_S) tolua_function(tolua_S,"new",lua_cocos2dx_Image_constructor); tolua_function(tolua_S,"hasPremultipliedAlpha",lua_cocos2dx_Image_hasPremultipliedAlpha); tolua_function(tolua_S,"saveToFile",lua_cocos2dx_Image_saveToFile); - tolua_function(tolua_S,"getBitPerPixel",lua_cocos2dx_Image_getBitPerPixel); tolua_function(tolua_S,"hasAlpha",lua_cocos2dx_Image_hasAlpha); tolua_function(tolua_S,"isCompressed",lua_cocos2dx_Image_isCompressed); tolua_function(tolua_S,"getHeight",lua_cocos2dx_Image_getHeight); tolua_function(tolua_S,"initWithImageFile",lua_cocos2dx_Image_initWithImageFile); tolua_function(tolua_S,"getWidth",lua_cocos2dx_Image_getWidth); - tolua_function(tolua_S,"isPremultipliedAlpha",lua_cocos2dx_Image_isPremultipliedAlpha); + tolua_function(tolua_S,"getBitPerPixel",lua_cocos2dx_Image_getBitPerPixel); tolua_function(tolua_S,"getFileType",lua_cocos2dx_Image_getFileType); tolua_function(tolua_S,"getNumberOfMipmaps",lua_cocos2dx_Image_getNumberOfMipmaps); tolua_function(tolua_S,"getRenderFormat",lua_cocos2dx_Image_getRenderFormat); + tolua_function(tolua_S,"setPVRImagesHavePremultipliedAlpha", lua_cocos2dx_Image_setPVRImagesHavePremultipliedAlpha); tolua_endmodule(tolua_S); std::string typeName = typeid(cocos2d::Image).name(); g_luaType[typeName] = "cc.Image"; @@ -44983,17 +47627,17 @@ int lua_cocos2dx_RenderTexture_setVirtualViewport(lua_State* tolua_S) cocos2d::Rect arg1; cocos2d::Rect arg2; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.RenderTexture:setVirtualViewport"); - ok &= luaval_to_rect(tolua_S, 3, &arg1); + ok &= luaval_to_rect(tolua_S, 3, &arg1, "cc.RenderTexture:setVirtualViewport"); - ok &= luaval_to_rect(tolua_S, 4, &arg2); + ok &= luaval_to_rect(tolua_S, 4, &arg2, "cc.RenderTexture:setVirtualViewport"); if(!ok) return 0; cobj->setVirtualViewport(arg0, arg1, arg2); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setVirtualViewport",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.RenderTexture:setVirtualViewport",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 @@ -45033,13 +47677,13 @@ int lua_cocos2dx_RenderTexture_clearStencil(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.RenderTexture:clearStencil"); if(!ok) return 0; cobj->clearStencil(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "clearStencil",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.RenderTexture:clearStencil",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -45083,7 +47727,7 @@ int lua_cocos2dx_RenderTexture_getClearDepth(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getClearDepth",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.RenderTexture:getClearDepth",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -45127,7 +47771,7 @@ int lua_cocos2dx_RenderTexture_getClearStencil(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getClearStencil",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.RenderTexture:getClearStencil",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -45170,7 +47814,7 @@ int lua_cocos2dx_RenderTexture_end(lua_State* tolua_S) cobj->end(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "end",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.RenderTexture:end",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -45210,13 +47854,13 @@ int lua_cocos2dx_RenderTexture_setClearStencil(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.RenderTexture:setClearStencil"); if(!ok) return 0; cobj->setClearStencil(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setClearStencil",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.RenderTexture:setClearStencil",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -45262,7 +47906,7 @@ int lua_cocos2dx_RenderTexture_setSprite(lua_State* tolua_S) cobj->setSprite(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setSprite",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.RenderTexture:setSprite",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -45306,7 +47950,7 @@ int lua_cocos2dx_RenderTexture_getSprite(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Sprite",(cocos2d::Sprite*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getSprite",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.RenderTexture:getSprite",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -45350,7 +47994,7 @@ int lua_cocos2dx_RenderTexture_isAutoDraw(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isAutoDraw",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.RenderTexture:isAutoDraw",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -45390,13 +48034,13 @@ int lua_cocos2dx_RenderTexture_setKeepMatrix(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.RenderTexture:setKeepMatrix"); if(!ok) return 0; cobj->setKeepMatrix(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setKeepMatrix",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.RenderTexture:setKeepMatrix",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -45436,13 +48080,13 @@ int lua_cocos2dx_RenderTexture_setClearFlags(lua_State* tolua_S) { unsigned int arg0; - ok &= luaval_to_uint32(tolua_S, 2,&arg0); + ok &= luaval_to_uint32(tolua_S, 2,&arg0, "cc.RenderTexture:setClearFlags"); if(!ok) return 0; cobj->setClearFlags(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setClearFlags",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.RenderTexture:setClearFlags",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -45485,7 +48129,7 @@ int lua_cocos2dx_RenderTexture_begin(lua_State* tolua_S) cobj->begin(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "begin",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.RenderTexture:begin",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -45519,11 +48163,11 @@ int lua_cocos2dx_RenderTexture_saveToFile(lua_State* tolua_S) do{ if (argc == 2) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.RenderTexture:saveToFile"); if (!ok) { break; } cocos2d::Image::Format arg1; - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.RenderTexture:saveToFile"); if (!ok) { break; } bool ret = cobj->saveToFile(arg0, arg1); @@ -45535,15 +48179,15 @@ int lua_cocos2dx_RenderTexture_saveToFile(lua_State* tolua_S) do{ if (argc == 3) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.RenderTexture:saveToFile"); if (!ok) { break; } cocos2d::Image::Format arg1; - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.RenderTexture:saveToFile"); if (!ok) { break; } bool arg2; - ok &= luaval_to_boolean(tolua_S, 4,&arg2); + ok &= luaval_to_boolean(tolua_S, 4,&arg2, "cc.RenderTexture:saveToFile"); if (!ok) { break; } bool ret = cobj->saveToFile(arg0, arg1, arg2); @@ -45552,10 +48196,38 @@ int lua_cocos2dx_RenderTexture_saveToFile(lua_State* tolua_S) } }while(0); ok = true; + do{ + if (argc == 4) { + std::string arg0; + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.RenderTexture:saveToFile"); + + if (!ok) { break; } + cocos2d::Image::Format arg1; + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.RenderTexture:saveToFile"); + + if (!ok) { break; } + bool arg2; + ok &= luaval_to_boolean(tolua_S, 4,&arg2, "cc.RenderTexture:saveToFile"); + + if (!ok) { break; } + std::function &)> arg3; + do { + // Lambda binding for lua is not supported. + assert(false); + } while(0) + ; + + if (!ok) { break; } + bool ret = cobj->saveToFile(arg0, arg1, arg2, arg3); + tolua_pushboolean(tolua_S,(bool)ret); + return 1; + } + }while(0); + ok = true; do{ if (argc == 1) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.RenderTexture:saveToFile"); if (!ok) { break; } bool ret = cobj->saveToFile(arg0); @@ -45567,11 +48239,11 @@ int lua_cocos2dx_RenderTexture_saveToFile(lua_State* tolua_S) do{ if (argc == 2) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.RenderTexture:saveToFile"); if (!ok) { break; } bool arg1; - ok &= luaval_to_boolean(tolua_S, 3,&arg1); + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "cc.RenderTexture:saveToFile"); if (!ok) { break; } bool ret = cobj->saveToFile(arg0, arg1); @@ -45580,7 +48252,31 @@ int lua_cocos2dx_RenderTexture_saveToFile(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "saveToFile",argc, 1); + do{ + if (argc == 3) { + std::string arg0; + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.RenderTexture:saveToFile"); + + if (!ok) { break; } + bool arg1; + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "cc.RenderTexture:saveToFile"); + + if (!ok) { break; } + std::function &)> arg2; + do { + // Lambda binding for lua is not supported. + assert(false); + } while(0) + ; + + if (!ok) { break; } + bool ret = cobj->saveToFile(arg0, arg1, arg2); + tolua_pushboolean(tolua_S,(bool)ret); + return 1; + } + }while(0); + ok = true; + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.RenderTexture:saveToFile",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -45620,13 +48316,13 @@ int lua_cocos2dx_RenderTexture_setAutoDraw(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.RenderTexture:setAutoDraw"); if(!ok) return 0; cobj->setAutoDraw(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAutoDraw",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.RenderTexture:setAutoDraw",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -45666,13 +48362,13 @@ int lua_cocos2dx_RenderTexture_setClearColor(lua_State* tolua_S) { cocos2d::Color4F arg0; - ok &=luaval_to_color4f(tolua_S, 2, &arg0); + ok &=luaval_to_color4f(tolua_S, 2, &arg0, "cc.RenderTexture:setClearColor"); if(!ok) return 0; cobj->setClearColor(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setClearColor",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.RenderTexture:setClearColor",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -45715,7 +48411,7 @@ int lua_cocos2dx_RenderTexture_endToLua(lua_State* tolua_S) cobj->endToLua(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "endToLua",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.RenderTexture:endToLua",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -45749,23 +48445,23 @@ int lua_cocos2dx_RenderTexture_beginWithClear(lua_State* tolua_S) do{ if (argc == 5) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.RenderTexture:beginWithClear"); if (!ok) { break; } double arg1; - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.RenderTexture:beginWithClear"); if (!ok) { break; } double arg2; - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.RenderTexture:beginWithClear"); if (!ok) { break; } double arg3; - ok &= luaval_to_number(tolua_S, 5,&arg3); + ok &= luaval_to_number(tolua_S, 5,&arg3, "cc.RenderTexture:beginWithClear"); if (!ok) { break; } double arg4; - ok &= luaval_to_number(tolua_S, 6,&arg4); + ok &= luaval_to_number(tolua_S, 6,&arg4, "cc.RenderTexture:beginWithClear"); if (!ok) { break; } cobj->beginWithClear(arg0, arg1, arg2, arg3, arg4); @@ -45776,19 +48472,19 @@ int lua_cocos2dx_RenderTexture_beginWithClear(lua_State* tolua_S) do{ if (argc == 4) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.RenderTexture:beginWithClear"); if (!ok) { break; } double arg1; - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.RenderTexture:beginWithClear"); if (!ok) { break; } double arg2; - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.RenderTexture:beginWithClear"); if (!ok) { break; } double arg3; - ok &= luaval_to_number(tolua_S, 5,&arg3); + ok &= luaval_to_number(tolua_S, 5,&arg3, "cc.RenderTexture:beginWithClear"); if (!ok) { break; } cobj->beginWithClear(arg0, arg1, arg2, arg3); @@ -45799,27 +48495,27 @@ int lua_cocos2dx_RenderTexture_beginWithClear(lua_State* tolua_S) do{ if (argc == 6) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.RenderTexture:beginWithClear"); if (!ok) { break; } double arg1; - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.RenderTexture:beginWithClear"); if (!ok) { break; } double arg2; - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.RenderTexture:beginWithClear"); if (!ok) { break; } double arg3; - ok &= luaval_to_number(tolua_S, 5,&arg3); + ok &= luaval_to_number(tolua_S, 5,&arg3, "cc.RenderTexture:beginWithClear"); if (!ok) { break; } double arg4; - ok &= luaval_to_number(tolua_S, 6,&arg4); + ok &= luaval_to_number(tolua_S, 6,&arg4, "cc.RenderTexture:beginWithClear"); if (!ok) { break; } int arg5; - ok &= luaval_to_int32(tolua_S, 7,(int *)&arg5); + ok &= luaval_to_int32(tolua_S, 7,(int *)&arg5, "cc.RenderTexture:beginWithClear"); if (!ok) { break; } cobj->beginWithClear(arg0, arg1, arg2, arg3, arg4, arg5); @@ -45827,7 +48523,7 @@ int lua_cocos2dx_RenderTexture_beginWithClear(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "beginWithClear",argc, 6); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.RenderTexture:beginWithClear",argc, 6); return 0; #if COCOS2D_DEBUG >= 1 @@ -45867,13 +48563,13 @@ int lua_cocos2dx_RenderTexture_clearDepth(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.RenderTexture:clearDepth"); if(!ok) return 0; cobj->clearDepth(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "clearDepth",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.RenderTexture:clearDepth",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -45917,7 +48613,7 @@ int lua_cocos2dx_RenderTexture_getClearColor(lua_State* tolua_S) color4f_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getClearColor",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.RenderTexture:getClearColor",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -45960,19 +48656,19 @@ int lua_cocos2dx_RenderTexture_clear(lua_State* tolua_S) double arg2; double arg3; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.RenderTexture:clear"); - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.RenderTexture:clear"); - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.RenderTexture:clear"); - ok &= luaval_to_number(tolua_S, 5,&arg3); + ok &= luaval_to_number(tolua_S, 5,&arg3, "cc.RenderTexture:clear"); if(!ok) return 0; cobj->clear(arg0, arg1, arg2, arg3); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "clear",argc, 4); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.RenderTexture:clear",argc, 4); return 0; #if COCOS2D_DEBUG >= 1 @@ -46016,7 +48712,7 @@ int lua_cocos2dx_RenderTexture_getClearFlags(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getClearFlags",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.RenderTexture:getClearFlags",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -46064,14 +48760,14 @@ int lua_cocos2dx_RenderTexture_newImage(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.RenderTexture:newImage"); if(!ok) return 0; cocos2d::Image* ret = cobj->newImage(arg0); object_to_luaval(tolua_S, "cc.Image",(cocos2d::Image*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "newImage",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.RenderTexture:newImage",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -46111,13 +48807,13 @@ int lua_cocos2dx_RenderTexture_setClearDepth(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.RenderTexture:setClearDepth"); if(!ok) return 0; cobj->setClearDepth(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setClearDepth",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.RenderTexture:setClearDepth",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -46151,19 +48847,19 @@ int lua_cocos2dx_RenderTexture_initWithWidthAndHeight(lua_State* tolua_S) do{ if (argc == 4) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.RenderTexture:initWithWidthAndHeight"); if (!ok) { break; } int arg1; - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.RenderTexture:initWithWidthAndHeight"); if (!ok) { break; } cocos2d::Texture2D::PixelFormat arg2; - ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2); + ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "cc.RenderTexture:initWithWidthAndHeight"); if (!ok) { break; } unsigned int arg3; - ok &= luaval_to_uint32(tolua_S, 5,&arg3); + ok &= luaval_to_uint32(tolua_S, 5,&arg3, "cc.RenderTexture:initWithWidthAndHeight"); if (!ok) { break; } bool ret = cobj->initWithWidthAndHeight(arg0, arg1, arg2, arg3); @@ -46175,15 +48871,15 @@ int lua_cocos2dx_RenderTexture_initWithWidthAndHeight(lua_State* tolua_S) do{ if (argc == 3) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.RenderTexture:initWithWidthAndHeight"); if (!ok) { break; } int arg1; - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.RenderTexture:initWithWidthAndHeight"); if (!ok) { break; } cocos2d::Texture2D::PixelFormat arg2; - ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2); + ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "cc.RenderTexture:initWithWidthAndHeight"); if (!ok) { break; } bool ret = cobj->initWithWidthAndHeight(arg0, arg1, arg2); @@ -46192,7 +48888,7 @@ int lua_cocos2dx_RenderTexture_initWithWidthAndHeight(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "initWithWidthAndHeight",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.RenderTexture:initWithWidthAndHeight",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 @@ -46221,13 +48917,13 @@ int lua_cocos2dx_RenderTexture_create(lua_State* tolua_S) if (argc == 3) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.RenderTexture:create"); if (!ok) { break; } int arg1; - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.RenderTexture:create"); if (!ok) { break; } cocos2d::Texture2D::PixelFormat arg2; - ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2); + ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "cc.RenderTexture:create"); if (!ok) { break; } cocos2d::RenderTexture* ret = cocos2d::RenderTexture::create(arg0, arg1, arg2); object_to_luaval(tolua_S, "cc.RenderTexture",(cocos2d::RenderTexture*)ret); @@ -46240,16 +48936,16 @@ int lua_cocos2dx_RenderTexture_create(lua_State* tolua_S) if (argc == 4) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.RenderTexture:create"); if (!ok) { break; } int arg1; - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.RenderTexture:create"); if (!ok) { break; } cocos2d::Texture2D::PixelFormat arg2; - ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2); + ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "cc.RenderTexture:create"); if (!ok) { break; } unsigned int arg3; - ok &= luaval_to_uint32(tolua_S, 5,&arg3); + ok &= luaval_to_uint32(tolua_S, 5,&arg3, "cc.RenderTexture:create"); if (!ok) { break; } cocos2d::RenderTexture* ret = cocos2d::RenderTexture::create(arg0, arg1, arg2, arg3); object_to_luaval(tolua_S, "cc.RenderTexture",(cocos2d::RenderTexture*)ret); @@ -46262,10 +48958,10 @@ int lua_cocos2dx_RenderTexture_create(lua_State* tolua_S) if (argc == 2) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.RenderTexture:create"); if (!ok) { break; } int arg1; - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.RenderTexture:create"); if (!ok) { break; } cocos2d::RenderTexture* ret = cocos2d::RenderTexture::create(arg0, arg1); object_to_luaval(tolua_S, "cc.RenderTexture",(cocos2d::RenderTexture*)ret); @@ -46273,7 +48969,7 @@ int lua_cocos2dx_RenderTexture_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.RenderTexture:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -46305,7 +49001,7 @@ int lua_cocos2dx_RenderTexture_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.RenderTexture"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "RenderTexture",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.RenderTexture:RenderTexture",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -46396,7 +49092,7 @@ int lua_cocos2dx_NodeGrid_setTarget(lua_State* tolua_S) cobj->setTarget(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTarget",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.NodeGrid:setTarget",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -46443,7 +49139,7 @@ int lua_cocos2dx_NodeGrid_getGrid(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getGrid",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.NodeGrid:getGrid",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -46489,7 +49185,7 @@ int lua_cocos2dx_NodeGrid_setGrid(lua_State* tolua_S) cobj->setGrid(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setGrid",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.NodeGrid:setGrid",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -46522,7 +49218,7 @@ int lua_cocos2dx_NodeGrid_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.NodeGrid",(cocos2d::NodeGrid*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.NodeGrid:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -46589,7 +49285,7 @@ int lua_cocos2dx_ParticleBatchNode_setTexture(lua_State* tolua_S) cobj->setTexture(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTexture",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleBatchNode:setTexture",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -46629,13 +49325,13 @@ int lua_cocos2dx_ParticleBatchNode_disableParticle(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.ParticleBatchNode:disableParticle"); if(!ok) return 0; cobj->disableParticle(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "disableParticle",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleBatchNode:disableParticle",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -46679,7 +49375,7 @@ int lua_cocos2dx_ParticleBatchNode_getTexture(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Texture2D",(cocos2d::Texture2D*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTexture",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleBatchNode:getTexture",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -46725,7 +49421,7 @@ int lua_cocos2dx_ParticleBatchNode_setTextureAtlas(lua_State* tolua_S) cobj->setTextureAtlas(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTextureAtlas",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleBatchNode:setTextureAtlas",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -46765,13 +49461,13 @@ int lua_cocos2dx_ParticleBatchNode_removeAllChildrenWithCleanup(lua_State* tolua { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.ParticleBatchNode:removeAllChildrenWithCleanup"); if(!ok) return 0; cobj->removeAllChildrenWithCleanup(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeAllChildrenWithCleanup",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleBatchNode:removeAllChildrenWithCleanup",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -46815,7 +49511,7 @@ int lua_cocos2dx_ParticleBatchNode_getTextureAtlas(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.TextureAtlas",(cocos2d::TextureAtlas*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTextureAtlas",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleBatchNode:getTextureAtlas",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -46858,13 +49554,13 @@ int lua_cocos2dx_ParticleBatchNode_insertChild(lua_State* tolua_S) ok &= luaval_to_object(tolua_S, 2, "cc.ParticleSystem",&arg0); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.ParticleBatchNode:insertChild"); if(!ok) return 0; cobj->insertChild(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "insertChild",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleBatchNode:insertChild",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -46905,15 +49601,15 @@ int lua_cocos2dx_ParticleBatchNode_removeChildAtIndex(lua_State* tolua_S) int arg0; bool arg1; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.ParticleBatchNode:removeChildAtIndex"); - ok &= luaval_to_boolean(tolua_S, 3,&arg1); + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "cc.ParticleBatchNode:removeChildAtIndex"); if(!ok) return 0; cobj->removeChildAtIndex(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeChildAtIndex",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleBatchNode:removeChildAtIndex",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -46941,7 +49637,7 @@ int lua_cocos2dx_ParticleBatchNode_create(lua_State* tolua_S) if (argc == 1) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.ParticleBatchNode:create"); if(!ok) return 0; cocos2d::ParticleBatchNode* ret = cocos2d::ParticleBatchNode::create(arg0); @@ -46952,15 +49648,15 @@ int lua_cocos2dx_ParticleBatchNode_create(lua_State* tolua_S) { std::string arg0; int arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.ParticleBatchNode:create"); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.ParticleBatchNode:create"); if(!ok) return 0; cocos2d::ParticleBatchNode* ret = cocos2d::ParticleBatchNode::create(arg0, arg1); object_to_luaval(tolua_S, "cc.ParticleBatchNode",(cocos2d::ParticleBatchNode*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.ParticleBatchNode:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -46998,14 +49694,14 @@ int lua_cocos2dx_ParticleBatchNode_createWithTexture(lua_State* tolua_S) cocos2d::Texture2D* arg0; int arg1; ok &= luaval_to_object(tolua_S, 2, "cc.Texture2D",&arg0); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.ParticleBatchNode:createWithTexture"); if(!ok) return 0; cocos2d::ParticleBatchNode* ret = cocos2d::ParticleBatchNode::createWithTexture(arg0, arg1); object_to_luaval(tolua_S, "cc.ParticleBatchNode",(cocos2d::ParticleBatchNode*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createWithTexture",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.ParticleBatchNode:createWithTexture",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -47076,7 +49772,7 @@ int lua_cocos2dx_ParticleSystem_getStartSizeVar(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getStartSizeVar",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:getStartSizeVar",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -47120,7 +49816,7 @@ int lua_cocos2dx_ParticleSystem_getTexture(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Texture2D",(cocos2d::Texture2D*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTexture",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:getTexture",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -47164,7 +49860,7 @@ int lua_cocos2dx_ParticleSystem_isFull(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isFull",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:isFull",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -47208,7 +49904,7 @@ int lua_cocos2dx_ParticleSystem_getBatchNode(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.ParticleBatchNode",(cocos2d::ParticleBatchNode*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getBatchNode",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:getBatchNode",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -47252,7 +49948,7 @@ int lua_cocos2dx_ParticleSystem_getStartColor(lua_State* tolua_S) color4f_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getStartColor",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:getStartColor",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -47296,7 +49992,7 @@ int lua_cocos2dx_ParticleSystem_getPositionType(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPositionType",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:getPositionType",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -47336,13 +50032,13 @@ int lua_cocos2dx_ParticleSystem_setPosVar(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.ParticleSystem:setPosVar"); if(!ok) return 0; cobj->setPosVar(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setPosVar",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:setPosVar",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -47386,7 +50082,7 @@ int lua_cocos2dx_ParticleSystem_getEndSpin(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getEndSpin",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:getEndSpin",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -47426,13 +50122,13 @@ int lua_cocos2dx_ParticleSystem_setRotatePerSecondVar(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ParticleSystem:setRotatePerSecondVar"); if(!ok) return 0; cobj->setRotatePerSecondVar(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setRotatePerSecondVar",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:setRotatePerSecondVar",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -47476,7 +50172,7 @@ int lua_cocos2dx_ParticleSystem_getStartSpinVar(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getStartSpinVar",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:getStartSpinVar",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -47520,7 +50216,7 @@ int lua_cocos2dx_ParticleSystem_getRadialAccelVar(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getRadialAccelVar",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:getRadialAccelVar",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -47564,7 +50260,7 @@ int lua_cocos2dx_ParticleSystem_getEndSizeVar(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getEndSizeVar",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:getEndSizeVar",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -47604,13 +50300,13 @@ int lua_cocos2dx_ParticleSystem_setRotation(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ParticleSystem:setRotation"); if(!ok) return 0; cobj->setRotation(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setRotation",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:setRotation",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -47650,13 +50346,13 @@ int lua_cocos2dx_ParticleSystem_setTangentialAccel(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ParticleSystem:setTangentialAccel"); if(!ok) return 0; cobj->setTangentialAccel(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTangentialAccel",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:setTangentialAccel",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -47696,13 +50392,13 @@ int lua_cocos2dx_ParticleSystem_setScaleY(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ParticleSystem:setScaleY"); if(!ok) return 0; cobj->setScaleY(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setScaleY",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:setScaleY",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -47742,13 +50438,13 @@ int lua_cocos2dx_ParticleSystem_setScaleX(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ParticleSystem:setScaleX"); if(!ok) return 0; cobj->setScaleX(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setScaleX",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:setScaleX",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -47792,7 +50488,7 @@ int lua_cocos2dx_ParticleSystem_getRadialAccel(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getRadialAccel",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:getRadialAccel",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -47832,13 +50528,13 @@ int lua_cocos2dx_ParticleSystem_setStartRadius(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ParticleSystem:setStartRadius"); if(!ok) return 0; cobj->setStartRadius(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setStartRadius",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:setStartRadius",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -47878,13 +50574,13 @@ int lua_cocos2dx_ParticleSystem_setRotatePerSecond(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ParticleSystem:setRotatePerSecond"); if(!ok) return 0; cobj->setRotatePerSecond(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setRotatePerSecond",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:setRotatePerSecond",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -47924,13 +50620,13 @@ int lua_cocos2dx_ParticleSystem_setEndSize(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ParticleSystem:setEndSize"); if(!ok) return 0; cobj->setEndSize(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setEndSize",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:setEndSize",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -47974,7 +50670,7 @@ int lua_cocos2dx_ParticleSystem_getGravity(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getGravity",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:getGravity",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -48018,7 +50714,7 @@ int lua_cocos2dx_ParticleSystem_getTangentialAccel(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTangentialAccel",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:getTangentialAccel",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -48058,13 +50754,13 @@ int lua_cocos2dx_ParticleSystem_setEndRadius(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ParticleSystem:setEndRadius"); if(!ok) return 0; cobj->setEndRadius(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setEndRadius",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:setEndRadius",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -48108,7 +50804,7 @@ int lua_cocos2dx_ParticleSystem_getSpeed(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getSpeed",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:getSpeed",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -48152,7 +50848,7 @@ int lua_cocos2dx_ParticleSystem_getAngle(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAngle",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:getAngle",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -48192,13 +50888,13 @@ int lua_cocos2dx_ParticleSystem_setEndColor(lua_State* tolua_S) { cocos2d::Color4F arg0; - ok &=luaval_to_color4f(tolua_S, 2, &arg0); + ok &=luaval_to_color4f(tolua_S, 2, &arg0, "cc.ParticleSystem:setEndColor"); if(!ok) return 0; cobj->setEndColor(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setEndColor",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:setEndColor",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -48238,13 +50934,13 @@ int lua_cocos2dx_ParticleSystem_setStartSpin(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ParticleSystem:setStartSpin"); if(!ok) return 0; cobj->setStartSpin(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setStartSpin",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:setStartSpin",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -48284,13 +50980,13 @@ int lua_cocos2dx_ParticleSystem_setDuration(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ParticleSystem:setDuration"); if(!ok) return 0; cobj->setDuration(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setDuration",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:setDuration",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -48336,7 +51032,7 @@ int lua_cocos2dx_ParticleSystem_setTexture(lua_State* tolua_S) cobj->setTexture(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTexture",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:setTexture",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -48380,7 +51076,7 @@ int lua_cocos2dx_ParticleSystem_getPosVar(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPosVar",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:getPosVar",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -48423,7 +51119,7 @@ int lua_cocos2dx_ParticleSystem_updateWithNoTime(lua_State* tolua_S) cobj->updateWithNoTime(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "updateWithNoTime",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:updateWithNoTime",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -48467,7 +51163,7 @@ int lua_cocos2dx_ParticleSystem_isBlendAdditive(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isBlendAdditive",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:isBlendAdditive",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -48511,7 +51207,7 @@ int lua_cocos2dx_ParticleSystem_getSpeedVar(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getSpeedVar",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:getSpeedVar",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -48551,13 +51247,13 @@ int lua_cocos2dx_ParticleSystem_setPositionType(lua_State* tolua_S) { cocos2d::ParticleSystem::PositionType arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.ParticleSystem:setPositionType"); if(!ok) return 0; cobj->setPositionType(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setPositionType",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:setPositionType",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -48600,7 +51296,7 @@ int lua_cocos2dx_ParticleSystem_stopSystem(lua_State* tolua_S) cobj->stopSystem(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "stopSystem",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:stopSystem",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -48644,7 +51340,7 @@ int lua_cocos2dx_ParticleSystem_getSourcePosition(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getSourcePosition",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:getSourcePosition",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -48684,13 +51380,13 @@ int lua_cocos2dx_ParticleSystem_setLifeVar(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ParticleSystem:setLifeVar"); if(!ok) return 0; cobj->setLifeVar(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setLifeVar",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:setLifeVar",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -48730,13 +51426,13 @@ int lua_cocos2dx_ParticleSystem_setTotalParticles(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.ParticleSystem:setTotalParticles"); if(!ok) return 0; cobj->setTotalParticles(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTotalParticles",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:setTotalParticles",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -48776,13 +51472,13 @@ int lua_cocos2dx_ParticleSystem_setEndColorVar(lua_State* tolua_S) { cocos2d::Color4F arg0; - ok &=luaval_to_color4f(tolua_S, 2, &arg0); + ok &=luaval_to_color4f(tolua_S, 2, &arg0, "cc.ParticleSystem:setEndColorVar"); if(!ok) return 0; cobj->setEndColorVar(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setEndColorVar",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:setEndColorVar",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -48826,7 +51522,7 @@ int lua_cocos2dx_ParticleSystem_getAtlasIndex(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAtlasIndex",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:getAtlasIndex",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -48870,7 +51566,7 @@ int lua_cocos2dx_ParticleSystem_getStartSize(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getStartSize",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:getStartSize",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -48910,13 +51606,13 @@ int lua_cocos2dx_ParticleSystem_setStartSpinVar(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ParticleSystem:setStartSpinVar"); if(!ok) return 0; cobj->setStartSpinVar(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setStartSpinVar",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:setStartSpinVar",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -48959,7 +51655,7 @@ int lua_cocos2dx_ParticleSystem_resetSystem(lua_State* tolua_S) cobj->resetSystem(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "resetSystem",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:resetSystem",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -48999,13 +51695,13 @@ int lua_cocos2dx_ParticleSystem_setAtlasIndex(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.ParticleSystem:setAtlasIndex"); if(!ok) return 0; cobj->setAtlasIndex(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAtlasIndex",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:setAtlasIndex",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -49045,13 +51741,13 @@ int lua_cocos2dx_ParticleSystem_setTangentialAccelVar(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ParticleSystem:setTangentialAccelVar"); if(!ok) return 0; cobj->setTangentialAccelVar(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTangentialAccelVar",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:setTangentialAccelVar",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -49091,13 +51787,13 @@ int lua_cocos2dx_ParticleSystem_setEndRadiusVar(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ParticleSystem:setEndRadiusVar"); if(!ok) return 0; cobj->setEndRadiusVar(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setEndRadiusVar",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:setEndRadiusVar",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -49141,7 +51837,7 @@ int lua_cocos2dx_ParticleSystem_getEndRadius(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getEndRadius",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:getEndRadius",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -49185,7 +51881,7 @@ int lua_cocos2dx_ParticleSystem_isOpacityModifyRGB(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isOpacityModifyRGB",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:isOpacityModifyRGB",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -49229,7 +51925,7 @@ int lua_cocos2dx_ParticleSystem_isActive(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isActive",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:isActive",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -49269,13 +51965,13 @@ int lua_cocos2dx_ParticleSystem_setRadialAccelVar(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ParticleSystem:setRadialAccelVar"); if(!ok) return 0; cobj->setRadialAccelVar(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setRadialAccelVar",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:setRadialAccelVar",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -49315,13 +52011,13 @@ int lua_cocos2dx_ParticleSystem_setStartSize(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ParticleSystem:setStartSize"); if(!ok) return 0; cobj->setStartSize(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setStartSize",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:setStartSize",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -49361,13 +52057,13 @@ int lua_cocos2dx_ParticleSystem_setSpeed(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ParticleSystem:setSpeed"); if(!ok) return 0; cobj->setSpeed(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setSpeed",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:setSpeed",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -49411,7 +52107,7 @@ int lua_cocos2dx_ParticleSystem_getStartSpin(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getStartSpin",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:getStartSpin",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -49455,7 +52151,7 @@ int lua_cocos2dx_ParticleSystem_getRotatePerSecond(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getRotatePerSecond",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:getRotatePerSecond",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -49495,13 +52191,13 @@ int lua_cocos2dx_ParticleSystem_setEmitterMode(lua_State* tolua_S) { cocos2d::ParticleSystem::Mode arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.ParticleSystem:setEmitterMode"); if(!ok) return 0; cobj->setEmitterMode(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setEmitterMode",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:setEmitterMode",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -49545,7 +52241,7 @@ int lua_cocos2dx_ParticleSystem_getDuration(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDuration",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:getDuration",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -49585,13 +52281,13 @@ int lua_cocos2dx_ParticleSystem_setSourcePosition(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.ParticleSystem:setSourcePosition"); if(!ok) return 0; cobj->setSourcePosition(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setSourcePosition",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:setSourcePosition",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -49635,7 +52331,7 @@ int lua_cocos2dx_ParticleSystem_getEndSpinVar(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getEndSpinVar",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:getEndSpinVar",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -49675,13 +52371,13 @@ int lua_cocos2dx_ParticleSystem_setBlendAdditive(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.ParticleSystem:setBlendAdditive"); if(!ok) return 0; cobj->setBlendAdditive(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setBlendAdditive",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:setBlendAdditive",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -49721,13 +52417,13 @@ int lua_cocos2dx_ParticleSystem_setLife(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ParticleSystem:setLife"); if(!ok) return 0; cobj->setLife(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setLife",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:setLife",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -49767,13 +52463,13 @@ int lua_cocos2dx_ParticleSystem_setAngleVar(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ParticleSystem:setAngleVar"); if(!ok) return 0; cobj->setAngleVar(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAngleVar",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:setAngleVar",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -49813,13 +52509,13 @@ int lua_cocos2dx_ParticleSystem_setRotationIsDir(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.ParticleSystem:setRotationIsDir"); if(!ok) return 0; cobj->setRotationIsDir(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setRotationIsDir",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:setRotationIsDir",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -49859,13 +52555,13 @@ int lua_cocos2dx_ParticleSystem_setEndSizeVar(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ParticleSystem:setEndSizeVar"); if(!ok) return 0; cobj->setEndSizeVar(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setEndSizeVar",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:setEndSizeVar",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -49905,13 +52601,13 @@ int lua_cocos2dx_ParticleSystem_setAngle(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ParticleSystem:setAngle"); if(!ok) return 0; cobj->setAngle(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAngle",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:setAngle",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -49957,7 +52653,7 @@ int lua_cocos2dx_ParticleSystem_setBatchNode(lua_State* tolua_S) cobj->setBatchNode(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setBatchNode",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:setBatchNode",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -50001,7 +52697,7 @@ int lua_cocos2dx_ParticleSystem_getTangentialAccelVar(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTangentialAccelVar",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:getTangentialAccelVar",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -50045,7 +52741,7 @@ int lua_cocos2dx_ParticleSystem_getEmitterMode(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getEmitterMode",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:getEmitterMode",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -50085,13 +52781,13 @@ int lua_cocos2dx_ParticleSystem_setEndSpinVar(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ParticleSystem:setEndSpinVar"); if(!ok) return 0; cobj->setEndSpinVar(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setEndSpinVar",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:setEndSpinVar",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -50135,7 +52831,7 @@ int lua_cocos2dx_ParticleSystem_getAngleVar(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAngleVar",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:getAngleVar",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -50175,13 +52871,13 @@ int lua_cocos2dx_ParticleSystem_setStartColor(lua_State* tolua_S) { cocos2d::Color4F arg0; - ok &=luaval_to_color4f(tolua_S, 2, &arg0); + ok &=luaval_to_color4f(tolua_S, 2, &arg0, "cc.ParticleSystem:setStartColor"); if(!ok) return 0; cobj->setStartColor(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setStartColor",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:setStartColor",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -50225,7 +52921,7 @@ int lua_cocos2dx_ParticleSystem_getRotatePerSecondVar(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getRotatePerSecondVar",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:getRotatePerSecondVar",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -50269,7 +52965,7 @@ int lua_cocos2dx_ParticleSystem_getEndSize(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getEndSize",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:getEndSize",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -50313,7 +53009,7 @@ int lua_cocos2dx_ParticleSystem_getLife(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getLife",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:getLife",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -50353,13 +53049,13 @@ int lua_cocos2dx_ParticleSystem_setSpeedVar(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ParticleSystem:setSpeedVar"); if(!ok) return 0; cobj->setSpeedVar(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setSpeedVar",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:setSpeedVar",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -50399,13 +53095,13 @@ int lua_cocos2dx_ParticleSystem_setAutoRemoveOnFinish(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.ParticleSystem:setAutoRemoveOnFinish"); if(!ok) return 0; cobj->setAutoRemoveOnFinish(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAutoRemoveOnFinish",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:setAutoRemoveOnFinish",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -50445,13 +53141,13 @@ int lua_cocos2dx_ParticleSystem_setGravity(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.ParticleSystem:setGravity"); if(!ok) return 0; cobj->setGravity(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setGravity",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:setGravity",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -50494,7 +53190,7 @@ int lua_cocos2dx_ParticleSystem_postStep(lua_State* tolua_S) cobj->postStep(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "postStep",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:postStep",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -50534,13 +53230,13 @@ int lua_cocos2dx_ParticleSystem_setEmissionRate(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ParticleSystem:setEmissionRate"); if(!ok) return 0; cobj->setEmissionRate(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setEmissionRate",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:setEmissionRate",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -50584,7 +53280,7 @@ int lua_cocos2dx_ParticleSystem_getEndColorVar(lua_State* tolua_S) color4f_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getEndColorVar",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:getEndColorVar",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -50628,7 +53324,7 @@ int lua_cocos2dx_ParticleSystem_getRotationIsDir(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getRotationIsDir",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:getRotationIsDir",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -50668,13 +53364,13 @@ int lua_cocos2dx_ParticleSystem_setScale(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ParticleSystem:setScale"); if(!ok) return 0; cobj->setScale(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setScale",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:setScale",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -50718,7 +53414,7 @@ int lua_cocos2dx_ParticleSystem_getEmissionRate(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getEmissionRate",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:getEmissionRate",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -50762,7 +53458,7 @@ int lua_cocos2dx_ParticleSystem_getEndColor(lua_State* tolua_S) color4f_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getEndColor",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:getEndColor",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -50806,7 +53502,7 @@ int lua_cocos2dx_ParticleSystem_getLifeVar(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getLifeVar",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:getLifeVar",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -50846,13 +53542,13 @@ int lua_cocos2dx_ParticleSystem_setStartSizeVar(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ParticleSystem:setStartSizeVar"); if(!ok) return 0; cobj->setStartSizeVar(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setStartSizeVar",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:setStartSizeVar",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -50892,13 +53588,13 @@ int lua_cocos2dx_ParticleSystem_setOpacityModifyRGB(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.ParticleSystem:setOpacityModifyRGB"); if(!ok) return 0; cobj->setOpacityModifyRGB(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setOpacityModifyRGB",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:setOpacityModifyRGB",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -50942,7 +53638,7 @@ int lua_cocos2dx_ParticleSystem_addParticle(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addParticle",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:addParticle",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -50986,7 +53682,7 @@ int lua_cocos2dx_ParticleSystem_getStartRadius(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getStartRadius",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:getStartRadius",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -51030,7 +53726,7 @@ int lua_cocos2dx_ParticleSystem_getParticleCount(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getParticleCount",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:getParticleCount",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -51074,7 +53770,7 @@ int lua_cocos2dx_ParticleSystem_getStartRadiusVar(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getStartRadiusVar",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:getStartRadiusVar",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -51114,13 +53810,13 @@ int lua_cocos2dx_ParticleSystem_setStartColorVar(lua_State* tolua_S) { cocos2d::Color4F arg0; - ok &=luaval_to_color4f(tolua_S, 2, &arg0); + ok &=luaval_to_color4f(tolua_S, 2, &arg0, "cc.ParticleSystem:setStartColorVar"); if(!ok) return 0; cobj->setStartColorVar(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setStartColorVar",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:setStartColorVar",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -51160,13 +53856,13 @@ int lua_cocos2dx_ParticleSystem_setEndSpin(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ParticleSystem:setEndSpin"); if(!ok) return 0; cobj->setEndSpin(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setEndSpin",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:setEndSpin",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -51206,13 +53902,13 @@ int lua_cocos2dx_ParticleSystem_setRadialAccel(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ParticleSystem:setRadialAccel"); if(!ok) return 0; cobj->setRadialAccel(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setRadialAccel",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:setRadialAccel",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -51256,7 +53952,7 @@ int lua_cocos2dx_ParticleSystem_isAutoRemoveOnFinish(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isAutoRemoveOnFinish",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:isAutoRemoveOnFinish",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -51300,7 +53996,7 @@ int lua_cocos2dx_ParticleSystem_getTotalParticles(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTotalParticles",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:getTotalParticles",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -51340,13 +54036,13 @@ int lua_cocos2dx_ParticleSystem_setStartRadiusVar(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ParticleSystem:setStartRadiusVar"); if(!ok) return 0; cobj->setStartRadiusVar(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setStartRadiusVar",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:setStartRadiusVar",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -51390,7 +54086,7 @@ int lua_cocos2dx_ParticleSystem_getEndRadiusVar(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getEndRadiusVar",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:getEndRadiusVar",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -51434,7 +54130,7 @@ int lua_cocos2dx_ParticleSystem_getStartColorVar(lua_State* tolua_S) color4f_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getStartColorVar",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystem:getStartColorVar",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -51462,14 +54158,14 @@ int lua_cocos2dx_ParticleSystem_create(lua_State* tolua_S) if (argc == 1) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.ParticleSystem:create"); if(!ok) return 0; cocos2d::ParticleSystem* ret = cocos2d::ParticleSystem::create(arg0); object_to_luaval(tolua_S, "cc.ParticleSystem",(cocos2d::ParticleSystem*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.ParticleSystem:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -51495,14 +54191,14 @@ int lua_cocos2dx_ParticleSystem_createWithTotalParticles(lua_State* tolua_S) if (argc == 1) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.ParticleSystem:createWithTotalParticles"); if(!ok) return 0; cocos2d::ParticleSystem* ret = cocos2d::ParticleSystem::createWithTotalParticles(arg0); object_to_luaval(tolua_S, "cc.ParticleSystem",(cocos2d::ParticleSystem*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createWithTotalParticles",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.ParticleSystem:createWithTotalParticles",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -51665,7 +54361,7 @@ int lua_cocos2dx_ParticleSystemQuad_setDisplayFrame(lua_State* tolua_S) cobj->setDisplayFrame(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setDisplayFrame",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystemQuad:setDisplayFrame",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -51708,13 +54404,13 @@ int lua_cocos2dx_ParticleSystemQuad_setTextureWithRect(lua_State* tolua_S) ok &= luaval_to_object(tolua_S, 2, "cc.Texture2D",&arg0); - ok &= luaval_to_rect(tolua_S, 3, &arg1); + ok &= luaval_to_rect(tolua_S, 3, &arg1, "cc.ParticleSystemQuad:setTextureWithRect"); if(!ok) return 0; cobj->setTextureWithRect(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTextureWithRect",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystemQuad:setTextureWithRect",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -51760,7 +54456,7 @@ int lua_cocos2dx_ParticleSystemQuad_listenRendererRecreated(lua_State* tolua_S) cobj->listenRendererRecreated(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "listenRendererRecreated",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParticleSystemQuad:listenRendererRecreated",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -51789,7 +54485,7 @@ int lua_cocos2dx_ParticleSystemQuad_create(lua_State* tolua_S) if (argc == 1) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.ParticleSystemQuad:create"); if (!ok) { break; } cocos2d::ParticleSystemQuad* ret = cocos2d::ParticleSystemQuad::create(arg0); object_to_luaval(tolua_S, "cc.ParticleSystemQuad",(cocos2d::ParticleSystemQuad*)ret); @@ -51812,7 +54508,7 @@ int lua_cocos2dx_ParticleSystemQuad_create(lua_State* tolua_S) if (argc == 1) { cocos2d::ValueMap arg0; - ok &= luaval_to_ccvaluemap(tolua_S, 2, &arg0); + ok &= luaval_to_ccvaluemap(tolua_S, 2, &arg0, "cc.ParticleSystemQuad:create"); if (!ok) { break; } cocos2d::ParticleSystemQuad* ret = cocos2d::ParticleSystemQuad::create(arg0); object_to_luaval(tolua_S, "cc.ParticleSystemQuad",(cocos2d::ParticleSystemQuad*)ret); @@ -51820,7 +54516,7 @@ int lua_cocos2dx_ParticleSystemQuad_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.ParticleSystemQuad:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -51846,14 +54542,14 @@ int lua_cocos2dx_ParticleSystemQuad_createWithTotalParticles(lua_State* tolua_S) if (argc == 1) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.ParticleSystemQuad:createWithTotalParticles"); if(!ok) return 0; cocos2d::ParticleSystemQuad* ret = cocos2d::ParticleSystemQuad::createWithTotalParticles(arg0); object_to_luaval(tolua_S, "cc.ParticleSystemQuad",(cocos2d::ParticleSystemQuad*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createWithTotalParticles",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.ParticleSystemQuad:createWithTotalParticles",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -51908,7 +54604,7 @@ int lua_cocos2dx_ParticleFire_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.ParticleFire",(cocos2d::ParticleFire*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.ParticleFire:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -51934,14 +54630,14 @@ int lua_cocos2dx_ParticleFire_createWithTotalParticles(lua_State* tolua_S) if (argc == 1) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.ParticleFire:createWithTotalParticles"); if(!ok) return 0; cocos2d::ParticleFire* ret = cocos2d::ParticleFire::createWithTotalParticles(arg0); object_to_luaval(tolua_S, "cc.ParticleFire",(cocos2d::ParticleFire*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createWithTotalParticles",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.ParticleFire:createWithTotalParticles",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -51993,7 +54689,7 @@ int lua_cocos2dx_ParticleFireworks_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.ParticleFireworks",(cocos2d::ParticleFireworks*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.ParticleFireworks:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -52019,14 +54715,14 @@ int lua_cocos2dx_ParticleFireworks_createWithTotalParticles(lua_State* tolua_S) if (argc == 1) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.ParticleFireworks:createWithTotalParticles"); if(!ok) return 0; cocos2d::ParticleFireworks* ret = cocos2d::ParticleFireworks::createWithTotalParticles(arg0); object_to_luaval(tolua_S, "cc.ParticleFireworks",(cocos2d::ParticleFireworks*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createWithTotalParticles",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.ParticleFireworks:createWithTotalParticles",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -52078,7 +54774,7 @@ int lua_cocos2dx_ParticleSun_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.ParticleSun",(cocos2d::ParticleSun*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.ParticleSun:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -52104,14 +54800,14 @@ int lua_cocos2dx_ParticleSun_createWithTotalParticles(lua_State* tolua_S) if (argc == 1) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.ParticleSun:createWithTotalParticles"); if(!ok) return 0; cocos2d::ParticleSun* ret = cocos2d::ParticleSun::createWithTotalParticles(arg0); object_to_luaval(tolua_S, "cc.ParticleSun",(cocos2d::ParticleSun*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createWithTotalParticles",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.ParticleSun:createWithTotalParticles",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -52163,7 +54859,7 @@ int lua_cocos2dx_ParticleGalaxy_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.ParticleGalaxy",(cocos2d::ParticleGalaxy*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.ParticleGalaxy:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -52189,14 +54885,14 @@ int lua_cocos2dx_ParticleGalaxy_createWithTotalParticles(lua_State* tolua_S) if (argc == 1) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.ParticleGalaxy:createWithTotalParticles"); if(!ok) return 0; cocos2d::ParticleGalaxy* ret = cocos2d::ParticleGalaxy::createWithTotalParticles(arg0); object_to_luaval(tolua_S, "cc.ParticleGalaxy",(cocos2d::ParticleGalaxy*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createWithTotalParticles",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.ParticleGalaxy:createWithTotalParticles",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -52248,7 +54944,7 @@ int lua_cocos2dx_ParticleFlower_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.ParticleFlower",(cocos2d::ParticleFlower*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.ParticleFlower:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -52274,14 +54970,14 @@ int lua_cocos2dx_ParticleFlower_createWithTotalParticles(lua_State* tolua_S) if (argc == 1) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.ParticleFlower:createWithTotalParticles"); if(!ok) return 0; cocos2d::ParticleFlower* ret = cocos2d::ParticleFlower::createWithTotalParticles(arg0); object_to_luaval(tolua_S, "cc.ParticleFlower",(cocos2d::ParticleFlower*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createWithTotalParticles",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.ParticleFlower:createWithTotalParticles",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -52333,7 +55029,7 @@ int lua_cocos2dx_ParticleMeteor_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.ParticleMeteor",(cocos2d::ParticleMeteor*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.ParticleMeteor:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -52359,14 +55055,14 @@ int lua_cocos2dx_ParticleMeteor_createWithTotalParticles(lua_State* tolua_S) if (argc == 1) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.ParticleMeteor:createWithTotalParticles"); if(!ok) return 0; cocos2d::ParticleMeteor* ret = cocos2d::ParticleMeteor::createWithTotalParticles(arg0); object_to_luaval(tolua_S, "cc.ParticleMeteor",(cocos2d::ParticleMeteor*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createWithTotalParticles",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.ParticleMeteor:createWithTotalParticles",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -52418,7 +55114,7 @@ int lua_cocos2dx_ParticleSpiral_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.ParticleSpiral",(cocos2d::ParticleSpiral*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.ParticleSpiral:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -52444,14 +55140,14 @@ int lua_cocos2dx_ParticleSpiral_createWithTotalParticles(lua_State* tolua_S) if (argc == 1) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.ParticleSpiral:createWithTotalParticles"); if(!ok) return 0; cocos2d::ParticleSpiral* ret = cocos2d::ParticleSpiral::createWithTotalParticles(arg0); object_to_luaval(tolua_S, "cc.ParticleSpiral",(cocos2d::ParticleSpiral*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createWithTotalParticles",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.ParticleSpiral:createWithTotalParticles",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -52503,7 +55199,7 @@ int lua_cocos2dx_ParticleExplosion_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.ParticleExplosion",(cocos2d::ParticleExplosion*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.ParticleExplosion:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -52529,14 +55225,14 @@ int lua_cocos2dx_ParticleExplosion_createWithTotalParticles(lua_State* tolua_S) if (argc == 1) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.ParticleExplosion:createWithTotalParticles"); if(!ok) return 0; cocos2d::ParticleExplosion* ret = cocos2d::ParticleExplosion::createWithTotalParticles(arg0); object_to_luaval(tolua_S, "cc.ParticleExplosion",(cocos2d::ParticleExplosion*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createWithTotalParticles",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.ParticleExplosion:createWithTotalParticles",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -52588,7 +55284,7 @@ int lua_cocos2dx_ParticleSmoke_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.ParticleSmoke",(cocos2d::ParticleSmoke*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.ParticleSmoke:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -52614,14 +55310,14 @@ int lua_cocos2dx_ParticleSmoke_createWithTotalParticles(lua_State* tolua_S) if (argc == 1) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.ParticleSmoke:createWithTotalParticles"); if(!ok) return 0; cocos2d::ParticleSmoke* ret = cocos2d::ParticleSmoke::createWithTotalParticles(arg0); object_to_luaval(tolua_S, "cc.ParticleSmoke",(cocos2d::ParticleSmoke*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createWithTotalParticles",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.ParticleSmoke:createWithTotalParticles",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -52673,7 +55369,7 @@ int lua_cocos2dx_ParticleSnow_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.ParticleSnow",(cocos2d::ParticleSnow*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.ParticleSnow:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -52699,14 +55395,14 @@ int lua_cocos2dx_ParticleSnow_createWithTotalParticles(lua_State* tolua_S) if (argc == 1) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.ParticleSnow:createWithTotalParticles"); if(!ok) return 0; cocos2d::ParticleSnow* ret = cocos2d::ParticleSnow::createWithTotalParticles(arg0); object_to_luaval(tolua_S, "cc.ParticleSnow",(cocos2d::ParticleSnow*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createWithTotalParticles",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.ParticleSnow:createWithTotalParticles",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -52758,7 +55454,7 @@ int lua_cocos2dx_ParticleRain_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.ParticleRain",(cocos2d::ParticleRain*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.ParticleRain:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -52784,14 +55480,14 @@ int lua_cocos2dx_ParticleRain_createWithTotalParticles(lua_State* tolua_S) if (argc == 1) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.ParticleRain:createWithTotalParticles"); if(!ok) return 0; cocos2d::ParticleRain* ret = cocos2d::ParticleRain::createWithTotalParticles(arg0); object_to_luaval(tolua_S, "cc.ParticleRain",(cocos2d::ParticleRain*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createWithTotalParticles",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.ParticleRain:createWithTotalParticles",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -52850,13 +55546,13 @@ int lua_cocos2dx_GridBase_setGridSize(lua_State* tolua_S) { cocos2d::Size arg0; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.GridBase:setGridSize"); if(!ok) return 0; cobj->setGridSize(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setGridSize",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GridBase:setGridSize",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -52899,7 +55595,7 @@ int lua_cocos2dx_GridBase_calculateVertexPoints(lua_State* tolua_S) cobj->calculateVertexPoints(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "calculateVertexPoints",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GridBase:calculateVertexPoints",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -52945,7 +55641,7 @@ int lua_cocos2dx_GridBase_afterDraw(lua_State* tolua_S) cobj->afterDraw(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "afterDraw",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GridBase:afterDraw",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -52988,7 +55684,7 @@ int lua_cocos2dx_GridBase_beforeDraw(lua_State* tolua_S) cobj->beforeDraw(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "beforeDraw",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GridBase:beforeDraw",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -53032,7 +55728,7 @@ int lua_cocos2dx_GridBase_isTextureFlipped(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isTextureFlipped",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GridBase:isTextureFlipped",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -53076,7 +55772,7 @@ int lua_cocos2dx_GridBase_getGridSize(lua_State* tolua_S) size_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getGridSize",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GridBase:getGridSize",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -53120,7 +55816,7 @@ int lua_cocos2dx_GridBase_getStep(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getStep",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GridBase:getStep",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -53163,7 +55859,7 @@ int lua_cocos2dx_GridBase_set2DProjection(lua_State* tolua_S) cobj->set2DProjection(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "set2DProjection",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GridBase:set2DProjection",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -53203,13 +55899,13 @@ int lua_cocos2dx_GridBase_setStep(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.GridBase:setStep"); if(!ok) return 0; cobj->setStep(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setStep",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GridBase:setStep",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -53249,13 +55945,13 @@ int lua_cocos2dx_GridBase_setTextureFlipped(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.GridBase:setTextureFlipped"); if(!ok) return 0; cobj->setTextureFlipped(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTextureFlipped",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GridBase:setTextureFlipped",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -53298,7 +55994,7 @@ int lua_cocos2dx_GridBase_blit(lua_State* tolua_S) cobj->blit(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "blit",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GridBase:blit",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -53338,13 +56034,13 @@ int lua_cocos2dx_GridBase_setActive(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.GridBase:setActive"); if(!ok) return 0; cobj->setActive(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setActive",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GridBase:setActive",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -53388,7 +56084,7 @@ int lua_cocos2dx_GridBase_getReuseGrid(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getReuseGrid",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GridBase:getReuseGrid",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -53422,7 +56118,7 @@ int lua_cocos2dx_GridBase_initWithSize(lua_State* tolua_S) do{ if (argc == 1) { cocos2d::Size arg0; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.GridBase:initWithSize"); if (!ok) { break; } bool ret = cobj->initWithSize(arg0); @@ -53434,7 +56130,7 @@ int lua_cocos2dx_GridBase_initWithSize(lua_State* tolua_S) do{ if (argc == 3) { cocos2d::Size arg0; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.GridBase:initWithSize"); if (!ok) { break; } cocos2d::Texture2D* arg1; @@ -53442,7 +56138,7 @@ int lua_cocos2dx_GridBase_initWithSize(lua_State* tolua_S) if (!ok) { break; } bool arg2; - ok &= luaval_to_boolean(tolua_S, 4,&arg2); + ok &= luaval_to_boolean(tolua_S, 4,&arg2, "cc.GridBase:initWithSize"); if (!ok) { break; } bool ret = cobj->initWithSize(arg0, arg1, arg2); @@ -53451,7 +56147,7 @@ int lua_cocos2dx_GridBase_initWithSize(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "initWithSize",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GridBase:initWithSize",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 @@ -53491,13 +56187,13 @@ int lua_cocos2dx_GridBase_setReuseGrid(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.GridBase:setReuseGrid"); if(!ok) return 0; cobj->setReuseGrid(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setReuseGrid",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GridBase:setReuseGrid",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -53541,7 +56237,7 @@ int lua_cocos2dx_GridBase_isActive(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isActive",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GridBase:isActive",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -53584,7 +56280,7 @@ int lua_cocos2dx_GridBase_reuse(lua_State* tolua_S) cobj->reuse(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "reuse",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GridBase:reuse",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -53613,7 +56309,7 @@ int lua_cocos2dx_GridBase_create(lua_State* tolua_S) if (argc == 1) { cocos2d::Size arg0; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.GridBase:create"); if (!ok) { break; } cocos2d::GridBase* ret = cocos2d::GridBase::create(arg0); object_to_luaval(tolua_S, "cc.GridBase",(cocos2d::GridBase*)ret); @@ -53626,13 +56322,13 @@ int lua_cocos2dx_GridBase_create(lua_State* tolua_S) if (argc == 3) { cocos2d::Size arg0; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.GridBase:create"); if (!ok) { break; } cocos2d::Texture2D* arg1; ok &= luaval_to_object(tolua_S, 3, "cc.Texture2D",&arg1); if (!ok) { break; } bool arg2; - ok &= luaval_to_boolean(tolua_S, 4,&arg2); + ok &= luaval_to_boolean(tolua_S, 4,&arg2, "cc.GridBase:create"); if (!ok) { break; } cocos2d::GridBase* ret = cocos2d::GridBase::create(arg0, arg1, arg2); object_to_luaval(tolua_S, "cc.GridBase",(cocos2d::GridBase*)ret); @@ -53640,7 +56336,7 @@ int lua_cocos2dx_GridBase_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.GridBase:create",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -53704,7 +56400,7 @@ int lua_cocos2dx_Grid3D_create(lua_State* tolua_S) if (argc == 1) { cocos2d::Size arg0; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.Grid3D:create"); if (!ok) { break; } cocos2d::Grid3D* ret = cocos2d::Grid3D::create(arg0); object_to_luaval(tolua_S, "cc.Grid3D",(cocos2d::Grid3D*)ret); @@ -53717,13 +56413,13 @@ int lua_cocos2dx_Grid3D_create(lua_State* tolua_S) if (argc == 3) { cocos2d::Size arg0; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.Grid3D:create"); if (!ok) { break; } cocos2d::Texture2D* arg1; ok &= luaval_to_object(tolua_S, 3, "cc.Texture2D",&arg1); if (!ok) { break; } bool arg2; - ok &= luaval_to_boolean(tolua_S, 4,&arg2); + ok &= luaval_to_boolean(tolua_S, 4,&arg2, "cc.Grid3D:create"); if (!ok) { break; } cocos2d::Grid3D* ret = cocos2d::Grid3D::create(arg0, arg1, arg2); object_to_luaval(tolua_S, "cc.Grid3D",(cocos2d::Grid3D*)ret); @@ -53731,7 +56427,7 @@ int lua_cocos2dx_Grid3D_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.Grid3D:create",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -53763,7 +56459,7 @@ int lua_cocos2dx_Grid3D_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.Grid3D"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "Grid3D",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Grid3D:Grid3D",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -53813,7 +56509,7 @@ int lua_cocos2dx_TiledGrid3D_create(lua_State* tolua_S) if (argc == 1) { cocos2d::Size arg0; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.TiledGrid3D:create"); if (!ok) { break; } cocos2d::TiledGrid3D* ret = cocos2d::TiledGrid3D::create(arg0); object_to_luaval(tolua_S, "cc.TiledGrid3D",(cocos2d::TiledGrid3D*)ret); @@ -53826,13 +56522,13 @@ int lua_cocos2dx_TiledGrid3D_create(lua_State* tolua_S) if (argc == 3) { cocos2d::Size arg0; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.TiledGrid3D:create"); if (!ok) { break; } cocos2d::Texture2D* arg1; ok &= luaval_to_object(tolua_S, 3, "cc.Texture2D",&arg1); if (!ok) { break; } bool arg2; - ok &= luaval_to_boolean(tolua_S, 4,&arg2); + ok &= luaval_to_boolean(tolua_S, 4,&arg2, "cc.TiledGrid3D:create"); if (!ok) { break; } cocos2d::TiledGrid3D* ret = cocos2d::TiledGrid3D::create(arg0, arg1, arg2); object_to_luaval(tolua_S, "cc.TiledGrid3D",(cocos2d::TiledGrid3D*)ret); @@ -53840,7 +56536,7 @@ int lua_cocos2dx_TiledGrid3D_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.TiledGrid3D:create",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -53872,7 +56568,7 @@ int lua_cocos2dx_TiledGrid3D_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.TiledGrid3D"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "TiledGrid3D",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TiledGrid3D:TiledGrid3D",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -53936,13 +56632,13 @@ int lua_cocos2dx_GLProgramCache_addGLProgram(lua_State* tolua_S) ok &= luaval_to_object(tolua_S, 2, "cc.GLProgram",&arg0); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.GLProgramCache:addGLProgram"); if(!ok) return 0; cobj->addGLProgram(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addGLProgram",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLProgramCache:addGLProgram",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -53982,14 +56678,14 @@ int lua_cocos2dx_GLProgramCache_getGLProgram(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.GLProgramCache:getGLProgram"); if(!ok) return 0; cocos2d::GLProgram* ret = cobj->getGLProgram(arg0); object_to_luaval(tolua_S, "cc.GLProgram",(cocos2d::GLProgram*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getGLProgram",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLProgramCache:getGLProgram",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -54032,7 +56728,7 @@ int lua_cocos2dx_GLProgramCache_reloadDefaultGLPrograms(lua_State* tolua_S) cobj->reloadDefaultGLPrograms(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "reloadDefaultGLPrograms",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLProgramCache:reloadDefaultGLPrograms",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -54075,7 +56771,7 @@ int lua_cocos2dx_GLProgramCache_loadDefaultGLPrograms(lua_State* tolua_S) cobj->loadDefaultGLPrograms(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "loadDefaultGLPrograms",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLProgramCache:loadDefaultGLPrograms",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -54107,7 +56803,7 @@ int lua_cocos2dx_GLProgramCache_destroyInstance(lua_State* tolua_S) cocos2d::GLProgramCache::destroyInstance(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "destroyInstance",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.GLProgramCache:destroyInstance",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -54138,7 +56834,7 @@ int lua_cocos2dx_GLProgramCache_getInstance(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.GLProgramCache",(cocos2d::GLProgramCache*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "getInstance",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.GLProgramCache:getInstance",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -54170,7 +56866,7 @@ int lua_cocos2dx_GLProgramCache_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.GLProgramCache"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "GLProgramCache",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLProgramCache:GLProgramCache",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -54236,14 +56932,14 @@ int lua_cocos2dx_TextureCache_reloadTexture(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.TextureCache:reloadTexture"); 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); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TextureCache:reloadTexture",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -54286,7 +56982,7 @@ int lua_cocos2dx_TextureCache_unbindAllImageAsync(lua_State* tolua_S) cobj->unbindAllImageAsync(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "unbindAllImageAsync",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TextureCache:unbindAllImageAsync",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -54326,13 +57022,13 @@ int lua_cocos2dx_TextureCache_removeTextureForKey(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.TextureCache:removeTextureForKey"); if(!ok) return 0; cobj->removeTextureForKey(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeTextureForKey",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TextureCache:removeTextureForKey",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -54375,7 +57071,7 @@ int lua_cocos2dx_TextureCache_removeAllTextures(lua_State* tolua_S) cobj->removeAllTextures(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeAllTextures",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TextureCache:removeAllTextures",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -54419,7 +57115,7 @@ int lua_cocos2dx_TextureCache_getDescription(lua_State* tolua_S) tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDescription",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TextureCache:getDescription",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -54463,7 +57159,7 @@ int lua_cocos2dx_TextureCache_getCachedTextureInfo(lua_State* tolua_S) tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getCachedTextureInfo",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TextureCache:getCachedTextureInfo",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -54501,7 +57197,7 @@ int lua_cocos2dx_TextureCache_addImage(lua_State* tolua_S) if (!ok) { break; } std::string arg1; - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.TextureCache:addImage"); if (!ok) { break; } cocos2d::Texture2D* ret = cobj->addImage(arg0, arg1); @@ -54513,7 +57209,7 @@ int lua_cocos2dx_TextureCache_addImage(lua_State* tolua_S) do{ if (argc == 1) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.TextureCache:addImage"); if (!ok) { break; } cocos2d::Texture2D* ret = cobj->addImage(arg0); @@ -54522,7 +57218,7 @@ int lua_cocos2dx_TextureCache_addImage(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addImage",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TextureCache:addImage",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -54562,13 +57258,13 @@ int lua_cocos2dx_TextureCache_unbindImageAsync(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.TextureCache:unbindImageAsync"); if(!ok) return 0; cobj->unbindImageAsync(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "unbindImageAsync",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TextureCache:unbindImageAsync",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -54608,14 +57304,14 @@ int lua_cocos2dx_TextureCache_getTextureForKey(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.TextureCache:getTextureForKey"); 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); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TextureCache:getTextureForKey",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -54658,7 +57354,7 @@ int lua_cocos2dx_TextureCache_removeUnusedTextures(lua_State* tolua_S) cobj->removeUnusedTextures(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeUnusedTextures",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TextureCache:removeUnusedTextures",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -54704,7 +57400,7 @@ int lua_cocos2dx_TextureCache_removeTexture(lua_State* tolua_S) cobj->removeTexture(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeTexture",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TextureCache:removeTexture",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -54747,7 +57443,7 @@ int lua_cocos2dx_TextureCache_waitForQuit(lua_State* tolua_S) cobj->waitForQuit(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "waitForQuit",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TextureCache:waitForQuit",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -54781,7 +57477,7 @@ int lua_cocos2dx_TextureCache_constructor(lua_State* tolua_S) 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); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TextureCache:TextureCache",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -54857,7 +57553,7 @@ int lua_cocos2dx_Application_getTargetPlatform(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTargetPlatform",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Application:getTargetPlatform",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -54901,7 +57597,7 @@ int lua_cocos2dx_Application_getCurrentLanguageCode(lua_State* tolua_S) tolua_pushstring(tolua_S,(const char*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getCurrentLanguageCode",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Application:getCurrentLanguageCode",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -54945,7 +57641,7 @@ int lua_cocos2dx_Application_getCurrentLanguage(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getCurrentLanguage",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Application:getCurrentLanguage",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -54985,13 +57681,13 @@ int lua_cocos2dx_Application_setAnimationInterval(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Application:setAnimationInterval"); if(!ok) return 0; cobj->setAnimationInterval(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAnimationInterval",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Application:setAnimationInterval",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -55024,7 +57720,7 @@ int lua_cocos2dx_Application_getInstance(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Application",(cocos2d::Application*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "getInstance",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.Application:getInstance",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -55056,1052 +57752,7 @@ int lua_register_cocos2dx_Application(lua_State* tolua_S) return 1; } -int lua_cocos2dx_GLViewProtocol_setFrameSize(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::GLViewProtocol* 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.GLViewProtocol",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::GLViewProtocol*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLViewProtocol_setFrameSize'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 2) - { - double arg0; - double arg1; - - ok &= luaval_to_number(tolua_S, 2,&arg0); - - ok &= luaval_to_number(tolua_S, 3,&arg1); - if(!ok) - return 0; - cobj->setFrameSize(arg0, arg1); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setFrameSize",argc, 2); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLViewProtocol_setFrameSize'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_GLViewProtocol_getViewPortRect(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::GLViewProtocol* 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.GLViewProtocol",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::GLViewProtocol*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLViewProtocol_getViewPortRect'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - const cocos2d::Rect& ret = cobj->getViewPortRect(); - rect_to_luaval(tolua_S, ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getViewPortRect",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLViewProtocol_getViewPortRect'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_GLViewProtocol_setIMEKeyboardState(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::GLViewProtocol* 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.GLViewProtocol",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::GLViewProtocol*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLViewProtocol_setIMEKeyboardState'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 1) - { - bool arg0; - - ok &= luaval_to_boolean(tolua_S, 2,&arg0); - if(!ok) - return 0; - cobj->setIMEKeyboardState(arg0); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setIMEKeyboardState",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLViewProtocol_setIMEKeyboardState'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_GLViewProtocol_setScissorInPoints(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::GLViewProtocol* 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.GLViewProtocol",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::GLViewProtocol*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLViewProtocol_setScissorInPoints'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 4) - { - double arg0; - double arg1; - double arg2; - double arg3; - - ok &= luaval_to_number(tolua_S, 2,&arg0); - - ok &= luaval_to_number(tolua_S, 3,&arg1); - - ok &= luaval_to_number(tolua_S, 4,&arg2); - - ok &= luaval_to_number(tolua_S, 5,&arg3); - if(!ok) - return 0; - cobj->setScissorInPoints(arg0, arg1, arg2, arg3); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setScissorInPoints",argc, 4); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLViewProtocol_setScissorInPoints'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_GLViewProtocol_getViewName(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::GLViewProtocol* 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.GLViewProtocol",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::GLViewProtocol*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLViewProtocol_getViewName'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - const std::string& ret = cobj->getViewName(); - tolua_pushcppstring(tolua_S,ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getViewName",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLViewProtocol_getViewName'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_GLViewProtocol_isOpenGLReady(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::GLViewProtocol* 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.GLViewProtocol",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::GLViewProtocol*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLViewProtocol_isOpenGLReady'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - bool ret = cobj->isOpenGLReady(); - tolua_pushboolean(tolua_S,(bool)ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isOpenGLReady",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLViewProtocol_isOpenGLReady'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_GLViewProtocol_end(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::GLViewProtocol* 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.GLViewProtocol",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::GLViewProtocol*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLViewProtocol_end'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - cobj->end(); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "end",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLViewProtocol_end'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_GLViewProtocol_getScaleY(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::GLViewProtocol* 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.GLViewProtocol",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::GLViewProtocol*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLViewProtocol_getScaleY'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - double ret = cobj->getScaleY(); - tolua_pushnumber(tolua_S,(lua_Number)ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getScaleY",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLViewProtocol_getScaleY'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_GLViewProtocol_getScaleX(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::GLViewProtocol* 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.GLViewProtocol",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::GLViewProtocol*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLViewProtocol_getScaleX'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - double ret = cobj->getScaleX(); - tolua_pushnumber(tolua_S,(lua_Number)ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getScaleX",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLViewProtocol_getScaleX'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_GLViewProtocol_getVisibleOrigin(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::GLViewProtocol* 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.GLViewProtocol",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::GLViewProtocol*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLViewProtocol_getVisibleOrigin'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - cocos2d::Vec2 ret = cobj->getVisibleOrigin(); - vec2_to_luaval(tolua_S, ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getVisibleOrigin",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLViewProtocol_getVisibleOrigin'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_GLViewProtocol_getFrameSize(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::GLViewProtocol* 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.GLViewProtocol",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::GLViewProtocol*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLViewProtocol_getFrameSize'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - const cocos2d::Size& ret = cobj->getFrameSize(); - size_to_luaval(tolua_S, ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getFrameSize",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLViewProtocol_getFrameSize'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_GLViewProtocol_getDesignResolutionSize(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::GLViewProtocol* 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.GLViewProtocol",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::GLViewProtocol*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLViewProtocol_getDesignResolutionSize'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - const cocos2d::Size& ret = cobj->getDesignResolutionSize(); - size_to_luaval(tolua_S, ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDesignResolutionSize",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLViewProtocol_getDesignResolutionSize'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_GLViewProtocol_pollInputEvents(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::GLViewProtocol* 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.GLViewProtocol",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::GLViewProtocol*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLViewProtocol_pollInputEvents'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - cobj->pollInputEvents(); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "pollInputEvents",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLViewProtocol_pollInputEvents'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_GLViewProtocol_swapBuffers(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::GLViewProtocol* 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.GLViewProtocol",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::GLViewProtocol*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLViewProtocol_swapBuffers'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - cobj->swapBuffers(); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "swapBuffers",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLViewProtocol_swapBuffers'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_GLViewProtocol_setDesignResolutionSize(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::GLViewProtocol* 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.GLViewProtocol",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::GLViewProtocol*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLViewProtocol_setDesignResolutionSize'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 3) - { - double arg0; - double arg1; - ResolutionPolicy arg2; - - ok &= luaval_to_number(tolua_S, 2,&arg0); - - ok &= luaval_to_number(tolua_S, 3,&arg1); - - ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2); - if(!ok) - return 0; - cobj->setDesignResolutionSize(arg0, arg1, arg2); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setDesignResolutionSize",argc, 3); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLViewProtocol_setDesignResolutionSize'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_GLViewProtocol_getResolutionPolicy(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::GLViewProtocol* 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.GLViewProtocol",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::GLViewProtocol*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLViewProtocol_getResolutionPolicy'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - int ret = (int)cobj->getResolutionPolicy(); - tolua_pushnumber(tolua_S,(lua_Number)ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getResolutionPolicy",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLViewProtocol_getResolutionPolicy'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_GLViewProtocol_setViewPortInPoints(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::GLViewProtocol* 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.GLViewProtocol",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::GLViewProtocol*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLViewProtocol_setViewPortInPoints'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 4) - { - double arg0; - double arg1; - double arg2; - double arg3; - - ok &= luaval_to_number(tolua_S, 2,&arg0); - - ok &= luaval_to_number(tolua_S, 3,&arg1); - - ok &= luaval_to_number(tolua_S, 4,&arg2); - - ok &= luaval_to_number(tolua_S, 5,&arg3); - if(!ok) - return 0; - cobj->setViewPortInPoints(arg0, arg1, arg2, arg3); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setViewPortInPoints",argc, 4); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLViewProtocol_setViewPortInPoints'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_GLViewProtocol_getScissorRect(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::GLViewProtocol* 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.GLViewProtocol",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::GLViewProtocol*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLViewProtocol_getScissorRect'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - cocos2d::Rect ret = cobj->getScissorRect(); - rect_to_luaval(tolua_S, ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getScissorRect",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLViewProtocol_getScissorRect'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_GLViewProtocol_setViewName(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::GLViewProtocol* 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.GLViewProtocol",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::GLViewProtocol*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLViewProtocol_setViewName'", 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->setViewName(arg0); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setViewName",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLViewProtocol_setViewName'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_GLViewProtocol_getVisibleRect(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::GLViewProtocol* 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.GLViewProtocol",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::GLViewProtocol*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLViewProtocol_getVisibleRect'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - cocos2d::Rect ret = cobj->getVisibleRect(); - rect_to_luaval(tolua_S, ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getVisibleRect",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLViewProtocol_getVisibleRect'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_GLViewProtocol_getVisibleSize(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::GLViewProtocol* 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.GLViewProtocol",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::GLViewProtocol*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLViewProtocol_getVisibleSize'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - cocos2d::Size ret = cobj->getVisibleSize(); - size_to_luaval(tolua_S, ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getVisibleSize",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLViewProtocol_getVisibleSize'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_GLViewProtocol_isScissorEnabled(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::GLViewProtocol* 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.GLViewProtocol",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::GLViewProtocol*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLViewProtocol_isScissorEnabled'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - bool ret = cobj->isScissorEnabled(); - tolua_pushboolean(tolua_S,(bool)ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isScissorEnabled",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLViewProtocol_isScissorEnabled'.",&tolua_err); -#endif - - return 0; -} -static int lua_cocos2dx_GLViewProtocol_finalize(lua_State* tolua_S) -{ - printf("luabindings: finalizing LUA object (GLViewProtocol)"); - return 0; -} - -int lua_register_cocos2dx_GLViewProtocol(lua_State* tolua_S) -{ - tolua_usertype(tolua_S,"cc.GLViewProtocol"); - tolua_cclass(tolua_S,"GLViewProtocol","cc.GLViewProtocol","",nullptr); - - tolua_beginmodule(tolua_S,"GLViewProtocol"); - tolua_function(tolua_S,"setFrameSize",lua_cocos2dx_GLViewProtocol_setFrameSize); - tolua_function(tolua_S,"getViewPortRect",lua_cocos2dx_GLViewProtocol_getViewPortRect); - tolua_function(tolua_S,"setIMEKeyboardState",lua_cocos2dx_GLViewProtocol_setIMEKeyboardState); - tolua_function(tolua_S,"setScissorInPoints",lua_cocos2dx_GLViewProtocol_setScissorInPoints); - tolua_function(tolua_S,"getViewName",lua_cocos2dx_GLViewProtocol_getViewName); - tolua_function(tolua_S,"isOpenGLReady",lua_cocos2dx_GLViewProtocol_isOpenGLReady); - tolua_function(tolua_S,"end",lua_cocos2dx_GLViewProtocol_end); - tolua_function(tolua_S,"getScaleY",lua_cocos2dx_GLViewProtocol_getScaleY); - tolua_function(tolua_S,"getScaleX",lua_cocos2dx_GLViewProtocol_getScaleX); - tolua_function(tolua_S,"getVisibleOrigin",lua_cocos2dx_GLViewProtocol_getVisibleOrigin); - tolua_function(tolua_S,"getFrameSize",lua_cocos2dx_GLViewProtocol_getFrameSize); - tolua_function(tolua_S,"getDesignResolutionSize",lua_cocos2dx_GLViewProtocol_getDesignResolutionSize); - tolua_function(tolua_S,"pollInputEvents",lua_cocos2dx_GLViewProtocol_pollInputEvents); - tolua_function(tolua_S,"swapBuffers",lua_cocos2dx_GLViewProtocol_swapBuffers); - tolua_function(tolua_S,"setDesignResolutionSize",lua_cocos2dx_GLViewProtocol_setDesignResolutionSize); - tolua_function(tolua_S,"getResolutionPolicy",lua_cocos2dx_GLViewProtocol_getResolutionPolicy); - tolua_function(tolua_S,"setViewPortInPoints",lua_cocos2dx_GLViewProtocol_setViewPortInPoints); - tolua_function(tolua_S,"getScissorRect",lua_cocos2dx_GLViewProtocol_getScissorRect); - tolua_function(tolua_S,"setViewName",lua_cocos2dx_GLViewProtocol_setViewName); - tolua_function(tolua_S,"getVisibleRect",lua_cocos2dx_GLViewProtocol_getVisibleRect); - tolua_function(tolua_S,"getVisibleSize",lua_cocos2dx_GLViewProtocol_getVisibleSize); - tolua_function(tolua_S,"isScissorEnabled",lua_cocos2dx_GLViewProtocol_isScissorEnabled); - tolua_endmodule(tolua_S); - std::string typeName = typeid(cocos2d::GLViewProtocol).name(); - g_luaType[typeName] = "cc.GLViewProtocol"; - g_typeCast["GLViewProtocol"] = "cc.GLViewProtocol"; - return 1; -} - -int lua_cocos2dx_GLView_createWithRect(lua_State* tolua_S) +int lua_cocos2dx_GLViewImpl_createWithRect(lua_State* tolua_S) { int argc = 0; bool ok = true; @@ -56111,7 +57762,7 @@ int lua_cocos2dx_GLView_createWithRect(lua_State* tolua_S) #endif #if COCOS2D_DEBUG >= 1 - if (!tolua_isusertable(tolua_S,1,"cc.GLView",0,&tolua_err)) goto tolua_lerror; + if (!tolua_isusertable(tolua_S,1,"cc.GLViewImpl",0,&tolua_err)) goto tolua_lerror; #endif argc = lua_gettop(tolua_S) - 1; @@ -56120,12 +57771,12 @@ int lua_cocos2dx_GLView_createWithRect(lua_State* tolua_S) { std::string arg0; cocos2d::Rect arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); - ok &= luaval_to_rect(tolua_S, 3, &arg1); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.GLViewImpl:createWithRect"); + ok &= luaval_to_rect(tolua_S, 3, &arg1, "cc.GLViewImpl:createWithRect"); if(!ok) return 0; - cocos2d::GLView* ret = cocos2d::GLView::createWithRect(arg0, arg1); - object_to_luaval(tolua_S, "cc.GLView",(cocos2d::GLView*)ret); + cocos2d::GLViewImpl* ret = cocos2d::GLViewImpl::createWithRect(arg0, arg1); + object_to_luaval(tolua_S, "cc.GLViewImpl",(cocos2d::GLViewImpl*)ret); return 1; } if (argc == 3) @@ -56133,24 +57784,24 @@ int lua_cocos2dx_GLView_createWithRect(lua_State* tolua_S) std::string arg0; cocos2d::Rect arg1; double arg2; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); - ok &= luaval_to_rect(tolua_S, 3, &arg1); - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.GLViewImpl:createWithRect"); + ok &= luaval_to_rect(tolua_S, 3, &arg1, "cc.GLViewImpl:createWithRect"); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.GLViewImpl:createWithRect"); if(!ok) return 0; - cocos2d::GLView* ret = cocos2d::GLView::createWithRect(arg0, arg1, arg2); - object_to_luaval(tolua_S, "cc.GLView",(cocos2d::GLView*)ret); + cocos2d::GLViewImpl* ret = cocos2d::GLViewImpl::createWithRect(arg0, arg1, arg2); + object_to_luaval(tolua_S, "cc.GLViewImpl",(cocos2d::GLViewImpl*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createWithRect",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.GLViewImpl:createWithRect",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLView_createWithRect'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLViewImpl_createWithRect'.",&tolua_err); #endif return 0; } -int lua_cocos2dx_GLView_create(lua_State* tolua_S) +int lua_cocos2dx_GLViewImpl_create(lua_State* tolua_S) { int argc = 0; bool ok = true; @@ -56160,7 +57811,7 @@ int lua_cocos2dx_GLView_create(lua_State* tolua_S) #endif #if COCOS2D_DEBUG >= 1 - if (!tolua_isusertable(tolua_S,1,"cc.GLView",0,&tolua_err)) goto tolua_lerror; + if (!tolua_isusertable(tolua_S,1,"cc.GLViewImpl",0,&tolua_err)) goto tolua_lerror; #endif argc = lua_gettop(tolua_S) - 1; @@ -56168,22 +57819,22 @@ int lua_cocos2dx_GLView_create(lua_State* tolua_S) if (argc == 1) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.GLViewImpl:create"); if(!ok) return 0; - cocos2d::GLView* ret = cocos2d::GLView::create(arg0); - object_to_luaval(tolua_S, "cc.GLView",(cocos2d::GLView*)ret); + cocos2d::GLViewImpl* ret = cocos2d::GLViewImpl::create(arg0); + object_to_luaval(tolua_S, "cc.GLViewImpl",(cocos2d::GLViewImpl*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.GLViewImpl:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLView_create'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLViewImpl_create'.",&tolua_err); #endif return 0; } -int lua_cocos2dx_GLView_createWithFullScreen(lua_State* tolua_S) +int lua_cocos2dx_GLViewImpl_createWithFullScreen(lua_State* tolua_S) { int argc = 0; bool ok = true; @@ -56193,7 +57844,7 @@ int lua_cocos2dx_GLView_createWithFullScreen(lua_State* tolua_S) #endif #if COCOS2D_DEBUG >= 1 - if (!tolua_isusertable(tolua_S,1,"cc.GLView",0,&tolua_err)) goto tolua_lerror; + if (!tolua_isusertable(tolua_S,1,"cc.GLViewImpl",0,&tolua_err)) goto tolua_lerror; #endif argc = lua_gettop(tolua_S) - 1; @@ -56201,40 +57852,40 @@ int lua_cocos2dx_GLView_createWithFullScreen(lua_State* tolua_S) if (argc == 1) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.GLViewImpl:createWithFullScreen"); if(!ok) return 0; - cocos2d::GLView* ret = cocos2d::GLView::createWithFullScreen(arg0); - object_to_luaval(tolua_S, "cc.GLView",(cocos2d::GLView*)ret); + cocos2d::GLViewImpl* ret = cocos2d::GLViewImpl::createWithFullScreen(arg0); + object_to_luaval(tolua_S, "cc.GLViewImpl",(cocos2d::GLViewImpl*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createWithFullScreen",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.GLViewImpl:createWithFullScreen",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLView_createWithFullScreen'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLViewImpl_createWithFullScreen'.",&tolua_err); #endif return 0; } -static int lua_cocos2dx_GLView_finalize(lua_State* tolua_S) +static int lua_cocos2dx_GLViewImpl_finalize(lua_State* tolua_S) { - printf("luabindings: finalizing LUA object (GLView)"); + printf("luabindings: finalizing LUA object (GLViewImpl)"); return 0; } -int lua_register_cocos2dx_GLView(lua_State* tolua_S) +int lua_register_cocos2dx_GLViewImpl(lua_State* tolua_S) { - tolua_usertype(tolua_S,"cc.GLView"); - tolua_cclass(tolua_S,"GLView","cc.GLView","cc.GLViewProtocol",nullptr); + tolua_usertype(tolua_S,"cc.GLViewImpl"); + tolua_cclass(tolua_S,"GLViewImpl","cc.GLViewImpl","cc.GLView",nullptr); - tolua_beginmodule(tolua_S,"GLView"); - tolua_function(tolua_S,"createWithRect", lua_cocos2dx_GLView_createWithRect); - tolua_function(tolua_S,"create", lua_cocos2dx_GLView_create); - tolua_function(tolua_S,"createWithFullScreen", lua_cocos2dx_GLView_createWithFullScreen); + tolua_beginmodule(tolua_S,"GLViewImpl"); + tolua_function(tolua_S,"createWithRect", lua_cocos2dx_GLViewImpl_createWithRect); + tolua_function(tolua_S,"create", lua_cocos2dx_GLViewImpl_create); + tolua_function(tolua_S,"createWithFullScreen", lua_cocos2dx_GLViewImpl_createWithFullScreen); tolua_endmodule(tolua_S); - std::string typeName = typeid(cocos2d::GLView).name(); - g_luaType[typeName] = "cc.GLView"; - g_typeCast["GLView"] = "cc.GLView"; + std::string typeName = typeid(cocos2d::GLViewImpl).name(); + g_luaType[typeName] = "cc.GLViewImpl"; + g_typeCast["GLViewImpl"] = "cc.GLViewImpl"; return 1; } @@ -56268,14 +57919,14 @@ int lua_cocos2dx_AnimationCache_getAnimation(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.AnimationCache:getAnimation"); if(!ok) return 0; cocos2d::Animation* ret = cobj->getAnimation(arg0); object_to_luaval(tolua_S, "cc.Animation",(cocos2d::Animation*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAnimation",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.AnimationCache:getAnimation",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -56318,13 +57969,13 @@ int lua_cocos2dx_AnimationCache_addAnimation(lua_State* tolua_S) ok &= luaval_to_object(tolua_S, 2, "cc.Animation",&arg0); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.AnimationCache:addAnimation"); if(!ok) return 0; cobj->addAnimation(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addAnimation",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.AnimationCache:addAnimation",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -56368,7 +58019,7 @@ int lua_cocos2dx_AnimationCache_init(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "init",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.AnimationCache:init",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -56409,15 +58060,15 @@ int lua_cocos2dx_AnimationCache_addAnimationsWithDictionary(lua_State* tolua_S) cocos2d::ValueMap arg0; std::string arg1; - ok &= luaval_to_ccvaluemap(tolua_S, 2, &arg0); + ok &= luaval_to_ccvaluemap(tolua_S, 2, &arg0, "cc.AnimationCache:addAnimationsWithDictionary"); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.AnimationCache:addAnimationsWithDictionary"); if(!ok) return 0; cobj->addAnimationsWithDictionary(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addAnimationsWithDictionary",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.AnimationCache:addAnimationsWithDictionary",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -56457,13 +58108,13 @@ int lua_cocos2dx_AnimationCache_removeAnimation(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.AnimationCache:removeAnimation"); if(!ok) return 0; cobj->removeAnimation(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeAnimation",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.AnimationCache:removeAnimation",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -56503,13 +58154,13 @@ int lua_cocos2dx_AnimationCache_addAnimationsWithFile(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.AnimationCache:addAnimationsWithFile"); if(!ok) return 0; cobj->addAnimationsWithFile(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addAnimationsWithFile",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.AnimationCache:addAnimationsWithFile",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -56541,7 +58192,7 @@ int lua_cocos2dx_AnimationCache_destroyInstance(lua_State* tolua_S) cocos2d::AnimationCache::destroyInstance(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "destroyInstance",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.AnimationCache:destroyInstance",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -56572,7 +58223,7 @@ int lua_cocos2dx_AnimationCache_getInstance(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.AnimationCache",(cocos2d::AnimationCache*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "getInstance",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.AnimationCache:getInstance",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -56604,7 +58255,7 @@ int lua_cocos2dx_AnimationCache_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.AnimationCache"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "AnimationCache",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.AnimationCache:AnimationCache",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -56642,6 +58293,55 @@ int lua_register_cocos2dx_AnimationCache(lua_State* tolua_S) return 1; } +int lua_cocos2dx_SpriteFrameCache_addSpriteFramesWithFileContent(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::SpriteFrameCache* 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.SpriteFrameCache",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::SpriteFrameCache*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_SpriteFrameCache_addSpriteFramesWithFileContent'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 2) + { + std::string arg0; + cocos2d::Texture2D* arg1; + + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.SpriteFrameCache:addSpriteFramesWithFileContent"); + + ok &= luaval_to_object(tolua_S, 3, "cc.Texture2D",&arg1); + if(!ok) + return 0; + cobj->addSpriteFramesWithFileContent(arg0, arg1); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SpriteFrameCache:addSpriteFramesWithFileContent",argc, 2); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_SpriteFrameCache_addSpriteFramesWithFileContent'.",&tolua_err); +#endif + + return 0; +} int lua_cocos2dx_SpriteFrameCache_addSpriteFramesWithFile(lua_State* tolua_S) { int argc = 0; @@ -56666,11 +58366,11 @@ int lua_cocos2dx_SpriteFrameCache_addSpriteFramesWithFile(lua_State* tolua_S) do{ if (argc == 2) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.SpriteFrameCache:addSpriteFramesWithFile"); if (!ok) { break; } std::string arg1; - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.SpriteFrameCache:addSpriteFramesWithFile"); if (!ok) { break; } cobj->addSpriteFramesWithFile(arg0, arg1); @@ -56681,7 +58381,7 @@ int lua_cocos2dx_SpriteFrameCache_addSpriteFramesWithFile(lua_State* tolua_S) do{ if (argc == 1) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.SpriteFrameCache:addSpriteFramesWithFile"); if (!ok) { break; } cobj->addSpriteFramesWithFile(arg0); @@ -56692,7 +58392,7 @@ int lua_cocos2dx_SpriteFrameCache_addSpriteFramesWithFile(lua_State* tolua_S) do{ if (argc == 2) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.SpriteFrameCache:addSpriteFramesWithFile"); if (!ok) { break; } cocos2d::Texture2D* arg1; @@ -56704,7 +58404,7 @@ int lua_cocos2dx_SpriteFrameCache_addSpriteFramesWithFile(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addSpriteFramesWithFile",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SpriteFrameCache:addSpriteFramesWithFile",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -56747,13 +58447,13 @@ int lua_cocos2dx_SpriteFrameCache_addSpriteFrame(lua_State* tolua_S) ok &= luaval_to_object(tolua_S, 2, "cc.SpriteFrame",&arg0); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.SpriteFrameCache:addSpriteFrame"); if(!ok) return 0; cobj->addSpriteFrame(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addSpriteFrame",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SpriteFrameCache:addSpriteFrame",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -56796,7 +58496,7 @@ int lua_cocos2dx_SpriteFrameCache_removeUnusedSpriteFrames(lua_State* tolua_S) cobj->removeUnusedSpriteFrames(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeUnusedSpriteFrames",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SpriteFrameCache:removeUnusedSpriteFrames",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -56836,14 +58536,14 @@ int lua_cocos2dx_SpriteFrameCache_getSpriteFrameByName(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.SpriteFrameCache:getSpriteFrameByName"); if(!ok) return 0; cocos2d::SpriteFrame* ret = cobj->getSpriteFrameByName(arg0); object_to_luaval(tolua_S, "cc.SpriteFrame",(cocos2d::SpriteFrame*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getSpriteFrameByName",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SpriteFrameCache:getSpriteFrameByName",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -56883,13 +58583,13 @@ int lua_cocos2dx_SpriteFrameCache_removeSpriteFramesFromFile(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.SpriteFrameCache:removeSpriteFramesFromFile"); if(!ok) return 0; cobj->removeSpriteFramesFromFile(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeSpriteFramesFromFile",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SpriteFrameCache:removeSpriteFramesFromFile",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -56933,7 +58633,7 @@ int lua_cocos2dx_SpriteFrameCache_init(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "init",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SpriteFrameCache:init",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -56976,7 +58676,7 @@ int lua_cocos2dx_SpriteFrameCache_removeSpriteFrames(lua_State* tolua_S) cobj->removeSpriteFrames(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeSpriteFrames",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SpriteFrameCache:removeSpriteFrames",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -57022,7 +58722,7 @@ int lua_cocos2dx_SpriteFrameCache_removeSpriteFramesFromTexture(lua_State* tolua cobj->removeSpriteFramesFromTexture(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeSpriteFramesFromTexture",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SpriteFrameCache:removeSpriteFramesFromTexture",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -57032,6 +58732,52 @@ int lua_cocos2dx_SpriteFrameCache_removeSpriteFramesFromTexture(lua_State* tolua return 0; } +int lua_cocos2dx_SpriteFrameCache_removeSpriteFramesFromFileContent(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::SpriteFrameCache* 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.SpriteFrameCache",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::SpriteFrameCache*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_SpriteFrameCache_removeSpriteFramesFromFileContent'", 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, "cc.SpriteFrameCache:removeSpriteFramesFromFileContent"); + if(!ok) + return 0; + cobj->removeSpriteFramesFromFileContent(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SpriteFrameCache:removeSpriteFramesFromFileContent",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_SpriteFrameCache_removeSpriteFramesFromFileContent'.",&tolua_err); +#endif + + return 0; +} int lua_cocos2dx_SpriteFrameCache_removeSpriteFrameByName(lua_State* tolua_S) { int argc = 0; @@ -57062,13 +58808,13 @@ int lua_cocos2dx_SpriteFrameCache_removeSpriteFrameByName(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.SpriteFrameCache:removeSpriteFrameByName"); if(!ok) return 0; cobj->removeSpriteFrameByName(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeSpriteFrameByName",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SpriteFrameCache:removeSpriteFrameByName",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -57100,7 +58846,7 @@ int lua_cocos2dx_SpriteFrameCache_destroyInstance(lua_State* tolua_S) cocos2d::SpriteFrameCache::destroyInstance(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "destroyInstance",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.SpriteFrameCache:destroyInstance",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -57131,7 +58877,7 @@ int lua_cocos2dx_SpriteFrameCache_getInstance(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.SpriteFrameCache",(cocos2d::SpriteFrameCache*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "getInstance",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.SpriteFrameCache:getInstance",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -57151,6 +58897,7 @@ int lua_register_cocos2dx_SpriteFrameCache(lua_State* tolua_S) tolua_cclass(tolua_S,"SpriteFrameCache","cc.SpriteFrameCache","cc.Ref",nullptr); tolua_beginmodule(tolua_S,"SpriteFrameCache"); + tolua_function(tolua_S,"addSpriteFramesWithFileContent",lua_cocos2dx_SpriteFrameCache_addSpriteFramesWithFileContent); tolua_function(tolua_S,"addSpriteFrames",lua_cocos2dx_SpriteFrameCache_addSpriteFramesWithFile); tolua_function(tolua_S,"addSpriteFrame",lua_cocos2dx_SpriteFrameCache_addSpriteFrame); tolua_function(tolua_S,"removeUnusedSpriteFrames",lua_cocos2dx_SpriteFrameCache_removeUnusedSpriteFrames); @@ -57159,6 +58906,7 @@ int lua_register_cocos2dx_SpriteFrameCache(lua_State* tolua_S) tolua_function(tolua_S,"init",lua_cocos2dx_SpriteFrameCache_init); tolua_function(tolua_S,"removeSpriteFrames",lua_cocos2dx_SpriteFrameCache_removeSpriteFrames); tolua_function(tolua_S,"removeSpriteFramesFromTexture",lua_cocos2dx_SpriteFrameCache_removeSpriteFramesFromTexture); + tolua_function(tolua_S,"removeSpriteFramesFromFileContent",lua_cocos2dx_SpriteFrameCache_removeSpriteFramesFromFileContent); tolua_function(tolua_S,"removeSpriteFrameByName",lua_cocos2dx_SpriteFrameCache_removeSpriteFrameByName); tolua_function(tolua_S,"destroyInstance", lua_cocos2dx_SpriteFrameCache_destroyInstance); tolua_function(tolua_S,"getInstance", lua_cocos2dx_SpriteFrameCache_getInstance); @@ -57204,17 +58952,17 @@ int lua_cocos2dx_ParallaxNode_addChild(lua_State* tolua_S) ok &= luaval_to_object(tolua_S, 2, "cc.Node",&arg0); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.ParallaxNode:addChild"); - ok &= luaval_to_vec2(tolua_S, 4, &arg2); + ok &= luaval_to_vec2(tolua_S, 4, &arg2, "cc.ParallaxNode:addChild"); - ok &= luaval_to_vec2(tolua_S, 5, &arg3); + ok &= luaval_to_vec2(tolua_S, 5, &arg3, "cc.ParallaxNode:addChild"); if(!ok) return 0; cobj->addChild(arg0, arg1, arg2, arg3); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addChild",argc, 4); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParallaxNode:addChild",argc, 4); return 0; #if COCOS2D_DEBUG >= 1 @@ -57254,13 +59002,13 @@ int lua_cocos2dx_ParallaxNode_removeAllChildrenWithCleanup(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.ParallaxNode:removeAllChildrenWithCleanup"); if(!ok) return 0; cobj->removeAllChildrenWithCleanup(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeAllChildrenWithCleanup",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ParallaxNode:removeAllChildrenWithCleanup",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -57293,7 +59041,7 @@ int lua_cocos2dx_ParallaxNode_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.ParallaxNode",(cocos2d::ParallaxNode*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.ParallaxNode:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -57353,13 +59101,13 @@ int lua_cocos2dx_TMXObjectGroup_setPositionOffset(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.TMXObjectGroup:setPositionOffset"); if(!ok) return 0; cobj->setPositionOffset(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setPositionOffset",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXObjectGroup:setPositionOffset",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -57399,14 +59147,14 @@ int lua_cocos2dx_TMXObjectGroup_getProperty(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.TMXObjectGroup:getProperty"); if(!ok) return 0; cocos2d::Value ret = cobj->getProperty(arg0); ccvalue_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getProperty",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXObjectGroup:getProperty",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -57450,7 +59198,7 @@ int lua_cocos2dx_TMXObjectGroup_getPositionOffset(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPositionOffset",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXObjectGroup:getPositionOffset",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -57490,14 +59238,14 @@ int lua_cocos2dx_TMXObjectGroup_getObject(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.TMXObjectGroup:getObject"); if(!ok) return 0; cocos2d::ValueMap ret = cobj->getObject(arg0); ccvaluemap_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getObject",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXObjectGroup:getObject",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -57544,7 +59292,7 @@ int lua_cocos2dx_TMXObjectGroup_getObjects(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getObjects",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXObjectGroup:getObjects",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -57584,13 +59332,13 @@ int lua_cocos2dx_TMXObjectGroup_setGroupName(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.TMXObjectGroup:setGroupName"); if(!ok) return 0; cobj->setGroupName(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setGroupName",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXObjectGroup:setGroupName",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -57637,7 +59385,7 @@ int lua_cocos2dx_TMXObjectGroup_getProperties(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getProperties",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXObjectGroup:getProperties",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -57681,7 +59429,7 @@ int lua_cocos2dx_TMXObjectGroup_getGroupName(lua_State* tolua_S) tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getGroupName",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXObjectGroup:getGroupName",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -57721,13 +59469,13 @@ int lua_cocos2dx_TMXObjectGroup_setProperties(lua_State* tolua_S) { cocos2d::ValueMap arg0; - ok &= luaval_to_ccvaluemap(tolua_S, 2, &arg0); + ok &= luaval_to_ccvaluemap(tolua_S, 2, &arg0, "cc.TMXObjectGroup:setProperties"); if(!ok) return 0; cobj->setProperties(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setProperties",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXObjectGroup:setProperties",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -57767,13 +59515,13 @@ int lua_cocos2dx_TMXObjectGroup_setObjects(lua_State* tolua_S) { cocos2d::ValueVector arg0; - ok &= luaval_to_ccvaluevector(tolua_S, 2, &arg0); + ok &= luaval_to_ccvaluevector(tolua_S, 2, &arg0, "cc.TMXObjectGroup:setObjects"); if(!ok) return 0; cobj->setObjects(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setObjects",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXObjectGroup:setObjects",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -57807,7 +59555,7 @@ int lua_cocos2dx_TMXObjectGroup_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.TMXObjectGroup"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "TMXObjectGroup",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXObjectGroup:TMXObjectGroup",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -57877,13 +59625,13 @@ int lua_cocos2dx_TMXLayerInfo_setProperties(lua_State* tolua_S) { cocos2d::ValueMap arg0; - ok &= luaval_to_ccvaluemap(tolua_S, 2, &arg0); + ok &= luaval_to_ccvaluemap(tolua_S, 2, &arg0, "cc.TMXLayerInfo:setProperties"); if(!ok) return 0; cobj->setProperties(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setProperties",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXLayerInfo:setProperties",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -57927,7 +59675,7 @@ int lua_cocos2dx_TMXLayerInfo_getProperties(lua_State* tolua_S) ccvaluemap_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getProperties",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXLayerInfo:getProperties",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -57961,7 +59709,7 @@ int lua_cocos2dx_TMXLayerInfo_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.TMXLayerInfo"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "TMXLayerInfo",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXLayerInfo:TMXLayerInfo",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -58023,14 +59771,14 @@ int lua_cocos2dx_TMXTilesetInfo_getRectForGID(lua_State* tolua_S) { unsigned int arg0; - ok &= luaval_to_uint32(tolua_S, 2,&arg0); + ok &= luaval_to_uint32(tolua_S, 2,&arg0, "cc.TMXTilesetInfo:getRectForGID"); if(!ok) return 0; cocos2d::Rect ret = cobj->getRectForGID(arg0); rect_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getRectForGID",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXTilesetInfo:getRectForGID",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -58064,7 +59812,7 @@ int lua_cocos2dx_TMXTilesetInfo_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.TMXTilesetInfo"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "TMXTilesetInfo",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXTilesetInfo:TMXTilesetInfo",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -58125,13 +59873,13 @@ int lua_cocos2dx_TMXMapInfo_setObjectGroups(lua_State* tolua_S) { cocos2d::Vector arg0; - ok &= luaval_to_ccvector(tolua_S, 2, &arg0); + ok &= luaval_to_ccvector(tolua_S, 2, &arg0, "cc.TMXMapInfo:setObjectGroups"); if(!ok) return 0; cobj->setObjectGroups(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setObjectGroups",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXMapInfo:setObjectGroups",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -58171,13 +59919,13 @@ int lua_cocos2dx_TMXMapInfo_setTileSize(lua_State* tolua_S) { cocos2d::Size arg0; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.TMXMapInfo:setTileSize"); if(!ok) return 0; cobj->setTileSize(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTileSize",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXMapInfo:setTileSize",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -58217,14 +59965,14 @@ int lua_cocos2dx_TMXMapInfo_initWithTMXFile(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.TMXMapInfo:initWithTMXFile"); if(!ok) return 0; bool ret = cobj->initWithTMXFile(arg0); tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "initWithTMXFile",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXMapInfo:initWithTMXFile",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -58268,7 +60016,7 @@ int lua_cocos2dx_TMXMapInfo_getOrientation(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getOrientation",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXMapInfo:getOrientation",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -58312,7 +60060,7 @@ int lua_cocos2dx_TMXMapInfo_isStoringCharacters(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isStoringCharacters",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXMapInfo:isStoringCharacters",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -58352,13 +60100,13 @@ int lua_cocos2dx_TMXMapInfo_setLayers(lua_State* tolua_S) { cocos2d::Vector arg0; - ok &= luaval_to_ccvector(tolua_S, 2, &arg0); + ok &= luaval_to_ccvector(tolua_S, 2, &arg0, "cc.TMXMapInfo:setLayers"); if(!ok) return 0; cobj->setLayers(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setLayers",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXMapInfo:setLayers",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -58398,14 +60146,14 @@ int lua_cocos2dx_TMXMapInfo_parseXMLFile(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.TMXMapInfo:parseXMLFile"); if(!ok) return 0; bool ret = cobj->parseXMLFile(arg0); tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "parseXMLFile",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXMapInfo:parseXMLFile",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -58449,7 +60197,7 @@ int lua_cocos2dx_TMXMapInfo_getParentElement(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getParentElement",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXMapInfo:getParentElement",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -58489,13 +60237,13 @@ int lua_cocos2dx_TMXMapInfo_setTMXFileName(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.TMXMapInfo:setTMXFileName"); if(!ok) return 0; cobj->setTMXFileName(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTMXFileName",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXMapInfo:setTMXFileName",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -58535,14 +60283,14 @@ int lua_cocos2dx_TMXMapInfo_parseXMLString(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.TMXMapInfo:parseXMLString"); if(!ok) return 0; bool ret = cobj->parseXMLString(arg0); tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "parseXMLString",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXMapInfo:parseXMLString",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -58589,7 +60337,7 @@ int lua_cocos2dx_TMXMapInfo_getLayers(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getLayers",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXMapInfo:getLayers",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -58636,7 +60384,7 @@ int lua_cocos2dx_TMXMapInfo_getTilesets(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTilesets",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXMapInfo:getTilesets",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -58680,7 +60428,7 @@ int lua_cocos2dx_TMXMapInfo_getParentGID(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getParentGID",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXMapInfo:getParentGID",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -58720,13 +60468,13 @@ int lua_cocos2dx_TMXMapInfo_setParentElement(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.TMXMapInfo:setParentElement"); if(!ok) return 0; cobj->setParentElement(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setParentElement",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXMapInfo:setParentElement",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -58767,16 +60515,16 @@ int lua_cocos2dx_TMXMapInfo_initWithXML(lua_State* tolua_S) std::string arg0; std::string arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.TMXMapInfo:initWithXML"); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.TMXMapInfo:initWithXML"); if(!ok) return 0; bool ret = cobj->initWithXML(arg0, arg1); tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "initWithXML",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXMapInfo:initWithXML",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -58816,13 +60564,13 @@ int lua_cocos2dx_TMXMapInfo_setParentGID(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.TMXMapInfo:setParentGID"); if(!ok) return 0; cobj->setParentGID(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setParentGID",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXMapInfo:setParentGID",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -58866,7 +60614,7 @@ int lua_cocos2dx_TMXMapInfo_getLayerAttribs(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getLayerAttribs",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXMapInfo:getLayerAttribs",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -58910,7 +60658,7 @@ int lua_cocos2dx_TMXMapInfo_getTileSize(lua_State* tolua_S) size_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTileSize",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXMapInfo:getTileSize",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -58954,7 +60702,7 @@ int lua_cocos2dx_TMXMapInfo_getTileProperties(lua_State* tolua_S) ccvaluemapintkey_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTileProperties",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXMapInfo:getTileProperties",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -59001,7 +60749,7 @@ int lua_cocos2dx_TMXMapInfo_getObjectGroups(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getObjectGroups",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXMapInfo:getObjectGroups",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -59045,7 +60793,7 @@ int lua_cocos2dx_TMXMapInfo_getTMXFileName(lua_State* tolua_S) tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTMXFileName",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXMapInfo:getTMXFileName",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -59085,13 +60833,13 @@ int lua_cocos2dx_TMXMapInfo_setCurrentString(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.TMXMapInfo:setCurrentString"); if(!ok) return 0; cobj->setCurrentString(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setCurrentString",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXMapInfo:setCurrentString",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -59131,13 +60879,13 @@ int lua_cocos2dx_TMXMapInfo_setProperties(lua_State* tolua_S) { cocos2d::ValueMap arg0; - ok &= luaval_to_ccvaluemap(tolua_S, 2, &arg0); + ok &= luaval_to_ccvaluemap(tolua_S, 2, &arg0, "cc.TMXMapInfo:setProperties"); if(!ok) return 0; cobj->setProperties(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setProperties",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXMapInfo:setProperties",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -59177,13 +60925,13 @@ int lua_cocos2dx_TMXMapInfo_setOrientation(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.TMXMapInfo:setOrientation"); if(!ok) return 0; cobj->setOrientation(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setOrientation",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXMapInfo:setOrientation",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -59223,13 +60971,13 @@ int lua_cocos2dx_TMXMapInfo_setTileProperties(lua_State* tolua_S) { cocos2d::ValueMapIntKey arg0; - ok &= luaval_to_ccvaluemapintkey(tolua_S, 2, &arg0); + ok &= luaval_to_ccvaluemapintkey(tolua_S, 2, &arg0, "cc.TMXMapInfo:setTileProperties"); if(!ok) return 0; cobj->setTileProperties(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTileProperties",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXMapInfo:setTileProperties",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -59269,13 +61017,13 @@ int lua_cocos2dx_TMXMapInfo_setMapSize(lua_State* tolua_S) { cocos2d::Size arg0; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.TMXMapInfo:setMapSize"); if(!ok) return 0; cobj->setMapSize(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setMapSize",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXMapInfo:setMapSize",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -59315,13 +61063,13 @@ int lua_cocos2dx_TMXMapInfo_setStoringCharacters(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.TMXMapInfo:setStoringCharacters"); if(!ok) return 0; cobj->setStoringCharacters(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setStoringCharacters",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXMapInfo:setStoringCharacters",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -59365,7 +61113,7 @@ int lua_cocos2dx_TMXMapInfo_getMapSize(lua_State* tolua_S) size_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getMapSize",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXMapInfo:getMapSize",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -59405,13 +61153,13 @@ int lua_cocos2dx_TMXMapInfo_setTilesets(lua_State* tolua_S) { cocos2d::Vector arg0; - ok &= luaval_to_ccvector(tolua_S, 2, &arg0); + ok &= luaval_to_ccvector(tolua_S, 2, &arg0, "cc.TMXMapInfo:setTilesets"); if(!ok) return 0; cobj->setTilesets(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTilesets",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXMapInfo:setTilesets",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -59458,7 +61206,7 @@ int lua_cocos2dx_TMXMapInfo_getProperties(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getProperties",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXMapInfo:getProperties",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -59502,7 +61250,7 @@ int lua_cocos2dx_TMXMapInfo_getCurrentString(lua_State* tolua_S) tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getCurrentString",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXMapInfo:getCurrentString",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -59542,13 +61290,13 @@ int lua_cocos2dx_TMXMapInfo_setLayerAttribs(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.TMXMapInfo:setLayerAttribs"); if(!ok) return 0; cobj->setLayerAttribs(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setLayerAttribs",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXMapInfo:setLayerAttribs",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -59576,14 +61324,14 @@ int lua_cocos2dx_TMXMapInfo_create(lua_State* tolua_S) if (argc == 1) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.TMXMapInfo:create"); if(!ok) return 0; cocos2d::TMXMapInfo* ret = cocos2d::TMXMapInfo::create(arg0); object_to_luaval(tolua_S, "cc.TMXMapInfo",(cocos2d::TMXMapInfo*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.TMXMapInfo:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -59610,15 +61358,15 @@ int lua_cocos2dx_TMXMapInfo_createWithXML(lua_State* tolua_S) { std::string arg0; std::string arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.TMXMapInfo:createWithXML"); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.TMXMapInfo:createWithXML"); if(!ok) return 0; cocos2d::TMXMapInfo* ret = cocos2d::TMXMapInfo::createWithXML(arg0, arg1); object_to_luaval(tolua_S, "cc.TMXMapInfo",(cocos2d::TMXMapInfo*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createWithXML",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.TMXMapInfo:createWithXML",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -59650,7 +61398,7 @@ int lua_cocos2dx_TMXMapInfo_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.TMXMapInfo"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "TMXMapInfo",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXMapInfo:TMXMapInfo",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -59744,14 +61492,14 @@ int lua_cocos2dx_TMXLayer_getPositionAt(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.TMXLayer:getPositionAt"); if(!ok) return 0; cocos2d::Vec2 ret = cobj->getPositionAt(arg0); vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPositionAt",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXLayer:getPositionAt",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -59791,13 +61539,13 @@ int lua_cocos2dx_TMXLayer_setLayerOrientation(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.TMXLayer:setLayerOrientation"); if(!ok) return 0; cobj->setLayerOrientation(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setLayerOrientation",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXLayer:setLayerOrientation",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -59840,7 +61588,7 @@ int lua_cocos2dx_TMXLayer_releaseMap(lua_State* tolua_S) cobj->releaseMap(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "releaseMap",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXLayer:releaseMap",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -59884,7 +61632,7 @@ int lua_cocos2dx_TMXLayer_getLayerSize(lua_State* tolua_S) size_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getLayerSize",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXLayer:getLayerSize",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -59924,13 +61672,13 @@ int lua_cocos2dx_TMXLayer_setMapTileSize(lua_State* tolua_S) { cocos2d::Size arg0; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.TMXLayer:setMapTileSize"); if(!ok) return 0; cobj->setMapTileSize(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setMapTileSize",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXLayer:setMapTileSize",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -59974,7 +61722,7 @@ int lua_cocos2dx_TMXLayer_getLayerOrientation(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getLayerOrientation",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXLayer:getLayerOrientation",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -60014,13 +61762,13 @@ int lua_cocos2dx_TMXLayer_setProperties(lua_State* tolua_S) { cocos2d::ValueMap arg0; - ok &= luaval_to_ccvaluemap(tolua_S, 2, &arg0); + ok &= luaval_to_ccvaluemap(tolua_S, 2, &arg0, "cc.TMXLayer:setProperties"); if(!ok) return 0; cobj->setProperties(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setProperties",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXLayer:setProperties",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -60060,13 +61808,13 @@ int lua_cocos2dx_TMXLayer_setLayerName(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.TMXLayer:setLayerName"); if(!ok) return 0; cobj->setLayerName(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setLayerName",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXLayer:setLayerName",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -60106,13 +61854,13 @@ int lua_cocos2dx_TMXLayer_removeTileAt(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.TMXLayer:removeTileAt"); if(!ok) return 0; cobj->removeTileAt(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeTileAt",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXLayer:removeTileAt",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -60165,7 +61913,7 @@ int lua_cocos2dx_TMXLayer_initWithTilesetInfo(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "initWithTilesetInfo",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXLayer:initWithTilesetInfo",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 @@ -60208,7 +61956,7 @@ int lua_cocos2dx_TMXLayer_setupTiles(lua_State* tolua_S) cobj->setupTiles(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setupTiles",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXLayer:setupTiles",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -60242,15 +61990,15 @@ int lua_cocos2dx_TMXLayer_setTileGID(lua_State* tolua_S) do{ if (argc == 3) { unsigned int arg0; - ok &= luaval_to_uint32(tolua_S, 2,&arg0); + ok &= luaval_to_uint32(tolua_S, 2,&arg0, "cc.TMXLayer:setTileGID"); if (!ok) { break; } cocos2d::Vec2 arg1; - ok &= luaval_to_vec2(tolua_S, 3, &arg1); + ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.TMXLayer:setTileGID"); if (!ok) { break; } cocos2d::TMXTileFlags_ arg2; - ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2); + ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "cc.TMXLayer:setTileGID"); if (!ok) { break; } cobj->setTileGID(arg0, arg1, arg2); @@ -60261,11 +62009,11 @@ int lua_cocos2dx_TMXLayer_setTileGID(lua_State* tolua_S) do{ if (argc == 2) { unsigned int arg0; - ok &= luaval_to_uint32(tolua_S, 2,&arg0); + ok &= luaval_to_uint32(tolua_S, 2,&arg0, "cc.TMXLayer:setTileGID"); if (!ok) { break; } cocos2d::Vec2 arg1; - ok &= luaval_to_vec2(tolua_S, 3, &arg1); + ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.TMXLayer:setTileGID"); if (!ok) { break; } cobj->setTileGID(arg0, arg1); @@ -60273,7 +62021,7 @@ int lua_cocos2dx_TMXLayer_setTileGID(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTileGID",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXLayer:setTileGID",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -60317,7 +62065,7 @@ int lua_cocos2dx_TMXLayer_getMapTileSize(lua_State* tolua_S) size_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getMapTileSize",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXLayer:getMapTileSize",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -60357,14 +62105,14 @@ int lua_cocos2dx_TMXLayer_getProperty(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.TMXLayer:getProperty"); if(!ok) return 0; cocos2d::Value ret = cobj->getProperty(arg0); ccvalue_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getProperty",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXLayer:getProperty",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -60404,13 +62152,13 @@ int lua_cocos2dx_TMXLayer_setLayerSize(lua_State* tolua_S) { cocos2d::Size arg0; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.TMXLayer:setLayerSize"); if(!ok) return 0; cobj->setLayerSize(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setLayerSize",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXLayer:setLayerSize",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -60454,7 +62202,7 @@ int lua_cocos2dx_TMXLayer_getLayerName(lua_State* tolua_S) tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getLayerName",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXLayer:getLayerName",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -60500,7 +62248,7 @@ int lua_cocos2dx_TMXLayer_setTileSet(lua_State* tolua_S) cobj->setTileSet(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTileSet",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXLayer:setTileSet",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -60544,7 +62292,7 @@ int lua_cocos2dx_TMXLayer_getTileSet(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.TMXTilesetInfo",(cocos2d::TMXTilesetInfo*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTileSet",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXLayer:getTileSet",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -60591,7 +62339,7 @@ int lua_cocos2dx_TMXLayer_getProperties(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getProperties",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXLayer:getProperties",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -60631,14 +62379,14 @@ int lua_cocos2dx_TMXLayer_getTileAt(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.TMXLayer:getTileAt"); if(!ok) return 0; cocos2d::Sprite* ret = cobj->getTileAt(arg0); object_to_luaval(tolua_S, "cc.Sprite",(cocos2d::Sprite*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTileAt",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXLayer:getTileAt",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -60677,7 +62425,7 @@ int lua_cocos2dx_TMXLayer_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.TMXLayer",(cocos2d::TMXLayer*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.TMXLayer:create",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -60709,7 +62457,7 @@ int lua_cocos2dx_TMXLayer_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.TMXLayer"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "TMXLayer",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXLayer:TMXLayer",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -60790,13 +62538,13 @@ int lua_cocos2dx_TMXTiledMap_setObjectGroups(lua_State* tolua_S) { cocos2d::Vector arg0; - ok &= luaval_to_ccvector(tolua_S, 2, &arg0); + ok &= luaval_to_ccvector(tolua_S, 2, &arg0, "cc.TMXTiledMap:setObjectGroups"); if(!ok) return 0; cobj->setObjectGroups(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setObjectGroups",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXTiledMap:setObjectGroups",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -60836,14 +62584,14 @@ int lua_cocos2dx_TMXTiledMap_getProperty(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.TMXTiledMap:getProperty"); if(!ok) return 0; cocos2d::Value ret = cobj->getProperty(arg0); ccvalue_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getProperty",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXTiledMap:getProperty",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -60883,13 +62631,13 @@ int lua_cocos2dx_TMXTiledMap_setMapSize(lua_State* tolua_S) { cocos2d::Size arg0; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.TMXTiledMap:setMapSize"); if(!ok) return 0; cobj->setMapSize(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setMapSize",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXTiledMap:setMapSize",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -60929,14 +62677,14 @@ int lua_cocos2dx_TMXTiledMap_getObjectGroup(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.TMXTiledMap:getObjectGroup"); if(!ok) return 0; cocos2d::TMXObjectGroup* ret = cobj->getObjectGroup(arg0); object_to_luaval(tolua_S, "cc.TMXObjectGroup",(cocos2d::TMXObjectGroup*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getObjectGroup",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXTiledMap:getObjectGroup",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -60983,7 +62731,7 @@ int lua_cocos2dx_TMXTiledMap_getObjectGroups(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getObjectGroups",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXTiledMap:getObjectGroups",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -61027,7 +62775,7 @@ int lua_cocos2dx_TMXTiledMap_getTileSize(lua_State* tolua_S) size_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTileSize",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXTiledMap:getTileSize",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -61071,7 +62819,7 @@ int lua_cocos2dx_TMXTiledMap_getMapSize(lua_State* tolua_S) size_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getMapSize",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXTiledMap:getMapSize",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -61115,7 +62863,7 @@ int lua_cocos2dx_TMXTiledMap_getProperties(lua_State* tolua_S) ccvaluemap_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getProperties",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXTiledMap:getProperties",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -61155,13 +62903,13 @@ int lua_cocos2dx_TMXTiledMap_setTileSize(lua_State* tolua_S) { cocos2d::Size arg0; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.TMXTiledMap:setTileSize"); if(!ok) return 0; cobj->setTileSize(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTileSize",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXTiledMap:setTileSize",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -61201,13 +62949,13 @@ int lua_cocos2dx_TMXTiledMap_setProperties(lua_State* tolua_S) { cocos2d::ValueMap arg0; - ok &= luaval_to_ccvaluemap(tolua_S, 2, &arg0); + ok &= luaval_to_ccvaluemap(tolua_S, 2, &arg0, "cc.TMXTiledMap:setProperties"); if(!ok) return 0; cobj->setProperties(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setProperties",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXTiledMap:setProperties",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -61247,14 +62995,14 @@ int lua_cocos2dx_TMXTiledMap_getLayer(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.TMXTiledMap:getLayer"); if(!ok) return 0; cocos2d::TMXLayer* ret = cobj->getLayer(arg0); object_to_luaval(tolua_S, "cc.TMXLayer",(cocos2d::TMXLayer*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getLayer",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXTiledMap:getLayer",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -61298,7 +63046,7 @@ int lua_cocos2dx_TMXTiledMap_getMapOrientation(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getMapOrientation",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXTiledMap:getMapOrientation",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -61338,13 +63086,13 @@ int lua_cocos2dx_TMXTiledMap_setMapOrientation(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.TMXTiledMap:setMapOrientation"); if(!ok) return 0; cobj->setMapOrientation(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setMapOrientation",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXTiledMap:setMapOrientation",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -61372,14 +63120,14 @@ int lua_cocos2dx_TMXTiledMap_create(lua_State* tolua_S) if (argc == 1) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.TMXTiledMap:create"); if(!ok) return 0; cocos2d::TMXTiledMap* ret = cocos2d::TMXTiledMap::create(arg0); object_to_luaval(tolua_S, "cc.TMXTiledMap",(cocos2d::TMXTiledMap*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.TMXTiledMap:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -61406,15 +63154,15 @@ int lua_cocos2dx_TMXTiledMap_createWithXML(lua_State* tolua_S) { std::string arg0; std::string arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.TMXTiledMap:createWithXML"); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.TMXTiledMap:createWithXML"); if(!ok) return 0; cocos2d::TMXTiledMap* ret = cocos2d::TMXTiledMap::createWithXML(arg0, arg1); object_to_luaval(tolua_S, "cc.TMXTiledMap",(cocos2d::TMXTiledMap*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createWithXML",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.TMXTiledMap:createWithXML",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -61489,20 +63237,20 @@ int lua_cocos2dx_TileMapAtlas_initWithTileFile(lua_State* tolua_S) int arg2; int arg3; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.TileMapAtlas:initWithTileFile"); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.TileMapAtlas:initWithTileFile"); - ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2); + ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "cc.TileMapAtlas:initWithTileFile"); - ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3); + ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3, "cc.TileMapAtlas:initWithTileFile"); if(!ok) return 0; bool ret = cobj->initWithTileFile(arg0, arg1, arg2, arg3); tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "initWithTileFile",argc, 4); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TileMapAtlas:initWithTileFile",argc, 4); return 0; #if COCOS2D_DEBUG >= 1 @@ -61545,7 +63293,7 @@ int lua_cocos2dx_TileMapAtlas_releaseMap(lua_State* tolua_S) cobj->releaseMap(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "releaseMap",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TileMapAtlas:releaseMap",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -61585,14 +63333,14 @@ int lua_cocos2dx_TileMapAtlas_getTileAt(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.TileMapAtlas:getTileAt"); if(!ok) return 0; cocos2d::Color3B ret = cobj->getTileAt(arg0); color3b_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTileAt",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TileMapAtlas:getTileAt",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -61633,15 +63381,15 @@ int lua_cocos2dx_TileMapAtlas_setTile(lua_State* tolua_S) cocos2d::Color3B arg0; cocos2d::Vec2 arg1; - ok &= luaval_to_color3b(tolua_S, 2, &arg0); + ok &= luaval_to_color3b(tolua_S, 2, &arg0, "cc.TileMapAtlas:setTile"); - ok &= luaval_to_vec2(tolua_S, 3, &arg1); + ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.TileMapAtlas:setTile"); if(!ok) return 0; cobj->setTile(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTile",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TileMapAtlas:setTile",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -61672,17 +63420,17 @@ int lua_cocos2dx_TileMapAtlas_create(lua_State* tolua_S) std::string arg1; int arg2; int arg3; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); - ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2); - ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.TileMapAtlas:create"); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.TileMapAtlas:create"); + ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "cc.TileMapAtlas:create"); + ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3, "cc.TileMapAtlas:create"); if(!ok) return 0; cocos2d::TileMapAtlas* ret = cocos2d::TileMapAtlas::create(arg0, arg1, arg2, arg3); object_to_luaval(tolua_S, "cc.TileMapAtlas",(cocos2d::TileMapAtlas*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 4); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.TileMapAtlas:create",argc, 4); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -61714,7 +63462,7 @@ int lua_cocos2dx_TileMapAtlas_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.TileMapAtlas"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "TileMapAtlas",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TileMapAtlas:TileMapAtlas",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -61779,13 +63527,13 @@ int lua_cocos2dx_Component_setEnabled(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.Component:setEnabled"); if(!ok) return 0; cobj->setEnabled(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setEnabled",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Component:setEnabled",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -61825,13 +63573,13 @@ int lua_cocos2dx_Component_setName(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Component:setName"); if(!ok) return 0; cobj->setName(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setName",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Component:setName",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -61875,7 +63623,7 @@ int lua_cocos2dx_Component_isEnabled(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isEnabled",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Component:isEnabled",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -61915,13 +63663,13 @@ int lua_cocos2dx_Component_update(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Component:update"); if(!ok) return 0; cobj->update(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "update",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Component:update",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -61965,7 +63713,7 @@ int lua_cocos2dx_Component_getOwner(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Node",(cocos2d::Node*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getOwner",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Component:getOwner",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -62009,7 +63757,7 @@ int lua_cocos2dx_Component_init(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "init",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Component:init",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -62055,7 +63803,7 @@ int lua_cocos2dx_Component_setOwner(lua_State* tolua_S) cobj->setOwner(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setOwner",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Component:setOwner",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -62099,7 +63847,7 @@ int lua_cocos2dx_Component_getName(lua_State* tolua_S) tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getName",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Component:getName",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -62132,7 +63880,7 @@ int lua_cocos2dx_Component_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Component",(cocos2d::Component*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.Component:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -62168,2248 +63916,6 @@ 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_getMesh(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_getMesh'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - cocos2d::Mesh* ret = cobj->getMesh(); - object_to_luaval(tolua_S, "cc.Mesh",(cocos2d::Mesh*)ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getMesh",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Sprite3D_getMesh'.",&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,"getMesh",lua_cocos2dx_Sprite3D_getMesh); - 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_Mesh_restore(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::Mesh* 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.Mesh",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::Mesh*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Mesh_restore'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - cobj->restore(); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "restore",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Mesh_restore'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_Mesh_getMeshVertexAttribCount(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::Mesh* 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.Mesh",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::Mesh*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Mesh_getMeshVertexAttribCount'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - ssize_t ret = cobj->getMeshVertexAttribCount(); - tolua_pushnumber(tolua_S,(lua_Number)ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getMeshVertexAttribCount",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Mesh_getMeshVertexAttribCount'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_Mesh_getIndexFormat(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::Mesh* 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.Mesh",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::Mesh*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Mesh_getIndexFormat'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - int ret = (int)cobj->getIndexFormat(); - tolua_pushnumber(tolua_S,(lua_Number)ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getIndexFormat",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Mesh_getIndexFormat'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_Mesh_getVertexSizeInBytes(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::Mesh* 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.Mesh",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::Mesh*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Mesh_getVertexSizeInBytes'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - int ret = cobj->getVertexSizeInBytes(); - tolua_pushnumber(tolua_S,(lua_Number)ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getVertexSizeInBytes",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Mesh_getVertexSizeInBytes'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_Mesh_getPrimitiveType(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::Mesh* 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.Mesh",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::Mesh*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Mesh_getPrimitiveType'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - int ret = (int)cobj->getPrimitiveType(); - tolua_pushnumber(tolua_S,(lua_Number)ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPrimitiveType",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Mesh_getPrimitiveType'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_Mesh_getIndexCount(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::Mesh* 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.Mesh",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::Mesh*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Mesh_getIndexCount'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - ssize_t ret = cobj->getIndexCount(); - tolua_pushnumber(tolua_S,(lua_Number)ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getIndexCount",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Mesh_getIndexCount'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_Mesh_getVertexBuffer(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::Mesh* 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.Mesh",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::Mesh*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Mesh_getVertexBuffer'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - unsigned int ret = cobj->getVertexBuffer(); - tolua_pushnumber(tolua_S,(lua_Number)ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getVertexBuffer",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Mesh_getVertexBuffer'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_Mesh_getMeshVertexAttribute(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::Mesh* 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.Mesh",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::Mesh*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Mesh_getMeshVertexAttribute'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 1) - { - int arg0; - - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); - if(!ok) - return 0; - const cocos2d::MeshVertexAttrib& ret = cobj->getMeshVertexAttribute(arg0); - mesh_vertex_attrib_to_luaval(tolua_S, ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getMeshVertexAttribute",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Mesh_getMeshVertexAttribute'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_Mesh_getIndexBuffer(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::Mesh* 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.Mesh",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::Mesh*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Mesh_getIndexBuffer'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - unsigned int ret = cobj->getIndexBuffer(); - tolua_pushnumber(tolua_S,(lua_Number)ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getIndexBuffer",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Mesh_getIndexBuffer'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_Mesh_hasVertexAttrib(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::Mesh* 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.Mesh",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::Mesh*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Mesh_hasVertexAttrib'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 1) - { - int arg0; - - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); - if(!ok) - return 0; - bool ret = cobj->hasVertexAttrib(arg0); - tolua_pushboolean(tolua_S,(bool)ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "hasVertexAttrib",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Mesh_hasVertexAttrib'.",&tolua_err); -#endif - - return 0; -} -static int lua_cocos2dx_Mesh_finalize(lua_State* tolua_S) -{ - printf("luabindings: finalizing LUA object (Mesh)"); - return 0; -} - -int lua_register_cocos2dx_Mesh(lua_State* tolua_S) -{ - tolua_usertype(tolua_S,"cc.Mesh"); - tolua_cclass(tolua_S,"Mesh","cc.Mesh","cc.Ref",nullptr); - - tolua_beginmodule(tolua_S,"Mesh"); - tolua_function(tolua_S,"restore",lua_cocos2dx_Mesh_restore); - tolua_function(tolua_S,"getMeshVertexAttribCount",lua_cocos2dx_Mesh_getMeshVertexAttribCount); - tolua_function(tolua_S,"getIndexFormat",lua_cocos2dx_Mesh_getIndexFormat); - tolua_function(tolua_S,"getVertexSizeInBytes",lua_cocos2dx_Mesh_getVertexSizeInBytes); - tolua_function(tolua_S,"getPrimitiveType",lua_cocos2dx_Mesh_getPrimitiveType); - tolua_function(tolua_S,"getIndexCount",lua_cocos2dx_Mesh_getIndexCount); - tolua_function(tolua_S,"getVertexBuffer",lua_cocos2dx_Mesh_getVertexBuffer); - tolua_function(tolua_S,"getMeshVertexAttribute",lua_cocos2dx_Mesh_getMeshVertexAttribute); - tolua_function(tolua_S,"getIndexBuffer",lua_cocos2dx_Mesh_getIndexBuffer); - tolua_function(tolua_S,"hasVertexAttrib",lua_cocos2dx_Mesh_hasVertexAttrib); - tolua_endmodule(tolua_S); - std::string typeName = typeid(cocos2d::Mesh).name(); - g_luaType[typeName] = "cc.Mesh"; - g_typeCast["Mesh"] = "cc.Mesh"; - return 1; -} - -int lua_cocos2dx_Animation3D_getDuration(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::Animation3D* 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.Animation3D",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::Animation3D*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Animation3D_getDuration'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - double ret = cobj->getDuration(); - tolua_pushnumber(tolua_S,(lua_Number)ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDuration",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Animation3D_getDuration'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_Animation3D_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.Animation3D",0,&tolua_err)) goto tolua_lerror; -#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::Animation3D* ret = cocos2d::Animation3D::create(arg0); - object_to_luaval(tolua_S, "cc.Animation3D",(cocos2d::Animation3D*)ret); - return 1; - } - if (argc == 2) - { - std::string arg0; - std::string arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); - if(!ok) - return 0; - cocos2d::Animation3D* ret = cocos2d::Animation3D::create(arg0, arg1); - object_to_luaval(tolua_S, "cc.Animation3D",(cocos2d::Animation3D*)ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); - return 0; -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Animation3D_create'.",&tolua_err); -#endif - return 0; -} -static int lua_cocos2dx_Animation3D_finalize(lua_State* tolua_S) -{ - printf("luabindings: finalizing LUA object (Animation3D)"); - return 0; -} - -int lua_register_cocos2dx_Animation3D(lua_State* tolua_S) -{ - tolua_usertype(tolua_S,"cc.Animation3D"); - tolua_cclass(tolua_S,"Animation3D","cc.Animation3D","cc.Ref",nullptr); - - tolua_beginmodule(tolua_S,"Animation3D"); - tolua_function(tolua_S,"getDuration",lua_cocos2dx_Animation3D_getDuration); - tolua_function(tolua_S,"create", lua_cocos2dx_Animation3D_create); - tolua_endmodule(tolua_S); - std::string typeName = typeid(cocos2d::Animation3D).name(); - g_luaType[typeName] = "cc.Animation3D"; - g_typeCast["Animation3D"] = "cc.Animation3D"; - return 1; -} - -int lua_cocos2dx_Animate3D_setSpeed(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::Animate3D* 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.Animate3D",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::Animate3D*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Animate3D_setSpeed'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 1) - { - double arg0; - - ok &= luaval_to_number(tolua_S, 2,&arg0); - if(!ok) - return 0; - cobj->setSpeed(arg0); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setSpeed",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Animate3D_setSpeed'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_Animate3D_setWeight(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::Animate3D* 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.Animate3D",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::Animate3D*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Animate3D_setWeight'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 1) - { - double arg0; - - ok &= luaval_to_number(tolua_S, 2,&arg0); - if(!ok) - return 0; - cobj->setWeight(arg0); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setWeight",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Animate3D_setWeight'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_Animate3D_getSpeed(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::Animate3D* 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.Animate3D",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::Animate3D*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Animate3D_getSpeed'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - double ret = cobj->getSpeed(); - tolua_pushnumber(tolua_S,(lua_Number)ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getSpeed",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Animate3D_getSpeed'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_Animate3D_getWeight(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::Animate3D* 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.Animate3D",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::Animate3D*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Animate3D_getWeight'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - double ret = cobj->getWeight(); - tolua_pushnumber(tolua_S,(lua_Number)ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getWeight",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Animate3D_getWeight'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_Animate3D_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.Animate3D",0,&tolua_err)) goto tolua_lerror; -#endif - - argc = lua_gettop(tolua_S)-1; - - do - { - if (argc == 3) - { - cocos2d::Animation3D* arg0; - ok &= luaval_to_object(tolua_S, 2, "cc.Animation3D",&arg0); - if (!ok) { break; } - double arg1; - ok &= luaval_to_number(tolua_S, 3,&arg1); - if (!ok) { break; } - double arg2; - ok &= luaval_to_number(tolua_S, 4,&arg2); - if (!ok) { break; } - cocos2d::Animate3D* ret = cocos2d::Animate3D::create(arg0, arg1, arg2); - object_to_luaval(tolua_S, "cc.Animate3D",(cocos2d::Animate3D*)ret); - return 1; - } - } while (0); - ok = true; - do - { - if (argc == 1) - { - cocos2d::Animation3D* arg0; - ok &= luaval_to_object(tolua_S, 2, "cc.Animation3D",&arg0); - if (!ok) { break; } - cocos2d::Animate3D* ret = cocos2d::Animate3D::create(arg0); - object_to_luaval(tolua_S, "cc.Animate3D",(cocos2d::Animate3D*)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_Animate3D_create'.",&tolua_err); -#endif - return 0; -} -static int lua_cocos2dx_Animate3D_finalize(lua_State* tolua_S) -{ - printf("luabindings: finalizing LUA object (Animate3D)"); - return 0; -} - -int lua_register_cocos2dx_Animate3D(lua_State* tolua_S) -{ - tolua_usertype(tolua_S,"cc.Animate3D"); - tolua_cclass(tolua_S,"Animate3D","cc.Animate3D","cc.ActionInterval",nullptr); - - tolua_beginmodule(tolua_S,"Animate3D"); - tolua_function(tolua_S,"setSpeed",lua_cocos2dx_Animate3D_setSpeed); - tolua_function(tolua_S,"setWeight",lua_cocos2dx_Animate3D_setWeight); - tolua_function(tolua_S,"getSpeed",lua_cocos2dx_Animate3D_getSpeed); - tolua_function(tolua_S,"getWeight",lua_cocos2dx_Animate3D_getWeight); - tolua_function(tolua_S,"create", lua_cocos2dx_Animate3D_create); - tolua_endmodule(tolua_S); - std::string typeName = typeid(cocos2d::Animate3D).name(); - g_luaType[typeName] = "cc.Animate3D"; - g_typeCast["Animate3D"] = "cc.Animate3D"; - return 1; -} - -int lua_cocos2dx_SimpleAudioEngine_preloadBackgroundMusic(lua_State* tolua_S) -{ - int argc = 0; - CocosDenshion::SimpleAudioEngine* 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.SimpleAudioEngine",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (CocosDenshion::SimpleAudioEngine*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_SimpleAudioEngine_preloadBackgroundMusic'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - 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) - return 0; - cobj->preloadBackgroundMusic(arg0); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "preloadBackgroundMusic",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_SimpleAudioEngine_preloadBackgroundMusic'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_SimpleAudioEngine_stopBackgroundMusic(lua_State* tolua_S) -{ - int argc = 0; - CocosDenshion::SimpleAudioEngine* 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.SimpleAudioEngine",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (CocosDenshion::SimpleAudioEngine*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_SimpleAudioEngine_stopBackgroundMusic'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - cobj->stopBackgroundMusic(); - return 0; - } - if (argc == 1) - { - bool arg0; - - ok &= luaval_to_boolean(tolua_S, 2,&arg0); - if(!ok) - return 0; - cobj->stopBackgroundMusic(arg0); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "stopBackgroundMusic",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_SimpleAudioEngine_stopBackgroundMusic'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_SimpleAudioEngine_stopAllEffects(lua_State* tolua_S) -{ - int argc = 0; - CocosDenshion::SimpleAudioEngine* 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.SimpleAudioEngine",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (CocosDenshion::SimpleAudioEngine*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_SimpleAudioEngine_stopAllEffects'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - cobj->stopAllEffects(); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "stopAllEffects",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_SimpleAudioEngine_stopAllEffects'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_SimpleAudioEngine_getBackgroundMusicVolume(lua_State* tolua_S) -{ - int argc = 0; - CocosDenshion::SimpleAudioEngine* 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.SimpleAudioEngine",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (CocosDenshion::SimpleAudioEngine*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_SimpleAudioEngine_getBackgroundMusicVolume'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - double ret = cobj->getBackgroundMusicVolume(); - tolua_pushnumber(tolua_S,(lua_Number)ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getBackgroundMusicVolume",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_SimpleAudioEngine_getBackgroundMusicVolume'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_SimpleAudioEngine_resumeBackgroundMusic(lua_State* tolua_S) -{ - int argc = 0; - CocosDenshion::SimpleAudioEngine* 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.SimpleAudioEngine",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (CocosDenshion::SimpleAudioEngine*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_SimpleAudioEngine_resumeBackgroundMusic'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - cobj->resumeBackgroundMusic(); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "resumeBackgroundMusic",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_SimpleAudioEngine_resumeBackgroundMusic'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_SimpleAudioEngine_setBackgroundMusicVolume(lua_State* tolua_S) -{ - int argc = 0; - CocosDenshion::SimpleAudioEngine* 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.SimpleAudioEngine",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (CocosDenshion::SimpleAudioEngine*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_SimpleAudioEngine_setBackgroundMusicVolume'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 1) - { - double arg0; - - ok &= luaval_to_number(tolua_S, 2,&arg0); - if(!ok) - return 0; - cobj->setBackgroundMusicVolume(arg0); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setBackgroundMusicVolume",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_SimpleAudioEngine_setBackgroundMusicVolume'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_SimpleAudioEngine_preloadEffect(lua_State* tolua_S) -{ - int argc = 0; - CocosDenshion::SimpleAudioEngine* 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.SimpleAudioEngine",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (CocosDenshion::SimpleAudioEngine*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_SimpleAudioEngine_preloadEffect'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - 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) - return 0; - cobj->preloadEffect(arg0); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "preloadEffect",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_SimpleAudioEngine_preloadEffect'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_SimpleAudioEngine_isBackgroundMusicPlaying(lua_State* tolua_S) -{ - int argc = 0; - CocosDenshion::SimpleAudioEngine* 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.SimpleAudioEngine",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (CocosDenshion::SimpleAudioEngine*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_SimpleAudioEngine_isBackgroundMusicPlaying'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - bool ret = cobj->isBackgroundMusicPlaying(); - tolua_pushboolean(tolua_S,(bool)ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isBackgroundMusicPlaying",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_SimpleAudioEngine_isBackgroundMusicPlaying'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_SimpleAudioEngine_getEffectsVolume(lua_State* tolua_S) -{ - int argc = 0; - CocosDenshion::SimpleAudioEngine* 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.SimpleAudioEngine",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (CocosDenshion::SimpleAudioEngine*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_SimpleAudioEngine_getEffectsVolume'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - double ret = cobj->getEffectsVolume(); - tolua_pushnumber(tolua_S,(lua_Number)ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getEffectsVolume",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_SimpleAudioEngine_getEffectsVolume'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_SimpleAudioEngine_willPlayBackgroundMusic(lua_State* tolua_S) -{ - int argc = 0; - CocosDenshion::SimpleAudioEngine* 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.SimpleAudioEngine",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (CocosDenshion::SimpleAudioEngine*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_SimpleAudioEngine_willPlayBackgroundMusic'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - bool ret = cobj->willPlayBackgroundMusic(); - tolua_pushboolean(tolua_S,(bool)ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "willPlayBackgroundMusic",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_SimpleAudioEngine_willPlayBackgroundMusic'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_SimpleAudioEngine_pauseEffect(lua_State* tolua_S) -{ - int argc = 0; - CocosDenshion::SimpleAudioEngine* 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.SimpleAudioEngine",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (CocosDenshion::SimpleAudioEngine*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_SimpleAudioEngine_pauseEffect'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 1) - { - unsigned int arg0; - - ok &= luaval_to_uint32(tolua_S, 2,&arg0); - if(!ok) - return 0; - cobj->pauseEffect(arg0); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "pauseEffect",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_SimpleAudioEngine_pauseEffect'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_SimpleAudioEngine_playEffect(lua_State* tolua_S) -{ - int argc = 0; - CocosDenshion::SimpleAudioEngine* 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.SimpleAudioEngine",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (CocosDenshion::SimpleAudioEngine*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_SimpleAudioEngine_playEffect'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - 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) - return 0; - unsigned int ret = cobj->playEffect(arg0); - tolua_pushnumber(tolua_S,(lua_Number)ret); - return 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; - unsigned int ret = cobj->playEffect(arg0, arg1); - tolua_pushnumber(tolua_S,(lua_Number)ret); - return 1; - } - if (argc == 3) - { - const char* arg0; - bool arg1; - double arg2; - - 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); - - ok &= luaval_to_number(tolua_S, 4,&arg2); - if(!ok) - return 0; - unsigned int ret = cobj->playEffect(arg0, arg1, arg2); - tolua_pushnumber(tolua_S,(lua_Number)ret); - return 1; - } - if (argc == 4) - { - const char* arg0; - bool arg1; - double arg2; - double arg3; - - 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); - - ok &= luaval_to_number(tolua_S, 4,&arg2); - - ok &= luaval_to_number(tolua_S, 5,&arg3); - if(!ok) - return 0; - unsigned int ret = cobj->playEffect(arg0, arg1, arg2, arg3); - tolua_pushnumber(tolua_S,(lua_Number)ret); - return 1; - } - if (argc == 5) - { - const char* arg0; - bool arg1; - double arg2; - double arg3; - double arg4; - - 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); - - ok &= luaval_to_number(tolua_S, 4,&arg2); - - ok &= luaval_to_number(tolua_S, 5,&arg3); - - ok &= luaval_to_number(tolua_S, 6,&arg4); - if(!ok) - return 0; - unsigned int ret = cobj->playEffect(arg0, arg1, arg2, arg3, arg4); - tolua_pushnumber(tolua_S,(lua_Number)ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "playEffect",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_SimpleAudioEngine_playEffect'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_SimpleAudioEngine_rewindBackgroundMusic(lua_State* tolua_S) -{ - int argc = 0; - CocosDenshion::SimpleAudioEngine* 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.SimpleAudioEngine",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (CocosDenshion::SimpleAudioEngine*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_SimpleAudioEngine_rewindBackgroundMusic'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - cobj->rewindBackgroundMusic(); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "rewindBackgroundMusic",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_SimpleAudioEngine_rewindBackgroundMusic'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_SimpleAudioEngine_playBackgroundMusic(lua_State* tolua_S) -{ - int argc = 0; - CocosDenshion::SimpleAudioEngine* 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.SimpleAudioEngine",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (CocosDenshion::SimpleAudioEngine*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_SimpleAudioEngine_playBackgroundMusic'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - 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) - return 0; - cobj->playBackgroundMusic(arg0); - return 0; - } - 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->playBackgroundMusic(arg0, arg1); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "playBackgroundMusic",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_SimpleAudioEngine_playBackgroundMusic'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_SimpleAudioEngine_resumeAllEffects(lua_State* tolua_S) -{ - int argc = 0; - CocosDenshion::SimpleAudioEngine* 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.SimpleAudioEngine",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (CocosDenshion::SimpleAudioEngine*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_SimpleAudioEngine_resumeAllEffects'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - cobj->resumeAllEffects(); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "resumeAllEffects",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_SimpleAudioEngine_resumeAllEffects'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_SimpleAudioEngine_setEffectsVolume(lua_State* tolua_S) -{ - int argc = 0; - CocosDenshion::SimpleAudioEngine* 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.SimpleAudioEngine",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (CocosDenshion::SimpleAudioEngine*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_SimpleAudioEngine_setEffectsVolume'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 1) - { - double arg0; - - ok &= luaval_to_number(tolua_S, 2,&arg0); - if(!ok) - return 0; - cobj->setEffectsVolume(arg0); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setEffectsVolume",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_SimpleAudioEngine_setEffectsVolume'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_SimpleAudioEngine_stopEffect(lua_State* tolua_S) -{ - int argc = 0; - CocosDenshion::SimpleAudioEngine* 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.SimpleAudioEngine",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (CocosDenshion::SimpleAudioEngine*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_SimpleAudioEngine_stopEffect'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 1) - { - unsigned int arg0; - - ok &= luaval_to_uint32(tolua_S, 2,&arg0); - if(!ok) - return 0; - cobj->stopEffect(arg0); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "stopEffect",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_SimpleAudioEngine_stopEffect'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_SimpleAudioEngine_pauseBackgroundMusic(lua_State* tolua_S) -{ - int argc = 0; - CocosDenshion::SimpleAudioEngine* 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.SimpleAudioEngine",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (CocosDenshion::SimpleAudioEngine*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_SimpleAudioEngine_pauseBackgroundMusic'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - cobj->pauseBackgroundMusic(); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "pauseBackgroundMusic",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_SimpleAudioEngine_pauseBackgroundMusic'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_SimpleAudioEngine_pauseAllEffects(lua_State* tolua_S) -{ - int argc = 0; - CocosDenshion::SimpleAudioEngine* 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.SimpleAudioEngine",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (CocosDenshion::SimpleAudioEngine*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_SimpleAudioEngine_pauseAllEffects'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - cobj->pauseAllEffects(); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "pauseAllEffects",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_SimpleAudioEngine_pauseAllEffects'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_SimpleAudioEngine_unloadEffect(lua_State* tolua_S) -{ - int argc = 0; - CocosDenshion::SimpleAudioEngine* 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.SimpleAudioEngine",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (CocosDenshion::SimpleAudioEngine*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_SimpleAudioEngine_unloadEffect'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - 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) - return 0; - cobj->unloadEffect(arg0); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "unloadEffect",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_SimpleAudioEngine_unloadEffect'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_SimpleAudioEngine_resumeEffect(lua_State* tolua_S) -{ - int argc = 0; - CocosDenshion::SimpleAudioEngine* 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.SimpleAudioEngine",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (CocosDenshion::SimpleAudioEngine*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_SimpleAudioEngine_resumeEffect'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 1) - { - unsigned int arg0; - - ok &= luaval_to_uint32(tolua_S, 2,&arg0); - if(!ok) - return 0; - cobj->resumeEffect(arg0); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "resumeEffect",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_SimpleAudioEngine_resumeEffect'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_SimpleAudioEngine_end(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.SimpleAudioEngine",0,&tolua_err)) goto tolua_lerror; -#endif - - argc = lua_gettop(tolua_S) - 1; - - if (argc == 0) - { - if(!ok) - return 0; - CocosDenshion::SimpleAudioEngine::end(); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "end",argc, 0); - return 0; -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_SimpleAudioEngine_end'.",&tolua_err); -#endif - return 0; -} -int lua_cocos2dx_SimpleAudioEngine_getInstance(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.SimpleAudioEngine",0,&tolua_err)) goto tolua_lerror; -#endif - - argc = lua_gettop(tolua_S) - 1; - - if (argc == 0) - { - if(!ok) - return 0; - CocosDenshion::SimpleAudioEngine* ret = CocosDenshion::SimpleAudioEngine::getInstance(); - object_to_luaval(tolua_S, "cc.SimpleAudioEngine",(CocosDenshion::SimpleAudioEngine*)ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "getInstance",argc, 0); - return 0; -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_SimpleAudioEngine_getInstance'.",&tolua_err); -#endif - return 0; -} -static int lua_cocos2dx_SimpleAudioEngine_finalize(lua_State* tolua_S) -{ - printf("luabindings: finalizing LUA object (SimpleAudioEngine)"); - return 0; -} - -int lua_register_cocos2dx_SimpleAudioEngine(lua_State* tolua_S) -{ - tolua_usertype(tolua_S,"cc.SimpleAudioEngine"); - tolua_cclass(tolua_S,"SimpleAudioEngine","cc.SimpleAudioEngine","",nullptr); - - tolua_beginmodule(tolua_S,"SimpleAudioEngine"); - tolua_function(tolua_S,"preloadMusic",lua_cocos2dx_SimpleAudioEngine_preloadBackgroundMusic); - tolua_function(tolua_S,"stopMusic",lua_cocos2dx_SimpleAudioEngine_stopBackgroundMusic); - tolua_function(tolua_S,"stopAllEffects",lua_cocos2dx_SimpleAudioEngine_stopAllEffects); - tolua_function(tolua_S,"getMusicVolume",lua_cocos2dx_SimpleAudioEngine_getBackgroundMusicVolume); - tolua_function(tolua_S,"resumeMusic",lua_cocos2dx_SimpleAudioEngine_resumeBackgroundMusic); - tolua_function(tolua_S,"setMusicVolume",lua_cocos2dx_SimpleAudioEngine_setBackgroundMusicVolume); - tolua_function(tolua_S,"preloadEffect",lua_cocos2dx_SimpleAudioEngine_preloadEffect); - tolua_function(tolua_S,"isMusicPlaying",lua_cocos2dx_SimpleAudioEngine_isBackgroundMusicPlaying); - tolua_function(tolua_S,"getEffectsVolume",lua_cocos2dx_SimpleAudioEngine_getEffectsVolume); - tolua_function(tolua_S,"willPlayMusic",lua_cocos2dx_SimpleAudioEngine_willPlayBackgroundMusic); - tolua_function(tolua_S,"pauseEffect",lua_cocos2dx_SimpleAudioEngine_pauseEffect); - tolua_function(tolua_S,"playEffect",lua_cocos2dx_SimpleAudioEngine_playEffect); - tolua_function(tolua_S,"rewindMusic",lua_cocos2dx_SimpleAudioEngine_rewindBackgroundMusic); - tolua_function(tolua_S,"playMusic",lua_cocos2dx_SimpleAudioEngine_playBackgroundMusic); - tolua_function(tolua_S,"resumeAllEffects",lua_cocos2dx_SimpleAudioEngine_resumeAllEffects); - tolua_function(tolua_S,"setEffectsVolume",lua_cocos2dx_SimpleAudioEngine_setEffectsVolume); - tolua_function(tolua_S,"stopEffect",lua_cocos2dx_SimpleAudioEngine_stopEffect); - tolua_function(tolua_S,"pauseMusic",lua_cocos2dx_SimpleAudioEngine_pauseBackgroundMusic); - tolua_function(tolua_S,"pauseAllEffects",lua_cocos2dx_SimpleAudioEngine_pauseAllEffects); - tolua_function(tolua_S,"unloadEffect",lua_cocos2dx_SimpleAudioEngine_unloadEffect); - tolua_function(tolua_S,"resumeEffect",lua_cocos2dx_SimpleAudioEngine_resumeEffect); - tolua_function(tolua_S,"destroyInstance", lua_cocos2dx_SimpleAudioEngine_end); - tolua_function(tolua_S,"getInstance", lua_cocos2dx_SimpleAudioEngine_getInstance); - tolua_endmodule(tolua_S); - std::string typeName = typeid(CocosDenshion::SimpleAudioEngine).name(); - g_luaType[typeName] = "cc.SimpleAudioEngine"; - g_typeCast["SimpleAudioEngine"] = "cc.SimpleAudioEngine"; - return 1; -} - int lua_cocos2dx_ProtectedNode_addProtectedChild(lua_State* tolua_S) { int argc = 0; @@ -64438,7 +63944,7 @@ int lua_cocos2dx_ProtectedNode_addProtectedChild(lua_State* tolua_S) if (!ok) { break; } int arg1; - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.ProtectedNode:addProtectedChild"); if (!ok) { break; } cobj->addProtectedChild(arg0, arg1); @@ -64464,11 +63970,11 @@ int lua_cocos2dx_ProtectedNode_addProtectedChild(lua_State* tolua_S) if (!ok) { break; } int arg1; - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.ProtectedNode:addProtectedChild"); if (!ok) { break; } int arg2; - ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2); + ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "cc.ProtectedNode:addProtectedChild"); if (!ok) { break; } cobj->addProtectedChild(arg0, arg1, arg2); @@ -64476,7 +63982,7 @@ int lua_cocos2dx_ProtectedNode_addProtectedChild(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addProtectedChild",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ProtectedNode:addProtectedChild",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 @@ -64519,7 +64025,7 @@ int lua_cocos2dx_ProtectedNode_disableCascadeColor(lua_State* tolua_S) cobj->disableCascadeColor(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "disableCascadeColor",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ProtectedNode:disableCascadeColor",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -64559,7 +64065,7 @@ int lua_cocos2dx_ProtectedNode_removeProtectedChildByTag(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.ProtectedNode:removeProtectedChildByTag"); if(!ok) return 0; cobj->removeProtectedChildByTag(arg0); @@ -64570,15 +64076,15 @@ int lua_cocos2dx_ProtectedNode_removeProtectedChildByTag(lua_State* tolua_S) int arg0; bool arg1; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.ProtectedNode:removeProtectedChildByTag"); - ok &= luaval_to_boolean(tolua_S, 3,&arg1); + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "cc.ProtectedNode:removeProtectedChildByTag"); if(!ok) return 0; cobj->removeProtectedChildByTag(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeProtectedChildByTag",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ProtectedNode:removeProtectedChildByTag",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -64621,13 +64127,13 @@ int lua_cocos2dx_ProtectedNode_reorderProtectedChild(lua_State* tolua_S) ok &= luaval_to_object(tolua_S, 2, "cc.Node",&arg0); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.ProtectedNode:reorderProtectedChild"); if(!ok) return 0; cobj->reorderProtectedChild(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "reorderProtectedChild",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ProtectedNode:reorderProtectedChild",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -64667,13 +64173,13 @@ int lua_cocos2dx_ProtectedNode_removeAllProtectedChildrenWithCleanup(lua_State* { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.ProtectedNode:removeAllProtectedChildrenWithCleanup"); if(!ok) return 0; cobj->removeAllProtectedChildrenWithCleanup(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeAllProtectedChildrenWithCleanup",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ProtectedNode:removeAllProtectedChildrenWithCleanup",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -64716,7 +64222,7 @@ int lua_cocos2dx_ProtectedNode_sortAllProtectedChildren(lua_State* tolua_S) cobj->sortAllProtectedChildren(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "sortAllProtectedChildren",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ProtectedNode:sortAllProtectedChildren",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -64756,14 +64262,14 @@ int lua_cocos2dx_ProtectedNode_getProtectedChildByTag(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.ProtectedNode:getProtectedChildByTag"); if(!ok) return 0; cocos2d::Node* ret = cobj->getProtectedChildByTag(arg0); object_to_luaval(tolua_S, "cc.Node",(cocos2d::Node*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getProtectedChildByTag",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ProtectedNode:getProtectedChildByTag",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -64816,13 +64322,13 @@ int lua_cocos2dx_ProtectedNode_removeProtectedChild(lua_State* tolua_S) ok &= luaval_to_object(tolua_S, 2, "cc.Node",&arg0); - ok &= luaval_to_boolean(tolua_S, 3,&arg1); + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "cc.ProtectedNode:removeProtectedChild"); if(!ok) return 0; cobj->removeProtectedChild(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeProtectedChild",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ProtectedNode:removeProtectedChild",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -64865,7 +64371,7 @@ int lua_cocos2dx_ProtectedNode_removeAllProtectedChildren(lua_State* tolua_S) cobj->removeAllProtectedChildren(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeAllProtectedChildren",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ProtectedNode:removeAllProtectedChildren",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -64898,7 +64404,7 @@ int lua_cocos2dx_ProtectedNode_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.ProtectedNode",(cocos2d::ProtectedNode*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.ProtectedNode:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -64951,7 +64457,6 @@ TOLUA_API int register_all_cocos2dx(lua_State* tolua_S) lua_register_cocos2dx_TransitionMoveInB(tolua_S); lua_register_cocos2dx_AtlasNode(tolua_S); lua_register_cocos2dx_TileMapAtlas(tolua_S); - lua_register_cocos2dx_GLViewProtocol(tolua_S); lua_register_cocos2dx_TransitionMoveInT(tolua_S); lua_register_cocos2dx_TMXTilesetInfo(tolua_S); lua_register_cocos2dx_TransitionMoveInR(tolua_S); @@ -64972,12 +64477,11 @@ TOLUA_API int register_all_cocos2dx(lua_State* tolua_S) lua_register_cocos2dx_JumpBy(tolua_S); lua_register_cocos2dx_EventListener(tolua_S); lua_register_cocos2dx_EventListenerKeyboard(tolua_S); - lua_register_cocos2dx_ActionEase(tolua_S); - lua_register_cocos2dx_EaseBounce(tolua_S); - lua_register_cocos2dx_EaseBounceIn(tolua_S); + lua_register_cocos2dx_EventListenerMouse(tolua_S); lua_register_cocos2dx_TransitionRotoZoom(tolua_S); lua_register_cocos2dx_Director(tolua_S); lua_register_cocos2dx_Scheduler(tolua_S); + lua_register_cocos2dx_ActionEase(tolua_S); lua_register_cocos2dx_EaseElastic(tolua_S); lua_register_cocos2dx_EaseElasticOut(tolua_S); lua_register_cocos2dx_EaseQuadraticActionInOut(tolua_S); @@ -64991,7 +64495,6 @@ TOLUA_API int register_all_cocos2dx(lua_State* tolua_S) lua_register_cocos2dx_FadeOutUpTiles(tolua_S); lua_register_cocos2dx_FadeOutDownTiles(tolua_S); lua_register_cocos2dx_StopGrid(tolua_S); - lua_register_cocos2dx_SimpleAudioEngine(tolua_S); lua_register_cocos2dx_SkewTo(tolua_S); lua_register_cocos2dx_SkewBy(tolua_S); lua_register_cocos2dx_EaseQuadraticActionOut(tolua_S); @@ -65009,12 +64512,13 @@ TOLUA_API int register_all_cocos2dx(lua_State* tolua_S) lua_register_cocos2dx_EaseSineInOut(tolua_S); lua_register_cocos2dx_TransitionFlipAngular(tolua_S); lua_register_cocos2dx_EaseElasticInOut(tolua_S); + lua_register_cocos2dx_EaseBounce(tolua_S); lua_register_cocos2dx_Show(tolua_S); lua_register_cocos2dx_FadeOut(tolua_S); lua_register_cocos2dx_CallFunc(tolua_S); lua_register_cocos2dx_Event(tolua_S); lua_register_cocos2dx_EventMouse(tolua_S); - lua_register_cocos2dx_Waves3D(tolua_S); + lua_register_cocos2dx_GLView(tolua_S); lua_register_cocos2dx_EaseBezierAction(tolua_S); lua_register_cocos2dx_ParticleFireworks(tolua_S); lua_register_cocos2dx_MenuItem(tolua_S); @@ -65026,12 +64530,12 @@ TOLUA_API int register_all_cocos2dx(lua_State* tolua_S) lua_register_cocos2dx_EaseIn(tolua_S); lua_register_cocos2dx_EaseExponentialInOut(tolua_S); lua_register_cocos2dx_EaseBackInOut(tolua_S); - lua_register_cocos2dx_GLView(tolua_S); + lua_register_cocos2dx_Waves3D(tolua_S); lua_register_cocos2dx_EaseExponentialOut(tolua_S); lua_register_cocos2dx_SpriteBatchNode(tolua_S); lua_register_cocos2dx_Label(tolua_S); lua_register_cocos2dx_Application(tolua_S); - lua_register_cocos2dx_DelayTime(tolua_S); + lua_register_cocos2dx_Camera(tolua_S); lua_register_cocos2dx_LabelAtlas(tolua_S); lua_register_cocos2dx_ParticleSnow(tolua_S); lua_register_cocos2dx_EaseElasticIn(tolua_S); @@ -65075,8 +64579,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_EaseBounceIn(tolua_S); lua_register_cocos2dx_TiledGrid3D(tolua_S); lua_register_cocos2dx_ParticleGalaxy(tolua_S); lua_register_cocos2dx_Twirl(tolua_S); @@ -65086,6 +64589,7 @@ TOLUA_API int register_all_cocos2dx(lua_State* tolua_S) lua_register_cocos2dx_FadeOutBLTiles(tolua_S); lua_register_cocos2dx_LayerGradient(tolua_S); lua_register_cocos2dx_EventListenerTouchAllAtOnce(tolua_S); + lua_register_cocos2dx_GLViewImpl(tolua_S); lua_register_cocos2dx_ToggleVisibility(tolua_S); lua_register_cocos2dx_Repeat(tolua_S); lua_register_cocos2dx_CardinalSplineTo(tolua_S); @@ -65097,7 +64601,6 @@ TOLUA_API int register_all_cocos2dx(lua_State* tolua_S) lua_register_cocos2dx_TransitionFadeBL(tolua_S); lua_register_cocos2dx_TargetedAction(tolua_S); lua_register_cocos2dx_DrawNode(tolua_S); - lua_register_cocos2dx_Mesh(tolua_S); lua_register_cocos2dx_TransitionTurnOffTiles(tolua_S); lua_register_cocos2dx_RotateTo(tolua_S); lua_register_cocos2dx_TransitionSplitRows(tolua_S); @@ -65117,11 +64620,11 @@ TOLUA_API int register_all_cocos2dx(lua_State* tolua_S) lua_register_cocos2dx_TransitionCrossFade(tolua_S); lua_register_cocos2dx_Ripple3D(tolua_S); lua_register_cocos2dx_Lens3D(tolua_S); + lua_register_cocos2dx_Animation(tolua_S); lua_register_cocos2dx_ScaleTo(tolua_S); lua_register_cocos2dx_Spawn(tolua_S); lua_register_cocos2dx_EaseQuarticActionInOut(tolua_S); lua_register_cocos2dx_GLProgramState(tolua_S); - lua_register_cocos2dx_Animation3D(tolua_S); lua_register_cocos2dx_PageTurn3D(tolua_S); lua_register_cocos2dx_TransitionSlideInL(tolua_S); lua_register_cocos2dx_TransitionSlideInT(tolua_S); @@ -65129,6 +64632,7 @@ TOLUA_API int register_all_cocos2dx(lua_State* tolua_S) lua_register_cocos2dx_EaseCircleActionOut(tolua_S); lua_register_cocos2dx_TransitionProgressInOut(tolua_S); lua_register_cocos2dx_EaseCubicActionInOut(tolua_S); + lua_register_cocos2dx_DelayTime(tolua_S); lua_register_cocos2dx_EaseBackIn(tolua_S); lua_register_cocos2dx_SplitRows(tolua_S); lua_register_cocos2dx_Follow(tolua_S); @@ -65141,7 +64645,6 @@ TOLUA_API int register_all_cocos2dx(lua_State* tolua_S) lua_register_cocos2dx_TransitionZoomFlipY(tolua_S); lua_register_cocos2dx_ScaleBy(tolua_S); lua_register_cocos2dx_EventTouch(tolua_S); - lua_register_cocos2dx_Animation(tolua_S); lua_register_cocos2dx_TMXMapInfo(tolua_S); lua_register_cocos2dx_EaseExponentialIn(tolua_S); lua_register_cocos2dx_ReuseGrid(tolua_S); @@ -65160,7 +64663,6 @@ TOLUA_API int register_all_cocos2dx(lua_State* tolua_S) lua_register_cocos2dx_ParticleRain(tolua_S); lua_register_cocos2dx_Waves(tolua_S); lua_register_cocos2dx_EaseOut(tolua_S); - lua_register_cocos2dx_Animate3D(tolua_S); lua_register_cocos2dx_MenuItemFont(tolua_S); lua_register_cocos2dx_TransitionFadeUp(tolua_S); lua_register_cocos2dx_EaseSineOut(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 082c44f7d7..b75ae767aa 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp @@ -1544,19 +1544,6 @@ int register_all_cocos2dx(lua_State* tolua_S); - - - - - - - - - - - - - diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_cocosbuilder_auto.cpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_cocosbuilder_auto.cpp new file mode 100644 index 0000000000..02ec7accb5 --- /dev/null +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_cocosbuilder_auto.cpp @@ -0,0 +1,2772 @@ +#include "lua_cocos2dx_cocosbuilder_auto.hpp" +#include "CocosBuilder.h" +#include "tolua_fix.h" +#include "LuaBasicConversions.h" + + + +int lua_cocos2dx_cocosbuilder_CCBAnimationManager_moveAnimationsFromNode(lua_State* tolua_S) +{ + int argc = 0; + cocosbuilder::CCBAnimationManager* 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.CCBAnimationManager",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocosbuilder::CCBAnimationManager*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_cocosbuilder_CCBAnimationManager_moveAnimationsFromNode'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 2) + { + cocos2d::Node* arg0; + cocos2d::Node* arg1; + + ok &= luaval_to_object(tolua_S, 2, "cc.Node",&arg0); + + ok &= luaval_to_object(tolua_S, 3, "cc.Node",&arg1); + if(!ok) + return 0; + cobj->moveAnimationsFromNode(arg0, arg1); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBAnimationManager:moveAnimationsFromNode",argc, 2); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_cocosbuilder_CCBAnimationManager_moveAnimationsFromNode'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_cocosbuilder_CCBAnimationManager_setAutoPlaySequenceId(lua_State* tolua_S) +{ + int argc = 0; + cocosbuilder::CCBAnimationManager* 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.CCBAnimationManager",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocosbuilder::CCBAnimationManager*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_cocosbuilder_CCBAnimationManager_setAutoPlaySequenceId'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + int arg0; + + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.CCBAnimationManager:setAutoPlaySequenceId"); + if(!ok) + return 0; + cobj->setAutoPlaySequenceId(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBAnimationManager:setAutoPlaySequenceId",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_cocosbuilder_CCBAnimationManager_setAutoPlaySequenceId'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_cocosbuilder_CCBAnimationManager_getDocumentCallbackNames(lua_State* tolua_S) +{ + int argc = 0; + cocosbuilder::CCBAnimationManager* 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.CCBAnimationManager",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocosbuilder::CCBAnimationManager*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_cocosbuilder_CCBAnimationManager_getDocumentCallbackNames'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + cocos2d::ValueVector& ret = cobj->getDocumentCallbackNames(); + ccvaluevector_to_luaval(tolua_S, ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBAnimationManager:getDocumentCallbackNames",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_cocosbuilder_CCBAnimationManager_getDocumentCallbackNames'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_cocosbuilder_CCBAnimationManager_actionForSoundChannel(lua_State* tolua_S) +{ + int argc = 0; + cocosbuilder::CCBAnimationManager* 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.CCBAnimationManager",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocosbuilder::CCBAnimationManager*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_cocosbuilder_CCBAnimationManager_actionForSoundChannel'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + cocosbuilder::CCBSequenceProperty* arg0; + + ok &= luaval_to_object(tolua_S, 2, "cc.CCBSequenceProperty",&arg0); + if(!ok) + return 0; + cocos2d::Sequence* ret = cobj->actionForSoundChannel(arg0); + object_to_luaval(tolua_S, "cc.Sequence",(cocos2d::Sequence*)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBAnimationManager:actionForSoundChannel",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_cocosbuilder_CCBAnimationManager_actionForSoundChannel'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_cocosbuilder_CCBAnimationManager_setBaseValue(lua_State* tolua_S) +{ + int argc = 0; + cocosbuilder::CCBAnimationManager* 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.CCBAnimationManager",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocosbuilder::CCBAnimationManager*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_cocosbuilder_CCBAnimationManager_setBaseValue'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 3) + { + cocos2d::Value arg0; + cocos2d::Node* arg1; + std::string arg2; + + ok &= luaval_to_ccvalue(tolua_S, 2, &arg0, "cc.CCBAnimationManager:setBaseValue"); + + ok &= luaval_to_object(tolua_S, 3, "cc.Node",&arg1); + + ok &= luaval_to_std_string(tolua_S, 4,&arg2, "cc.CCBAnimationManager:setBaseValue"); + if(!ok) + return 0; + cobj->setBaseValue(arg0, arg1, arg2); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBAnimationManager:setBaseValue",argc, 3); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_cocosbuilder_CCBAnimationManager_setBaseValue'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_cocosbuilder_CCBAnimationManager_getDocumentOutletNodes(lua_State* tolua_S) +{ + int argc = 0; + cocosbuilder::CCBAnimationManager* 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.CCBAnimationManager",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocosbuilder::CCBAnimationManager*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_cocosbuilder_CCBAnimationManager_getDocumentOutletNodes'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + cocos2d::Vector& ret = cobj->getDocumentOutletNodes(); + ccvector_to_luaval(tolua_S, ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBAnimationManager:getDocumentOutletNodes",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_cocosbuilder_CCBAnimationManager_getDocumentOutletNodes'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_cocosbuilder_CCBAnimationManager_getLastCompletedSequenceName(lua_State* tolua_S) +{ + int argc = 0; + cocosbuilder::CCBAnimationManager* 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.CCBAnimationManager",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocosbuilder::CCBAnimationManager*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_cocosbuilder_CCBAnimationManager_getLastCompletedSequenceName'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + std::string ret = cobj->getLastCompletedSequenceName(); + tolua_pushcppstring(tolua_S,ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBAnimationManager:getLastCompletedSequenceName",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_cocosbuilder_CCBAnimationManager_getLastCompletedSequenceName'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_cocosbuilder_CCBAnimationManager_setRootNode(lua_State* tolua_S) +{ + int argc = 0; + cocosbuilder::CCBAnimationManager* 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.CCBAnimationManager",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocosbuilder::CCBAnimationManager*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_cocosbuilder_CCBAnimationManager_setRootNode'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + cocos2d::Node* arg0; + + ok &= luaval_to_object(tolua_S, 2, "cc.Node",&arg0); + if(!ok) + return 0; + cobj->setRootNode(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBAnimationManager:setRootNode",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_cocosbuilder_CCBAnimationManager_setRootNode'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_cocosbuilder_CCBAnimationManager_runAnimationsForSequenceNamedTweenDuration(lua_State* tolua_S) +{ + int argc = 0; + cocosbuilder::CCBAnimationManager* 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.CCBAnimationManager",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocosbuilder::CCBAnimationManager*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_cocosbuilder_CCBAnimationManager_runAnimationsForSequenceNamedTweenDuration'", 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, "cc.CCBAnimationManager:runAnimationsForSequenceNamedTweenDuration"); arg0 = arg0_tmp.c_str(); + + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.CCBAnimationManager:runAnimationsForSequenceNamedTweenDuration"); + if(!ok) + return 0; + cobj->runAnimationsForSequenceNamedTweenDuration(arg0, arg1); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBAnimationManager:runAnimationsForSequenceNamedTweenDuration",argc, 2); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_cocosbuilder_CCBAnimationManager_runAnimationsForSequenceNamedTweenDuration'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_cocosbuilder_CCBAnimationManager_addDocumentOutletName(lua_State* tolua_S) +{ + int argc = 0; + cocosbuilder::CCBAnimationManager* 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.CCBAnimationManager",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocosbuilder::CCBAnimationManager*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_cocosbuilder_CCBAnimationManager_addDocumentOutletName'", 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, "cc.CCBAnimationManager:addDocumentOutletName"); + if(!ok) + return 0; + cobj->addDocumentOutletName(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBAnimationManager:addDocumentOutletName",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_cocosbuilder_CCBAnimationManager_addDocumentOutletName'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_cocosbuilder_CCBAnimationManager_getSequences(lua_State* tolua_S) +{ + int argc = 0; + cocosbuilder::CCBAnimationManager* 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.CCBAnimationManager",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocosbuilder::CCBAnimationManager*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_cocosbuilder_CCBAnimationManager_getSequences'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + cocos2d::Vector& ret = cobj->getSequences(); + ccvector_to_luaval(tolua_S, ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBAnimationManager:getSequences",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_cocosbuilder_CCBAnimationManager_getSequences'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_cocosbuilder_CCBAnimationManager_getRootContainerSize(lua_State* tolua_S) +{ + int argc = 0; + cocosbuilder::CCBAnimationManager* 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.CCBAnimationManager",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocosbuilder::CCBAnimationManager*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_cocosbuilder_CCBAnimationManager_getRootContainerSize'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + const cocos2d::Size& ret = cobj->getRootContainerSize(); + size_to_luaval(tolua_S, ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBAnimationManager:getRootContainerSize",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_cocosbuilder_CCBAnimationManager_getRootContainerSize'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_cocosbuilder_CCBAnimationManager_setDocumentControllerName(lua_State* tolua_S) +{ + int argc = 0; + cocosbuilder::CCBAnimationManager* 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.CCBAnimationManager",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocosbuilder::CCBAnimationManager*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_cocosbuilder_CCBAnimationManager_setDocumentControllerName'", 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, "cc.CCBAnimationManager:setDocumentControllerName"); + if(!ok) + return 0; + cobj->setDocumentControllerName(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBAnimationManager:setDocumentControllerName",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_cocosbuilder_CCBAnimationManager_setDocumentControllerName'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_cocosbuilder_CCBAnimationManager_setObject(lua_State* tolua_S) +{ + int argc = 0; + cocosbuilder::CCBAnimationManager* 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.CCBAnimationManager",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocosbuilder::CCBAnimationManager*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_cocosbuilder_CCBAnimationManager_setObject'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 3) + { + cocos2d::Ref* arg0; + cocos2d::Node* arg1; + std::string arg2; + + ok &= luaval_to_object(tolua_S, 2, "cc.Ref",&arg0); + + ok &= luaval_to_object(tolua_S, 3, "cc.Node",&arg1); + + ok &= luaval_to_std_string(tolua_S, 4,&arg2, "cc.CCBAnimationManager:setObject"); + if(!ok) + return 0; + cobj->setObject(arg0, arg1, arg2); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBAnimationManager:setObject",argc, 3); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_cocosbuilder_CCBAnimationManager_setObject'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_cocosbuilder_CCBAnimationManager_getContainerSize(lua_State* tolua_S) +{ + int argc = 0; + cocosbuilder::CCBAnimationManager* 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.CCBAnimationManager",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocosbuilder::CCBAnimationManager*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_cocosbuilder_CCBAnimationManager_getContainerSize'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + cocos2d::Node* arg0; + + ok &= luaval_to_object(tolua_S, 2, "cc.Node",&arg0); + if(!ok) + return 0; + const cocos2d::Size& ret = cobj->getContainerSize(arg0); + size_to_luaval(tolua_S, ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBAnimationManager:getContainerSize",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_cocosbuilder_CCBAnimationManager_getContainerSize'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_cocosbuilder_CCBAnimationManager_actionForCallbackChannel(lua_State* tolua_S) +{ + int argc = 0; + cocosbuilder::CCBAnimationManager* 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.CCBAnimationManager",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocosbuilder::CCBAnimationManager*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_cocosbuilder_CCBAnimationManager_actionForCallbackChannel'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + cocosbuilder::CCBSequenceProperty* arg0; + + ok &= luaval_to_object(tolua_S, 2, "cc.CCBSequenceProperty",&arg0); + if(!ok) + return 0; + cocos2d::Sequence* ret = cobj->actionForCallbackChannel(arg0); + object_to_luaval(tolua_S, "cc.Sequence",(cocos2d::Sequence*)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBAnimationManager:actionForCallbackChannel",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_cocosbuilder_CCBAnimationManager_actionForCallbackChannel'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_cocosbuilder_CCBAnimationManager_getDocumentOutletNames(lua_State* tolua_S) +{ + int argc = 0; + cocosbuilder::CCBAnimationManager* 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.CCBAnimationManager",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocosbuilder::CCBAnimationManager*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_cocosbuilder_CCBAnimationManager_getDocumentOutletNames'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + cocos2d::ValueVector& ret = cobj->getDocumentOutletNames(); + ccvaluevector_to_luaval(tolua_S, ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBAnimationManager:getDocumentOutletNames",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_cocosbuilder_CCBAnimationManager_getDocumentOutletNames'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_cocosbuilder_CCBAnimationManager_addDocumentCallbackControlEvents(lua_State* tolua_S) +{ + int argc = 0; + cocosbuilder::CCBAnimationManager* 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.CCBAnimationManager",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocosbuilder::CCBAnimationManager*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_cocosbuilder_CCBAnimationManager_addDocumentCallbackControlEvents'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + cocos2d::extension::Control::EventType arg0; + + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.CCBAnimationManager:addDocumentCallbackControlEvents"); + if(!ok) + return 0; + cobj->addDocumentCallbackControlEvents(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBAnimationManager:addDocumentCallbackControlEvents",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_cocosbuilder_CCBAnimationManager_addDocumentCallbackControlEvents'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_cocosbuilder_CCBAnimationManager_init(lua_State* tolua_S) +{ + int argc = 0; + cocosbuilder::CCBAnimationManager* 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.CCBAnimationManager",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocosbuilder::CCBAnimationManager*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_cocosbuilder_CCBAnimationManager_init'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + bool ret = cobj->init(); + tolua_pushboolean(tolua_S,(bool)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBAnimationManager:init",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_cocosbuilder_CCBAnimationManager_init'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_cocosbuilder_CCBAnimationManager_getKeyframeCallbacks(lua_State* tolua_S) +{ + int argc = 0; + cocosbuilder::CCBAnimationManager* 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.CCBAnimationManager",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocosbuilder::CCBAnimationManager*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_cocosbuilder_CCBAnimationManager_getKeyframeCallbacks'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + cocos2d::ValueVector& ret = cobj->getKeyframeCallbacks(); + ccvaluevector_to_luaval(tolua_S, ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBAnimationManager:getKeyframeCallbacks",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_cocosbuilder_CCBAnimationManager_getKeyframeCallbacks'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_cocosbuilder_CCBAnimationManager_getDocumentCallbackControlEvents(lua_State* tolua_S) +{ + int argc = 0; + cocosbuilder::CCBAnimationManager* 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.CCBAnimationManager",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocosbuilder::CCBAnimationManager*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_cocosbuilder_CCBAnimationManager_getDocumentCallbackControlEvents'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + cocos2d::ValueVector& ret = cobj->getDocumentCallbackControlEvents(); + ccvaluevector_to_luaval(tolua_S, ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBAnimationManager:getDocumentCallbackControlEvents",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_cocosbuilder_CCBAnimationManager_getDocumentCallbackControlEvents'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_cocosbuilder_CCBAnimationManager_setRootContainerSize(lua_State* tolua_S) +{ + int argc = 0; + cocosbuilder::CCBAnimationManager* 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.CCBAnimationManager",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocosbuilder::CCBAnimationManager*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_cocosbuilder_CCBAnimationManager_setRootContainerSize'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + cocos2d::Size arg0; + + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.CCBAnimationManager:setRootContainerSize"); + if(!ok) + return 0; + cobj->setRootContainerSize(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBAnimationManager:setRootContainerSize",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_cocosbuilder_CCBAnimationManager_setRootContainerSize'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_cocosbuilder_CCBAnimationManager_runAnimationsForSequenceIdTweenDuration(lua_State* tolua_S) +{ + int argc = 0; + cocosbuilder::CCBAnimationManager* 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.CCBAnimationManager",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocosbuilder::CCBAnimationManager*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_cocosbuilder_CCBAnimationManager_runAnimationsForSequenceIdTweenDuration'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 2) + { + int arg0; + double arg1; + + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.CCBAnimationManager:runAnimationsForSequenceIdTweenDuration"); + + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.CCBAnimationManager:runAnimationsForSequenceIdTweenDuration"); + if(!ok) + return 0; + cobj->runAnimationsForSequenceIdTweenDuration(arg0, arg1); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBAnimationManager:runAnimationsForSequenceIdTweenDuration",argc, 2); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_cocosbuilder_CCBAnimationManager_runAnimationsForSequenceIdTweenDuration'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_cocosbuilder_CCBAnimationManager_getRunningSequenceName(lua_State* tolua_S) +{ + int argc = 0; + cocosbuilder::CCBAnimationManager* 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.CCBAnimationManager",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocosbuilder::CCBAnimationManager*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_cocosbuilder_CCBAnimationManager_getRunningSequenceName'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + const char* ret = cobj->getRunningSequenceName(); + tolua_pushstring(tolua_S,(const char*)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBAnimationManager:getRunningSequenceName",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_cocosbuilder_CCBAnimationManager_getRunningSequenceName'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_cocosbuilder_CCBAnimationManager_getAutoPlaySequenceId(lua_State* tolua_S) +{ + int argc = 0; + cocosbuilder::CCBAnimationManager* 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.CCBAnimationManager",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocosbuilder::CCBAnimationManager*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_cocosbuilder_CCBAnimationManager_getAutoPlaySequenceId'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + int ret = cobj->getAutoPlaySequenceId(); + tolua_pushnumber(tolua_S,(lua_Number)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBAnimationManager:getAutoPlaySequenceId",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_cocosbuilder_CCBAnimationManager_getAutoPlaySequenceId'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_cocosbuilder_CCBAnimationManager_addDocumentCallbackName(lua_State* tolua_S) +{ + int argc = 0; + cocosbuilder::CCBAnimationManager* 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.CCBAnimationManager",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocosbuilder::CCBAnimationManager*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_cocosbuilder_CCBAnimationManager_addDocumentCallbackName'", 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, "cc.CCBAnimationManager:addDocumentCallbackName"); + if(!ok) + return 0; + cobj->addDocumentCallbackName(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBAnimationManager:addDocumentCallbackName",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_cocosbuilder_CCBAnimationManager_addDocumentCallbackName'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_cocosbuilder_CCBAnimationManager_getRootNode(lua_State* tolua_S) +{ + int argc = 0; + cocosbuilder::CCBAnimationManager* 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.CCBAnimationManager",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocosbuilder::CCBAnimationManager*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_cocosbuilder_CCBAnimationManager_getRootNode'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + cocos2d::Node* ret = cobj->getRootNode(); + object_to_luaval(tolua_S, "cc.Node",(cocos2d::Node*)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBAnimationManager:getRootNode",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_cocosbuilder_CCBAnimationManager_getRootNode'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_cocosbuilder_CCBAnimationManager_addDocumentOutletNode(lua_State* tolua_S) +{ + int argc = 0; + cocosbuilder::CCBAnimationManager* 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.CCBAnimationManager",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocosbuilder::CCBAnimationManager*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_cocosbuilder_CCBAnimationManager_addDocumentOutletNode'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + cocos2d::Node* arg0; + + ok &= luaval_to_object(tolua_S, 2, "cc.Node",&arg0); + if(!ok) + return 0; + cobj->addDocumentOutletNode(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBAnimationManager:addDocumentOutletNode",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_cocosbuilder_CCBAnimationManager_addDocumentOutletNode'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_cocosbuilder_CCBAnimationManager_getSequenceDuration(lua_State* tolua_S) +{ + int argc = 0; + cocosbuilder::CCBAnimationManager* 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.CCBAnimationManager",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocosbuilder::CCBAnimationManager*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_cocosbuilder_CCBAnimationManager_getSequenceDuration'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + const char* arg0; + + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.CCBAnimationManager:getSequenceDuration"); arg0 = arg0_tmp.c_str(); + if(!ok) + return 0; + double ret = cobj->getSequenceDuration(arg0); + tolua_pushnumber(tolua_S,(lua_Number)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBAnimationManager:getSequenceDuration",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_cocosbuilder_CCBAnimationManager_getSequenceDuration'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_cocosbuilder_CCBAnimationManager_addDocumentCallbackNode(lua_State* tolua_S) +{ + int argc = 0; + cocosbuilder::CCBAnimationManager* 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.CCBAnimationManager",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocosbuilder::CCBAnimationManager*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_cocosbuilder_CCBAnimationManager_addDocumentCallbackNode'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + cocos2d::Node* arg0; + + ok &= luaval_to_object(tolua_S, 2, "cc.Node",&arg0); + if(!ok) + return 0; + cobj->addDocumentCallbackNode(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBAnimationManager:addDocumentCallbackNode",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_cocosbuilder_CCBAnimationManager_addDocumentCallbackNode'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_cocosbuilder_CCBAnimationManager_runAnimationsForSequenceNamed(lua_State* tolua_S) +{ + int argc = 0; + cocosbuilder::CCBAnimationManager* 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.CCBAnimationManager",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocosbuilder::CCBAnimationManager*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_cocosbuilder_CCBAnimationManager_runAnimationsForSequenceNamed'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + const char* arg0; + + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.CCBAnimationManager:runAnimationsForSequenceNamed"); arg0 = arg0_tmp.c_str(); + if(!ok) + return 0; + cobj->runAnimationsForSequenceNamed(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBAnimationManager:runAnimationsForSequenceNamed",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_cocosbuilder_CCBAnimationManager_runAnimationsForSequenceNamed'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_cocosbuilder_CCBAnimationManager_getSequenceId(lua_State* tolua_S) +{ + int argc = 0; + cocosbuilder::CCBAnimationManager* 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.CCBAnimationManager",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocosbuilder::CCBAnimationManager*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_cocosbuilder_CCBAnimationManager_getSequenceId'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + const char* arg0; + + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.CCBAnimationManager:getSequenceId"); arg0 = arg0_tmp.c_str(); + if(!ok) + return 0; + int ret = cobj->getSequenceId(arg0); + tolua_pushnumber(tolua_S,(lua_Number)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBAnimationManager:getSequenceId",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_cocosbuilder_CCBAnimationManager_getSequenceId'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_cocosbuilder_CCBAnimationManager_getDocumentCallbackNodes(lua_State* tolua_S) +{ + int argc = 0; + cocosbuilder::CCBAnimationManager* 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.CCBAnimationManager",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocosbuilder::CCBAnimationManager*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_cocosbuilder_CCBAnimationManager_getDocumentCallbackNodes'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + cocos2d::Vector& ret = cobj->getDocumentCallbackNodes(); + ccvector_to_luaval(tolua_S, ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBAnimationManager:getDocumentCallbackNodes",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_cocosbuilder_CCBAnimationManager_getDocumentCallbackNodes'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_cocosbuilder_CCBAnimationManager_setSequences(lua_State* tolua_S) +{ + int argc = 0; + cocosbuilder::CCBAnimationManager* 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.CCBAnimationManager",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocosbuilder::CCBAnimationManager*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_cocosbuilder_CCBAnimationManager_setSequences'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + cocos2d::Vector arg0; + + ok &= luaval_to_ccvector(tolua_S, 2, &arg0, "cc.CCBAnimationManager:setSequences"); + if(!ok) + return 0; + cobj->setSequences(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBAnimationManager:setSequences",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_cocosbuilder_CCBAnimationManager_setSequences'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_cocosbuilder_CCBAnimationManager_debug(lua_State* tolua_S) +{ + int argc = 0; + cocosbuilder::CCBAnimationManager* 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.CCBAnimationManager",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocosbuilder::CCBAnimationManager*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_cocosbuilder_CCBAnimationManager_debug'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + cobj->debug(); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBAnimationManager:debug",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_cocosbuilder_CCBAnimationManager_debug'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_cocosbuilder_CCBAnimationManager_getDocumentControllerName(lua_State* tolua_S) +{ + int argc = 0; + cocosbuilder::CCBAnimationManager* 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.CCBAnimationManager",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocosbuilder::CCBAnimationManager*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_cocosbuilder_CCBAnimationManager_getDocumentControllerName'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + std::string ret = cobj->getDocumentControllerName(); + tolua_pushcppstring(tolua_S,ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBAnimationManager:getDocumentControllerName",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_cocosbuilder_CCBAnimationManager_getDocumentControllerName'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_cocosbuilder_CCBAnimationManager_constructor(lua_State* tolua_S) +{ + int argc = 0; + cocosbuilder::CCBAnimationManager* 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 cocosbuilder::CCBAnimationManager(); + cobj->autorelease(); + int ID = (int)cobj->_ID ; + int* luaID = &cobj->_luaID ; + toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.CCBAnimationManager"); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBAnimationManager:CCBAnimationManager",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_cocosbuilder_CCBAnimationManager_constructor'.",&tolua_err); +#endif + + return 0; +} + +static int lua_cocos2dx_cocosbuilder_CCBAnimationManager_finalize(lua_State* tolua_S) +{ + printf("luabindings: finalizing LUA object (CCBAnimationManager)"); + return 0; +} + +int lua_register_cocos2dx_cocosbuilder_CCBAnimationManager(lua_State* tolua_S) +{ + tolua_usertype(tolua_S,"cc.CCBAnimationManager"); + tolua_cclass(tolua_S,"CCBAnimationManager","cc.CCBAnimationManager","cc.Ref",nullptr); + + tolua_beginmodule(tolua_S,"CCBAnimationManager"); + tolua_function(tolua_S,"new",lua_cocos2dx_cocosbuilder_CCBAnimationManager_constructor); + tolua_function(tolua_S,"moveAnimationsFromNode",lua_cocos2dx_cocosbuilder_CCBAnimationManager_moveAnimationsFromNode); + tolua_function(tolua_S,"setAutoPlaySequenceId",lua_cocos2dx_cocosbuilder_CCBAnimationManager_setAutoPlaySequenceId); + tolua_function(tolua_S,"getDocumentCallbackNames",lua_cocos2dx_cocosbuilder_CCBAnimationManager_getDocumentCallbackNames); + tolua_function(tolua_S,"actionForSoundChannel",lua_cocos2dx_cocosbuilder_CCBAnimationManager_actionForSoundChannel); + tolua_function(tolua_S,"setBaseValue",lua_cocos2dx_cocosbuilder_CCBAnimationManager_setBaseValue); + tolua_function(tolua_S,"getDocumentOutletNodes",lua_cocos2dx_cocosbuilder_CCBAnimationManager_getDocumentOutletNodes); + tolua_function(tolua_S,"getLastCompletedSequenceName",lua_cocos2dx_cocosbuilder_CCBAnimationManager_getLastCompletedSequenceName); + tolua_function(tolua_S,"setRootNode",lua_cocos2dx_cocosbuilder_CCBAnimationManager_setRootNode); + tolua_function(tolua_S,"runAnimationsForSequenceNamedTweenDuration",lua_cocos2dx_cocosbuilder_CCBAnimationManager_runAnimationsForSequenceNamedTweenDuration); + tolua_function(tolua_S,"addDocumentOutletName",lua_cocos2dx_cocosbuilder_CCBAnimationManager_addDocumentOutletName); + tolua_function(tolua_S,"getSequences",lua_cocos2dx_cocosbuilder_CCBAnimationManager_getSequences); + tolua_function(tolua_S,"getRootContainerSize",lua_cocos2dx_cocosbuilder_CCBAnimationManager_getRootContainerSize); + tolua_function(tolua_S,"setDocumentControllerName",lua_cocos2dx_cocosbuilder_CCBAnimationManager_setDocumentControllerName); + tolua_function(tolua_S,"setObject",lua_cocos2dx_cocosbuilder_CCBAnimationManager_setObject); + tolua_function(tolua_S,"getContainerSize",lua_cocos2dx_cocosbuilder_CCBAnimationManager_getContainerSize); + tolua_function(tolua_S,"actionForCallbackChannel",lua_cocos2dx_cocosbuilder_CCBAnimationManager_actionForCallbackChannel); + tolua_function(tolua_S,"getDocumentOutletNames",lua_cocos2dx_cocosbuilder_CCBAnimationManager_getDocumentOutletNames); + tolua_function(tolua_S,"addDocumentCallbackControlEvents",lua_cocos2dx_cocosbuilder_CCBAnimationManager_addDocumentCallbackControlEvents); + tolua_function(tolua_S,"init",lua_cocos2dx_cocosbuilder_CCBAnimationManager_init); + tolua_function(tolua_S,"getKeyframeCallbacks",lua_cocos2dx_cocosbuilder_CCBAnimationManager_getKeyframeCallbacks); + tolua_function(tolua_S,"getDocumentCallbackControlEvents",lua_cocos2dx_cocosbuilder_CCBAnimationManager_getDocumentCallbackControlEvents); + tolua_function(tolua_S,"setRootContainerSize",lua_cocos2dx_cocosbuilder_CCBAnimationManager_setRootContainerSize); + tolua_function(tolua_S,"runAnimationsForSequenceIdTweenDuration",lua_cocos2dx_cocosbuilder_CCBAnimationManager_runAnimationsForSequenceIdTweenDuration); + tolua_function(tolua_S,"getRunningSequenceName",lua_cocos2dx_cocosbuilder_CCBAnimationManager_getRunningSequenceName); + tolua_function(tolua_S,"getAutoPlaySequenceId",lua_cocos2dx_cocosbuilder_CCBAnimationManager_getAutoPlaySequenceId); + tolua_function(tolua_S,"addDocumentCallbackName",lua_cocos2dx_cocosbuilder_CCBAnimationManager_addDocumentCallbackName); + tolua_function(tolua_S,"getRootNode",lua_cocos2dx_cocosbuilder_CCBAnimationManager_getRootNode); + tolua_function(tolua_S,"addDocumentOutletNode",lua_cocos2dx_cocosbuilder_CCBAnimationManager_addDocumentOutletNode); + tolua_function(tolua_S,"getSequenceDuration",lua_cocos2dx_cocosbuilder_CCBAnimationManager_getSequenceDuration); + tolua_function(tolua_S,"addDocumentCallbackNode",lua_cocos2dx_cocosbuilder_CCBAnimationManager_addDocumentCallbackNode); + tolua_function(tolua_S,"runAnimationsForSequenceNamed",lua_cocos2dx_cocosbuilder_CCBAnimationManager_runAnimationsForSequenceNamed); + tolua_function(tolua_S,"getSequenceId",lua_cocos2dx_cocosbuilder_CCBAnimationManager_getSequenceId); + tolua_function(tolua_S,"getDocumentCallbackNodes",lua_cocos2dx_cocosbuilder_CCBAnimationManager_getDocumentCallbackNodes); + tolua_function(tolua_S,"setSequences",lua_cocos2dx_cocosbuilder_CCBAnimationManager_setSequences); + tolua_function(tolua_S,"debug",lua_cocos2dx_cocosbuilder_CCBAnimationManager_debug); + tolua_function(tolua_S,"getDocumentControllerName",lua_cocos2dx_cocosbuilder_CCBAnimationManager_getDocumentControllerName); + tolua_endmodule(tolua_S); + std::string typeName = typeid(cocosbuilder::CCBAnimationManager).name(); + g_luaType[typeName] = "cc.CCBAnimationManager"; + g_typeCast["CCBAnimationManager"] = "cc.CCBAnimationManager"; + return 1; +} + +int lua_cocos2dx_cocosbuilder_CCBReader_addOwnerOutletName(lua_State* tolua_S) +{ + int argc = 0; + cocosbuilder::CCBReader* 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.CCBReader",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocosbuilder::CCBReader*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_cocosbuilder_CCBReader_addOwnerOutletName'", 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, "cc.CCBReader:addOwnerOutletName"); + if(!ok) + return 0; + cobj->addOwnerOutletName(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBReader:addOwnerOutletName",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_cocosbuilder_CCBReader_addOwnerOutletName'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_cocosbuilder_CCBReader_getOwnerCallbackNames(lua_State* tolua_S) +{ + int argc = 0; + cocosbuilder::CCBReader* 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.CCBReader",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocosbuilder::CCBReader*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_cocosbuilder_CCBReader_getOwnerCallbackNames'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + cocos2d::ValueVector ret = cobj->getOwnerCallbackNames(); + ccvaluevector_to_luaval(tolua_S, ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBReader:getOwnerCallbackNames",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_cocosbuilder_CCBReader_getOwnerCallbackNames'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_cocosbuilder_CCBReader_addDocumentCallbackControlEvents(lua_State* tolua_S) +{ + int argc = 0; + cocosbuilder::CCBReader* 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.CCBReader",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocosbuilder::CCBReader*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_cocosbuilder_CCBReader_addDocumentCallbackControlEvents'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + cocos2d::extension::Control::EventType arg0; + + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.CCBReader:addDocumentCallbackControlEvents"); + if(!ok) + return 0; + cobj->addDocumentCallbackControlEvents(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBReader:addDocumentCallbackControlEvents",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_cocosbuilder_CCBReader_addDocumentCallbackControlEvents'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_cocosbuilder_CCBReader_setCCBRootPath(lua_State* tolua_S) +{ + int argc = 0; + cocosbuilder::CCBReader* 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.CCBReader",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocosbuilder::CCBReader*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_cocosbuilder_CCBReader_setCCBRootPath'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + const char* arg0; + + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.CCBReader:setCCBRootPath"); arg0 = arg0_tmp.c_str(); + if(!ok) + return 0; + cobj->setCCBRootPath(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBReader:setCCBRootPath",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_cocosbuilder_CCBReader_setCCBRootPath'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_cocosbuilder_CCBReader_addOwnerOutletNode(lua_State* tolua_S) +{ + int argc = 0; + cocosbuilder::CCBReader* 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.CCBReader",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocosbuilder::CCBReader*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_cocosbuilder_CCBReader_addOwnerOutletNode'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + cocos2d::Node* arg0; + + ok &= luaval_to_object(tolua_S, 2, "cc.Node",&arg0); + if(!ok) + return 0; + cobj->addOwnerOutletNode(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBReader:addOwnerOutletNode",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_cocosbuilder_CCBReader_addOwnerOutletNode'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_cocosbuilder_CCBReader_getOwnerCallbackNodes(lua_State* tolua_S) +{ + int argc = 0; + cocosbuilder::CCBReader* 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.CCBReader",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocosbuilder::CCBReader*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_cocosbuilder_CCBReader_getOwnerCallbackNodes'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + cocos2d::Vector& ret = cobj->getOwnerCallbackNodes(); + ccvector_to_luaval(tolua_S, ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBReader:getOwnerCallbackNodes",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_cocosbuilder_CCBReader_getOwnerCallbackNodes'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_cocosbuilder_CCBReader_readSoundKeyframesForSeq(lua_State* tolua_S) +{ + int argc = 0; + cocosbuilder::CCBReader* 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.CCBReader",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocosbuilder::CCBReader*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_cocosbuilder_CCBReader_readSoundKeyframesForSeq'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + cocosbuilder::CCBSequence* arg0; + + ok &= luaval_to_object(tolua_S, 2, "cc.CCBSequence",&arg0); + if(!ok) + return 0; + bool ret = cobj->readSoundKeyframesForSeq(arg0); + tolua_pushboolean(tolua_S,(bool)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBReader:readSoundKeyframesForSeq",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_cocosbuilder_CCBReader_readSoundKeyframesForSeq'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_cocosbuilder_CCBReader_getCCBRootPath(lua_State* tolua_S) +{ + int argc = 0; + cocosbuilder::CCBReader* 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.CCBReader",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocosbuilder::CCBReader*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_cocosbuilder_CCBReader_getCCBRootPath'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + const std::string& ret = cobj->getCCBRootPath(); + tolua_pushcppstring(tolua_S,ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBReader:getCCBRootPath",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_cocosbuilder_CCBReader_getCCBRootPath'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_cocosbuilder_CCBReader_getOwnerCallbackControlEvents(lua_State* tolua_S) +{ + int argc = 0; + cocosbuilder::CCBReader* 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.CCBReader",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocosbuilder::CCBReader*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_cocosbuilder_CCBReader_getOwnerCallbackControlEvents'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + cocos2d::ValueVector& ret = cobj->getOwnerCallbackControlEvents(); + ccvaluevector_to_luaval(tolua_S, ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBReader:getOwnerCallbackControlEvents",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_cocosbuilder_CCBReader_getOwnerCallbackControlEvents'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_cocosbuilder_CCBReader_getOwnerOutletNodes(lua_State* tolua_S) +{ + int argc = 0; + cocosbuilder::CCBReader* 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.CCBReader",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocosbuilder::CCBReader*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_cocosbuilder_CCBReader_getOwnerOutletNodes'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + cocos2d::Vector& ret = cobj->getOwnerOutletNodes(); + ccvector_to_luaval(tolua_S, ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBReader:getOwnerOutletNodes",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_cocosbuilder_CCBReader_getOwnerOutletNodes'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_cocosbuilder_CCBReader_readUTF8(lua_State* tolua_S) +{ + int argc = 0; + cocosbuilder::CCBReader* 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.CCBReader",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocosbuilder::CCBReader*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_cocosbuilder_CCBReader_readUTF8'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + std::string ret = cobj->readUTF8(); + tolua_pushcppstring(tolua_S,ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBReader:readUTF8",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_cocosbuilder_CCBReader_readUTF8'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_cocosbuilder_CCBReader_addOwnerCallbackControlEvents(lua_State* tolua_S) +{ + int argc = 0; + cocosbuilder::CCBReader* 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.CCBReader",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocosbuilder::CCBReader*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_cocosbuilder_CCBReader_addOwnerCallbackControlEvents'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + cocos2d::extension::Control::EventType arg0; + + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.CCBReader:addOwnerCallbackControlEvents"); + if(!ok) + return 0; + cobj->addOwnerCallbackControlEvents(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBReader:addOwnerCallbackControlEvents",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_cocosbuilder_CCBReader_addOwnerCallbackControlEvents'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_cocosbuilder_CCBReader_getOwnerOutletNames(lua_State* tolua_S) +{ + int argc = 0; + cocosbuilder::CCBReader* 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.CCBReader",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocosbuilder::CCBReader*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_cocosbuilder_CCBReader_getOwnerOutletNames'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + cocos2d::ValueVector ret = cobj->getOwnerOutletNames(); + ccvaluevector_to_luaval(tolua_S, ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBReader:getOwnerOutletNames",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_cocosbuilder_CCBReader_getOwnerOutletNames'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_cocosbuilder_CCBReader_setAnimationManager(lua_State* tolua_S) +{ + int argc = 0; + cocosbuilder::CCBReader* 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.CCBReader",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocosbuilder::CCBReader*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_cocosbuilder_CCBReader_setAnimationManager'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + cocosbuilder::CCBAnimationManager* arg0; + + ok &= luaval_to_object(tolua_S, 2, "cc.CCBAnimationManager",&arg0); + if(!ok) + return 0; + cobj->setAnimationManager(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBReader:setAnimationManager",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_cocosbuilder_CCBReader_setAnimationManager'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_cocosbuilder_CCBReader_readCallbackKeyframesForSeq(lua_State* tolua_S) +{ + int argc = 0; + cocosbuilder::CCBReader* 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.CCBReader",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocosbuilder::CCBReader*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_cocosbuilder_CCBReader_readCallbackKeyframesForSeq'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + cocosbuilder::CCBSequence* arg0; + + ok &= luaval_to_object(tolua_S, 2, "cc.CCBSequence",&arg0); + if(!ok) + return 0; + bool ret = cobj->readCallbackKeyframesForSeq(arg0); + tolua_pushboolean(tolua_S,(bool)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBReader:readCallbackKeyframesForSeq",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_cocosbuilder_CCBReader_readCallbackKeyframesForSeq'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_cocosbuilder_CCBReader_getAnimationManagersForNodes(lua_State* tolua_S) +{ + int argc = 0; + cocosbuilder::CCBReader* 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.CCBReader",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocosbuilder::CCBReader*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_cocosbuilder_CCBReader_getAnimationManagersForNodes'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + cocos2d::Vector& ret = cobj->getAnimationManagersForNodes(); + ccvector_to_luaval(tolua_S, ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBReader:getAnimationManagersForNodes",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_cocosbuilder_CCBReader_getAnimationManagersForNodes'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_cocosbuilder_CCBReader_getNodesWithAnimationManagers(lua_State* tolua_S) +{ + int argc = 0; + cocosbuilder::CCBReader* 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.CCBReader",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocosbuilder::CCBReader*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_cocosbuilder_CCBReader_getNodesWithAnimationManagers'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + cocos2d::Vector& ret = cobj->getNodesWithAnimationManagers(); + ccvector_to_luaval(tolua_S, ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBReader:getNodesWithAnimationManagers",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_cocosbuilder_CCBReader_getNodesWithAnimationManagers'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_cocosbuilder_CCBReader_getAnimationManager(lua_State* tolua_S) +{ + int argc = 0; + cocosbuilder::CCBReader* 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.CCBReader",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocosbuilder::CCBReader*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_cocosbuilder_CCBReader_getAnimationManager'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + cocosbuilder::CCBAnimationManager* ret = cobj->getAnimationManager(); + object_to_luaval(tolua_S, "cc.CCBAnimationManager",(cocosbuilder::CCBAnimationManager*)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBReader:getAnimationManager",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_cocosbuilder_CCBReader_getAnimationManager'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_cocosbuilder_CCBReader_setResolutionScale(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.CCBReader",0,&tolua_err)) goto tolua_lerror; +#endif + + argc = lua_gettop(tolua_S) - 1; + + if (argc == 1) + { + double arg0; + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.CCBReader:setResolutionScale"); + if(!ok) + return 0; + cocosbuilder::CCBReader::setResolutionScale(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.CCBReader:setResolutionScale",argc, 1); + return 0; +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_cocosbuilder_CCBReader_setResolutionScale'.",&tolua_err); +#endif + return 0; +} +int lua_cocos2dx_cocosbuilder_CCBReader_constructor(lua_State* tolua_S) +{ + int argc = 0; + cocosbuilder::CCBReader* cobj = nullptr; + bool ok = true; +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + argc = lua_gettop(tolua_S)-1; + do{ + if (argc == 1) { + cocosbuilder::CCBReader* arg0; + ok &= luaval_to_object(tolua_S, 2, "cc.CCBReader",&arg0); + + if (!ok) { break; } + cobj = new cocosbuilder::CCBReader(arg0); + cobj->autorelease(); + int ID = (int)cobj->_ID ; + int* luaID = &cobj->_luaID ; + toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.CCBReader"); + return 1; + } + }while(0); + ok = true; + do{ + if (argc == 1) { + cocosbuilder::NodeLoaderLibrary* arg0; + ok &= luaval_to_object(tolua_S, 2, "cc.NodeLoaderLibrary",&arg0); + + if (!ok) { break; } + cobj = new cocosbuilder::CCBReader(arg0); + cobj->autorelease(); + int ID = (int)cobj->_ID ; + int* luaID = &cobj->_luaID ; + toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.CCBReader"); + return 1; + } + }while(0); + ok = true; + do{ + if (argc == 2) { + cocosbuilder::NodeLoaderLibrary* arg0; + ok &= luaval_to_object(tolua_S, 2, "cc.NodeLoaderLibrary",&arg0); + + if (!ok) { break; } + cocosbuilder::CCBMemberVariableAssigner* arg1; + ok &= luaval_to_object(tolua_S, 3, "cc.CCBMemberVariableAssigner",&arg1); + + if (!ok) { break; } + cobj = new cocosbuilder::CCBReader(arg0, arg1); + cobj->autorelease(); + int ID = (int)cobj->_ID ; + int* luaID = &cobj->_luaID ; + toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.CCBReader"); + return 1; + } + }while(0); + ok = true; + do{ + if (argc == 3) { + cocosbuilder::NodeLoaderLibrary* arg0; + ok &= luaval_to_object(tolua_S, 2, "cc.NodeLoaderLibrary",&arg0); + + if (!ok) { break; } + cocosbuilder::CCBMemberVariableAssigner* arg1; + ok &= luaval_to_object(tolua_S, 3, "cc.CCBMemberVariableAssigner",&arg1); + + if (!ok) { break; } + cocosbuilder::CCBSelectorResolver* arg2; + ok &= luaval_to_object(tolua_S, 4, "cc.CCBSelectorResolver",&arg2); + + if (!ok) { break; } + cobj = new cocosbuilder::CCBReader(arg0, arg1, arg2); + cobj->autorelease(); + int ID = (int)cobj->_ID ; + int* luaID = &cobj->_luaID ; + toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.CCBReader"); + return 1; + } + }while(0); + ok = true; + do{ + if (argc == 4) { + cocosbuilder::NodeLoaderLibrary* arg0; + ok &= luaval_to_object(tolua_S, 2, "cc.NodeLoaderLibrary",&arg0); + + if (!ok) { break; } + cocosbuilder::CCBMemberVariableAssigner* arg1; + ok &= luaval_to_object(tolua_S, 3, "cc.CCBMemberVariableAssigner",&arg1); + + if (!ok) { break; } + cocosbuilder::CCBSelectorResolver* arg2; + ok &= luaval_to_object(tolua_S, 4, "cc.CCBSelectorResolver",&arg2); + + if (!ok) { break; } + cocosbuilder::NodeLoaderListener* arg3; + ok &= luaval_to_object(tolua_S, 5, "cc.NodeLoaderListener",&arg3); + + if (!ok) { break; } + cobj = new cocosbuilder::CCBReader(arg0, arg1, arg2, arg3); + cobj->autorelease(); + int ID = (int)cobj->_ID ; + int* luaID = &cobj->_luaID ; + toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.CCBReader"); + return 1; + } + }while(0); + ok = true; + do{ + if (argc == 0) { + cobj = new cocosbuilder::CCBReader(); + cobj->autorelease(); + int ID = (int)cobj->_ID ; + int* luaID = &cobj->_luaID ; + toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.CCBReader"); + return 1; + } + }while(0); + ok = true; + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.CCBReader:CCBReader",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_cocosbuilder_CCBReader_constructor'.",&tolua_err); +#endif + + return 0; +} + +static int lua_cocos2dx_cocosbuilder_CCBReader_finalize(lua_State* tolua_S) +{ + printf("luabindings: finalizing LUA object (CCBReader)"); + return 0; +} + +int lua_register_cocos2dx_cocosbuilder_CCBReader(lua_State* tolua_S) +{ + tolua_usertype(tolua_S,"cc.CCBReader"); + tolua_cclass(tolua_S,"CCBReader","cc.CCBReader","cc.Ref",nullptr); + + tolua_beginmodule(tolua_S,"CCBReader"); + tolua_function(tolua_S,"new",lua_cocos2dx_cocosbuilder_CCBReader_constructor); + tolua_function(tolua_S,"addOwnerOutletName",lua_cocos2dx_cocosbuilder_CCBReader_addOwnerOutletName); + tolua_function(tolua_S,"getOwnerCallbackNames",lua_cocos2dx_cocosbuilder_CCBReader_getOwnerCallbackNames); + tolua_function(tolua_S,"addDocumentCallbackControlEvents",lua_cocos2dx_cocosbuilder_CCBReader_addDocumentCallbackControlEvents); + tolua_function(tolua_S,"setCCBRootPath",lua_cocos2dx_cocosbuilder_CCBReader_setCCBRootPath); + tolua_function(tolua_S,"addOwnerOutletNode",lua_cocos2dx_cocosbuilder_CCBReader_addOwnerOutletNode); + tolua_function(tolua_S,"getOwnerCallbackNodes",lua_cocos2dx_cocosbuilder_CCBReader_getOwnerCallbackNodes); + tolua_function(tolua_S,"readSoundKeyframesForSeq",lua_cocos2dx_cocosbuilder_CCBReader_readSoundKeyframesForSeq); + tolua_function(tolua_S,"getCCBRootPath",lua_cocos2dx_cocosbuilder_CCBReader_getCCBRootPath); + tolua_function(tolua_S,"getOwnerCallbackControlEvents",lua_cocos2dx_cocosbuilder_CCBReader_getOwnerCallbackControlEvents); + tolua_function(tolua_S,"getOwnerOutletNodes",lua_cocos2dx_cocosbuilder_CCBReader_getOwnerOutletNodes); + tolua_function(tolua_S,"readUTF8",lua_cocos2dx_cocosbuilder_CCBReader_readUTF8); + tolua_function(tolua_S,"addOwnerCallbackControlEvents",lua_cocos2dx_cocosbuilder_CCBReader_addOwnerCallbackControlEvents); + tolua_function(tolua_S,"getOwnerOutletNames",lua_cocos2dx_cocosbuilder_CCBReader_getOwnerOutletNames); + tolua_function(tolua_S,"setActionManager",lua_cocos2dx_cocosbuilder_CCBReader_setAnimationManager); + tolua_function(tolua_S,"readCallbackKeyframesForSeq",lua_cocos2dx_cocosbuilder_CCBReader_readCallbackKeyframesForSeq); + tolua_function(tolua_S,"getAnimationManagersForNodes",lua_cocos2dx_cocosbuilder_CCBReader_getAnimationManagersForNodes); + tolua_function(tolua_S,"getNodesWithAnimationManagers",lua_cocos2dx_cocosbuilder_CCBReader_getNodesWithAnimationManagers); + tolua_function(tolua_S,"getActionManager",lua_cocos2dx_cocosbuilder_CCBReader_getAnimationManager); + tolua_function(tolua_S,"setResolutionScale", lua_cocos2dx_cocosbuilder_CCBReader_setResolutionScale); + tolua_endmodule(tolua_S); + std::string typeName = typeid(cocosbuilder::CCBReader).name(); + g_luaType[typeName] = "cc.CCBReader"; + g_typeCast["CCBReader"] = "cc.CCBReader"; + return 1; +} +TOLUA_API int register_all_cocos2dx_cocosbuilder(lua_State* tolua_S) +{ + tolua_open(tolua_S); + + tolua_module(tolua_S,"cc",0); + tolua_beginmodule(tolua_S,"cc"); + + lua_register_cocos2dx_cocosbuilder_CCBAnimationManager(tolua_S); + lua_register_cocos2dx_cocosbuilder_CCBReader(tolua_S); + + tolua_endmodule(tolua_S); + return 1; +} + diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_cocosbuilder_auto.hpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_cocosbuilder_auto.hpp new file mode 100644 index 0000000000..42f7b98e06 --- /dev/null +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_cocosbuilder_auto.hpp @@ -0,0 +1,74 @@ +#include "base/ccConfig.h" +#ifndef __cocos2dx_cocosbuilder_h__ +#define __cocos2dx_cocosbuilder_h__ + +#ifdef __cplusplus +extern "C" { +#endif +#include "tolua++.h" +#ifdef __cplusplus +} +#endif + +int register_all_cocos2dx_cocosbuilder(lua_State* tolua_S); + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +#endif // __cocos2dx_cocosbuilder_h__ diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_cocosdenshion_auto.cpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_cocosdenshion_auto.cpp new file mode 100644 index 0000000000..34447cf1f1 --- /dev/null +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_cocosdenshion_auto.cpp @@ -0,0 +1,1157 @@ +#include "lua_cocos2dx_cocosdenshion_auto.hpp" +#include "SimpleAudioEngine.h" +#include "tolua_fix.h" +#include "LuaBasicConversions.h" + + + +int lua_cocos2dx_cocosdenshion_SimpleAudioEngine_preloadBackgroundMusic(lua_State* tolua_S) +{ + int argc = 0; + CocosDenshion::SimpleAudioEngine* 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.SimpleAudioEngine",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (CocosDenshion::SimpleAudioEngine*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_cocosdenshion_SimpleAudioEngine_preloadBackgroundMusic'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + const char* arg0; + + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.SimpleAudioEngine:preloadBackgroundMusic"); arg0 = arg0_tmp.c_str(); + if(!ok) + return 0; + cobj->preloadBackgroundMusic(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SimpleAudioEngine:preloadBackgroundMusic",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_cocosdenshion_SimpleAudioEngine_preloadBackgroundMusic'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_cocosdenshion_SimpleAudioEngine_stopBackgroundMusic(lua_State* tolua_S) +{ + int argc = 0; + CocosDenshion::SimpleAudioEngine* 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.SimpleAudioEngine",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (CocosDenshion::SimpleAudioEngine*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_cocosdenshion_SimpleAudioEngine_stopBackgroundMusic'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + cobj->stopBackgroundMusic(); + return 0; + } + if (argc == 1) + { + bool arg0; + + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.SimpleAudioEngine:stopBackgroundMusic"); + if(!ok) + return 0; + cobj->stopBackgroundMusic(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SimpleAudioEngine:stopBackgroundMusic",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_cocosdenshion_SimpleAudioEngine_stopBackgroundMusic'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_cocosdenshion_SimpleAudioEngine_stopAllEffects(lua_State* tolua_S) +{ + int argc = 0; + CocosDenshion::SimpleAudioEngine* 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.SimpleAudioEngine",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (CocosDenshion::SimpleAudioEngine*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_cocosdenshion_SimpleAudioEngine_stopAllEffects'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + cobj->stopAllEffects(); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SimpleAudioEngine:stopAllEffects",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_cocosdenshion_SimpleAudioEngine_stopAllEffects'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_cocosdenshion_SimpleAudioEngine_getBackgroundMusicVolume(lua_State* tolua_S) +{ + int argc = 0; + CocosDenshion::SimpleAudioEngine* 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.SimpleAudioEngine",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (CocosDenshion::SimpleAudioEngine*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_cocosdenshion_SimpleAudioEngine_getBackgroundMusicVolume'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + double ret = cobj->getBackgroundMusicVolume(); + tolua_pushnumber(tolua_S,(lua_Number)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SimpleAudioEngine:getBackgroundMusicVolume",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_cocosdenshion_SimpleAudioEngine_getBackgroundMusicVolume'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_cocosdenshion_SimpleAudioEngine_resumeBackgroundMusic(lua_State* tolua_S) +{ + int argc = 0; + CocosDenshion::SimpleAudioEngine* 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.SimpleAudioEngine",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (CocosDenshion::SimpleAudioEngine*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_cocosdenshion_SimpleAudioEngine_resumeBackgroundMusic'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + cobj->resumeBackgroundMusic(); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SimpleAudioEngine:resumeBackgroundMusic",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_cocosdenshion_SimpleAudioEngine_resumeBackgroundMusic'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_cocosdenshion_SimpleAudioEngine_setBackgroundMusicVolume(lua_State* tolua_S) +{ + int argc = 0; + CocosDenshion::SimpleAudioEngine* 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.SimpleAudioEngine",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (CocosDenshion::SimpleAudioEngine*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_cocosdenshion_SimpleAudioEngine_setBackgroundMusicVolume'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + double arg0; + + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.SimpleAudioEngine:setBackgroundMusicVolume"); + if(!ok) + return 0; + cobj->setBackgroundMusicVolume(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SimpleAudioEngine:setBackgroundMusicVolume",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_cocosdenshion_SimpleAudioEngine_setBackgroundMusicVolume'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_cocosdenshion_SimpleAudioEngine_preloadEffect(lua_State* tolua_S) +{ + int argc = 0; + CocosDenshion::SimpleAudioEngine* 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.SimpleAudioEngine",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (CocosDenshion::SimpleAudioEngine*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_cocosdenshion_SimpleAudioEngine_preloadEffect'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + const char* arg0; + + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.SimpleAudioEngine:preloadEffect"); arg0 = arg0_tmp.c_str(); + if(!ok) + return 0; + cobj->preloadEffect(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SimpleAudioEngine:preloadEffect",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_cocosdenshion_SimpleAudioEngine_preloadEffect'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_cocosdenshion_SimpleAudioEngine_isBackgroundMusicPlaying(lua_State* tolua_S) +{ + int argc = 0; + CocosDenshion::SimpleAudioEngine* 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.SimpleAudioEngine",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (CocosDenshion::SimpleAudioEngine*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_cocosdenshion_SimpleAudioEngine_isBackgroundMusicPlaying'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + bool ret = cobj->isBackgroundMusicPlaying(); + tolua_pushboolean(tolua_S,(bool)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SimpleAudioEngine:isBackgroundMusicPlaying",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_cocosdenshion_SimpleAudioEngine_isBackgroundMusicPlaying'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_cocosdenshion_SimpleAudioEngine_getEffectsVolume(lua_State* tolua_S) +{ + int argc = 0; + CocosDenshion::SimpleAudioEngine* 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.SimpleAudioEngine",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (CocosDenshion::SimpleAudioEngine*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_cocosdenshion_SimpleAudioEngine_getEffectsVolume'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + double ret = cobj->getEffectsVolume(); + tolua_pushnumber(tolua_S,(lua_Number)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SimpleAudioEngine:getEffectsVolume",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_cocosdenshion_SimpleAudioEngine_getEffectsVolume'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_cocosdenshion_SimpleAudioEngine_willPlayBackgroundMusic(lua_State* tolua_S) +{ + int argc = 0; + CocosDenshion::SimpleAudioEngine* 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.SimpleAudioEngine",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (CocosDenshion::SimpleAudioEngine*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_cocosdenshion_SimpleAudioEngine_willPlayBackgroundMusic'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + bool ret = cobj->willPlayBackgroundMusic(); + tolua_pushboolean(tolua_S,(bool)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SimpleAudioEngine:willPlayBackgroundMusic",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_cocosdenshion_SimpleAudioEngine_willPlayBackgroundMusic'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_cocosdenshion_SimpleAudioEngine_pauseEffect(lua_State* tolua_S) +{ + int argc = 0; + CocosDenshion::SimpleAudioEngine* 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.SimpleAudioEngine",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (CocosDenshion::SimpleAudioEngine*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_cocosdenshion_SimpleAudioEngine_pauseEffect'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + unsigned int arg0; + + ok &= luaval_to_uint32(tolua_S, 2,&arg0, "cc.SimpleAudioEngine:pauseEffect"); + if(!ok) + return 0; + cobj->pauseEffect(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SimpleAudioEngine:pauseEffect",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_cocosdenshion_SimpleAudioEngine_pauseEffect'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_cocosdenshion_SimpleAudioEngine_playEffect(lua_State* tolua_S) +{ + int argc = 0; + CocosDenshion::SimpleAudioEngine* 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.SimpleAudioEngine",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (CocosDenshion::SimpleAudioEngine*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_cocosdenshion_SimpleAudioEngine_playEffect'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + const char* arg0; + + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.SimpleAudioEngine:playEffect"); arg0 = arg0_tmp.c_str(); + if(!ok) + return 0; + unsigned int ret = cobj->playEffect(arg0); + tolua_pushnumber(tolua_S,(lua_Number)ret); + return 1; + } + if (argc == 2) + { + const char* arg0; + bool arg1; + + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.SimpleAudioEngine:playEffect"); arg0 = arg0_tmp.c_str(); + + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "cc.SimpleAudioEngine:playEffect"); + if(!ok) + return 0; + unsigned int ret = cobj->playEffect(arg0, arg1); + tolua_pushnumber(tolua_S,(lua_Number)ret); + return 1; + } + if (argc == 3) + { + const char* arg0; + bool arg1; + double arg2; + + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.SimpleAudioEngine:playEffect"); arg0 = arg0_tmp.c_str(); + + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "cc.SimpleAudioEngine:playEffect"); + + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.SimpleAudioEngine:playEffect"); + if(!ok) + return 0; + unsigned int ret = cobj->playEffect(arg0, arg1, arg2); + tolua_pushnumber(tolua_S,(lua_Number)ret); + return 1; + } + if (argc == 4) + { + const char* arg0; + bool arg1; + double arg2; + double arg3; + + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.SimpleAudioEngine:playEffect"); arg0 = arg0_tmp.c_str(); + + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "cc.SimpleAudioEngine:playEffect"); + + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.SimpleAudioEngine:playEffect"); + + ok &= luaval_to_number(tolua_S, 5,&arg3, "cc.SimpleAudioEngine:playEffect"); + if(!ok) + return 0; + unsigned int ret = cobj->playEffect(arg0, arg1, arg2, arg3); + tolua_pushnumber(tolua_S,(lua_Number)ret); + return 1; + } + if (argc == 5) + { + const char* arg0; + bool arg1; + double arg2; + double arg3; + double arg4; + + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.SimpleAudioEngine:playEffect"); arg0 = arg0_tmp.c_str(); + + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "cc.SimpleAudioEngine:playEffect"); + + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.SimpleAudioEngine:playEffect"); + + ok &= luaval_to_number(tolua_S, 5,&arg3, "cc.SimpleAudioEngine:playEffect"); + + ok &= luaval_to_number(tolua_S, 6,&arg4, "cc.SimpleAudioEngine:playEffect"); + if(!ok) + return 0; + unsigned int ret = cobj->playEffect(arg0, arg1, arg2, arg3, arg4); + tolua_pushnumber(tolua_S,(lua_Number)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SimpleAudioEngine:playEffect",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_cocosdenshion_SimpleAudioEngine_playEffect'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_cocosdenshion_SimpleAudioEngine_rewindBackgroundMusic(lua_State* tolua_S) +{ + int argc = 0; + CocosDenshion::SimpleAudioEngine* 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.SimpleAudioEngine",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (CocosDenshion::SimpleAudioEngine*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_cocosdenshion_SimpleAudioEngine_rewindBackgroundMusic'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + cobj->rewindBackgroundMusic(); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SimpleAudioEngine:rewindBackgroundMusic",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_cocosdenshion_SimpleAudioEngine_rewindBackgroundMusic'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_cocosdenshion_SimpleAudioEngine_playBackgroundMusic(lua_State* tolua_S) +{ + int argc = 0; + CocosDenshion::SimpleAudioEngine* 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.SimpleAudioEngine",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (CocosDenshion::SimpleAudioEngine*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_cocosdenshion_SimpleAudioEngine_playBackgroundMusic'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + const char* arg0; + + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.SimpleAudioEngine:playBackgroundMusic"); arg0 = arg0_tmp.c_str(); + if(!ok) + return 0; + cobj->playBackgroundMusic(arg0); + return 0; + } + if (argc == 2) + { + const char* arg0; + bool arg1; + + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.SimpleAudioEngine:playBackgroundMusic"); arg0 = arg0_tmp.c_str(); + + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "cc.SimpleAudioEngine:playBackgroundMusic"); + if(!ok) + return 0; + cobj->playBackgroundMusic(arg0, arg1); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SimpleAudioEngine:playBackgroundMusic",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_cocosdenshion_SimpleAudioEngine_playBackgroundMusic'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_cocosdenshion_SimpleAudioEngine_resumeAllEffects(lua_State* tolua_S) +{ + int argc = 0; + CocosDenshion::SimpleAudioEngine* 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.SimpleAudioEngine",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (CocosDenshion::SimpleAudioEngine*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_cocosdenshion_SimpleAudioEngine_resumeAllEffects'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + cobj->resumeAllEffects(); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SimpleAudioEngine:resumeAllEffects",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_cocosdenshion_SimpleAudioEngine_resumeAllEffects'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_cocosdenshion_SimpleAudioEngine_setEffectsVolume(lua_State* tolua_S) +{ + int argc = 0; + CocosDenshion::SimpleAudioEngine* 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.SimpleAudioEngine",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (CocosDenshion::SimpleAudioEngine*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_cocosdenshion_SimpleAudioEngine_setEffectsVolume'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + double arg0; + + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.SimpleAudioEngine:setEffectsVolume"); + if(!ok) + return 0; + cobj->setEffectsVolume(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SimpleAudioEngine:setEffectsVolume",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_cocosdenshion_SimpleAudioEngine_setEffectsVolume'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_cocosdenshion_SimpleAudioEngine_stopEffect(lua_State* tolua_S) +{ + int argc = 0; + CocosDenshion::SimpleAudioEngine* 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.SimpleAudioEngine",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (CocosDenshion::SimpleAudioEngine*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_cocosdenshion_SimpleAudioEngine_stopEffect'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + unsigned int arg0; + + ok &= luaval_to_uint32(tolua_S, 2,&arg0, "cc.SimpleAudioEngine:stopEffect"); + if(!ok) + return 0; + cobj->stopEffect(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SimpleAudioEngine:stopEffect",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_cocosdenshion_SimpleAudioEngine_stopEffect'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_cocosdenshion_SimpleAudioEngine_pauseBackgroundMusic(lua_State* tolua_S) +{ + int argc = 0; + CocosDenshion::SimpleAudioEngine* 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.SimpleAudioEngine",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (CocosDenshion::SimpleAudioEngine*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_cocosdenshion_SimpleAudioEngine_pauseBackgroundMusic'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + cobj->pauseBackgroundMusic(); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SimpleAudioEngine:pauseBackgroundMusic",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_cocosdenshion_SimpleAudioEngine_pauseBackgroundMusic'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_cocosdenshion_SimpleAudioEngine_pauseAllEffects(lua_State* tolua_S) +{ + int argc = 0; + CocosDenshion::SimpleAudioEngine* 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.SimpleAudioEngine",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (CocosDenshion::SimpleAudioEngine*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_cocosdenshion_SimpleAudioEngine_pauseAllEffects'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + cobj->pauseAllEffects(); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SimpleAudioEngine:pauseAllEffects",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_cocosdenshion_SimpleAudioEngine_pauseAllEffects'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_cocosdenshion_SimpleAudioEngine_unloadEffect(lua_State* tolua_S) +{ + int argc = 0; + CocosDenshion::SimpleAudioEngine* 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.SimpleAudioEngine",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (CocosDenshion::SimpleAudioEngine*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_cocosdenshion_SimpleAudioEngine_unloadEffect'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + const char* arg0; + + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.SimpleAudioEngine:unloadEffect"); arg0 = arg0_tmp.c_str(); + if(!ok) + return 0; + cobj->unloadEffect(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SimpleAudioEngine:unloadEffect",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_cocosdenshion_SimpleAudioEngine_unloadEffect'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_cocosdenshion_SimpleAudioEngine_resumeEffect(lua_State* tolua_S) +{ + int argc = 0; + CocosDenshion::SimpleAudioEngine* 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.SimpleAudioEngine",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (CocosDenshion::SimpleAudioEngine*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_cocosdenshion_SimpleAudioEngine_resumeEffect'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + unsigned int arg0; + + ok &= luaval_to_uint32(tolua_S, 2,&arg0, "cc.SimpleAudioEngine:resumeEffect"); + if(!ok) + return 0; + cobj->resumeEffect(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SimpleAudioEngine:resumeEffect",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_cocosdenshion_SimpleAudioEngine_resumeEffect'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_cocosdenshion_SimpleAudioEngine_end(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.SimpleAudioEngine",0,&tolua_err)) goto tolua_lerror; +#endif + + argc = lua_gettop(tolua_S) - 1; + + if (argc == 0) + { + if(!ok) + return 0; + CocosDenshion::SimpleAudioEngine::end(); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.SimpleAudioEngine:end",argc, 0); + return 0; +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_cocosdenshion_SimpleAudioEngine_end'.",&tolua_err); +#endif + return 0; +} +int lua_cocos2dx_cocosdenshion_SimpleAudioEngine_getInstance(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.SimpleAudioEngine",0,&tolua_err)) goto tolua_lerror; +#endif + + argc = lua_gettop(tolua_S) - 1; + + if (argc == 0) + { + if(!ok) + return 0; + CocosDenshion::SimpleAudioEngine* ret = CocosDenshion::SimpleAudioEngine::getInstance(); + object_to_luaval(tolua_S, "cc.SimpleAudioEngine",(CocosDenshion::SimpleAudioEngine*)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.SimpleAudioEngine:getInstance",argc, 0); + return 0; +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_cocosdenshion_SimpleAudioEngine_getInstance'.",&tolua_err); +#endif + return 0; +} +static int lua_cocos2dx_cocosdenshion_SimpleAudioEngine_finalize(lua_State* tolua_S) +{ + printf("luabindings: finalizing LUA object (SimpleAudioEngine)"); + return 0; +} + +int lua_register_cocos2dx_cocosdenshion_SimpleAudioEngine(lua_State* tolua_S) +{ + tolua_usertype(tolua_S,"cc.SimpleAudioEngine"); + tolua_cclass(tolua_S,"SimpleAudioEngine","cc.SimpleAudioEngine","",nullptr); + + tolua_beginmodule(tolua_S,"SimpleAudioEngine"); + tolua_function(tolua_S,"preloadMusic",lua_cocos2dx_cocosdenshion_SimpleAudioEngine_preloadBackgroundMusic); + tolua_function(tolua_S,"stopMusic",lua_cocos2dx_cocosdenshion_SimpleAudioEngine_stopBackgroundMusic); + tolua_function(tolua_S,"stopAllEffects",lua_cocos2dx_cocosdenshion_SimpleAudioEngine_stopAllEffects); + tolua_function(tolua_S,"getMusicVolume",lua_cocos2dx_cocosdenshion_SimpleAudioEngine_getBackgroundMusicVolume); + tolua_function(tolua_S,"resumeMusic",lua_cocos2dx_cocosdenshion_SimpleAudioEngine_resumeBackgroundMusic); + tolua_function(tolua_S,"setMusicVolume",lua_cocos2dx_cocosdenshion_SimpleAudioEngine_setBackgroundMusicVolume); + tolua_function(tolua_S,"preloadEffect",lua_cocos2dx_cocosdenshion_SimpleAudioEngine_preloadEffect); + tolua_function(tolua_S,"isMusicPlaying",lua_cocos2dx_cocosdenshion_SimpleAudioEngine_isBackgroundMusicPlaying); + tolua_function(tolua_S,"getEffectsVolume",lua_cocos2dx_cocosdenshion_SimpleAudioEngine_getEffectsVolume); + tolua_function(tolua_S,"willPlayMusic",lua_cocos2dx_cocosdenshion_SimpleAudioEngine_willPlayBackgroundMusic); + tolua_function(tolua_S,"pauseEffect",lua_cocos2dx_cocosdenshion_SimpleAudioEngine_pauseEffect); + tolua_function(tolua_S,"playEffect",lua_cocos2dx_cocosdenshion_SimpleAudioEngine_playEffect); + tolua_function(tolua_S,"rewindMusic",lua_cocos2dx_cocosdenshion_SimpleAudioEngine_rewindBackgroundMusic); + tolua_function(tolua_S,"playMusic",lua_cocos2dx_cocosdenshion_SimpleAudioEngine_playBackgroundMusic); + tolua_function(tolua_S,"resumeAllEffects",lua_cocos2dx_cocosdenshion_SimpleAudioEngine_resumeAllEffects); + tolua_function(tolua_S,"setEffectsVolume",lua_cocos2dx_cocosdenshion_SimpleAudioEngine_setEffectsVolume); + tolua_function(tolua_S,"stopEffect",lua_cocos2dx_cocosdenshion_SimpleAudioEngine_stopEffect); + tolua_function(tolua_S,"pauseMusic",lua_cocos2dx_cocosdenshion_SimpleAudioEngine_pauseBackgroundMusic); + tolua_function(tolua_S,"pauseAllEffects",lua_cocos2dx_cocosdenshion_SimpleAudioEngine_pauseAllEffects); + tolua_function(tolua_S,"unloadEffect",lua_cocos2dx_cocosdenshion_SimpleAudioEngine_unloadEffect); + tolua_function(tolua_S,"resumeEffect",lua_cocos2dx_cocosdenshion_SimpleAudioEngine_resumeEffect); + tolua_function(tolua_S,"destroyInstance", lua_cocos2dx_cocosdenshion_SimpleAudioEngine_end); + tolua_function(tolua_S,"getInstance", lua_cocos2dx_cocosdenshion_SimpleAudioEngine_getInstance); + tolua_endmodule(tolua_S); + std::string typeName = typeid(CocosDenshion::SimpleAudioEngine).name(); + g_luaType[typeName] = "cc.SimpleAudioEngine"; + g_typeCast["SimpleAudioEngine"] = "cc.SimpleAudioEngine"; + return 1; +} +TOLUA_API int register_all_cocos2dx_cocosdenshion(lua_State* tolua_S) +{ + tolua_open(tolua_S); + + tolua_module(tolua_S,"cc",0); + tolua_beginmodule(tolua_S,"cc"); + + lua_register_cocos2dx_cocosdenshion_SimpleAudioEngine(tolua_S); + + tolua_endmodule(tolua_S); + return 1; +} + diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_cocosdenshion_auto.hpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_cocosdenshion_auto.hpp new file mode 100644 index 0000000000..344cb92a54 --- /dev/null +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_cocosdenshion_auto.hpp @@ -0,0 +1,39 @@ +#include "base/ccConfig.h" +#ifndef __cocos2dx_cocosdenshion_h__ +#define __cocos2dx_cocosdenshion_h__ + +#ifdef __cplusplus +extern "C" { +#endif +#include "tolua++.h" +#ifdef __cplusplus +} +#endif + +int register_all_cocos2dx_cocosdenshion(lua_State* tolua_S); + + + + + + + + + + + + + + + + + + + + + + + + + +#endif // __cocos2dx_cocosdenshion_h__ diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_controller_auto.cpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_controller_auto.cpp index 160c684a1d..30a5370bd9 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_controller_auto.cpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_controller_auto.cpp @@ -37,15 +37,15 @@ int lua_cocos2dx_controller_Controller_receiveExternalKeyEvent(lua_State* tolua_ int arg0; bool arg1; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.Controller:receiveExternalKeyEvent"); - ok &= luaval_to_boolean(tolua_S, 3,&arg1); + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "cc.Controller:receiveExternalKeyEvent"); if(!ok) return 0; cobj->receiveExternalKeyEvent(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "receiveExternalKeyEvent",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Controller:receiveExternalKeyEvent",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -89,7 +89,7 @@ int lua_cocos2dx_controller_Controller_getDeviceName(lua_State* tolua_S) tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDeviceName",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Controller:getDeviceName",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -133,7 +133,7 @@ int lua_cocos2dx_controller_Controller_isConnected(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isConnected",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Controller:isConnected",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -177,7 +177,7 @@ int lua_cocos2dx_controller_Controller_getDeviceId(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDeviceId",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Controller:getDeviceId",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -217,13 +217,13 @@ int lua_cocos2dx_controller_Controller_setTag(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.Controller:setTag"); if(!ok) return 0; cobj->setTag(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTag",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Controller:setTag",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -267,7 +267,7 @@ int lua_cocos2dx_controller_Controller_getTag(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTag",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Controller:getTag",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -299,7 +299,7 @@ int lua_cocos2dx_controller_Controller_startDiscoveryController(lua_State* tolua cocos2d::Controller::startDiscoveryController(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "startDiscoveryController",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.Controller:startDiscoveryController",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -329,7 +329,7 @@ int lua_cocos2dx_controller_Controller_stopDiscoveryController(lua_State* tolua_ cocos2d::Controller::stopDiscoveryController(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "stopDiscoveryController",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.Controller:stopDiscoveryController",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -355,14 +355,14 @@ int lua_cocos2dx_controller_Controller_getControllerByTag(lua_State* tolua_S) if (argc == 1) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.Controller:getControllerByTag"); if(!ok) return 0; cocos2d::Controller* ret = cocos2d::Controller::getControllerByTag(arg0); object_to_luaval(tolua_S, "cc.Controller",(cocos2d::Controller*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "getControllerByTag",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.Controller:getControllerByTag",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -432,7 +432,7 @@ int lua_cocos2dx_controller_EventController_getControllerEventType(lua_State* to tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getControllerEventType",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventController:getControllerEventType",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -472,13 +472,13 @@ int lua_cocos2dx_controller_EventController_setConnectStatus(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.EventController:setConnectStatus"); if(!ok) return 0; cobj->setConnectStatus(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setConnectStatus",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventController:setConnectStatus",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -522,7 +522,7 @@ int lua_cocos2dx_controller_EventController_isConnected(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isConnected",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventController:isConnected",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -562,13 +562,13 @@ int lua_cocos2dx_controller_EventController_setKeyCode(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.EventController:setKeyCode"); if(!ok) return 0; cobj->setKeyCode(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setKeyCode",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventController:setKeyCode",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -612,7 +612,7 @@ int lua_cocos2dx_controller_EventController_getController(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Controller",(cocos2d::Controller*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getController",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventController:getController",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -656,7 +656,7 @@ int lua_cocos2dx_controller_EventController_getKeyCode(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getKeyCode",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventController:getKeyCode",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -679,7 +679,7 @@ int lua_cocos2dx_controller_EventController_constructor(lua_State* tolua_S) do{ if (argc == 3) { cocos2d::EventController::ControllerEventType arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.EventController:EventController"); if (!ok) { break; } cocos2d::Controller* arg1; @@ -687,7 +687,7 @@ int lua_cocos2dx_controller_EventController_constructor(lua_State* tolua_S) if (!ok) { break; } bool arg2; - ok &= luaval_to_boolean(tolua_S, 4,&arg2); + ok &= luaval_to_boolean(tolua_S, 4,&arg2, "cc.EventController:EventController"); if (!ok) { break; } cobj = new cocos2d::EventController(arg0, arg1, arg2); @@ -702,7 +702,7 @@ int lua_cocos2dx_controller_EventController_constructor(lua_State* tolua_S) do{ if (argc == 3) { cocos2d::EventController::ControllerEventType arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.EventController:EventController"); if (!ok) { break; } cocos2d::Controller* arg1; @@ -710,7 +710,7 @@ int lua_cocos2dx_controller_EventController_constructor(lua_State* tolua_S) if (!ok) { break; } int arg2; - ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2); + ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "cc.EventController:EventController"); if (!ok) { break; } cobj = new cocos2d::EventController(arg0, arg1, arg2); @@ -722,7 +722,7 @@ int lua_cocos2dx_controller_EventController_constructor(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "EventController",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventController:EventController",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 @@ -781,7 +781,7 @@ int lua_cocos2dx_controller_EventListenerController_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.EventListenerController",(cocos2d::EventListenerController*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.EventListenerController:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_experimental_auto.cpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_experimental_auto.cpp index 4e7ff2d009..8094a81b01 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_experimental_auto.cpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_experimental_auto.cpp @@ -36,14 +36,14 @@ int lua_cocos2dx_experimental_TMXLayer_getPositionAt(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "ccexp.TMXLayer:getPositionAt"); if(!ok) return 0; cocos2d::Vec2 ret = cobj->getPositionAt(arg0); vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPositionAt",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.TMXLayer:getPositionAt",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -83,13 +83,13 @@ int lua_cocos2dx_experimental_TMXLayer_setLayerOrientation(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccexp.TMXLayer:setLayerOrientation"); if(!ok) return 0; cobj->setLayerOrientation(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setLayerOrientation",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.TMXLayer:setLayerOrientation",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -133,7 +133,7 @@ int lua_cocos2dx_experimental_TMXLayer_getLayerSize(lua_State* tolua_S) size_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getLayerSize",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.TMXLayer:getLayerSize",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -173,13 +173,13 @@ int lua_cocos2dx_experimental_TMXLayer_setMapTileSize(lua_State* tolua_S) { cocos2d::Size arg0; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "ccexp.TMXLayer:setMapTileSize"); if(!ok) return 0; cobj->setMapTileSize(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setMapTileSize",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.TMXLayer:setMapTileSize",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -223,7 +223,7 @@ int lua_cocos2dx_experimental_TMXLayer_getLayerOrientation(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getLayerOrientation",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.TMXLayer:getLayerOrientation",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -263,13 +263,13 @@ int lua_cocos2dx_experimental_TMXLayer_setProperties(lua_State* tolua_S) { cocos2d::ValueMap arg0; - ok &= luaval_to_ccvaluemap(tolua_S, 2, &arg0); + ok &= luaval_to_ccvaluemap(tolua_S, 2, &arg0, "ccexp.TMXLayer:setProperties"); if(!ok) return 0; cobj->setProperties(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setProperties",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.TMXLayer:setProperties",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -309,13 +309,13 @@ int lua_cocos2dx_experimental_TMXLayer_setLayerName(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccexp.TMXLayer:setLayerName"); if(!ok) return 0; cobj->setLayerName(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setLayerName",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.TMXLayer:setLayerName",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -355,13 +355,13 @@ int lua_cocos2dx_experimental_TMXLayer_removeTileAt(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "ccexp.TMXLayer:removeTileAt"); if(!ok) return 0; cobj->removeTileAt(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeTileAt",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.TMXLayer:removeTileAt",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -408,7 +408,7 @@ int lua_cocos2dx_experimental_TMXLayer_getProperties(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getProperties",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.TMXLayer:getProperties",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -451,7 +451,7 @@ int lua_cocos2dx_experimental_TMXLayer_setupTiles(lua_State* tolua_S) cobj->setupTiles(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setupTiles",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.TMXLayer:setupTiles",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -495,15 +495,15 @@ int lua_cocos2dx_experimental_TMXLayer_setupTileSprite(lua_State* tolua_S) ok &= luaval_to_object(tolua_S, 2, "cc.Sprite",&arg0); - ok &= luaval_to_vec2(tolua_S, 3, &arg1); + ok &= luaval_to_vec2(tolua_S, 3, &arg1, "ccexp.TMXLayer:setupTileSprite"); - ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2); + ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "ccexp.TMXLayer:setupTileSprite"); if(!ok) return 0; cobj->setupTileSprite(arg0, arg1, arg2); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setupTileSprite",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.TMXLayer:setupTileSprite",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 @@ -537,15 +537,15 @@ int lua_cocos2dx_experimental_TMXLayer_setTileGID(lua_State* tolua_S) do{ if (argc == 3) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccexp.TMXLayer:setTileGID"); if (!ok) { break; } cocos2d::Vec2 arg1; - ok &= luaval_to_vec2(tolua_S, 3, &arg1); + ok &= luaval_to_vec2(tolua_S, 3, &arg1, "ccexp.TMXLayer:setTileGID"); if (!ok) { break; } cocos2d::TMXTileFlags_ arg2; - ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2); + ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "ccexp.TMXLayer:setTileGID"); if (!ok) { break; } cobj->setTileGID(arg0, arg1, arg2); @@ -556,11 +556,11 @@ int lua_cocos2dx_experimental_TMXLayer_setTileGID(lua_State* tolua_S) do{ if (argc == 2) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccexp.TMXLayer:setTileGID"); if (!ok) { break; } cocos2d::Vec2 arg1; - ok &= luaval_to_vec2(tolua_S, 3, &arg1); + ok &= luaval_to_vec2(tolua_S, 3, &arg1, "ccexp.TMXLayer:setTileGID"); if (!ok) { break; } cobj->setTileGID(arg0, arg1); @@ -568,7 +568,7 @@ int lua_cocos2dx_experimental_TMXLayer_setTileGID(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTileGID",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.TMXLayer:setTileGID",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -612,7 +612,7 @@ int lua_cocos2dx_experimental_TMXLayer_getMapTileSize(lua_State* tolua_S) size_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getMapTileSize",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.TMXLayer:getMapTileSize",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -652,14 +652,14 @@ int lua_cocos2dx_experimental_TMXLayer_getProperty(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccexp.TMXLayer:getProperty"); if(!ok) return 0; cocos2d::Value ret = cobj->getProperty(arg0); ccvalue_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getProperty",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.TMXLayer:getProperty",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -699,13 +699,13 @@ int lua_cocos2dx_experimental_TMXLayer_setLayerSize(lua_State* tolua_S) { cocos2d::Size arg0; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "ccexp.TMXLayer:setLayerSize"); if(!ok) return 0; cobj->setLayerSize(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setLayerSize",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.TMXLayer:setLayerSize",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -749,7 +749,7 @@ int lua_cocos2dx_experimental_TMXLayer_getLayerName(lua_State* tolua_S) tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getLayerName",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.TMXLayer:getLayerName",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -795,7 +795,7 @@ int lua_cocos2dx_experimental_TMXLayer_setTileSet(lua_State* tolua_S) cobj->setTileSet(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTileSet",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.TMXLayer:setTileSet",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -839,7 +839,7 @@ int lua_cocos2dx_experimental_TMXLayer_getTileSet(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.TMXTilesetInfo",(cocos2d::TMXTilesetInfo*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTileSet",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.TMXLayer:getTileSet",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -879,14 +879,14 @@ int lua_cocos2dx_experimental_TMXLayer_getTileAt(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "ccexp.TMXLayer:getTileAt"); if(!ok) return 0; cocos2d::Sprite* ret = cobj->getTileAt(arg0); object_to_luaval(tolua_S, "cc.Sprite",(cocos2d::Sprite*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTileAt",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.TMXLayer:getTileAt",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -925,7 +925,7 @@ int lua_cocos2dx_experimental_TMXLayer_create(lua_State* tolua_S) object_to_luaval(tolua_S, "ccexp.TMXLayer",(cocos2d::experimental::TMXLayer*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccexp.TMXLayer:create",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -957,7 +957,7 @@ int lua_cocos2dx_experimental_TMXLayer_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccexp.TMXLayer"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "TMXLayer",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.TMXLayer:TMXLayer",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1037,13 +1037,13 @@ int lua_cocos2dx_experimental_TMXTiledMap_setObjectGroups(lua_State* tolua_S) { cocos2d::Vector arg0; - ok &= luaval_to_ccvector(tolua_S, 2, &arg0); + ok &= luaval_to_ccvector(tolua_S, 2, &arg0, "ccexp.TMXTiledMap:setObjectGroups"); if(!ok) return 0; cobj->setObjectGroups(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setObjectGroups",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.TMXTiledMap:setObjectGroups",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -1083,14 +1083,14 @@ int lua_cocos2dx_experimental_TMXTiledMap_getProperty(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccexp.TMXTiledMap:getProperty"); if(!ok) return 0; cocos2d::Value ret = cobj->getProperty(arg0); ccvalue_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getProperty",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.TMXTiledMap:getProperty",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -1130,13 +1130,13 @@ int lua_cocos2dx_experimental_TMXTiledMap_setMapSize(lua_State* tolua_S) { cocos2d::Size arg0; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "ccexp.TMXTiledMap:setMapSize"); if(!ok) return 0; cobj->setMapSize(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setMapSize",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.TMXTiledMap:setMapSize",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -1176,14 +1176,14 @@ int lua_cocos2dx_experimental_TMXTiledMap_getObjectGroup(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccexp.TMXTiledMap:getObjectGroup"); if(!ok) return 0; cocos2d::TMXObjectGroup* ret = cobj->getObjectGroup(arg0); object_to_luaval(tolua_S, "cc.TMXObjectGroup",(cocos2d::TMXObjectGroup*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getObjectGroup",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.TMXTiledMap:getObjectGroup",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -1230,7 +1230,7 @@ int lua_cocos2dx_experimental_TMXTiledMap_getObjectGroups(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getObjectGroups",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.TMXTiledMap:getObjectGroups",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1274,7 +1274,7 @@ int lua_cocos2dx_experimental_TMXTiledMap_getTileSize(lua_State* tolua_S) size_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTileSize",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.TMXTiledMap:getTileSize",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1318,7 +1318,7 @@ int lua_cocos2dx_experimental_TMXTiledMap_getMapSize(lua_State* tolua_S) size_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getMapSize",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.TMXTiledMap:getMapSize",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1362,7 +1362,7 @@ int lua_cocos2dx_experimental_TMXTiledMap_getProperties(lua_State* tolua_S) ccvaluemap_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getProperties",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.TMXTiledMap:getProperties",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1402,14 +1402,14 @@ int lua_cocos2dx_experimental_TMXTiledMap_getPropertiesForGID(lua_State* tolua_S { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccexp.TMXTiledMap:getPropertiesForGID"); if(!ok) return 0; cocos2d::Value ret = cobj->getPropertiesForGID(arg0); ccvalue_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPropertiesForGID",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.TMXTiledMap:getPropertiesForGID",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -1449,13 +1449,13 @@ int lua_cocos2dx_experimental_TMXTiledMap_setTileSize(lua_State* tolua_S) { cocos2d::Size arg0; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "ccexp.TMXTiledMap:setTileSize"); if(!ok) return 0; cobj->setTileSize(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTileSize",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.TMXTiledMap:setTileSize",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -1495,13 +1495,13 @@ int lua_cocos2dx_experimental_TMXTiledMap_setProperties(lua_State* tolua_S) { cocos2d::ValueMap arg0; - ok &= luaval_to_ccvaluemap(tolua_S, 2, &arg0); + ok &= luaval_to_ccvaluemap(tolua_S, 2, &arg0, "ccexp.TMXTiledMap:setProperties"); if(!ok) return 0; cobj->setProperties(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setProperties",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.TMXTiledMap:setProperties",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -1541,14 +1541,14 @@ int lua_cocos2dx_experimental_TMXTiledMap_getLayer(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccexp.TMXTiledMap:getLayer"); if(!ok) return 0; cocos2d::experimental::TMXLayer* ret = cobj->getLayer(arg0); object_to_luaval(tolua_S, "ccexp.TMXLayer",(cocos2d::experimental::TMXLayer*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getLayer",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.TMXTiledMap:getLayer",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -1592,7 +1592,7 @@ int lua_cocos2dx_experimental_TMXTiledMap_getMapOrientation(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getMapOrientation",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.TMXTiledMap:getMapOrientation",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1632,13 +1632,13 @@ int lua_cocos2dx_experimental_TMXTiledMap_setMapOrientation(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccexp.TMXTiledMap:setMapOrientation"); if(!ok) return 0; cobj->setMapOrientation(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setMapOrientation",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.TMXTiledMap:setMapOrientation",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -1666,14 +1666,14 @@ int lua_cocos2dx_experimental_TMXTiledMap_create(lua_State* tolua_S) if (argc == 1) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccexp.TMXTiledMap:create"); if(!ok) return 0; cocos2d::experimental::TMXTiledMap* ret = cocos2d::experimental::TMXTiledMap::create(arg0); object_to_luaval(tolua_S, "ccexp.TMXTiledMap",(cocos2d::experimental::TMXTiledMap*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccexp.TMXTiledMap:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -1700,15 +1700,15 @@ int lua_cocos2dx_experimental_TMXTiledMap_createWithXML(lua_State* tolua_S) { std::string arg0; std::string arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccexp.TMXTiledMap:createWithXML"); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccexp.TMXTiledMap:createWithXML"); if(!ok) return 0; cocos2d::experimental::TMXTiledMap* ret = cocos2d::experimental::TMXTiledMap::createWithXML(arg0, arg1); object_to_luaval(tolua_S, "ccexp.TMXTiledMap",(cocos2d::experimental::TMXTiledMap*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createWithXML",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccexp.TMXTiledMap:createWithXML",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_experimental_video_auto.cpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_experimental_video_auto.cpp index e62111ffaf..6b6a43244b 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_experimental_video_auto.cpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_experimental_video_auto.cpp @@ -40,7 +40,7 @@ int lua_cocos2dx_experimental_video_VideoPlayer_getFileName(lua_State* tolua_S) tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getFileName",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.VideoPlayer:getFileName",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -84,7 +84,7 @@ int lua_cocos2dx_experimental_video_VideoPlayer_getURL(lua_State* tolua_S) tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getURL",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.VideoPlayer:getURL",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -127,7 +127,7 @@ int lua_cocos2dx_experimental_video_VideoPlayer_play(lua_State* tolua_S) cobj->play(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "play",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.VideoPlayer:play",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -170,7 +170,7 @@ int lua_cocos2dx_experimental_video_VideoPlayer_pause(lua_State* tolua_S) cobj->pause(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "pause",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.VideoPlayer:pause",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -210,13 +210,13 @@ int lua_cocos2dx_experimental_video_VideoPlayer_setKeepAspectRatioEnabled(lua_St { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccexp.VideoPlayer:setKeepAspectRatioEnabled"); if(!ok) return 0; cobj->setKeepAspectRatioEnabled(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setKeepAspectRatioEnabled",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.VideoPlayer:setKeepAspectRatioEnabled",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -259,7 +259,7 @@ int lua_cocos2dx_experimental_video_VideoPlayer_resume(lua_State* tolua_S) cobj->resume(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "resume",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.VideoPlayer:resume",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -302,7 +302,7 @@ int lua_cocos2dx_experimental_video_VideoPlayer_stop(lua_State* tolua_S) cobj->stop(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "stop",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.VideoPlayer:stop",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -342,13 +342,13 @@ int lua_cocos2dx_experimental_video_VideoPlayer_setFullScreenEnabled(lua_State* { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccexp.VideoPlayer:setFullScreenEnabled"); if(!ok) return 0; cobj->setFullScreenEnabled(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setFullScreenEnabled",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.VideoPlayer:setFullScreenEnabled",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -388,13 +388,13 @@ int lua_cocos2dx_experimental_video_VideoPlayer_setFileName(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccexp.VideoPlayer:setFileName"); if(!ok) return 0; cobj->setFileName(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setFileName",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.VideoPlayer:setFileName",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -434,13 +434,13 @@ int lua_cocos2dx_experimental_video_VideoPlayer_setURL(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccexp.VideoPlayer:setURL"); if(!ok) return 0; cobj->setURL(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setURL",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.VideoPlayer:setURL",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -484,7 +484,7 @@ int lua_cocos2dx_experimental_video_VideoPlayer_isKeepAspectRatioEnabled(lua_Sta tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isKeepAspectRatioEnabled",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.VideoPlayer:isKeepAspectRatioEnabled",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -524,13 +524,13 @@ int lua_cocos2dx_experimental_video_VideoPlayer_onPlayEvent(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccexp.VideoPlayer:onPlayEvent"); if(!ok) return 0; cobj->onPlayEvent(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "onPlayEvent",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.VideoPlayer:onPlayEvent",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -574,7 +574,7 @@ int lua_cocos2dx_experimental_video_VideoPlayer_isFullScreenEnabled(lua_State* t tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isFullScreenEnabled",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.VideoPlayer:isFullScreenEnabled",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -618,7 +618,7 @@ int lua_cocos2dx_experimental_video_VideoPlayer_isPlaying(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isPlaying",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.VideoPlayer:isPlaying",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -658,13 +658,13 @@ int lua_cocos2dx_experimental_video_VideoPlayer_seekTo(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccexp.VideoPlayer:seekTo"); if(!ok) return 0; cobj->seekTo(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "seekTo",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.VideoPlayer:seekTo",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -697,7 +697,7 @@ int lua_cocos2dx_experimental_video_VideoPlayer_create(lua_State* tolua_S) object_to_luaval(tolua_S, "ccexp.VideoPlayer",(cocos2d::experimental::ui::VideoPlayer*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccexp.VideoPlayer:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_extension_auto.cpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_extension_auto.cpp index 6a66e82f68..81f1c26626 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_extension_auto.cpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_extension_auto.cpp @@ -1,6 +1,5 @@ #include "lua_cocos2dx_extension_auto.hpp" #include "cocos-ext.h" -#include "CocosBuilder.h" #include "tolua_fix.h" #include "LuaBasicConversions.h" @@ -36,14 +35,14 @@ int lua_cocos2dx_extension_Scale9Sprite_resizableSpriteWithCapInsets(lua_State* { cocos2d::Rect arg0; - ok &= luaval_to_rect(tolua_S, 2, &arg0); + ok &= luaval_to_rect(tolua_S, 2, &arg0, "cc.Scale9Sprite:resizableSpriteWithCapInsets"); if(!ok) return 0; cocos2d::extension::Scale9Sprite* ret = cobj->resizableSpriteWithCapInsets(arg0); object_to_luaval(tolua_S, "cc.Scale9Sprite",(cocos2d::extension::Scale9Sprite*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "resizableSpriteWithCapInsets",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Scale9Sprite:resizableSpriteWithCapInsets",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -83,13 +82,13 @@ int lua_cocos2dx_extension_Scale9Sprite_setInsetBottom(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Scale9Sprite:setInsetBottom"); if(!ok) return 0; cobj->setInsetBottom(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setInsetBottom",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Scale9Sprite:setInsetBottom",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -123,7 +122,7 @@ int lua_cocos2dx_extension_Scale9Sprite_initWithSpriteFrameName(lua_State* tolua do{ if (argc == 1) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Scale9Sprite:initWithSpriteFrameName"); if (!ok) { break; } bool ret = cobj->initWithSpriteFrameName(arg0); @@ -135,11 +134,11 @@ int lua_cocos2dx_extension_Scale9Sprite_initWithSpriteFrameName(lua_State* tolua do{ if (argc == 2) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Scale9Sprite:initWithSpriteFrameName"); if (!ok) { break; } cocos2d::Rect arg1; - ok &= luaval_to_rect(tolua_S, 3, &arg1); + ok &= luaval_to_rect(tolua_S, 3, &arg1, "cc.Scale9Sprite:initWithSpriteFrameName"); if (!ok) { break; } bool ret = cobj->initWithSpriteFrameName(arg0, arg1); @@ -148,7 +147,7 @@ int lua_cocos2dx_extension_Scale9Sprite_initWithSpriteFrameName(lua_State* tolua } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "initWithSpriteFrameName",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Scale9Sprite:initWithSpriteFrameName",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -188,13 +187,13 @@ int lua_cocos2dx_extension_Scale9Sprite_setInsetTop(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Scale9Sprite:setInsetTop"); if(!ok) return 0; cobj->setInsetTop(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setInsetTop",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Scale9Sprite:setInsetTop",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -238,7 +237,7 @@ int lua_cocos2dx_extension_Scale9Sprite_init(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "init",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Scale9Sprite:init",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -278,13 +277,13 @@ int lua_cocos2dx_extension_Scale9Sprite_setPreferredSize(lua_State* tolua_S) { cocos2d::Size arg0; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.Scale9Sprite:setPreferredSize"); if(!ok) return 0; cobj->setPreferredSize(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setPreferredSize",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Scale9Sprite:setPreferredSize",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -330,7 +329,7 @@ int lua_cocos2dx_extension_Scale9Sprite_setSpriteFrame(lua_State* tolua_S) cobj->setSpriteFrame(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setSpriteFrame",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Scale9Sprite:setSpriteFrame",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -368,11 +367,11 @@ int lua_cocos2dx_extension_Scale9Sprite_initWithBatchNode(lua_State* tolua_S) if (!ok) { break; } cocos2d::Rect arg1; - ok &= luaval_to_rect(tolua_S, 3, &arg1); + ok &= luaval_to_rect(tolua_S, 3, &arg1, "cc.Scale9Sprite:initWithBatchNode"); if (!ok) { break; } cocos2d::Rect arg2; - ok &= luaval_to_rect(tolua_S, 4, &arg2); + ok &= luaval_to_rect(tolua_S, 4, &arg2, "cc.Scale9Sprite:initWithBatchNode"); if (!ok) { break; } bool ret = cobj->initWithBatchNode(arg0, arg1, arg2); @@ -388,15 +387,15 @@ int lua_cocos2dx_extension_Scale9Sprite_initWithBatchNode(lua_State* tolua_S) if (!ok) { break; } cocos2d::Rect arg1; - ok &= luaval_to_rect(tolua_S, 3, &arg1); + ok &= luaval_to_rect(tolua_S, 3, &arg1, "cc.Scale9Sprite:initWithBatchNode"); if (!ok) { break; } bool arg2; - ok &= luaval_to_boolean(tolua_S, 4,&arg2); + ok &= luaval_to_boolean(tolua_S, 4,&arg2, "cc.Scale9Sprite:initWithBatchNode"); if (!ok) { break; } cocos2d::Rect arg3; - ok &= luaval_to_rect(tolua_S, 5, &arg3); + ok &= luaval_to_rect(tolua_S, 5, &arg3, "cc.Scale9Sprite:initWithBatchNode"); if (!ok) { break; } bool ret = cobj->initWithBatchNode(arg0, arg1, arg2, arg3); @@ -405,7 +404,7 @@ int lua_cocos2dx_extension_Scale9Sprite_initWithBatchNode(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "initWithBatchNode",argc, 4); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Scale9Sprite:initWithBatchNode",argc, 4); return 0; #if COCOS2D_DEBUG >= 1 @@ -449,7 +448,7 @@ int lua_cocos2dx_extension_Scale9Sprite_getInsetBottom(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getInsetBottom",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Scale9Sprite:getInsetBottom",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -493,7 +492,7 @@ int lua_cocos2dx_extension_Scale9Sprite_getCapInsets(lua_State* tolua_S) rect_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getCapInsets",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Scale9Sprite:getCapInsets",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -538,18 +537,18 @@ int lua_cocos2dx_extension_Scale9Sprite_updateWithBatchNode(lua_State* tolua_S) ok &= luaval_to_object(tolua_S, 2, "cc.SpriteBatchNode",&arg0); - ok &= luaval_to_rect(tolua_S, 3, &arg1); + ok &= luaval_to_rect(tolua_S, 3, &arg1, "cc.Scale9Sprite:updateWithBatchNode"); - ok &= luaval_to_boolean(tolua_S, 4,&arg2); + ok &= luaval_to_boolean(tolua_S, 4,&arg2, "cc.Scale9Sprite:updateWithBatchNode"); - ok &= luaval_to_rect(tolua_S, 5, &arg3); + ok &= luaval_to_rect(tolua_S, 5, &arg3, "cc.Scale9Sprite:updateWithBatchNode"); if(!ok) return 0; bool ret = cobj->updateWithBatchNode(arg0, arg1, arg2, arg3); tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "updateWithBatchNode",argc, 4); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Scale9Sprite:updateWithBatchNode",argc, 4); return 0; #if COCOS2D_DEBUG >= 1 @@ -593,7 +592,7 @@ int lua_cocos2dx_extension_Scale9Sprite_getInsetRight(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getInsetRight",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Scale9Sprite:getInsetRight",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -637,7 +636,7 @@ int lua_cocos2dx_extension_Scale9Sprite_getOriginalSize(lua_State* tolua_S) size_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getOriginalSize",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Scale9Sprite:getOriginalSize",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -671,11 +670,11 @@ int lua_cocos2dx_extension_Scale9Sprite_initWithFile(lua_State* tolua_S) do{ if (argc == 2) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Scale9Sprite:initWithFile"); if (!ok) { break; } cocos2d::Rect arg1; - ok &= luaval_to_rect(tolua_S, 3, &arg1); + ok &= luaval_to_rect(tolua_S, 3, &arg1, "cc.Scale9Sprite:initWithFile"); if (!ok) { break; } bool ret = cobj->initWithFile(arg0, arg1); @@ -687,15 +686,15 @@ int lua_cocos2dx_extension_Scale9Sprite_initWithFile(lua_State* tolua_S) do{ if (argc == 3) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Scale9Sprite:initWithFile"); if (!ok) { break; } cocos2d::Rect arg1; - ok &= luaval_to_rect(tolua_S, 3, &arg1); + ok &= luaval_to_rect(tolua_S, 3, &arg1, "cc.Scale9Sprite:initWithFile"); if (!ok) { break; } cocos2d::Rect arg2; - ok &= luaval_to_rect(tolua_S, 4, &arg2); + ok &= luaval_to_rect(tolua_S, 4, &arg2, "cc.Scale9Sprite:initWithFile"); if (!ok) { break; } bool ret = cobj->initWithFile(arg0, arg1, arg2); @@ -707,11 +706,11 @@ int lua_cocos2dx_extension_Scale9Sprite_initWithFile(lua_State* tolua_S) do{ if (argc == 2) { cocos2d::Rect arg0; - ok &= luaval_to_rect(tolua_S, 2, &arg0); + ok &= luaval_to_rect(tolua_S, 2, &arg0, "cc.Scale9Sprite:initWithFile"); if (!ok) { break; } std::string arg1; - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.Scale9Sprite:initWithFile"); if (!ok) { break; } bool ret = cobj->initWithFile(arg0, arg1); @@ -723,7 +722,7 @@ int lua_cocos2dx_extension_Scale9Sprite_initWithFile(lua_State* tolua_S) do{ if (argc == 1) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Scale9Sprite:initWithFile"); if (!ok) { break; } bool ret = cobj->initWithFile(arg0); @@ -732,7 +731,7 @@ int lua_cocos2dx_extension_Scale9Sprite_initWithFile(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "initWithFile",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Scale9Sprite:initWithFile",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -776,7 +775,7 @@ int lua_cocos2dx_extension_Scale9Sprite_getInsetTop(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getInsetTop",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Scale9Sprite:getInsetTop",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -816,13 +815,13 @@ int lua_cocos2dx_extension_Scale9Sprite_setInsetLeft(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Scale9Sprite:setInsetLeft"); if(!ok) return 0; cobj->setInsetLeft(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setInsetLeft",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Scale9Sprite:setInsetLeft",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -872,7 +871,7 @@ int lua_cocos2dx_extension_Scale9Sprite_initWithSpriteFrame(lua_State* tolua_S) if (!ok) { break; } cocos2d::Rect arg1; - ok &= luaval_to_rect(tolua_S, 3, &arg1); + ok &= luaval_to_rect(tolua_S, 3, &arg1, "cc.Scale9Sprite:initWithSpriteFrame"); if (!ok) { break; } bool ret = cobj->initWithSpriteFrame(arg0, arg1); @@ -881,7 +880,7 @@ int lua_cocos2dx_extension_Scale9Sprite_initWithSpriteFrame(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "initWithSpriteFrame",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Scale9Sprite:initWithSpriteFrame",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -925,7 +924,7 @@ int lua_cocos2dx_extension_Scale9Sprite_getPreferredSize(lua_State* tolua_S) size_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPreferredSize",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Scale9Sprite:getPreferredSize",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -965,13 +964,13 @@ int lua_cocos2dx_extension_Scale9Sprite_setCapInsets(lua_State* tolua_S) { cocos2d::Rect arg0; - ok &= luaval_to_rect(tolua_S, 2, &arg0); + ok &= luaval_to_rect(tolua_S, 2, &arg0, "cc.Scale9Sprite:setCapInsets"); if(!ok) return 0; cobj->setCapInsets(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setCapInsets",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Scale9Sprite:setCapInsets",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -1015,7 +1014,7 @@ int lua_cocos2dx_extension_Scale9Sprite_getInsetLeft(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getInsetLeft",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Scale9Sprite:getInsetLeft",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1055,13 +1054,13 @@ int lua_cocos2dx_extension_Scale9Sprite_setInsetRight(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.Scale9Sprite:setInsetRight"); if(!ok) return 0; cobj->setInsetRight(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setInsetRight",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Scale9Sprite:setInsetRight",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -1090,13 +1089,13 @@ int lua_cocos2dx_extension_Scale9Sprite_create(lua_State* tolua_S) if (argc == 3) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Scale9Sprite:create"); if (!ok) { break; } cocos2d::Rect arg1; - ok &= luaval_to_rect(tolua_S, 3, &arg1); + ok &= luaval_to_rect(tolua_S, 3, &arg1, "cc.Scale9Sprite:create"); if (!ok) { break; } cocos2d::Rect arg2; - ok &= luaval_to_rect(tolua_S, 4, &arg2); + ok &= luaval_to_rect(tolua_S, 4, &arg2, "cc.Scale9Sprite:create"); if (!ok) { break; } cocos2d::extension::Scale9Sprite* ret = cocos2d::extension::Scale9Sprite::create(arg0, arg1, arg2); object_to_luaval(tolua_S, "cc.Scale9Sprite",(cocos2d::extension::Scale9Sprite*)ret); @@ -1119,10 +1118,10 @@ int lua_cocos2dx_extension_Scale9Sprite_create(lua_State* tolua_S) if (argc == 2) { cocos2d::Rect arg0; - ok &= luaval_to_rect(tolua_S, 2, &arg0); + ok &= luaval_to_rect(tolua_S, 2, &arg0, "cc.Scale9Sprite:create"); if (!ok) { break; } std::string arg1; - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.Scale9Sprite:create"); if (!ok) { break; } cocos2d::extension::Scale9Sprite* ret = cocos2d::extension::Scale9Sprite::create(arg0, arg1); object_to_luaval(tolua_S, "cc.Scale9Sprite",(cocos2d::extension::Scale9Sprite*)ret); @@ -1135,10 +1134,10 @@ int lua_cocos2dx_extension_Scale9Sprite_create(lua_State* tolua_S) if (argc == 2) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Scale9Sprite:create"); if (!ok) { break; } cocos2d::Rect arg1; - ok &= luaval_to_rect(tolua_S, 3, &arg1); + ok &= luaval_to_rect(tolua_S, 3, &arg1, "cc.Scale9Sprite:create"); if (!ok) { break; } cocos2d::extension::Scale9Sprite* ret = cocos2d::extension::Scale9Sprite::create(arg0, arg1); object_to_luaval(tolua_S, "cc.Scale9Sprite",(cocos2d::extension::Scale9Sprite*)ret); @@ -1151,7 +1150,7 @@ int lua_cocos2dx_extension_Scale9Sprite_create(lua_State* tolua_S) if (argc == 1) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Scale9Sprite:create"); if (!ok) { break; } cocos2d::extension::Scale9Sprite* ret = cocos2d::extension::Scale9Sprite::create(arg0); object_to_luaval(tolua_S, "cc.Scale9Sprite",(cocos2d::extension::Scale9Sprite*)ret); @@ -1159,7 +1158,7 @@ int lua_cocos2dx_extension_Scale9Sprite_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.Scale9Sprite:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -1186,10 +1185,10 @@ int lua_cocos2dx_extension_Scale9Sprite_createWithSpriteFrameName(lua_State* tol if (argc == 2) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Scale9Sprite:createWithSpriteFrameName"); if (!ok) { break; } cocos2d::Rect arg1; - ok &= luaval_to_rect(tolua_S, 3, &arg1); + ok &= luaval_to_rect(tolua_S, 3, &arg1, "cc.Scale9Sprite:createWithSpriteFrameName"); if (!ok) { break; } cocos2d::extension::Scale9Sprite* ret = cocos2d::extension::Scale9Sprite::createWithSpriteFrameName(arg0, arg1); object_to_luaval(tolua_S, "cc.Scale9Sprite",(cocos2d::extension::Scale9Sprite*)ret); @@ -1202,7 +1201,7 @@ int lua_cocos2dx_extension_Scale9Sprite_createWithSpriteFrameName(lua_State* tol if (argc == 1) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.Scale9Sprite:createWithSpriteFrameName"); if (!ok) { break; } cocos2d::extension::Scale9Sprite* ret = cocos2d::extension::Scale9Sprite::createWithSpriteFrameName(arg0); object_to_luaval(tolua_S, "cc.Scale9Sprite",(cocos2d::extension::Scale9Sprite*)ret); @@ -1210,7 +1209,7 @@ int lua_cocos2dx_extension_Scale9Sprite_createWithSpriteFrameName(lua_State* tol } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "createWithSpriteFrameName",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.Scale9Sprite:createWithSpriteFrameName",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -1240,7 +1239,7 @@ int lua_cocos2dx_extension_Scale9Sprite_createWithSpriteFrame(lua_State* tolua_S ok &= luaval_to_object(tolua_S, 2, "cc.SpriteFrame",&arg0); if (!ok) { break; } cocos2d::Rect arg1; - ok &= luaval_to_rect(tolua_S, 3, &arg1); + ok &= luaval_to_rect(tolua_S, 3, &arg1, "cc.Scale9Sprite:createWithSpriteFrame"); if (!ok) { break; } cocos2d::extension::Scale9Sprite* ret = cocos2d::extension::Scale9Sprite::createWithSpriteFrame(arg0, arg1); object_to_luaval(tolua_S, "cc.Scale9Sprite",(cocos2d::extension::Scale9Sprite*)ret); @@ -1261,7 +1260,7 @@ int lua_cocos2dx_extension_Scale9Sprite_createWithSpriteFrame(lua_State* tolua_S } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "createWithSpriteFrame",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.Scale9Sprite:createWithSpriteFrame",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -1293,7 +1292,7 @@ int lua_cocos2dx_extension_Scale9Sprite_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.Scale9Sprite"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "Scale9Sprite",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Scale9Sprite:Scale9Sprite",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1377,13 +1376,13 @@ int lua_cocos2dx_extension_Control_setEnabled(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.Control:setEnabled"); if(!ok) return 0; cobj->setEnabled(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setEnabled",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Control:setEnabled",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -1432,7 +1431,7 @@ int lua_cocos2dx_extension_Control_onTouchMoved(lua_State* tolua_S) cobj->onTouchMoved(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "onTouchMoved",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Control:onTouchMoved",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -1476,7 +1475,7 @@ int lua_cocos2dx_extension_Control_getState(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getState",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Control:getState",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1525,7 +1524,7 @@ int lua_cocos2dx_extension_Control_onTouchEnded(lua_State* tolua_S) cobj->onTouchEnded(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "onTouchEnded",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Control:onTouchEnded",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -1565,13 +1564,13 @@ int lua_cocos2dx_extension_Control_sendActionsForControlEvents(lua_State* tolua_ { cocos2d::extension::Control::EventType arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.Control:sendActionsForControlEvents"); if(!ok) return 0; cobj->sendActionsForControlEvents(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "sendActionsForControlEvents",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Control:sendActionsForControlEvents",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -1611,13 +1610,13 @@ int lua_cocos2dx_extension_Control_setSelected(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.Control:setSelected"); if(!ok) return 0; cobj->setSelected(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setSelected",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Control:setSelected",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -1661,7 +1660,7 @@ int lua_cocos2dx_extension_Control_isEnabled(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isEnabled",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Control:isEnabled",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1710,7 +1709,7 @@ int lua_cocos2dx_extension_Control_onTouchCancelled(lua_State* tolua_S) cobj->onTouchCancelled(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "onTouchCancelled",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Control:onTouchCancelled",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -1753,7 +1752,7 @@ int lua_cocos2dx_extension_Control_needsLayout(lua_State* tolua_S) cobj->needsLayout(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "needsLayout",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Control:needsLayout",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1803,7 +1802,7 @@ int lua_cocos2dx_extension_Control_onTouchBegan(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "onTouchBegan",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Control:onTouchBegan",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -1847,7 +1846,7 @@ int lua_cocos2dx_extension_Control_hasVisibleParents(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "hasVisibleParents",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Control:hasVisibleParents",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1891,7 +1890,7 @@ int lua_cocos2dx_extension_Control_isSelected(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isSelected",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Control:isSelected",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1938,7 +1937,7 @@ int lua_cocos2dx_extension_Control_isTouchInside(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isTouchInside",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Control:isTouchInside",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -1978,13 +1977,13 @@ int lua_cocos2dx_extension_Control_setHighlighted(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.Control:setHighlighted"); if(!ok) return 0; cobj->setHighlighted(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setHighlighted",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Control:setHighlighted",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2031,7 +2030,7 @@ int lua_cocos2dx_extension_Control_getTouchLocation(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTouchLocation",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Control:getTouchLocation",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2075,7 +2074,7 @@ int lua_cocos2dx_extension_Control_isHighlighted(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isHighlighted",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Control:isHighlighted",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2108,7 +2107,7 @@ int lua_cocos2dx_extension_Control_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Control",(cocos2d::extension::Control*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.Control:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -2186,7 +2185,7 @@ int lua_cocos2dx_extension_ControlButton_isPushed(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isPushed",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlButton:isPushed",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2226,13 +2225,13 @@ int lua_cocos2dx_extension_ControlButton_setSelected(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.ControlButton:setSelected"); if(!ok) return 0; cobj->setSelected(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setSelected",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlButton:setSelected",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2275,13 +2274,13 @@ int lua_cocos2dx_extension_ControlButton_setTitleLabelForState(lua_State* tolua_ ok &= luaval_to_object(tolua_S, 2, "cc.Node",&arg0); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.ControlButton:setTitleLabelForState"); if(!ok) return 0; cobj->setTitleLabelForState(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTitleLabelForState",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlButton:setTitleLabelForState",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -2321,13 +2320,13 @@ int lua_cocos2dx_extension_ControlButton_setAdjustBackgroundImage(lua_State* tol { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.ControlButton:setAdjustBackgroundImage"); if(!ok) return 0; cobj->setAdjustBackgroundImage(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAdjustBackgroundImage",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlButton:setAdjustBackgroundImage",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2367,13 +2366,13 @@ int lua_cocos2dx_extension_ControlButton_setHighlighted(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.ControlButton:setHighlighted"); if(!ok) return 0; cobj->setHighlighted(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setHighlighted",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlButton:setHighlighted",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2413,13 +2412,13 @@ int lua_cocos2dx_extension_ControlButton_setZoomOnTouchDown(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.ControlButton:setZoomOnTouchDown"); if(!ok) return 0; cobj->setZoomOnTouchDown(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setZoomOnTouchDown",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlButton:setZoomOnTouchDown",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2460,15 +2459,15 @@ int lua_cocos2dx_extension_ControlButton_setTitleForState(lua_State* tolua_S) std::string arg0; cocos2d::extension::Control::State arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.ControlButton:setTitleForState"); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.ControlButton:setTitleForState"); if(!ok) return 0; cobj->setTitleForState(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTitleForState",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlButton:setTitleForState",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -2508,13 +2507,13 @@ int lua_cocos2dx_extension_ControlButton_setLabelAnchorPoint(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.ControlButton:setLabelAnchorPoint"); if(!ok) return 0; cobj->setLabelAnchorPoint(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setLabelAnchorPoint",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlButton:setLabelAnchorPoint",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2558,7 +2557,7 @@ int lua_cocos2dx_extension_ControlButton_getLabelAnchorPoint(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getLabelAnchorPoint",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlButton:getLabelAnchorPoint",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2598,14 +2597,14 @@ int lua_cocos2dx_extension_ControlButton_getTitleTTFSizeForState(lua_State* tolu { cocos2d::extension::Control::State arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.ControlButton:getTitleTTFSizeForState"); if(!ok) return 0; double ret = cobj->getTitleTTFSizeForState(arg0); tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTitleTTFSizeForState",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlButton:getTitleTTFSizeForState",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2646,15 +2645,15 @@ int lua_cocos2dx_extension_ControlButton_setTitleTTFForState(lua_State* tolua_S) std::string arg0; cocos2d::extension::Control::State arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.ControlButton:setTitleTTFForState"); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.ControlButton:setTitleTTFForState"); if(!ok) return 0; cobj->setTitleTTFForState(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTitleTTFForState",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlButton:setTitleTTFForState",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -2695,15 +2694,15 @@ int lua_cocos2dx_extension_ControlButton_setTitleTTFSizeForState(lua_State* tolu double arg0; cocos2d::extension::Control::State arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ControlButton:setTitleTTFSizeForState"); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.ControlButton:setTitleTTFSizeForState"); if(!ok) return 0; cobj->setTitleTTFSizeForState(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTitleTTFSizeForState",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlButton:setTitleTTFSizeForState",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -2749,7 +2748,7 @@ int lua_cocos2dx_extension_ControlButton_setTitleLabel(lua_State* tolua_S) cobj->setTitleLabel(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTitleLabel",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlButton:setTitleLabel",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2789,13 +2788,13 @@ int lua_cocos2dx_extension_ControlButton_setPreferredSize(lua_State* tolua_S) { cocos2d::Size arg0; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.ControlButton:setPreferredSize"); if(!ok) return 0; cobj->setPreferredSize(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setPreferredSize",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlButton:setPreferredSize",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2839,7 +2838,7 @@ int lua_cocos2dx_extension_ControlButton_getCurrentTitleColor(lua_State* tolua_S color3b_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getCurrentTitleColor",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlButton:getCurrentTitleColor",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2879,13 +2878,13 @@ int lua_cocos2dx_extension_ControlButton_setEnabled(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.ControlButton:setEnabled"); if(!ok) return 0; cobj->setEnabled(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setEnabled",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlButton:setEnabled",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2925,14 +2924,14 @@ int lua_cocos2dx_extension_ControlButton_getBackgroundSpriteForState(lua_State* { cocos2d::extension::Control::State arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.ControlButton:getBackgroundSpriteForState"); if(!ok) return 0; cocos2d::extension::Scale9Sprite* ret = cobj->getBackgroundSpriteForState(arg0); object_to_luaval(tolua_S, "cc.Scale9Sprite",(cocos2d::extension::Scale9Sprite*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getBackgroundSpriteForState",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlButton:getBackgroundSpriteForState",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2976,7 +2975,7 @@ int lua_cocos2dx_extension_ControlButton_getHorizontalOrigin(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getHorizontalOrigin",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlButton:getHorizontalOrigin",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3019,7 +3018,7 @@ int lua_cocos2dx_extension_ControlButton_needsLayout(lua_State* tolua_S) cobj->needsLayout(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "needsLayout",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlButton:needsLayout",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3066,7 +3065,7 @@ int lua_cocos2dx_extension_ControlButton_getCurrentTitle(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getCurrentTitle",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlButton:getCurrentTitle",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3110,7 +3109,7 @@ int lua_cocos2dx_extension_ControlButton_getScaleRatio(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getScaleRatio",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlButton:getScaleRatio",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3150,14 +3149,14 @@ int lua_cocos2dx_extension_ControlButton_getTitleTTFForState(lua_State* tolua_S) { cocos2d::extension::Control::State arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.ControlButton:getTitleTTFForState"); if(!ok) return 0; const std::string& ret = cobj->getTitleTTFForState(arg0); tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTitleTTFForState",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlButton:getTitleTTFForState",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3201,7 +3200,7 @@ int lua_cocos2dx_extension_ControlButton_getBackgroundSprite(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Scale9Sprite",(cocos2d::extension::Scale9Sprite*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getBackgroundSprite",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlButton:getBackgroundSprite",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3241,14 +3240,14 @@ int lua_cocos2dx_extension_ControlButton_getTitleColorForState(lua_State* tolua_ { cocos2d::extension::Control::State arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.ControlButton:getTitleColorForState"); if(!ok) return 0; cocos2d::Color3B ret = cobj->getTitleColorForState(arg0); color3b_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTitleColorForState",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlButton:getTitleColorForState",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3289,15 +3288,15 @@ int lua_cocos2dx_extension_ControlButton_setTitleColorForState(lua_State* tolua_ cocos2d::Color3B arg0; cocos2d::extension::Control::State arg1; - ok &= luaval_to_color3b(tolua_S, 2, &arg0); + ok &= luaval_to_color3b(tolua_S, 2, &arg0, "cc.ControlButton:setTitleColorForState"); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.ControlButton:setTitleColorForState"); if(!ok) return 0; cobj->setTitleColorForState(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTitleColorForState",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlButton:setTitleColorForState",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -3341,7 +3340,7 @@ int lua_cocos2dx_extension_ControlButton_doesAdjustBackgroundImage(lua_State* to tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "doesAdjustBackgroundImage",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlButton:doesAdjustBackgroundImage",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3384,13 +3383,13 @@ int lua_cocos2dx_extension_ControlButton_setBackgroundSpriteFrameForState(lua_St ok &= luaval_to_object(tolua_S, 2, "cc.SpriteFrame",&arg0); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.ControlButton:setBackgroundSpriteFrameForState"); if(!ok) return 0; cobj->setBackgroundSpriteFrameForState(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setBackgroundSpriteFrameForState",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlButton:setBackgroundSpriteFrameForState",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -3433,13 +3432,13 @@ int lua_cocos2dx_extension_ControlButton_setBackgroundSpriteForState(lua_State* ok &= luaval_to_object(tolua_S, 2, "cc.Scale9Sprite",&arg0); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.ControlButton:setBackgroundSpriteForState"); if(!ok) return 0; cobj->setBackgroundSpriteForState(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setBackgroundSpriteForState",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlButton:setBackgroundSpriteForState",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -3479,13 +3478,13 @@ int lua_cocos2dx_extension_ControlButton_setScaleRatio(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ControlButton:setScaleRatio"); if(!ok) return 0; cobj->setScaleRatio(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setScaleRatio",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlButton:setScaleRatio",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3531,7 +3530,7 @@ int lua_cocos2dx_extension_ControlButton_setBackgroundSprite(lua_State* tolua_S) cobj->setBackgroundSprite(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setBackgroundSprite",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlButton:setBackgroundSprite",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3575,7 +3574,7 @@ int lua_cocos2dx_extension_ControlButton_getTitleLabel(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Node",(cocos2d::Node*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTitleLabel",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlButton:getTitleLabel",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3619,7 +3618,7 @@ int lua_cocos2dx_extension_ControlButton_getPreferredSize(lua_State* tolua_S) size_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPreferredSize",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlButton:getPreferredSize",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3663,7 +3662,7 @@ int lua_cocos2dx_extension_ControlButton_getVerticalMargin(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getVerticalMargin",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlButton:getVerticalMargin",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3703,14 +3702,14 @@ int lua_cocos2dx_extension_ControlButton_getTitleLabelForState(lua_State* tolua_ { cocos2d::extension::Control::State arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.ControlButton:getTitleLabelForState"); if(!ok) return 0; cocos2d::Node* ret = cobj->getTitleLabelForState(arg0); object_to_luaval(tolua_S, "cc.Node",(cocos2d::Node*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTitleLabelForState",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlButton:getTitleLabelForState",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3751,15 +3750,15 @@ int lua_cocos2dx_extension_ControlButton_setMargins(lua_State* tolua_S) int arg0; int arg1; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.ControlButton:setMargins"); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.ControlButton:setMargins"); if(!ok) return 0; cobj->setMargins(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setMargins",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlButton:setMargins",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -3800,15 +3799,15 @@ int lua_cocos2dx_extension_ControlButton_setTitleBMFontForState(lua_State* tolua std::string arg0; cocos2d::extension::Control::State arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.ControlButton:setTitleBMFontForState"); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.ControlButton:setTitleBMFontForState"); if(!ok) return 0; cobj->setTitleBMFontForState(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTitleBMFontForState",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlButton:setTitleBMFontForState",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -3848,14 +3847,14 @@ int lua_cocos2dx_extension_ControlButton_getTitleBMFontForState(lua_State* tolua { cocos2d::extension::Control::State arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.ControlButton:getTitleBMFontForState"); if(!ok) return 0; const std::string& ret = cobj->getTitleBMFontForState(arg0); tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTitleBMFontForState",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlButton:getTitleBMFontForState",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3899,7 +3898,7 @@ int lua_cocos2dx_extension_ControlButton_getZoomOnTouchDown(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getZoomOnTouchDown",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlButton:getZoomOnTouchDown",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3939,14 +3938,14 @@ int lua_cocos2dx_extension_ControlButton_getTitleForState(lua_State* tolua_S) { cocos2d::extension::Control::State arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.ControlButton:getTitleForState"); if(!ok) return 0; std::string ret = cobj->getTitleForState(arg0); tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTitleForState",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlButton:getTitleForState",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4014,13 +4013,13 @@ int lua_cocos2dx_extension_ControlButton_create(lua_State* tolua_S) if (argc == 3) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.ControlButton:create"); if (!ok) { break; } std::string arg1; - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.ControlButton:create"); if (!ok) { break; } double arg2; - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.ControlButton:create"); if (!ok) { break; } cocos2d::extension::ControlButton* ret = cocos2d::extension::ControlButton::create(arg0, arg1, arg2); object_to_luaval(tolua_S, "cc.ControlButton",(cocos2d::extension::ControlButton*)ret); @@ -4028,7 +4027,7 @@ int lua_cocos2dx_extension_ControlButton_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.ControlButton:create",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -4125,13 +4124,13 @@ int lua_cocos2dx_extension_ControlHuePicker_setEnabled(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.ControlHuePicker:setEnabled"); if(!ok) return 0; cobj->setEnabled(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setEnabled",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlHuePicker:setEnabled",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4174,14 +4173,14 @@ int lua_cocos2dx_extension_ControlHuePicker_initWithTargetAndPos(lua_State* tolu ok &= luaval_to_object(tolua_S, 2, "cc.Node",&arg0); - ok &= luaval_to_vec2(tolua_S, 3, &arg1); + ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.ControlHuePicker:initWithTargetAndPos"); if(!ok) return 0; bool ret = cobj->initWithTargetAndPos(arg0, arg1); tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "initWithTargetAndPos",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlHuePicker:initWithTargetAndPos",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -4221,13 +4220,13 @@ int lua_cocos2dx_extension_ControlHuePicker_setHue(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ControlHuePicker:setHue"); if(!ok) return 0; cobj->setHue(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setHue",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlHuePicker:setHue",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4271,7 +4270,7 @@ int lua_cocos2dx_extension_ControlHuePicker_getStartPos(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getStartPos",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlHuePicker:getStartPos",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4315,7 +4314,7 @@ int lua_cocos2dx_extension_ControlHuePicker_getHue(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getHue",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlHuePicker:getHue",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4359,7 +4358,7 @@ int lua_cocos2dx_extension_ControlHuePicker_getSlider(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Sprite",(cocos2d::Sprite*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getSlider",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlHuePicker:getSlider",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4405,7 +4404,7 @@ int lua_cocos2dx_extension_ControlHuePicker_setBackground(lua_State* tolua_S) cobj->setBackground(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setBackground",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlHuePicker:setBackground",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4445,13 +4444,13 @@ int lua_cocos2dx_extension_ControlHuePicker_setHuePercentage(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ControlHuePicker:setHuePercentage"); if(!ok) return 0; cobj->setHuePercentage(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setHuePercentage",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlHuePicker:setHuePercentage",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4495,7 +4494,7 @@ int lua_cocos2dx_extension_ControlHuePicker_getBackground(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Sprite",(cocos2d::Sprite*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getBackground",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlHuePicker:getBackground",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4539,7 +4538,7 @@ int lua_cocos2dx_extension_ControlHuePicker_getHuePercentage(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getHuePercentage",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlHuePicker:getHuePercentage",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4585,7 +4584,7 @@ int lua_cocos2dx_extension_ControlHuePicker_setSlider(lua_State* tolua_S) cobj->setSlider(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setSlider",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlHuePicker:setSlider",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4615,14 +4614,14 @@ int lua_cocos2dx_extension_ControlHuePicker_create(lua_State* tolua_S) cocos2d::Node* arg0; cocos2d::Vec2 arg1; ok &= luaval_to_object(tolua_S, 2, "cc.Node",&arg0); - ok &= luaval_to_vec2(tolua_S, 3, &arg1); + ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.ControlHuePicker:create"); if(!ok) return 0; cocos2d::extension::ControlHuePicker* ret = cocos2d::extension::ControlHuePicker::create(arg0, arg1); object_to_luaval(tolua_S, "cc.ControlHuePicker",(cocos2d::extension::ControlHuePicker*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.ControlHuePicker:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -4654,7 +4653,7 @@ int lua_cocos2dx_extension_ControlHuePicker_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.ControlHuePicker"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ControlHuePicker",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlHuePicker:ControlHuePicker",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4730,7 +4729,7 @@ int lua_cocos2dx_extension_ControlSaturationBrightnessPicker_getShadow(lua_State object_to_luaval(tolua_S, "cc.Sprite",(cocos2d::Sprite*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getShadow",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlSaturationBrightnessPicker:getShadow",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4773,14 +4772,14 @@ int lua_cocos2dx_extension_ControlSaturationBrightnessPicker_initWithTargetAndPo ok &= luaval_to_object(tolua_S, 2, "cc.Node",&arg0); - ok &= luaval_to_vec2(tolua_S, 3, &arg1); + ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.ControlSaturationBrightnessPicker:initWithTargetAndPos"); if(!ok) return 0; bool ret = cobj->initWithTargetAndPos(arg0, arg1); tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "initWithTargetAndPos",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlSaturationBrightnessPicker:initWithTargetAndPos",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -4824,7 +4823,7 @@ int lua_cocos2dx_extension_ControlSaturationBrightnessPicker_getStartPos(lua_Sta vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getStartPos",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlSaturationBrightnessPicker:getStartPos",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4868,7 +4867,7 @@ int lua_cocos2dx_extension_ControlSaturationBrightnessPicker_getOverlay(lua_Stat object_to_luaval(tolua_S, "cc.Sprite",(cocos2d::Sprite*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getOverlay",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlSaturationBrightnessPicker:getOverlay",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4908,13 +4907,13 @@ int lua_cocos2dx_extension_ControlSaturationBrightnessPicker_setEnabled(lua_Stat { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.ControlSaturationBrightnessPicker:setEnabled"); if(!ok) return 0; cobj->setEnabled(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setEnabled",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlSaturationBrightnessPicker:setEnabled",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4958,7 +4957,7 @@ int lua_cocos2dx_extension_ControlSaturationBrightnessPicker_getSlider(lua_State object_to_luaval(tolua_S, "cc.Sprite",(cocos2d::Sprite*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getSlider",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlSaturationBrightnessPicker:getSlider",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -5002,7 +5001,7 @@ int lua_cocos2dx_extension_ControlSaturationBrightnessPicker_getBackground(lua_S object_to_luaval(tolua_S, "cc.Sprite",(cocos2d::Sprite*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getBackground",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlSaturationBrightnessPicker:getBackground",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -5046,7 +5045,7 @@ int lua_cocos2dx_extension_ControlSaturationBrightnessPicker_getSaturation(lua_S tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getSaturation",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlSaturationBrightnessPicker:getSaturation",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -5090,7 +5089,7 @@ int lua_cocos2dx_extension_ControlSaturationBrightnessPicker_getBrightness(lua_S tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getBrightness",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlSaturationBrightnessPicker:getBrightness",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -5120,14 +5119,14 @@ int lua_cocos2dx_extension_ControlSaturationBrightnessPicker_create(lua_State* t cocos2d::Node* arg0; cocos2d::Vec2 arg1; ok &= luaval_to_object(tolua_S, 2, "cc.Node",&arg0); - ok &= luaval_to_vec2(tolua_S, 3, &arg1); + ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.ControlSaturationBrightnessPicker:create"); if(!ok) return 0; cocos2d::extension::ControlSaturationBrightnessPicker* ret = cocos2d::extension::ControlSaturationBrightnessPicker::create(arg0, arg1); object_to_luaval(tolua_S, "cc.ControlSaturationBrightnessPicker",(cocos2d::extension::ControlSaturationBrightnessPicker*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.ControlSaturationBrightnessPicker:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -5159,7 +5158,7 @@ int lua_cocos2dx_extension_ControlSaturationBrightnessPicker_constructor(lua_Sta toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.ControlSaturationBrightnessPicker"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ControlSaturationBrightnessPicker",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlSaturationBrightnessPicker:ControlSaturationBrightnessPicker",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -5229,13 +5228,13 @@ int lua_cocos2dx_extension_ControlColourPicker_setEnabled(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.ControlColourPicker:setEnabled"); if(!ok) return 0; cobj->setEnabled(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setEnabled",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlColourPicker:setEnabled",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5279,7 +5278,7 @@ int lua_cocos2dx_extension_ControlColourPicker_getHuePicker(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.ControlHuePicker",(cocos2d::extension::ControlHuePicker*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getHuePicker",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlColourPicker:getHuePicker",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -5319,13 +5318,13 @@ int lua_cocos2dx_extension_ControlColourPicker_setColor(lua_State* tolua_S) { cocos2d::Color3B arg0; - ok &= luaval_to_color3b(tolua_S, 2, &arg0); + ok &= luaval_to_color3b(tolua_S, 2, &arg0, "cc.ControlColourPicker:setColor"); if(!ok) return 0; cobj->setColor(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setColor",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlColourPicker:setColor",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5368,13 +5367,13 @@ int lua_cocos2dx_extension_ControlColourPicker_hueSliderValueChanged(lua_State* ok &= luaval_to_object(tolua_S, 2, "cc.Ref",&arg0); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.ControlColourPicker:hueSliderValueChanged"); if(!ok) return 0; cobj->hueSliderValueChanged(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "hueSliderValueChanged",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlColourPicker:hueSliderValueChanged",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -5418,7 +5417,7 @@ int lua_cocos2dx_extension_ControlColourPicker_getcolourPicker(lua_State* tolua_ object_to_luaval(tolua_S, "cc.ControlSaturationBrightnessPicker",(cocos2d::extension::ControlSaturationBrightnessPicker*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getcolourPicker",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlColourPicker:getcolourPicker",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -5464,7 +5463,7 @@ int lua_cocos2dx_extension_ControlColourPicker_setBackground(lua_State* tolua_S) cobj->setBackground(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setBackground",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlColourPicker:setBackground",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5508,7 +5507,7 @@ int lua_cocos2dx_extension_ControlColourPicker_init(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "init",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlColourPicker:init",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -5554,7 +5553,7 @@ int lua_cocos2dx_extension_ControlColourPicker_setcolourPicker(lua_State* tolua_ cobj->setcolourPicker(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setcolourPicker",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlColourPicker:setcolourPicker",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5597,13 +5596,13 @@ int lua_cocos2dx_extension_ControlColourPicker_colourSliderValueChanged(lua_Stat ok &= luaval_to_object(tolua_S, 2, "cc.Ref",&arg0); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.ControlColourPicker:colourSliderValueChanged"); if(!ok) return 0; cobj->colourSliderValueChanged(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "colourSliderValueChanged",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlColourPicker:colourSliderValueChanged",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -5649,7 +5648,7 @@ int lua_cocos2dx_extension_ControlColourPicker_setHuePicker(lua_State* tolua_S) cobj->setHuePicker(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setHuePicker",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlColourPicker:setHuePicker",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5693,7 +5692,7 @@ int lua_cocos2dx_extension_ControlColourPicker_getBackground(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Sprite",(cocos2d::Sprite*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getBackground",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlColourPicker:getBackground",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -5726,7 +5725,7 @@ int lua_cocos2dx_extension_ControlColourPicker_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.ControlColourPicker",(cocos2d::extension::ControlColourPicker*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.ControlColourPicker:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -5758,7 +5757,7 @@ int lua_cocos2dx_extension_ControlColourPicker_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.ControlColourPicker"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ControlColourPicker",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlColourPicker:ControlColourPicker",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -5830,13 +5829,13 @@ int lua_cocos2dx_extension_ControlPotentiometer_setPreviousLocation(lua_State* t { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.ControlPotentiometer:setPreviousLocation"); if(!ok) return 0; cobj->setPreviousLocation(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setPreviousLocation",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlPotentiometer:setPreviousLocation",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5876,13 +5875,13 @@ int lua_cocos2dx_extension_ControlPotentiometer_setValue(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ControlPotentiometer:setValue"); if(!ok) return 0; cobj->setValue(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setValue",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlPotentiometer:setValue",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5926,7 +5925,7 @@ int lua_cocos2dx_extension_ControlPotentiometer_getProgressTimer(lua_State* tolu object_to_luaval(tolua_S, "cc.ProgressTimer",(cocos2d::ProgressTimer*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getProgressTimer",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlPotentiometer:getProgressTimer",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -5970,7 +5969,7 @@ int lua_cocos2dx_extension_ControlPotentiometer_getMaximumValue(lua_State* tolua tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getMaximumValue",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlPotentiometer:getMaximumValue",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -6013,20 +6012,20 @@ int lua_cocos2dx_extension_ControlPotentiometer_angleInDegreesBetweenLineFromPoi cocos2d::Vec2 arg2; cocos2d::Vec2 arg3; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.ControlPotentiometer:angleInDegreesBetweenLineFromPoint_toPoint_toLineFromPoint_toPoint"); - ok &= luaval_to_vec2(tolua_S, 3, &arg1); + ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.ControlPotentiometer:angleInDegreesBetweenLineFromPoint_toPoint_toLineFromPoint_toPoint"); - ok &= luaval_to_vec2(tolua_S, 4, &arg2); + ok &= luaval_to_vec2(tolua_S, 4, &arg2, "cc.ControlPotentiometer:angleInDegreesBetweenLineFromPoint_toPoint_toLineFromPoint_toPoint"); - ok &= luaval_to_vec2(tolua_S, 5, &arg3); + ok &= luaval_to_vec2(tolua_S, 5, &arg3, "cc.ControlPotentiometer:angleInDegreesBetweenLineFromPoint_toPoint_toLineFromPoint_toPoint"); if(!ok) return 0; double ret = cobj->angleInDegreesBetweenLineFromPoint_toPoint_toLineFromPoint_toPoint(arg0, arg1, arg2, arg3); tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "angleInDegreesBetweenLineFromPoint_toPoint_toLineFromPoint_toPoint",argc, 4); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlPotentiometer:angleInDegreesBetweenLineFromPoint_toPoint_toLineFromPoint_toPoint",argc, 4); return 0; #if COCOS2D_DEBUG >= 1 @@ -6066,13 +6065,13 @@ int lua_cocos2dx_extension_ControlPotentiometer_potentiometerBegan(lua_State* to { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.ControlPotentiometer:potentiometerBegan"); if(!ok) return 0; cobj->potentiometerBegan(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "potentiometerBegan",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlPotentiometer:potentiometerBegan",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -6112,13 +6111,13 @@ int lua_cocos2dx_extension_ControlPotentiometer_setMaximumValue(lua_State* tolua { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ControlPotentiometer:setMaximumValue"); if(!ok) return 0; cobj->setMaximumValue(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setMaximumValue",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlPotentiometer:setMaximumValue",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -6162,7 +6161,7 @@ int lua_cocos2dx_extension_ControlPotentiometer_getMinimumValue(lua_State* tolua tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getMinimumValue",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlPotentiometer:getMinimumValue",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -6208,7 +6207,7 @@ int lua_cocos2dx_extension_ControlPotentiometer_setThumbSprite(lua_State* tolua_ cobj->setThumbSprite(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setThumbSprite",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlPotentiometer:setThumbSprite",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -6252,7 +6251,7 @@ int lua_cocos2dx_extension_ControlPotentiometer_getValue(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getValue",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlPotentiometer:getValue",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -6296,7 +6295,7 @@ int lua_cocos2dx_extension_ControlPotentiometer_getPreviousLocation(lua_State* t vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPreviousLocation",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlPotentiometer:getPreviousLocation",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -6337,16 +6336,16 @@ int lua_cocos2dx_extension_ControlPotentiometer_distanceBetweenPointAndPoint(lua cocos2d::Vec2 arg0; cocos2d::Vec2 arg1; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.ControlPotentiometer:distanceBetweenPointAndPoint"); - ok &= luaval_to_vec2(tolua_S, 3, &arg1); + ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.ControlPotentiometer:distanceBetweenPointAndPoint"); if(!ok) return 0; double ret = cobj->distanceBetweenPointAndPoint(arg0, arg1); tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "distanceBetweenPointAndPoint",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlPotentiometer:distanceBetweenPointAndPoint",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -6386,13 +6385,13 @@ int lua_cocos2dx_extension_ControlPotentiometer_potentiometerEnded(lua_State* to { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.ControlPotentiometer:potentiometerEnded"); if(!ok) return 0; cobj->potentiometerEnded(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "potentiometerEnded",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlPotentiometer:potentiometerEnded",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -6438,7 +6437,7 @@ int lua_cocos2dx_extension_ControlPotentiometer_setProgressTimer(lua_State* tolu cobj->setProgressTimer(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setProgressTimer",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlPotentiometer:setProgressTimer",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -6478,13 +6477,13 @@ int lua_cocos2dx_extension_ControlPotentiometer_setMinimumValue(lua_State* tolua { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ControlPotentiometer:setMinimumValue"); if(!ok) return 0; cobj->setMinimumValue(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setMinimumValue",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlPotentiometer:setMinimumValue",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -6528,7 +6527,7 @@ int lua_cocos2dx_extension_ControlPotentiometer_getThumbSprite(lua_State* tolua_ object_to_luaval(tolua_S, "cc.Sprite",(cocos2d::Sprite*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getThumbSprite",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlPotentiometer:getThumbSprite",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -6581,7 +6580,7 @@ int lua_cocos2dx_extension_ControlPotentiometer_initWithTrackSprite_ProgressTime tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "initWithTrackSprite_ProgressTimer_ThumbSprite",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlPotentiometer:initWithTrackSprite_ProgressTimer_ThumbSprite",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 @@ -6621,13 +6620,13 @@ int lua_cocos2dx_extension_ControlPotentiometer_potentiometerMoved(lua_State* to { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.ControlPotentiometer:potentiometerMoved"); if(!ok) return 0; cobj->potentiometerMoved(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "potentiometerMoved",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlPotentiometer:potentiometerMoved",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -6657,16 +6656,16 @@ int lua_cocos2dx_extension_ControlPotentiometer_create(lua_State* tolua_S) const char* arg0; const char* arg1; const char* arg2; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); - std::string arg1_tmp; ok &= luaval_to_std_string(tolua_S, 3, &arg1_tmp); arg1 = arg1_tmp.c_str(); - std::string arg2_tmp; ok &= luaval_to_std_string(tolua_S, 4, &arg2_tmp); arg2 = arg2_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.ControlPotentiometer:create"); arg0 = arg0_tmp.c_str(); + std::string arg1_tmp; ok &= luaval_to_std_string(tolua_S, 3, &arg1_tmp, "cc.ControlPotentiometer:create"); arg1 = arg1_tmp.c_str(); + std::string arg2_tmp; ok &= luaval_to_std_string(tolua_S, 4, &arg2_tmp, "cc.ControlPotentiometer:create"); arg2 = arg2_tmp.c_str(); if(!ok) return 0; cocos2d::extension::ControlPotentiometer* ret = cocos2d::extension::ControlPotentiometer::create(arg0, arg1, arg2); object_to_luaval(tolua_S, "cc.ControlPotentiometer",(cocos2d::extension::ControlPotentiometer*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.ControlPotentiometer:create",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -6698,7 +6697,7 @@ int lua_cocos2dx_extension_ControlPotentiometer_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.ControlPotentiometer"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ControlPotentiometer",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlPotentiometer:ControlPotentiometer",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -6781,7 +6780,7 @@ int lua_cocos2dx_extension_ControlSlider_getSelectedThumbSprite(lua_State* tolua object_to_luaval(tolua_S, "cc.Sprite",(cocos2d::Sprite*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getSelectedThumbSprite",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlSlider:getSelectedThumbSprite",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -6828,7 +6827,7 @@ int lua_cocos2dx_extension_ControlSlider_locationFromTouch(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "locationFromTouch",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlSlider:locationFromTouch",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -6874,7 +6873,7 @@ int lua_cocos2dx_extension_ControlSlider_setSelectedThumbSprite(lua_State* tolua cobj->setSelectedThumbSprite(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setSelectedThumbSprite",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlSlider:setSelectedThumbSprite",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -6920,7 +6919,7 @@ int lua_cocos2dx_extension_ControlSlider_setProgressSprite(lua_State* tolua_S) cobj->setProgressSprite(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setProgressSprite",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlSlider:setProgressSprite",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -6964,7 +6963,7 @@ int lua_cocos2dx_extension_ControlSlider_getMaximumAllowedValue(lua_State* tolua tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getMaximumAllowedValue",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlSlider:getMaximumAllowedValue",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -7008,7 +7007,7 @@ int lua_cocos2dx_extension_ControlSlider_getMinimumAllowedValue(lua_State* tolua tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getMinimumAllowedValue",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlSlider:getMinimumAllowedValue",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -7052,7 +7051,7 @@ int lua_cocos2dx_extension_ControlSlider_getMinimumValue(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getMinimumValue",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlSlider:getMinimumValue",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -7098,7 +7097,7 @@ int lua_cocos2dx_extension_ControlSlider_setThumbSprite(lua_State* tolua_S) cobj->setThumbSprite(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setThumbSprite",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlSlider:setThumbSprite",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -7138,13 +7137,13 @@ int lua_cocos2dx_extension_ControlSlider_setMinimumValue(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ControlSlider:setMinimumValue"); if(!ok) return 0; cobj->setMinimumValue(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setMinimumValue",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlSlider:setMinimumValue",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -7184,13 +7183,13 @@ int lua_cocos2dx_extension_ControlSlider_setMinimumAllowedValue(lua_State* tolua { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ControlSlider:setMinimumAllowedValue"); if(!ok) return 0; cobj->setMinimumAllowedValue(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setMinimumAllowedValue",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlSlider:setMinimumAllowedValue",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -7230,13 +7229,13 @@ int lua_cocos2dx_extension_ControlSlider_setEnabled(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.ControlSlider:setEnabled"); if(!ok) return 0; cobj->setEnabled(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setEnabled",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlSlider:setEnabled",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -7276,13 +7275,13 @@ int lua_cocos2dx_extension_ControlSlider_setValue(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ControlSlider:setValue"); if(!ok) return 0; cobj->setValue(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setValue",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlSlider:setValue",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -7322,13 +7321,13 @@ int lua_cocos2dx_extension_ControlSlider_setMaximumValue(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ControlSlider:setMaximumValue"); if(!ok) return 0; cobj->setMaximumValue(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setMaximumValue",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlSlider:setMaximumValue",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -7371,7 +7370,7 @@ int lua_cocos2dx_extension_ControlSlider_needsLayout(lua_State* tolua_S) cobj->needsLayout(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "needsLayout",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlSlider:needsLayout",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -7415,7 +7414,7 @@ int lua_cocos2dx_extension_ControlSlider_getBackgroundSprite(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Sprite",(cocos2d::Sprite*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getBackgroundSprite",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlSlider:getBackgroundSprite",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -7490,7 +7489,7 @@ int lua_cocos2dx_extension_ControlSlider_initWithSprites(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "initWithSprites",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlSlider:initWithSprites",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 @@ -7534,7 +7533,7 @@ int lua_cocos2dx_extension_ControlSlider_getMaximumValue(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getMaximumValue",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlSlider:getMaximumValue",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -7581,7 +7580,7 @@ int lua_cocos2dx_extension_ControlSlider_isTouchInside(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isTouchInside",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlSlider:isTouchInside",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -7625,7 +7624,7 @@ int lua_cocos2dx_extension_ControlSlider_getValue(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getValue",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlSlider:getValue",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -7669,7 +7668,7 @@ int lua_cocos2dx_extension_ControlSlider_getThumbSprite(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Sprite",(cocos2d::Sprite*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getThumbSprite",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlSlider:getThumbSprite",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -7713,7 +7712,7 @@ int lua_cocos2dx_extension_ControlSlider_getProgressSprite(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Sprite",(cocos2d::Sprite*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getProgressSprite",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlSlider:getProgressSprite",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -7759,7 +7758,7 @@ int lua_cocos2dx_extension_ControlSlider_setBackgroundSprite(lua_State* tolua_S) cobj->setBackgroundSprite(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setBackgroundSprite",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlSlider:setBackgroundSprite",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -7799,13 +7798,13 @@ int lua_cocos2dx_extension_ControlSlider_setMaximumAllowedValue(lua_State* tolua { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ControlSlider:setMaximumAllowedValue"); if(!ok) return 0; cobj->setMaximumAllowedValue(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setMaximumAllowedValue",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlSlider:setMaximumAllowedValue",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -7853,13 +7852,13 @@ int lua_cocos2dx_extension_ControlSlider_create(lua_State* tolua_S) if (argc == 3) { const char* arg0; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.ControlSlider:create"); arg0 = arg0_tmp.c_str(); if (!ok) { break; } const char* arg1; - std::string arg1_tmp; ok &= luaval_to_std_string(tolua_S, 3, &arg1_tmp); arg1 = arg1_tmp.c_str(); + std::string arg1_tmp; ok &= luaval_to_std_string(tolua_S, 3, &arg1_tmp, "cc.ControlSlider:create"); arg1 = arg1_tmp.c_str(); if (!ok) { break; } const char* arg2; - std::string arg2_tmp; ok &= luaval_to_std_string(tolua_S, 4, &arg2_tmp); arg2 = arg2_tmp.c_str(); + std::string arg2_tmp; ok &= luaval_to_std_string(tolua_S, 4, &arg2_tmp, "cc.ControlSlider:create"); arg2 = arg2_tmp.c_str(); if (!ok) { break; } cocos2d::extension::ControlSlider* ret = cocos2d::extension::ControlSlider::create(arg0, arg1, arg2); object_to_luaval(tolua_S, "cc.ControlSlider",(cocos2d::extension::ControlSlider*)ret); @@ -7872,16 +7871,16 @@ int lua_cocos2dx_extension_ControlSlider_create(lua_State* tolua_S) if (argc == 4) { const char* arg0; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.ControlSlider:create"); arg0 = arg0_tmp.c_str(); if (!ok) { break; } const char* arg1; - std::string arg1_tmp; ok &= luaval_to_std_string(tolua_S, 3, &arg1_tmp); arg1 = arg1_tmp.c_str(); + std::string arg1_tmp; ok &= luaval_to_std_string(tolua_S, 3, &arg1_tmp, "cc.ControlSlider:create"); arg1 = arg1_tmp.c_str(); if (!ok) { break; } const char* arg2; - std::string arg2_tmp; ok &= luaval_to_std_string(tolua_S, 4, &arg2_tmp); arg2 = arg2_tmp.c_str(); + std::string arg2_tmp; ok &= luaval_to_std_string(tolua_S, 4, &arg2_tmp, "cc.ControlSlider:create"); arg2 = arg2_tmp.c_str(); if (!ok) { break; } const char* arg3; - std::string arg3_tmp; ok &= luaval_to_std_string(tolua_S, 5, &arg3_tmp); arg3 = arg3_tmp.c_str(); + std::string arg3_tmp; ok &= luaval_to_std_string(tolua_S, 5, &arg3_tmp, "cc.ControlSlider:create"); arg3 = arg3_tmp.c_str(); if (!ok) { break; } cocos2d::extension::ControlSlider* ret = cocos2d::extension::ControlSlider::create(arg0, arg1, arg2, arg3); object_to_luaval(tolua_S, "cc.ControlSlider",(cocos2d::extension::ControlSlider*)ret); @@ -7911,7 +7910,7 @@ int lua_cocos2dx_extension_ControlSlider_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 4); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.ControlSlider:create",argc, 4); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -7943,7 +7942,7 @@ int lua_cocos2dx_extension_ControlSlider_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.ControlSlider"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ControlSlider",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlSlider:ControlSlider",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -8033,7 +8032,7 @@ int lua_cocos2dx_extension_ControlStepper_setMinusSprite(lua_State* tolua_S) cobj->setMinusSprite(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setMinusSprite",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlStepper:setMinusSprite",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -8077,7 +8076,7 @@ int lua_cocos2dx_extension_ControlStepper_getMinusLabel(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Label",(cocos2d::Label*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getMinusLabel",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlStepper:getMinusLabel",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -8117,13 +8116,13 @@ int lua_cocos2dx_extension_ControlStepper_setWraps(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.ControlStepper:setWraps"); if(!ok) return 0; cobj->setWraps(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setWraps",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlStepper:setWraps",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -8167,7 +8166,7 @@ int lua_cocos2dx_extension_ControlStepper_isContinuous(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isContinuous",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlStepper:isContinuous",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -8211,7 +8210,7 @@ int lua_cocos2dx_extension_ControlStepper_getMinusSprite(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Sprite",(cocos2d::Sprite*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getMinusSprite",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlStepper:getMinusSprite",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -8251,13 +8250,13 @@ int lua_cocos2dx_extension_ControlStepper_updateLayoutUsingTouchLocation(lua_Sta { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.ControlStepper:updateLayoutUsingTouchLocation"); if(!ok) return 0; cobj->updateLayoutUsingTouchLocation(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "updateLayoutUsingTouchLocation",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlStepper:updateLayoutUsingTouchLocation",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -8298,15 +8297,15 @@ int lua_cocos2dx_extension_ControlStepper_setValueWithSendingEvent(lua_State* to double arg0; bool arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ControlStepper:setValueWithSendingEvent"); - ok &= luaval_to_boolean(tolua_S, 3,&arg1); + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "cc.ControlStepper:setValueWithSendingEvent"); if(!ok) return 0; cobj->setValueWithSendingEvent(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setValueWithSendingEvent",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlStepper:setValueWithSendingEvent",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -8350,7 +8349,7 @@ int lua_cocos2dx_extension_ControlStepper_getPlusLabel(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Label",(cocos2d::Label*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPlusLabel",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlStepper:getPlusLabel",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -8393,7 +8392,7 @@ int lua_cocos2dx_extension_ControlStepper_stopAutorepeat(lua_State* tolua_S) cobj->stopAutorepeat(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "stopAutorepeat",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlStepper:stopAutorepeat",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -8433,13 +8432,13 @@ int lua_cocos2dx_extension_ControlStepper_setMinimumValue(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ControlStepper:setMinimumValue"); if(!ok) return 0; cobj->setMinimumValue(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setMinimumValue",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlStepper:setMinimumValue",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -8483,7 +8482,7 @@ int lua_cocos2dx_extension_ControlStepper_getPlusSprite(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Sprite",(cocos2d::Sprite*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPlusSprite",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlStepper:getPlusSprite",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -8529,7 +8528,7 @@ int lua_cocos2dx_extension_ControlStepper_setPlusSprite(lua_State* tolua_S) cobj->setPlusSprite(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setPlusSprite",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlStepper:setPlusSprite",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -8575,7 +8574,7 @@ int lua_cocos2dx_extension_ControlStepper_setMinusLabel(lua_State* tolua_S) cobj->setMinusLabel(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setMinusLabel",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlStepper:setMinusLabel",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -8615,13 +8614,13 @@ int lua_cocos2dx_extension_ControlStepper_setValue(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ControlStepper:setValue"); if(!ok) return 0; cobj->setValue(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setValue",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlStepper:setValue",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -8661,13 +8660,13 @@ int lua_cocos2dx_extension_ControlStepper_setStepValue(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ControlStepper:setStepValue"); if(!ok) return 0; cobj->setStepValue(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setStepValue",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlStepper:setStepValue",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -8707,13 +8706,13 @@ int lua_cocos2dx_extension_ControlStepper_setMaximumValue(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ControlStepper:setMaximumValue"); if(!ok) return 0; cobj->setMaximumValue(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setMaximumValue",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlStepper:setMaximumValue",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -8753,13 +8752,13 @@ int lua_cocos2dx_extension_ControlStepper_update(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ControlStepper:update"); if(!ok) return 0; cobj->update(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "update",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlStepper:update",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -8802,7 +8801,7 @@ int lua_cocos2dx_extension_ControlStepper_startAutorepeat(lua_State* tolua_S) cobj->startAutorepeat(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "startAutorepeat",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlStepper:startAutorepeat",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -8852,7 +8851,7 @@ int lua_cocos2dx_extension_ControlStepper_initWithMinusSpriteAndPlusSprite(lua_S tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "initWithMinusSpriteAndPlusSprite",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlStepper:initWithMinusSpriteAndPlusSprite",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -8896,7 +8895,7 @@ int lua_cocos2dx_extension_ControlStepper_getValue(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getValue",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlStepper:getValue",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -8942,7 +8941,7 @@ int lua_cocos2dx_extension_ControlStepper_setPlusLabel(lua_State* tolua_S) cobj->setPlusLabel(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setPlusLabel",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlStepper:setPlusLabel",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -8979,7 +8978,7 @@ int lua_cocos2dx_extension_ControlStepper_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.ControlStepper",(cocos2d::extension::ControlStepper*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.ControlStepper:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -9011,7 +9010,7 @@ int lua_cocos2dx_extension_ControlStepper_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.ControlStepper"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ControlStepper",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlStepper:ControlStepper",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -9093,13 +9092,13 @@ int lua_cocos2dx_extension_ControlSwitch_setEnabled(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.ControlSwitch:setEnabled"); if(!ok) return 0; cobj->setEnabled(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setEnabled",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlSwitch:setEnabled",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -9133,7 +9132,7 @@ int lua_cocos2dx_extension_ControlSwitch_setOn(lua_State* tolua_S) do{ if (argc == 1) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.ControlSwitch:setOn"); if (!ok) { break; } cobj->setOn(arg0); @@ -9144,11 +9143,11 @@ int lua_cocos2dx_extension_ControlSwitch_setOn(lua_State* tolua_S) do{ if (argc == 2) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.ControlSwitch:setOn"); if (!ok) { break; } bool arg1; - ok &= luaval_to_boolean(tolua_S, 3,&arg1); + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "cc.ControlSwitch:setOn"); if (!ok) { break; } cobj->setOn(arg0, arg1); @@ -9156,7 +9155,7 @@ int lua_cocos2dx_extension_ControlSwitch_setOn(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setOn",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlSwitch:setOn",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -9200,7 +9199,7 @@ int lua_cocos2dx_extension_ControlSwitch_isOn(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isOn",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlSwitch:isOn",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -9287,7 +9286,7 @@ int lua_cocos2dx_extension_ControlSwitch_initWithMaskSprite(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "initWithMaskSprite",argc, 4); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlSwitch:initWithMaskSprite",argc, 4); return 0; #if COCOS2D_DEBUG >= 1 @@ -9331,7 +9330,7 @@ int lua_cocos2dx_extension_ControlSwitch_hasMoved(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "hasMoved",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlSwitch:hasMoved",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -9378,7 +9377,7 @@ int lua_cocos2dx_extension_ControlSwitch_locationFromTouch(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "locationFromTouch",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlSwitch:locationFromTouch",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -9452,7 +9451,7 @@ int lua_cocos2dx_extension_ControlSwitch_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 6); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.ControlSwitch:create",argc, 6); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -9484,7 +9483,7 @@ int lua_cocos2dx_extension_ControlSwitch_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.ControlSwitch"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ControlSwitch",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ControlSwitch:ControlSwitch",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -9555,7 +9554,7 @@ int lua_cocos2dx_extension_ScrollView_isClippingToBounds(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isClippingToBounds",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ScrollView:isClippingToBounds",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -9601,7 +9600,7 @@ int lua_cocos2dx_extension_ScrollView_setContainer(lua_State* tolua_S) cobj->setContainer(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setContainer",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ScrollView:setContainer",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -9650,7 +9649,7 @@ int lua_cocos2dx_extension_ScrollView_onTouchEnded(lua_State* tolua_S) cobj->onTouchEnded(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "onTouchEnded",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ScrollView:onTouchEnded",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -9691,15 +9690,15 @@ int lua_cocos2dx_extension_ScrollView_setContentOffsetInDuration(lua_State* tolu cocos2d::Vec2 arg0; double arg1; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.ScrollView:setContentOffsetInDuration"); - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.ScrollView:setContentOffsetInDuration"); if(!ok) return 0; cobj->setContentOffsetInDuration(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setContentOffsetInDuration",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ScrollView:setContentOffsetInDuration",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -9740,15 +9739,15 @@ int lua_cocos2dx_extension_ScrollView_setZoomScaleInDuration(lua_State* tolua_S) double arg0; double arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ScrollView:setZoomScaleInDuration"); - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.ScrollView:setZoomScaleInDuration"); if(!ok) return 0; cobj->setZoomScaleInDuration(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setZoomScaleInDuration",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ScrollView:setZoomScaleInDuration",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -9758,7 +9757,7 @@ int lua_cocos2dx_extension_ScrollView_setZoomScaleInDuration(lua_State* tolua_S) return 0; } -int lua_cocos2dx_extension_ScrollView_setBounceable(lua_State* tolua_S) +int lua_cocos2dx_extension_ScrollView_updateTweenAction(lua_State* tolua_S) { int argc = 0; cocos2d::extension::ScrollView* cobj = nullptr; @@ -9778,7 +9777,56 @@ int lua_cocos2dx_extension_ScrollView_setBounceable(lua_State* tolua_S) #if COCOS2D_DEBUG >= 1 if (!cobj) { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_extension_ScrollView_setBounceable'", nullptr); + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_extension_ScrollView_updateTweenAction'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 2) + { + double arg0; + std::string arg1; + + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ScrollView:updateTweenAction"); + + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.ScrollView:updateTweenAction"); + if(!ok) + return 0; + cobj->updateTweenAction(arg0, arg1); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ScrollView:updateTweenAction",argc, 2); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_extension_ScrollView_updateTweenAction'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_extension_ScrollView_setMaxScale(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::extension::ScrollView* 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.ScrollView",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::extension::ScrollView*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_extension_ScrollView_setMaxScale'", nullptr); return 0; } #endif @@ -9786,20 +9834,20 @@ int lua_cocos2dx_extension_ScrollView_setBounceable(lua_State* tolua_S) argc = lua_gettop(tolua_S)-1; if (argc == 1) { - bool arg0; + double arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ScrollView:setMaxScale"); if(!ok) return 0; - cobj->setBounceable(arg0); + cobj->setMaxScale(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setBounceable",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ScrollView:setMaxScale",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_extension_ScrollView_setBounceable'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_extension_ScrollView_setMaxScale'.",&tolua_err); #endif return 0; @@ -9838,7 +9886,7 @@ int lua_cocos2dx_extension_ScrollView_getDirection(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDirection",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ScrollView:getDirection",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -9882,7 +9930,7 @@ int lua_cocos2dx_extension_ScrollView_getContainer(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Node",(cocos2d::Node*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getContainer",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ScrollView:getContainer",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -9892,7 +9940,7 @@ int lua_cocos2dx_extension_ScrollView_getContainer(lua_State* tolua_S) return 0; } -int lua_cocos2dx_extension_ScrollView_updateTweenAction(lua_State* tolua_S) +int lua_cocos2dx_extension_ScrollView_setMinScale(lua_State* tolua_S) { int argc = 0; cocos2d::extension::ScrollView* cobj = nullptr; @@ -9912,31 +9960,28 @@ int lua_cocos2dx_extension_ScrollView_updateTweenAction(lua_State* tolua_S) #if COCOS2D_DEBUG >= 1 if (!cobj) { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_extension_ScrollView_updateTweenAction'", nullptr); + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_extension_ScrollView_setMinScale'", nullptr); return 0; } #endif argc = lua_gettop(tolua_S)-1; - if (argc == 2) + if (argc == 1) { double arg0; - std::string arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); - - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ScrollView:setMinScale"); if(!ok) return 0; - cobj->updateTweenAction(arg0, arg1); + cobj->setMinScale(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "updateTweenAction",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ScrollView:setMinScale",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_extension_ScrollView_updateTweenAction'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_extension_ScrollView_setMinScale'.",&tolua_err); #endif return 0; @@ -9975,7 +10020,7 @@ int lua_cocos2dx_extension_ScrollView_getZoomScale(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getZoomScale",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ScrollView:getZoomScale",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -10018,7 +10063,7 @@ int lua_cocos2dx_extension_ScrollView_updateInset(lua_State* tolua_S) cobj->updateInset(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "updateInset",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ScrollView:updateInset",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -10058,7 +10103,7 @@ int lua_cocos2dx_extension_ScrollView_initWithViewSize(lua_State* tolua_S) { cocos2d::Size arg0; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.ScrollView:initWithViewSize"); if(!ok) return 0; bool ret = cobj->initWithViewSize(arg0); @@ -10070,7 +10115,7 @@ int lua_cocos2dx_extension_ScrollView_initWithViewSize(lua_State* tolua_S) cocos2d::Size arg0; cocos2d::Node* arg1; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.ScrollView:initWithViewSize"); ok &= luaval_to_object(tolua_S, 3, "cc.Node",&arg1); if(!ok) @@ -10079,7 +10124,7 @@ int lua_cocos2dx_extension_ScrollView_initWithViewSize(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "initWithViewSize",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ScrollView:initWithViewSize",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -10125,7 +10170,7 @@ int lua_cocos2dx_extension_ScrollView_pause(lua_State* tolua_S) cobj->pause(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "pause",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ScrollView:pause",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -10165,13 +10210,13 @@ int lua_cocos2dx_extension_ScrollView_setDirection(lua_State* tolua_S) { cocos2d::extension::ScrollView::Direction arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.ScrollView:setDirection"); if(!ok) return 0; cobj->setDirection(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setDirection",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ScrollView:setDirection",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -10215,7 +10260,7 @@ int lua_cocos2dx_extension_ScrollView_init(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "init",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ScrollView:init",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -10255,7 +10300,7 @@ int lua_cocos2dx_extension_ScrollView_setContentOffset(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.ScrollView:setContentOffset"); if(!ok) return 0; cobj->setContentOffset(arg0); @@ -10266,15 +10311,15 @@ int lua_cocos2dx_extension_ScrollView_setContentOffset(lua_State* tolua_S) cocos2d::Vec2 arg0; bool arg1; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.ScrollView:setContentOffset"); - ok &= luaval_to_boolean(tolua_S, 3,&arg1); + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "cc.ScrollView:setContentOffset"); if(!ok) return 0; cobj->setContentOffset(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setContentOffset",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ScrollView:setContentOffset",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -10318,7 +10363,7 @@ int lua_cocos2dx_extension_ScrollView_isDragging(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isDragging",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ScrollView:isDragging",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -10362,7 +10407,7 @@ int lua_cocos2dx_extension_ScrollView_isTouchEnabled(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isTouchEnabled",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ScrollView:isTouchEnabled",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -10406,7 +10451,7 @@ int lua_cocos2dx_extension_ScrollView_isBounceable(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isBounceable",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ScrollView:isBounceable",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -10446,13 +10491,13 @@ int lua_cocos2dx_extension_ScrollView_setTouchEnabled(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.ScrollView:setTouchEnabled"); if(!ok) return 0; cobj->setTouchEnabled(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTouchEnabled",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ScrollView:setTouchEnabled",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -10501,7 +10546,7 @@ int lua_cocos2dx_extension_ScrollView_onTouchMoved(lua_State* tolua_S) cobj->onTouchMoved(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "onTouchMoved",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ScrollView:onTouchMoved",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -10545,7 +10590,7 @@ int lua_cocos2dx_extension_ScrollView_getContentOffset(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getContentOffset",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ScrollView:getContentOffset",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -10591,7 +10636,7 @@ int lua_cocos2dx_extension_ScrollView_resume(lua_State* tolua_S) cobj->resume(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "resume",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ScrollView:resume",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -10631,13 +10676,13 @@ int lua_cocos2dx_extension_ScrollView_setClippingToBounds(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.ScrollView:setClippingToBounds"); if(!ok) return 0; cobj->setClippingToBounds(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setClippingToBounds",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ScrollView:setClippingToBounds",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -10677,13 +10722,13 @@ int lua_cocos2dx_extension_ScrollView_setViewSize(lua_State* tolua_S) { cocos2d::Size arg0; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.ScrollView:setViewSize"); if(!ok) return 0; cobj->setViewSize(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setViewSize",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ScrollView:setViewSize",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -10732,7 +10777,7 @@ int lua_cocos2dx_extension_ScrollView_onTouchCancelled(lua_State* tolua_S) cobj->onTouchCancelled(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "onTouchCancelled",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ScrollView:onTouchCancelled",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -10776,7 +10821,7 @@ int lua_cocos2dx_extension_ScrollView_getViewSize(lua_State* tolua_S) size_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getViewSize",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ScrollView:getViewSize",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -10820,7 +10865,7 @@ int lua_cocos2dx_extension_ScrollView_maxContainerOffset(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "maxContainerOffset",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ScrollView:maxContainerOffset",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -10830,6 +10875,52 @@ int lua_cocos2dx_extension_ScrollView_maxContainerOffset(lua_State* tolua_S) return 0; } +int lua_cocos2dx_extension_ScrollView_setBounceable(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::extension::ScrollView* 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.ScrollView",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::extension::ScrollView*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_extension_ScrollView_setBounceable'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + bool arg0; + + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.ScrollView:setBounceable"); + if(!ok) + return 0; + cobj->setBounceable(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ScrollView:setBounceable",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_extension_ScrollView_setBounceable'.",&tolua_err); +#endif + + return 0; +} int lua_cocos2dx_extension_ScrollView_onTouchBegan(lua_State* tolua_S) { int argc = 0; @@ -10870,7 +10961,7 @@ int lua_cocos2dx_extension_ScrollView_onTouchBegan(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "onTouchBegan",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ScrollView:onTouchBegan",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -10914,7 +11005,7 @@ int lua_cocos2dx_extension_ScrollView_isTouchMoved(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isTouchMoved",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ScrollView:isTouchMoved",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -10961,7 +11052,7 @@ int lua_cocos2dx_extension_ScrollView_isNodeVisible(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isNodeVisible",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ScrollView:isNodeVisible",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -11005,7 +11096,7 @@ int lua_cocos2dx_extension_ScrollView_minContainerOffset(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "minContainerOffset",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ScrollView:minContainerOffset",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -11039,11 +11130,11 @@ int lua_cocos2dx_extension_ScrollView_setZoomScale(lua_State* tolua_S) do{ if (argc == 2) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ScrollView:setZoomScale"); if (!ok) { break; } bool arg1; - ok &= luaval_to_boolean(tolua_S, 3,&arg1); + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "cc.ScrollView:setZoomScale"); if (!ok) { break; } cobj->setZoomScale(arg0, arg1); @@ -11054,7 +11145,7 @@ int lua_cocos2dx_extension_ScrollView_setZoomScale(lua_State* tolua_S) do{ if (argc == 1) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.ScrollView:setZoomScale"); if (!ok) { break; } cobj->setZoomScale(arg0); @@ -11062,7 +11153,7 @@ int lua_cocos2dx_extension_ScrollView_setZoomScale(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setZoomScale",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ScrollView:setZoomScale",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -11101,7 +11192,7 @@ int lua_cocos2dx_extension_ScrollView_create(lua_State* tolua_S) if (argc == 1) { cocos2d::Size arg0; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.ScrollView:create"); if (!ok) { break; } cocos2d::extension::ScrollView* ret = cocos2d::extension::ScrollView::create(arg0); object_to_luaval(tolua_S, "cc.ScrollView",(cocos2d::extension::ScrollView*)ret); @@ -11114,7 +11205,7 @@ int lua_cocos2dx_extension_ScrollView_create(lua_State* tolua_S) if (argc == 2) { cocos2d::Size arg0; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.ScrollView:create"); if (!ok) { break; } cocos2d::Node* arg1; ok &= luaval_to_object(tolua_S, 3, "cc.Node",&arg1); @@ -11125,7 +11216,7 @@ int lua_cocos2dx_extension_ScrollView_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.ScrollView:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -11157,7 +11248,7 @@ int lua_cocos2dx_extension_ScrollView_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.ScrollView"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ScrollView",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ScrollView:ScrollView",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -11185,10 +11276,11 @@ int lua_register_cocos2dx_extension_ScrollView(lua_State* tolua_S) tolua_function(tolua_S,"onTouchEnded",lua_cocos2dx_extension_ScrollView_onTouchEnded); tolua_function(tolua_S,"setContentOffsetInDuration",lua_cocos2dx_extension_ScrollView_setContentOffsetInDuration); tolua_function(tolua_S,"setZoomScaleInDuration",lua_cocos2dx_extension_ScrollView_setZoomScaleInDuration); - tolua_function(tolua_S,"setBounceable",lua_cocos2dx_extension_ScrollView_setBounceable); + tolua_function(tolua_S,"updateTweenAction",lua_cocos2dx_extension_ScrollView_updateTweenAction); + tolua_function(tolua_S,"setMaxScale",lua_cocos2dx_extension_ScrollView_setMaxScale); tolua_function(tolua_S,"getDirection",lua_cocos2dx_extension_ScrollView_getDirection); tolua_function(tolua_S,"getContainer",lua_cocos2dx_extension_ScrollView_getContainer); - tolua_function(tolua_S,"updateTweenAction",lua_cocos2dx_extension_ScrollView_updateTweenAction); + tolua_function(tolua_S,"setMinScale",lua_cocos2dx_extension_ScrollView_setMinScale); tolua_function(tolua_S,"getZoomScale",lua_cocos2dx_extension_ScrollView_getZoomScale); tolua_function(tolua_S,"updateInset",lua_cocos2dx_extension_ScrollView_updateInset); tolua_function(tolua_S,"initWithViewSize",lua_cocos2dx_extension_ScrollView_initWithViewSize); @@ -11208,6 +11300,7 @@ int lua_register_cocos2dx_extension_ScrollView(lua_State* tolua_S) tolua_function(tolua_S,"onTouchCancelled",lua_cocos2dx_extension_ScrollView_onTouchCancelled); tolua_function(tolua_S,"getViewSize",lua_cocos2dx_extension_ScrollView_getViewSize); tolua_function(tolua_S,"maxContainerOffset",lua_cocos2dx_extension_ScrollView_maxContainerOffset); + tolua_function(tolua_S,"setBounceable",lua_cocos2dx_extension_ScrollView_setBounceable); tolua_function(tolua_S,"onTouchBegan",lua_cocos2dx_extension_ScrollView_onTouchBegan); tolua_function(tolua_S,"isTouchMoved",lua_cocos2dx_extension_ScrollView_isTouchMoved); tolua_function(tolua_S,"isNodeVisible",lua_cocos2dx_extension_ScrollView_isNodeVisible); @@ -11254,7 +11347,7 @@ int lua_cocos2dx_extension_TableViewCell_reset(lua_State* tolua_S) cobj->reset(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "reset",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TableViewCell:reset",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -11298,7 +11391,7 @@ int lua_cocos2dx_extension_TableViewCell_getIdx(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getIdx",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TableViewCell:getIdx",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -11338,13 +11431,13 @@ int lua_cocos2dx_extension_TableViewCell_setIdx(lua_State* tolua_S) { ssize_t arg0; - ok &= luaval_to_ssize(tolua_S, 2, &arg0); + ok &= luaval_to_ssize(tolua_S, 2, &arg0, "cc.TableViewCell:setIdx"); if(!ok) return 0; cobj->setIdx(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setIdx",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TableViewCell:setIdx",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -11377,7 +11470,7 @@ int lua_cocos2dx_extension_TableViewCell_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.TableViewCell",(cocos2d::extension::TableViewCell*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.TableViewCell:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -11409,7 +11502,7 @@ int lua_cocos2dx_extension_TableViewCell_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.TableViewCell"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "TableViewCell",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TableViewCell:TableViewCell",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -11473,13 +11566,13 @@ int lua_cocos2dx_extension_TableView_updateCellAtIndex(lua_State* tolua_S) { ssize_t arg0; - ok &= luaval_to_ssize(tolua_S, 2, &arg0); + ok &= luaval_to_ssize(tolua_S, 2, &arg0, "cc.TableView:updateCellAtIndex"); if(!ok) return 0; cobj->updateCellAtIndex(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "updateCellAtIndex",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TableView:updateCellAtIndex",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -11519,13 +11612,13 @@ int lua_cocos2dx_extension_TableView_setVerticalFillOrder(lua_State* tolua_S) { cocos2d::extension::TableView::VerticalFillOrder arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.TableView:setVerticalFillOrder"); if(!ok) return 0; cobj->setVerticalFillOrder(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setVerticalFillOrder",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TableView:setVerticalFillOrder",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -11571,7 +11664,7 @@ int lua_cocos2dx_extension_TableView_scrollViewDidZoom(lua_State* tolua_S) cobj->scrollViewDidZoom(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "scrollViewDidZoom",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TableView:scrollViewDidZoom",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -11614,7 +11707,7 @@ int lua_cocos2dx_extension_TableView__updateContentSize(lua_State* tolua_S) cobj->_updateContentSize(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "_updateContentSize",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TableView:_updateContentSize",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -11658,7 +11751,7 @@ int lua_cocos2dx_extension_TableView_getVerticalFillOrder(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getVerticalFillOrder",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TableView:getVerticalFillOrder",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -11698,13 +11791,13 @@ int lua_cocos2dx_extension_TableView_removeCellAtIndex(lua_State* tolua_S) { ssize_t arg0; - ok &= luaval_to_ssize(tolua_S, 2, &arg0); + ok &= luaval_to_ssize(tolua_S, 2, &arg0, "cc.TableView:removeCellAtIndex"); if(!ok) return 0; cobj->removeCellAtIndex(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeCellAtIndex",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TableView:removeCellAtIndex",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -11744,7 +11837,7 @@ int lua_cocos2dx_extension_TableView_initWithViewSize(lua_State* tolua_S) { cocos2d::Size arg0; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.TableView:initWithViewSize"); if(!ok) return 0; bool ret = cobj->initWithViewSize(arg0); @@ -11756,7 +11849,7 @@ int lua_cocos2dx_extension_TableView_initWithViewSize(lua_State* tolua_S) cocos2d::Size arg0; cocos2d::Node* arg1; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.TableView:initWithViewSize"); ok &= luaval_to_object(tolua_S, 3, "cc.Node",&arg1); if(!ok) @@ -11765,7 +11858,7 @@ int lua_cocos2dx_extension_TableView_initWithViewSize(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "initWithViewSize",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TableView:initWithViewSize",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -11811,7 +11904,7 @@ int lua_cocos2dx_extension_TableView_scrollViewDidScroll(lua_State* tolua_S) cobj->scrollViewDidScroll(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "scrollViewDidScroll",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TableView:scrollViewDidScroll",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -11854,7 +11947,7 @@ int lua_cocos2dx_extension_TableView_reloadData(lua_State* tolua_S) cobj->reloadData(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "reloadData",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TableView:reloadData",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -11894,13 +11987,13 @@ int lua_cocos2dx_extension_TableView_insertCellAtIndex(lua_State* tolua_S) { ssize_t arg0; - ok &= luaval_to_ssize(tolua_S, 2, &arg0); + ok &= luaval_to_ssize(tolua_S, 2, &arg0, "cc.TableView:insertCellAtIndex"); if(!ok) return 0; cobj->insertCellAtIndex(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "insertCellAtIndex",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TableView:insertCellAtIndex",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -11940,14 +12033,14 @@ int lua_cocos2dx_extension_TableView_cellAtIndex(lua_State* tolua_S) { ssize_t arg0; - ok &= luaval_to_ssize(tolua_S, 2, &arg0); + ok &= luaval_to_ssize(tolua_S, 2, &arg0, "cc.TableView:cellAtIndex"); if(!ok) return 0; cocos2d::extension::TableViewCell* ret = cobj->cellAtIndex(arg0); object_to_luaval(tolua_S, "cc.TableViewCell",(cocos2d::extension::TableViewCell*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cellAtIndex",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TableView:cellAtIndex",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -11991,7 +12084,7 @@ int lua_cocos2dx_extension_TableView_dequeueCell(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.TableViewCell",(cocos2d::extension::TableViewCell*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "dequeueCell",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TableView:dequeueCell",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -12025,7 +12118,7 @@ int lua_cocos2dx_extension_TableView_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.TableView"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "TableView",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TableView:TableView",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -12101,7 +12194,7 @@ int lua_cocos2dx_extension_EditBox_getText(lua_State* tolua_S) tolua_pushstring(tolua_S,(const char*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getText",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EditBox:getText",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -12141,13 +12234,13 @@ int lua_cocos2dx_extension_EditBox_setPlaceholderFontName(lua_State* tolua_S) { const char* arg0; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.EditBox:setPlaceholderFontName"); arg0 = arg0_tmp.c_str(); if(!ok) return 0; cobj->setPlaceholderFontName(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setPlaceholderFontName",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EditBox:setPlaceholderFontName",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -12191,7 +12284,7 @@ int lua_cocos2dx_extension_EditBox_getPlaceHolder(lua_State* tolua_S) tolua_pushstring(tolua_S,(const char*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPlaceHolder",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EditBox:getPlaceHolder",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -12231,13 +12324,13 @@ int lua_cocos2dx_extension_EditBox_setFontName(lua_State* tolua_S) { const char* arg0; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.EditBox:setFontName"); arg0 = arg0_tmp.c_str(); if(!ok) return 0; cobj->setFontName(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setFontName",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EditBox:setFontName",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -12277,13 +12370,13 @@ int lua_cocos2dx_extension_EditBox_setPlaceholderFontSize(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.EditBox:setPlaceholderFontSize"); if(!ok) return 0; cobj->setPlaceholderFontSize(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setPlaceholderFontSize",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EditBox:setPlaceholderFontSize",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -12323,13 +12416,13 @@ int lua_cocos2dx_extension_EditBox_setInputMode(lua_State* tolua_S) { cocos2d::extension::EditBox::InputMode arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.EditBox:setInputMode"); if(!ok) return 0; cobj->setInputMode(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setInputMode",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EditBox:setInputMode",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -12369,13 +12462,13 @@ int lua_cocos2dx_extension_EditBox_setPlaceholderFontColor(lua_State* tolua_S) { cocos2d::Color3B arg0; - ok &= luaval_to_color3b(tolua_S, 2, &arg0); + ok &= luaval_to_color3b(tolua_S, 2, &arg0, "cc.EditBox:setPlaceholderFontColor"); if(!ok) return 0; cobj->setPlaceholderFontColor(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setPlaceholderFontColor",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EditBox:setPlaceholderFontColor",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -12415,13 +12508,13 @@ int lua_cocos2dx_extension_EditBox_setFontColor(lua_State* tolua_S) { cocos2d::Color3B arg0; - ok &= luaval_to_color3b(tolua_S, 2, &arg0); + ok &= luaval_to_color3b(tolua_S, 2, &arg0, "cc.EditBox:setFontColor"); if(!ok) return 0; cobj->setFontColor(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setFontColor",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EditBox:setFontColor",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -12462,15 +12555,15 @@ int lua_cocos2dx_extension_EditBox_setPlaceholderFont(lua_State* tolua_S) const char* arg0; int arg1; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.EditBox:setPlaceholderFont"); arg0 = arg0_tmp.c_str(); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.EditBox:setPlaceholderFont"); if(!ok) return 0; cobj->setPlaceholderFont(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setPlaceholderFont",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EditBox:setPlaceholderFont",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -12510,13 +12603,13 @@ int lua_cocos2dx_extension_EditBox_setFontSize(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.EditBox:setFontSize"); if(!ok) return 0; cobj->setFontSize(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setFontSize",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EditBox:setFontSize",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -12557,7 +12650,7 @@ int lua_cocos2dx_extension_EditBox_initWithSizeAndBackgroundSprite(lua_State* to cocos2d::Size arg0; cocos2d::extension::Scale9Sprite* arg1; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.EditBox:initWithSizeAndBackgroundSprite"); ok &= luaval_to_object(tolua_S, 3, "cc.Scale9Sprite",&arg1); if(!ok) @@ -12566,7 +12659,7 @@ int lua_cocos2dx_extension_EditBox_initWithSizeAndBackgroundSprite(lua_State* to tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "initWithSizeAndBackgroundSprite",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EditBox:initWithSizeAndBackgroundSprite",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -12606,13 +12699,13 @@ int lua_cocos2dx_extension_EditBox_setPlaceHolder(lua_State* tolua_S) { const char* arg0; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.EditBox:setPlaceHolder"); arg0 = arg0_tmp.c_str(); if(!ok) return 0; cobj->setPlaceHolder(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setPlaceHolder",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EditBox:setPlaceHolder",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -12652,13 +12745,13 @@ int lua_cocos2dx_extension_EditBox_setReturnType(lua_State* tolua_S) { cocos2d::extension::EditBox::KeyboardReturnType arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.EditBox:setReturnType"); if(!ok) return 0; cobj->setReturnType(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setReturnType",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EditBox:setReturnType",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -12698,13 +12791,13 @@ int lua_cocos2dx_extension_EditBox_setInputFlag(lua_State* tolua_S) { cocos2d::extension::EditBox::InputFlag arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.EditBox:setInputFlag"); if(!ok) return 0; cobj->setInputFlag(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setInputFlag",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EditBox:setInputFlag",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -12748,7 +12841,7 @@ int lua_cocos2dx_extension_EditBox_getMaxLength(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getMaxLength",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EditBox:getMaxLength",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -12788,13 +12881,13 @@ int lua_cocos2dx_extension_EditBox_setText(lua_State* tolua_S) { const char* arg0; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.EditBox:setText"); arg0 = arg0_tmp.c_str(); if(!ok) return 0; cobj->setText(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setText",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EditBox:setText",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -12834,13 +12927,13 @@ int lua_cocos2dx_extension_EditBox_setMaxLength(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.EditBox:setMaxLength"); if(!ok) return 0; cobj->setMaxLength(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setMaxLength",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EditBox:setMaxLength",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -12881,15 +12974,15 @@ int lua_cocos2dx_extension_EditBox_setFont(lua_State* tolua_S) const char* arg0; int arg1; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.EditBox:setFont"); arg0 = arg0_tmp.c_str(); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.EditBox:setFont"); if(!ok) return 0; cobj->setFont(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setFont",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EditBox:setFont",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -12918,7 +13011,7 @@ int lua_cocos2dx_extension_EditBox_create(lua_State* tolua_S) { cocos2d::Size arg0; cocos2d::extension::Scale9Sprite* arg1; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.EditBox:create"); ok &= luaval_to_object(tolua_S, 3, "cc.Scale9Sprite",&arg1); if(!ok) return 0; @@ -12931,7 +13024,7 @@ int lua_cocos2dx_extension_EditBox_create(lua_State* tolua_S) cocos2d::Size arg0; cocos2d::extension::Scale9Sprite* arg1; cocos2d::extension::Scale9Sprite* arg2; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.EditBox:create"); ok &= luaval_to_object(tolua_S, 3, "cc.Scale9Sprite",&arg1); ok &= luaval_to_object(tolua_S, 4, "cc.Scale9Sprite",&arg2); if(!ok) @@ -12946,7 +13039,7 @@ int lua_cocos2dx_extension_EditBox_create(lua_State* tolua_S) cocos2d::extension::Scale9Sprite* arg1; cocos2d::extension::Scale9Sprite* arg2; cocos2d::extension::Scale9Sprite* arg3; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.EditBox:create"); ok &= luaval_to_object(tolua_S, 3, "cc.Scale9Sprite",&arg1); ok &= luaval_to_object(tolua_S, 4, "cc.Scale9Sprite",&arg2); ok &= luaval_to_object(tolua_S, 5, "cc.Scale9Sprite",&arg3); @@ -12956,7 +13049,7 @@ int lua_cocos2dx_extension_EditBox_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.EditBox",(cocos2d::extension::EditBox*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.EditBox:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -12988,7 +13081,7 @@ int lua_cocos2dx_extension_EditBox_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.EditBox"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "EditBox",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EditBox:EditBox",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -13067,13 +13160,13 @@ int lua_cocos2dx_extension_AssetsManager_setStoragePath(lua_State* tolua_S) { const char* arg0; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.AssetsManager:setStoragePath"); arg0 = arg0_tmp.c_str(); if(!ok) return 0; cobj->setStoragePath(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setStoragePath",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.AssetsManager:setStoragePath",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -13113,13 +13206,13 @@ int lua_cocos2dx_extension_AssetsManager_setPackageUrl(lua_State* tolua_S) { const char* arg0; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.AssetsManager:setPackageUrl"); arg0 = arg0_tmp.c_str(); if(!ok) return 0; cobj->setPackageUrl(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setPackageUrl",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.AssetsManager:setPackageUrl",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -13163,7 +13256,7 @@ int lua_cocos2dx_extension_AssetsManager_checkUpdate(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "checkUpdate",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.AssetsManager:checkUpdate",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -13207,7 +13300,7 @@ int lua_cocos2dx_extension_AssetsManager_getStoragePath(lua_State* tolua_S) tolua_pushstring(tolua_S,(const char*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getStoragePath",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.AssetsManager:getStoragePath",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -13250,7 +13343,7 @@ int lua_cocos2dx_extension_AssetsManager_update(lua_State* tolua_S) cobj->update(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "update",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.AssetsManager:update",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -13290,13 +13383,13 @@ int lua_cocos2dx_extension_AssetsManager_setConnectionTimeout(lua_State* tolua_S { unsigned int arg0; - ok &= luaval_to_uint32(tolua_S, 2,&arg0); + ok &= luaval_to_uint32(tolua_S, 2,&arg0, "cc.AssetsManager:setConnectionTimeout"); if(!ok) return 0; cobj->setConnectionTimeout(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setConnectionTimeout",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.AssetsManager:setConnectionTimeout",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -13336,13 +13429,13 @@ int lua_cocos2dx_extension_AssetsManager_setVersionFileUrl(lua_State* tolua_S) { const char* arg0; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.AssetsManager:setVersionFileUrl"); arg0 = arg0_tmp.c_str(); if(!ok) return 0; cobj->setVersionFileUrl(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setVersionFileUrl",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.AssetsManager:setVersionFileUrl",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -13386,7 +13479,7 @@ int lua_cocos2dx_extension_AssetsManager_getPackageUrl(lua_State* tolua_S) tolua_pushstring(tolua_S,(const char*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPackageUrl",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.AssetsManager:getPackageUrl",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -13430,7 +13523,7 @@ int lua_cocos2dx_extension_AssetsManager_getConnectionTimeout(lua_State* tolua_S tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getConnectionTimeout",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.AssetsManager:getConnectionTimeout",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -13474,7 +13567,7 @@ int lua_cocos2dx_extension_AssetsManager_getVersion(lua_State* tolua_S) tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getVersion",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.AssetsManager:getVersion",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -13518,7 +13611,7 @@ int lua_cocos2dx_extension_AssetsManager_getVersionFileUrl(lua_State* tolua_S) tolua_pushstring(tolua_S,(const char*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getVersionFileUrl",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.AssetsManager:getVersionFileUrl",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -13561,7 +13654,7 @@ int lua_cocos2dx_extension_AssetsManager_deleteVersion(lua_State* tolua_S) cobj->deleteVersion(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "deleteVersion",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.AssetsManager:deleteVersion",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -13594,9 +13687,9 @@ int lua_cocos2dx_extension_AssetsManager_create(lua_State* tolua_S) std::function arg3; std::function arg4; std::function arg5; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); - std::string arg1_tmp; ok &= luaval_to_std_string(tolua_S, 3, &arg1_tmp); arg1 = arg1_tmp.c_str(); - std::string arg2_tmp; ok &= luaval_to_std_string(tolua_S, 4, &arg2_tmp); arg2 = arg2_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.AssetsManager:create"); arg0 = arg0_tmp.c_str(); + std::string arg1_tmp; ok &= luaval_to_std_string(tolua_S, 3, &arg1_tmp, "cc.AssetsManager:create"); arg1 = arg1_tmp.c_str(); + std::string arg2_tmp; ok &= luaval_to_std_string(tolua_S, 4, &arg2_tmp, "cc.AssetsManager:create"); arg2 = arg2_tmp.c_str(); do { // Lambda binding for lua is not supported. assert(false); @@ -13618,7 +13711,7 @@ int lua_cocos2dx_extension_AssetsManager_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.AssetsManager",(cocos2d::extension::AssetsManager*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 6); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.AssetsManager:create",argc, 6); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -13654,7 +13747,7 @@ int lua_cocos2dx_extension_AssetsManager_constructor(lua_State* tolua_S) { const char* arg0; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.AssetsManager:AssetsManager"); arg0 = arg0_tmp.c_str(); if(!ok) return 0; cobj = new cocos2d::extension::AssetsManager(arg0); @@ -13669,9 +13762,9 @@ int lua_cocos2dx_extension_AssetsManager_constructor(lua_State* tolua_S) const char* arg0; const char* arg1; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.AssetsManager:AssetsManager"); arg0 = arg0_tmp.c_str(); - std::string arg1_tmp; ok &= luaval_to_std_string(tolua_S, 3, &arg1_tmp); arg1 = arg1_tmp.c_str(); + std::string arg1_tmp; ok &= luaval_to_std_string(tolua_S, 3, &arg1_tmp, "cc.AssetsManager:AssetsManager"); arg1 = arg1_tmp.c_str(); if(!ok) return 0; cobj = new cocos2d::extension::AssetsManager(arg0, arg1); @@ -13687,11 +13780,11 @@ int lua_cocos2dx_extension_AssetsManager_constructor(lua_State* tolua_S) const char* arg1; const char* arg2; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.AssetsManager:AssetsManager"); arg0 = arg0_tmp.c_str(); - std::string arg1_tmp; ok &= luaval_to_std_string(tolua_S, 3, &arg1_tmp); arg1 = arg1_tmp.c_str(); + std::string arg1_tmp; ok &= luaval_to_std_string(tolua_S, 3, &arg1_tmp, "cc.AssetsManager:AssetsManager"); arg1 = arg1_tmp.c_str(); - std::string arg2_tmp; ok &= luaval_to_std_string(tolua_S, 4, &arg2_tmp); arg2 = arg2_tmp.c_str(); + std::string arg2_tmp; ok &= luaval_to_std_string(tolua_S, 4, &arg2_tmp, "cc.AssetsManager:AssetsManager"); arg2 = arg2_tmp.c_str(); if(!ok) return 0; cobj = new cocos2d::extension::AssetsManager(arg0, arg1, arg2); @@ -13701,7 +13794,7 @@ int lua_cocos2dx_extension_AssetsManager_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.AssetsManager"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "AssetsManager",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.AssetsManager:AssetsManager",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -13743,2758 +13836,6 @@ int lua_register_cocos2dx_extension_AssetsManager(lua_State* tolua_S) g_typeCast["AssetsManager"] = "cc.AssetsManager"; return 1; } - -int lua_cocos2dx_extension_CCBAnimationManager_moveAnimationsFromNode(lua_State* tolua_S) -{ - int argc = 0; - cocosbuilder::CCBAnimationManager* 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.CCBAnimationManager",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocosbuilder::CCBAnimationManager*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_extension_CCBAnimationManager_moveAnimationsFromNode'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 2) - { - cocos2d::Node* arg0; - cocos2d::Node* arg1; - - ok &= luaval_to_object(tolua_S, 2, "cc.Node",&arg0); - - ok &= luaval_to_object(tolua_S, 3, "cc.Node",&arg1); - if(!ok) - return 0; - cobj->moveAnimationsFromNode(arg0, arg1); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "moveAnimationsFromNode",argc, 2); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_extension_CCBAnimationManager_moveAnimationsFromNode'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_extension_CCBAnimationManager_setAutoPlaySequenceId(lua_State* tolua_S) -{ - int argc = 0; - cocosbuilder::CCBAnimationManager* 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.CCBAnimationManager",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocosbuilder::CCBAnimationManager*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_extension_CCBAnimationManager_setAutoPlaySequenceId'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 1) - { - int arg0; - - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); - if(!ok) - return 0; - cobj->setAutoPlaySequenceId(arg0); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAutoPlaySequenceId",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_extension_CCBAnimationManager_setAutoPlaySequenceId'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_extension_CCBAnimationManager_getDocumentCallbackNames(lua_State* tolua_S) -{ - int argc = 0; - cocosbuilder::CCBAnimationManager* 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.CCBAnimationManager",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocosbuilder::CCBAnimationManager*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_extension_CCBAnimationManager_getDocumentCallbackNames'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - cocos2d::ValueVector& ret = cobj->getDocumentCallbackNames(); - ccvaluevector_to_luaval(tolua_S, ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDocumentCallbackNames",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_extension_CCBAnimationManager_getDocumentCallbackNames'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_extension_CCBAnimationManager_actionForSoundChannel(lua_State* tolua_S) -{ - int argc = 0; - cocosbuilder::CCBAnimationManager* 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.CCBAnimationManager",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocosbuilder::CCBAnimationManager*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_extension_CCBAnimationManager_actionForSoundChannel'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 1) - { - cocosbuilder::CCBSequenceProperty* arg0; - - ok &= luaval_to_object(tolua_S, 2, "cc.CCBSequenceProperty",&arg0); - if(!ok) - return 0; - cocos2d::Sequence* ret = cobj->actionForSoundChannel(arg0); - object_to_luaval(tolua_S, "cc.Sequence",(cocos2d::Sequence*)ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "actionForSoundChannel",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_extension_CCBAnimationManager_actionForSoundChannel'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_extension_CCBAnimationManager_setBaseValue(lua_State* tolua_S) -{ - int argc = 0; - cocosbuilder::CCBAnimationManager* 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.CCBAnimationManager",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocosbuilder::CCBAnimationManager*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_extension_CCBAnimationManager_setBaseValue'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 3) - { - cocos2d::Value arg0; - cocos2d::Node* arg1; - std::string arg2; - - ok &= luaval_to_ccvalue(tolua_S, 2, &arg0); - - ok &= luaval_to_object(tolua_S, 3, "cc.Node",&arg1); - - ok &= luaval_to_std_string(tolua_S, 4,&arg2); - if(!ok) - return 0; - cobj->setBaseValue(arg0, arg1, arg2); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setBaseValue",argc, 3); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_extension_CCBAnimationManager_setBaseValue'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_extension_CCBAnimationManager_getDocumentOutletNodes(lua_State* tolua_S) -{ - int argc = 0; - cocosbuilder::CCBAnimationManager* 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.CCBAnimationManager",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocosbuilder::CCBAnimationManager*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_extension_CCBAnimationManager_getDocumentOutletNodes'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - cocos2d::Vector& ret = cobj->getDocumentOutletNodes(); - ccvector_to_luaval(tolua_S, ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDocumentOutletNodes",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_extension_CCBAnimationManager_getDocumentOutletNodes'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_extension_CCBAnimationManager_getLastCompletedSequenceName(lua_State* tolua_S) -{ - int argc = 0; - cocosbuilder::CCBAnimationManager* 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.CCBAnimationManager",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocosbuilder::CCBAnimationManager*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_extension_CCBAnimationManager_getLastCompletedSequenceName'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - std::string ret = cobj->getLastCompletedSequenceName(); - tolua_pushcppstring(tolua_S,ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getLastCompletedSequenceName",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_extension_CCBAnimationManager_getLastCompletedSequenceName'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_extension_CCBAnimationManager_setRootNode(lua_State* tolua_S) -{ - int argc = 0; - cocosbuilder::CCBAnimationManager* 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.CCBAnimationManager",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocosbuilder::CCBAnimationManager*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_extension_CCBAnimationManager_setRootNode'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 1) - { - cocos2d::Node* arg0; - - ok &= luaval_to_object(tolua_S, 2, "cc.Node",&arg0); - if(!ok) - return 0; - cobj->setRootNode(arg0); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setRootNode",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_extension_CCBAnimationManager_setRootNode'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_extension_CCBAnimationManager_runAnimationsForSequenceNamedTweenDuration(lua_State* tolua_S) -{ - int argc = 0; - cocosbuilder::CCBAnimationManager* 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.CCBAnimationManager",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocosbuilder::CCBAnimationManager*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_extension_CCBAnimationManager_runAnimationsForSequenceNamedTweenDuration'", 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->runAnimationsForSequenceNamedTweenDuration(arg0, arg1); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "runAnimationsForSequenceNamedTweenDuration",argc, 2); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_extension_CCBAnimationManager_runAnimationsForSequenceNamedTweenDuration'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_extension_CCBAnimationManager_addDocumentOutletName(lua_State* tolua_S) -{ - int argc = 0; - cocosbuilder::CCBAnimationManager* 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.CCBAnimationManager",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocosbuilder::CCBAnimationManager*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_extension_CCBAnimationManager_addDocumentOutletName'", 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->addDocumentOutletName(arg0); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addDocumentOutletName",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_extension_CCBAnimationManager_addDocumentOutletName'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_extension_CCBAnimationManager_getSequences(lua_State* tolua_S) -{ - int argc = 0; - cocosbuilder::CCBAnimationManager* 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.CCBAnimationManager",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocosbuilder::CCBAnimationManager*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_extension_CCBAnimationManager_getSequences'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - cocos2d::Vector& ret = cobj->getSequences(); - ccvector_to_luaval(tolua_S, ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getSequences",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_extension_CCBAnimationManager_getSequences'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_extension_CCBAnimationManager_getRootContainerSize(lua_State* tolua_S) -{ - int argc = 0; - cocosbuilder::CCBAnimationManager* 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.CCBAnimationManager",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocosbuilder::CCBAnimationManager*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_extension_CCBAnimationManager_getRootContainerSize'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - const cocos2d::Size& ret = cobj->getRootContainerSize(); - size_to_luaval(tolua_S, ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getRootContainerSize",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_extension_CCBAnimationManager_getRootContainerSize'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_extension_CCBAnimationManager_setDocumentControllerName(lua_State* tolua_S) -{ - int argc = 0; - cocosbuilder::CCBAnimationManager* 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.CCBAnimationManager",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocosbuilder::CCBAnimationManager*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_extension_CCBAnimationManager_setDocumentControllerName'", 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->setDocumentControllerName(arg0); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setDocumentControllerName",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_extension_CCBAnimationManager_setDocumentControllerName'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_extension_CCBAnimationManager_setObject(lua_State* tolua_S) -{ - int argc = 0; - cocosbuilder::CCBAnimationManager* 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.CCBAnimationManager",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocosbuilder::CCBAnimationManager*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_extension_CCBAnimationManager_setObject'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 3) - { - cocos2d::Ref* arg0; - cocos2d::Node* arg1; - std::string arg2; - - ok &= luaval_to_object(tolua_S, 2, "cc.Ref",&arg0); - - ok &= luaval_to_object(tolua_S, 3, "cc.Node",&arg1); - - ok &= luaval_to_std_string(tolua_S, 4,&arg2); - if(!ok) - return 0; - cobj->setObject(arg0, arg1, arg2); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setObject",argc, 3); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_extension_CCBAnimationManager_setObject'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_extension_CCBAnimationManager_getContainerSize(lua_State* tolua_S) -{ - int argc = 0; - cocosbuilder::CCBAnimationManager* 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.CCBAnimationManager",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocosbuilder::CCBAnimationManager*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_extension_CCBAnimationManager_getContainerSize'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 1) - { - cocos2d::Node* arg0; - - ok &= luaval_to_object(tolua_S, 2, "cc.Node",&arg0); - if(!ok) - return 0; - const cocos2d::Size& ret = cobj->getContainerSize(arg0); - size_to_luaval(tolua_S, ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getContainerSize",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_extension_CCBAnimationManager_getContainerSize'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_extension_CCBAnimationManager_actionForCallbackChannel(lua_State* tolua_S) -{ - int argc = 0; - cocosbuilder::CCBAnimationManager* 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.CCBAnimationManager",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocosbuilder::CCBAnimationManager*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_extension_CCBAnimationManager_actionForCallbackChannel'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 1) - { - cocosbuilder::CCBSequenceProperty* arg0; - - ok &= luaval_to_object(tolua_S, 2, "cc.CCBSequenceProperty",&arg0); - if(!ok) - return 0; - cocos2d::Sequence* ret = cobj->actionForCallbackChannel(arg0); - object_to_luaval(tolua_S, "cc.Sequence",(cocos2d::Sequence*)ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "actionForCallbackChannel",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_extension_CCBAnimationManager_actionForCallbackChannel'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_extension_CCBAnimationManager_getDocumentOutletNames(lua_State* tolua_S) -{ - int argc = 0; - cocosbuilder::CCBAnimationManager* 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.CCBAnimationManager",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocosbuilder::CCBAnimationManager*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_extension_CCBAnimationManager_getDocumentOutletNames'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - cocos2d::ValueVector& ret = cobj->getDocumentOutletNames(); - ccvaluevector_to_luaval(tolua_S, ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDocumentOutletNames",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_extension_CCBAnimationManager_getDocumentOutletNames'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_extension_CCBAnimationManager_addDocumentCallbackControlEvents(lua_State* tolua_S) -{ - int argc = 0; - cocosbuilder::CCBAnimationManager* 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.CCBAnimationManager",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocosbuilder::CCBAnimationManager*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_extension_CCBAnimationManager_addDocumentCallbackControlEvents'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 1) - { - cocos2d::extension::Control::EventType arg0; - - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); - if(!ok) - return 0; - cobj->addDocumentCallbackControlEvents(arg0); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addDocumentCallbackControlEvents",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_extension_CCBAnimationManager_addDocumentCallbackControlEvents'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_extension_CCBAnimationManager_init(lua_State* tolua_S) -{ - int argc = 0; - cocosbuilder::CCBAnimationManager* 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.CCBAnimationManager",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocosbuilder::CCBAnimationManager*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_extension_CCBAnimationManager_init'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - bool ret = cobj->init(); - tolua_pushboolean(tolua_S,(bool)ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "init",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_extension_CCBAnimationManager_init'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_extension_CCBAnimationManager_getKeyframeCallbacks(lua_State* tolua_S) -{ - int argc = 0; - cocosbuilder::CCBAnimationManager* 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.CCBAnimationManager",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocosbuilder::CCBAnimationManager*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_extension_CCBAnimationManager_getKeyframeCallbacks'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - cocos2d::ValueVector& ret = cobj->getKeyframeCallbacks(); - ccvaluevector_to_luaval(tolua_S, ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getKeyframeCallbacks",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_extension_CCBAnimationManager_getKeyframeCallbacks'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_extension_CCBAnimationManager_getDocumentCallbackControlEvents(lua_State* tolua_S) -{ - int argc = 0; - cocosbuilder::CCBAnimationManager* 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.CCBAnimationManager",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocosbuilder::CCBAnimationManager*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_extension_CCBAnimationManager_getDocumentCallbackControlEvents'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - cocos2d::ValueVector& ret = cobj->getDocumentCallbackControlEvents(); - ccvaluevector_to_luaval(tolua_S, ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDocumentCallbackControlEvents",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_extension_CCBAnimationManager_getDocumentCallbackControlEvents'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_extension_CCBAnimationManager_setRootContainerSize(lua_State* tolua_S) -{ - int argc = 0; - cocosbuilder::CCBAnimationManager* 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.CCBAnimationManager",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocosbuilder::CCBAnimationManager*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_extension_CCBAnimationManager_setRootContainerSize'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 1) - { - cocos2d::Size arg0; - - ok &= luaval_to_size(tolua_S, 2, &arg0); - if(!ok) - return 0; - cobj->setRootContainerSize(arg0); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setRootContainerSize",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_extension_CCBAnimationManager_setRootContainerSize'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_extension_CCBAnimationManager_runAnimationsForSequenceIdTweenDuration(lua_State* tolua_S) -{ - int argc = 0; - cocosbuilder::CCBAnimationManager* 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.CCBAnimationManager",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocosbuilder::CCBAnimationManager*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_extension_CCBAnimationManager_runAnimationsForSequenceIdTweenDuration'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 2) - { - int arg0; - double arg1; - - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); - - ok &= luaval_to_number(tolua_S, 3,&arg1); - if(!ok) - return 0; - cobj->runAnimationsForSequenceIdTweenDuration(arg0, arg1); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "runAnimationsForSequenceIdTweenDuration",argc, 2); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_extension_CCBAnimationManager_runAnimationsForSequenceIdTweenDuration'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_extension_CCBAnimationManager_getRunningSequenceName(lua_State* tolua_S) -{ - int argc = 0; - cocosbuilder::CCBAnimationManager* 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.CCBAnimationManager",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocosbuilder::CCBAnimationManager*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_extension_CCBAnimationManager_getRunningSequenceName'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - const char* ret = cobj->getRunningSequenceName(); - tolua_pushstring(tolua_S,(const char*)ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getRunningSequenceName",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_extension_CCBAnimationManager_getRunningSequenceName'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_extension_CCBAnimationManager_getAutoPlaySequenceId(lua_State* tolua_S) -{ - int argc = 0; - cocosbuilder::CCBAnimationManager* 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.CCBAnimationManager",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocosbuilder::CCBAnimationManager*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_extension_CCBAnimationManager_getAutoPlaySequenceId'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - int ret = cobj->getAutoPlaySequenceId(); - tolua_pushnumber(tolua_S,(lua_Number)ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAutoPlaySequenceId",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_extension_CCBAnimationManager_getAutoPlaySequenceId'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_extension_CCBAnimationManager_addDocumentCallbackName(lua_State* tolua_S) -{ - int argc = 0; - cocosbuilder::CCBAnimationManager* 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.CCBAnimationManager",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocosbuilder::CCBAnimationManager*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_extension_CCBAnimationManager_addDocumentCallbackName'", 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->addDocumentCallbackName(arg0); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addDocumentCallbackName",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_extension_CCBAnimationManager_addDocumentCallbackName'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_extension_CCBAnimationManager_getRootNode(lua_State* tolua_S) -{ - int argc = 0; - cocosbuilder::CCBAnimationManager* 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.CCBAnimationManager",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocosbuilder::CCBAnimationManager*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_extension_CCBAnimationManager_getRootNode'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - cocos2d::Node* ret = cobj->getRootNode(); - object_to_luaval(tolua_S, "cc.Node",(cocos2d::Node*)ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getRootNode",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_extension_CCBAnimationManager_getRootNode'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_extension_CCBAnimationManager_addDocumentOutletNode(lua_State* tolua_S) -{ - int argc = 0; - cocosbuilder::CCBAnimationManager* 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.CCBAnimationManager",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocosbuilder::CCBAnimationManager*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_extension_CCBAnimationManager_addDocumentOutletNode'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 1) - { - cocos2d::Node* arg0; - - ok &= luaval_to_object(tolua_S, 2, "cc.Node",&arg0); - if(!ok) - return 0; - cobj->addDocumentOutletNode(arg0); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addDocumentOutletNode",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_extension_CCBAnimationManager_addDocumentOutletNode'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_extension_CCBAnimationManager_getSequenceDuration(lua_State* tolua_S) -{ - int argc = 0; - cocosbuilder::CCBAnimationManager* 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.CCBAnimationManager",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocosbuilder::CCBAnimationManager*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_extension_CCBAnimationManager_getSequenceDuration'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - 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) - return 0; - double ret = cobj->getSequenceDuration(arg0); - tolua_pushnumber(tolua_S,(lua_Number)ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getSequenceDuration",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_extension_CCBAnimationManager_getSequenceDuration'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_extension_CCBAnimationManager_addDocumentCallbackNode(lua_State* tolua_S) -{ - int argc = 0; - cocosbuilder::CCBAnimationManager* 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.CCBAnimationManager",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocosbuilder::CCBAnimationManager*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_extension_CCBAnimationManager_addDocumentCallbackNode'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 1) - { - cocos2d::Node* arg0; - - ok &= luaval_to_object(tolua_S, 2, "cc.Node",&arg0); - if(!ok) - return 0; - cobj->addDocumentCallbackNode(arg0); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addDocumentCallbackNode",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_extension_CCBAnimationManager_addDocumentCallbackNode'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_extension_CCBAnimationManager_runAnimationsForSequenceNamed(lua_State* tolua_S) -{ - int argc = 0; - cocosbuilder::CCBAnimationManager* 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.CCBAnimationManager",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocosbuilder::CCBAnimationManager*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_extension_CCBAnimationManager_runAnimationsForSequenceNamed'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - 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) - return 0; - cobj->runAnimationsForSequenceNamed(arg0); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "runAnimationsForSequenceNamed",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_extension_CCBAnimationManager_runAnimationsForSequenceNamed'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_extension_CCBAnimationManager_getSequenceId(lua_State* tolua_S) -{ - int argc = 0; - cocosbuilder::CCBAnimationManager* 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.CCBAnimationManager",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocosbuilder::CCBAnimationManager*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_extension_CCBAnimationManager_getSequenceId'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - 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) - return 0; - int ret = cobj->getSequenceId(arg0); - tolua_pushnumber(tolua_S,(lua_Number)ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getSequenceId",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_extension_CCBAnimationManager_getSequenceId'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_extension_CCBAnimationManager_getDocumentCallbackNodes(lua_State* tolua_S) -{ - int argc = 0; - cocosbuilder::CCBAnimationManager* 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.CCBAnimationManager",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocosbuilder::CCBAnimationManager*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_extension_CCBAnimationManager_getDocumentCallbackNodes'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - cocos2d::Vector& ret = cobj->getDocumentCallbackNodes(); - ccvector_to_luaval(tolua_S, ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDocumentCallbackNodes",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_extension_CCBAnimationManager_getDocumentCallbackNodes'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_extension_CCBAnimationManager_setSequences(lua_State* tolua_S) -{ - int argc = 0; - cocosbuilder::CCBAnimationManager* 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.CCBAnimationManager",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocosbuilder::CCBAnimationManager*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_extension_CCBAnimationManager_setSequences'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 1) - { - cocos2d::Vector arg0; - - ok &= luaval_to_ccvector(tolua_S, 2, &arg0); - if(!ok) - return 0; - cobj->setSequences(arg0); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setSequences",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_extension_CCBAnimationManager_setSequences'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_extension_CCBAnimationManager_debug(lua_State* tolua_S) -{ - int argc = 0; - cocosbuilder::CCBAnimationManager* 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.CCBAnimationManager",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocosbuilder::CCBAnimationManager*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_extension_CCBAnimationManager_debug'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - cobj->debug(); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "debug",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_extension_CCBAnimationManager_debug'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_extension_CCBAnimationManager_getDocumentControllerName(lua_State* tolua_S) -{ - int argc = 0; - cocosbuilder::CCBAnimationManager* 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.CCBAnimationManager",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocosbuilder::CCBAnimationManager*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_extension_CCBAnimationManager_getDocumentControllerName'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - std::string ret = cobj->getDocumentControllerName(); - tolua_pushcppstring(tolua_S,ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDocumentControllerName",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_extension_CCBAnimationManager_getDocumentControllerName'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_extension_CCBAnimationManager_constructor(lua_State* tolua_S) -{ - int argc = 0; - cocosbuilder::CCBAnimationManager* 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 cocosbuilder::CCBAnimationManager(); - cobj->autorelease(); - int ID = (int)cobj->_ID ; - int* luaID = &cobj->_luaID ; - toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.CCBAnimationManager"); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "CCBAnimationManager",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_extension_CCBAnimationManager_constructor'.",&tolua_err); -#endif - - return 0; -} - -static int lua_cocos2dx_extension_CCBAnimationManager_finalize(lua_State* tolua_S) -{ - printf("luabindings: finalizing LUA object (CCBAnimationManager)"); - return 0; -} - -int lua_register_cocos2dx_extension_CCBAnimationManager(lua_State* tolua_S) -{ - tolua_usertype(tolua_S,"cc.CCBAnimationManager"); - tolua_cclass(tolua_S,"CCBAnimationManager","cc.CCBAnimationManager","cc.Ref",nullptr); - - tolua_beginmodule(tolua_S,"CCBAnimationManager"); - tolua_function(tolua_S,"new",lua_cocos2dx_extension_CCBAnimationManager_constructor); - tolua_function(tolua_S,"moveAnimationsFromNode",lua_cocos2dx_extension_CCBAnimationManager_moveAnimationsFromNode); - tolua_function(tolua_S,"setAutoPlaySequenceId",lua_cocos2dx_extension_CCBAnimationManager_setAutoPlaySequenceId); - tolua_function(tolua_S,"getDocumentCallbackNames",lua_cocos2dx_extension_CCBAnimationManager_getDocumentCallbackNames); - tolua_function(tolua_S,"actionForSoundChannel",lua_cocos2dx_extension_CCBAnimationManager_actionForSoundChannel); - tolua_function(tolua_S,"setBaseValue",lua_cocos2dx_extension_CCBAnimationManager_setBaseValue); - tolua_function(tolua_S,"getDocumentOutletNodes",lua_cocos2dx_extension_CCBAnimationManager_getDocumentOutletNodes); - tolua_function(tolua_S,"getLastCompletedSequenceName",lua_cocos2dx_extension_CCBAnimationManager_getLastCompletedSequenceName); - tolua_function(tolua_S,"setRootNode",lua_cocos2dx_extension_CCBAnimationManager_setRootNode); - tolua_function(tolua_S,"runAnimationsForSequenceNamedTweenDuration",lua_cocos2dx_extension_CCBAnimationManager_runAnimationsForSequenceNamedTweenDuration); - tolua_function(tolua_S,"addDocumentOutletName",lua_cocos2dx_extension_CCBAnimationManager_addDocumentOutletName); - tolua_function(tolua_S,"getSequences",lua_cocos2dx_extension_CCBAnimationManager_getSequences); - tolua_function(tolua_S,"getRootContainerSize",lua_cocos2dx_extension_CCBAnimationManager_getRootContainerSize); - tolua_function(tolua_S,"setDocumentControllerName",lua_cocos2dx_extension_CCBAnimationManager_setDocumentControllerName); - tolua_function(tolua_S,"setObject",lua_cocos2dx_extension_CCBAnimationManager_setObject); - tolua_function(tolua_S,"getContainerSize",lua_cocos2dx_extension_CCBAnimationManager_getContainerSize); - tolua_function(tolua_S,"actionForCallbackChannel",lua_cocos2dx_extension_CCBAnimationManager_actionForCallbackChannel); - tolua_function(tolua_S,"getDocumentOutletNames",lua_cocos2dx_extension_CCBAnimationManager_getDocumentOutletNames); - tolua_function(tolua_S,"addDocumentCallbackControlEvents",lua_cocos2dx_extension_CCBAnimationManager_addDocumentCallbackControlEvents); - tolua_function(tolua_S,"init",lua_cocos2dx_extension_CCBAnimationManager_init); - tolua_function(tolua_S,"getKeyframeCallbacks",lua_cocos2dx_extension_CCBAnimationManager_getKeyframeCallbacks); - tolua_function(tolua_S,"getDocumentCallbackControlEvents",lua_cocos2dx_extension_CCBAnimationManager_getDocumentCallbackControlEvents); - tolua_function(tolua_S,"setRootContainerSize",lua_cocos2dx_extension_CCBAnimationManager_setRootContainerSize); - tolua_function(tolua_S,"runAnimationsForSequenceIdTweenDuration",lua_cocos2dx_extension_CCBAnimationManager_runAnimationsForSequenceIdTweenDuration); - tolua_function(tolua_S,"getRunningSequenceName",lua_cocos2dx_extension_CCBAnimationManager_getRunningSequenceName); - tolua_function(tolua_S,"getAutoPlaySequenceId",lua_cocos2dx_extension_CCBAnimationManager_getAutoPlaySequenceId); - tolua_function(tolua_S,"addDocumentCallbackName",lua_cocos2dx_extension_CCBAnimationManager_addDocumentCallbackName); - tolua_function(tolua_S,"getRootNode",lua_cocos2dx_extension_CCBAnimationManager_getRootNode); - tolua_function(tolua_S,"addDocumentOutletNode",lua_cocos2dx_extension_CCBAnimationManager_addDocumentOutletNode); - tolua_function(tolua_S,"getSequenceDuration",lua_cocos2dx_extension_CCBAnimationManager_getSequenceDuration); - tolua_function(tolua_S,"addDocumentCallbackNode",lua_cocos2dx_extension_CCBAnimationManager_addDocumentCallbackNode); - tolua_function(tolua_S,"runAnimationsForSequenceNamed",lua_cocos2dx_extension_CCBAnimationManager_runAnimationsForSequenceNamed); - tolua_function(tolua_S,"getSequenceId",lua_cocos2dx_extension_CCBAnimationManager_getSequenceId); - tolua_function(tolua_S,"getDocumentCallbackNodes",lua_cocos2dx_extension_CCBAnimationManager_getDocumentCallbackNodes); - tolua_function(tolua_S,"setSequences",lua_cocos2dx_extension_CCBAnimationManager_setSequences); - tolua_function(tolua_S,"debug",lua_cocos2dx_extension_CCBAnimationManager_debug); - tolua_function(tolua_S,"getDocumentControllerName",lua_cocos2dx_extension_CCBAnimationManager_getDocumentControllerName); - tolua_endmodule(tolua_S); - std::string typeName = typeid(cocosbuilder::CCBAnimationManager).name(); - g_luaType[typeName] = "cc.CCBAnimationManager"; - g_typeCast["CCBAnimationManager"] = "cc.CCBAnimationManager"; - return 1; -} - -int lua_cocos2dx_extension_CCBReader_addOwnerOutletName(lua_State* tolua_S) -{ - int argc = 0; - cocosbuilder::CCBReader* 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.CCBReader",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocosbuilder::CCBReader*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_extension_CCBReader_addOwnerOutletName'", 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->addOwnerOutletName(arg0); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addOwnerOutletName",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_extension_CCBReader_addOwnerOutletName'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_extension_CCBReader_getOwnerCallbackNames(lua_State* tolua_S) -{ - int argc = 0; - cocosbuilder::CCBReader* 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.CCBReader",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocosbuilder::CCBReader*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_extension_CCBReader_getOwnerCallbackNames'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - cocos2d::ValueVector ret = cobj->getOwnerCallbackNames(); - ccvaluevector_to_luaval(tolua_S, ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getOwnerCallbackNames",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_extension_CCBReader_getOwnerCallbackNames'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_extension_CCBReader_addDocumentCallbackControlEvents(lua_State* tolua_S) -{ - int argc = 0; - cocosbuilder::CCBReader* 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.CCBReader",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocosbuilder::CCBReader*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_extension_CCBReader_addDocumentCallbackControlEvents'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 1) - { - cocos2d::extension::Control::EventType arg0; - - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); - if(!ok) - return 0; - cobj->addDocumentCallbackControlEvents(arg0); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addDocumentCallbackControlEvents",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_extension_CCBReader_addDocumentCallbackControlEvents'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_extension_CCBReader_setCCBRootPath(lua_State* tolua_S) -{ - int argc = 0; - cocosbuilder::CCBReader* 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.CCBReader",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocosbuilder::CCBReader*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_extension_CCBReader_setCCBRootPath'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - 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) - return 0; - cobj->setCCBRootPath(arg0); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setCCBRootPath",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_extension_CCBReader_setCCBRootPath'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_extension_CCBReader_addOwnerOutletNode(lua_State* tolua_S) -{ - int argc = 0; - cocosbuilder::CCBReader* 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.CCBReader",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocosbuilder::CCBReader*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_extension_CCBReader_addOwnerOutletNode'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 1) - { - cocos2d::Node* arg0; - - ok &= luaval_to_object(tolua_S, 2, "cc.Node",&arg0); - if(!ok) - return 0; - cobj->addOwnerOutletNode(arg0); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addOwnerOutletNode",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_extension_CCBReader_addOwnerOutletNode'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_extension_CCBReader_getOwnerCallbackNodes(lua_State* tolua_S) -{ - int argc = 0; - cocosbuilder::CCBReader* 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.CCBReader",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocosbuilder::CCBReader*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_extension_CCBReader_getOwnerCallbackNodes'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - cocos2d::Vector& ret = cobj->getOwnerCallbackNodes(); - ccvector_to_luaval(tolua_S, ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getOwnerCallbackNodes",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_extension_CCBReader_getOwnerCallbackNodes'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_extension_CCBReader_readSoundKeyframesForSeq(lua_State* tolua_S) -{ - int argc = 0; - cocosbuilder::CCBReader* 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.CCBReader",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocosbuilder::CCBReader*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_extension_CCBReader_readSoundKeyframesForSeq'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 1) - { - cocosbuilder::CCBSequence* arg0; - - ok &= luaval_to_object(tolua_S, 2, "cc.CCBSequence",&arg0); - if(!ok) - return 0; - bool ret = cobj->readSoundKeyframesForSeq(arg0); - tolua_pushboolean(tolua_S,(bool)ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "readSoundKeyframesForSeq",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_extension_CCBReader_readSoundKeyframesForSeq'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_extension_CCBReader_getCCBRootPath(lua_State* tolua_S) -{ - int argc = 0; - cocosbuilder::CCBReader* 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.CCBReader",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocosbuilder::CCBReader*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_extension_CCBReader_getCCBRootPath'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - const std::string& ret = cobj->getCCBRootPath(); - tolua_pushcppstring(tolua_S,ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getCCBRootPath",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_extension_CCBReader_getCCBRootPath'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_extension_CCBReader_getOwnerCallbackControlEvents(lua_State* tolua_S) -{ - int argc = 0; - cocosbuilder::CCBReader* 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.CCBReader",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocosbuilder::CCBReader*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_extension_CCBReader_getOwnerCallbackControlEvents'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - cocos2d::ValueVector& ret = cobj->getOwnerCallbackControlEvents(); - ccvaluevector_to_luaval(tolua_S, ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getOwnerCallbackControlEvents",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_extension_CCBReader_getOwnerCallbackControlEvents'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_extension_CCBReader_getOwnerOutletNodes(lua_State* tolua_S) -{ - int argc = 0; - cocosbuilder::CCBReader* 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.CCBReader",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocosbuilder::CCBReader*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_extension_CCBReader_getOwnerOutletNodes'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - cocos2d::Vector& ret = cobj->getOwnerOutletNodes(); - ccvector_to_luaval(tolua_S, ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getOwnerOutletNodes",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_extension_CCBReader_getOwnerOutletNodes'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_extension_CCBReader_readUTF8(lua_State* tolua_S) -{ - int argc = 0; - cocosbuilder::CCBReader* 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.CCBReader",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocosbuilder::CCBReader*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_extension_CCBReader_readUTF8'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - std::string ret = cobj->readUTF8(); - tolua_pushcppstring(tolua_S,ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "readUTF8",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_extension_CCBReader_readUTF8'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_extension_CCBReader_addOwnerCallbackControlEvents(lua_State* tolua_S) -{ - int argc = 0; - cocosbuilder::CCBReader* 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.CCBReader",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocosbuilder::CCBReader*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_extension_CCBReader_addOwnerCallbackControlEvents'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 1) - { - cocos2d::extension::Control::EventType arg0; - - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); - if(!ok) - return 0; - cobj->addOwnerCallbackControlEvents(arg0); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addOwnerCallbackControlEvents",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_extension_CCBReader_addOwnerCallbackControlEvents'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_extension_CCBReader_getOwnerOutletNames(lua_State* tolua_S) -{ - int argc = 0; - cocosbuilder::CCBReader* 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.CCBReader",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocosbuilder::CCBReader*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_extension_CCBReader_getOwnerOutletNames'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - cocos2d::ValueVector ret = cobj->getOwnerOutletNames(); - ccvaluevector_to_luaval(tolua_S, ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getOwnerOutletNames",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_extension_CCBReader_getOwnerOutletNames'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_extension_CCBReader_setAnimationManager(lua_State* tolua_S) -{ - int argc = 0; - cocosbuilder::CCBReader* 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.CCBReader",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocosbuilder::CCBReader*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_extension_CCBReader_setAnimationManager'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 1) - { - cocosbuilder::CCBAnimationManager* arg0; - - ok &= luaval_to_object(tolua_S, 2, "cc.CCBAnimationManager",&arg0); - if(!ok) - return 0; - cobj->setAnimationManager(arg0); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAnimationManager",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_extension_CCBReader_setAnimationManager'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_extension_CCBReader_readCallbackKeyframesForSeq(lua_State* tolua_S) -{ - int argc = 0; - cocosbuilder::CCBReader* 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.CCBReader",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocosbuilder::CCBReader*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_extension_CCBReader_readCallbackKeyframesForSeq'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 1) - { - cocosbuilder::CCBSequence* arg0; - - ok &= luaval_to_object(tolua_S, 2, "cc.CCBSequence",&arg0); - if(!ok) - return 0; - bool ret = cobj->readCallbackKeyframesForSeq(arg0); - tolua_pushboolean(tolua_S,(bool)ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "readCallbackKeyframesForSeq",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_extension_CCBReader_readCallbackKeyframesForSeq'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_extension_CCBReader_getAnimationManagersForNodes(lua_State* tolua_S) -{ - int argc = 0; - cocosbuilder::CCBReader* 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.CCBReader",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocosbuilder::CCBReader*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_extension_CCBReader_getAnimationManagersForNodes'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - cocos2d::Vector& ret = cobj->getAnimationManagersForNodes(); - ccvector_to_luaval(tolua_S, ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAnimationManagersForNodes",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_extension_CCBReader_getAnimationManagersForNodes'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_extension_CCBReader_getNodesWithAnimationManagers(lua_State* tolua_S) -{ - int argc = 0; - cocosbuilder::CCBReader* 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.CCBReader",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocosbuilder::CCBReader*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_extension_CCBReader_getNodesWithAnimationManagers'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - cocos2d::Vector& ret = cobj->getNodesWithAnimationManagers(); - ccvector_to_luaval(tolua_S, ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getNodesWithAnimationManagers",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_extension_CCBReader_getNodesWithAnimationManagers'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_extension_CCBReader_getAnimationManager(lua_State* tolua_S) -{ - int argc = 0; - cocosbuilder::CCBReader* 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.CCBReader",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocosbuilder::CCBReader*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_extension_CCBReader_getAnimationManager'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - cocosbuilder::CCBAnimationManager* ret = cobj->getAnimationManager(); - object_to_luaval(tolua_S, "cc.CCBAnimationManager",(cocosbuilder::CCBAnimationManager*)ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAnimationManager",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_extension_CCBReader_getAnimationManager'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_extension_CCBReader_setResolutionScale(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.CCBReader",0,&tolua_err)) goto tolua_lerror; -#endif - - argc = lua_gettop(tolua_S) - 1; - - if (argc == 1) - { - double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); - if(!ok) - return 0; - cocosbuilder::CCBReader::setResolutionScale(arg0); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "setResolutionScale",argc, 1); - return 0; -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_extension_CCBReader_setResolutionScale'.",&tolua_err); -#endif - return 0; -} -int lua_cocos2dx_extension_CCBReader_constructor(lua_State* tolua_S) -{ - int argc = 0; - cocosbuilder::CCBReader* cobj = nullptr; - bool ok = true; -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - argc = lua_gettop(tolua_S)-1; - do{ - if (argc == 1) { - cocosbuilder::CCBReader* arg0; - ok &= luaval_to_object(tolua_S, 2, "cc.CCBReader",&arg0); - - if (!ok) { break; } - cobj = new cocosbuilder::CCBReader(arg0); - cobj->autorelease(); - int ID = (int)cobj->_ID ; - int* luaID = &cobj->_luaID ; - toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.CCBReader"); - return 1; - } - }while(0); - ok = true; - do{ - if (argc == 1) { - cocosbuilder::NodeLoaderLibrary* arg0; - ok &= luaval_to_object(tolua_S, 2, "cc.NodeLoaderLibrary",&arg0); - - if (!ok) { break; } - cobj = new cocosbuilder::CCBReader(arg0); - cobj->autorelease(); - int ID = (int)cobj->_ID ; - int* luaID = &cobj->_luaID ; - toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.CCBReader"); - return 1; - } - }while(0); - ok = true; - do{ - if (argc == 2) { - cocosbuilder::NodeLoaderLibrary* arg0; - ok &= luaval_to_object(tolua_S, 2, "cc.NodeLoaderLibrary",&arg0); - - if (!ok) { break; } - cocosbuilder::CCBMemberVariableAssigner* arg1; - ok &= luaval_to_object(tolua_S, 3, "cc.CCBMemberVariableAssigner",&arg1); - - if (!ok) { break; } - cobj = new cocosbuilder::CCBReader(arg0, arg1); - cobj->autorelease(); - int ID = (int)cobj->_ID ; - int* luaID = &cobj->_luaID ; - toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.CCBReader"); - return 1; - } - }while(0); - ok = true; - do{ - if (argc == 3) { - cocosbuilder::NodeLoaderLibrary* arg0; - ok &= luaval_to_object(tolua_S, 2, "cc.NodeLoaderLibrary",&arg0); - - if (!ok) { break; } - cocosbuilder::CCBMemberVariableAssigner* arg1; - ok &= luaval_to_object(tolua_S, 3, "cc.CCBMemberVariableAssigner",&arg1); - - if (!ok) { break; } - cocosbuilder::CCBSelectorResolver* arg2; - ok &= luaval_to_object(tolua_S, 4, "cc.CCBSelectorResolver",&arg2); - - if (!ok) { break; } - cobj = new cocosbuilder::CCBReader(arg0, arg1, arg2); - cobj->autorelease(); - int ID = (int)cobj->_ID ; - int* luaID = &cobj->_luaID ; - toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.CCBReader"); - return 1; - } - }while(0); - ok = true; - do{ - if (argc == 4) { - cocosbuilder::NodeLoaderLibrary* arg0; - ok &= luaval_to_object(tolua_S, 2, "cc.NodeLoaderLibrary",&arg0); - - if (!ok) { break; } - cocosbuilder::CCBMemberVariableAssigner* arg1; - ok &= luaval_to_object(tolua_S, 3, "cc.CCBMemberVariableAssigner",&arg1); - - if (!ok) { break; } - cocosbuilder::CCBSelectorResolver* arg2; - ok &= luaval_to_object(tolua_S, 4, "cc.CCBSelectorResolver",&arg2); - - if (!ok) { break; } - cocosbuilder::NodeLoaderListener* arg3; - ok &= luaval_to_object(tolua_S, 5, "cc.NodeLoaderListener",&arg3); - - if (!ok) { break; } - cobj = new cocosbuilder::CCBReader(arg0, arg1, arg2, arg3); - cobj->autorelease(); - int ID = (int)cobj->_ID ; - int* luaID = &cobj->_luaID ; - toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.CCBReader"); - return 1; - } - }while(0); - ok = true; - do{ - if (argc == 0) { - cobj = new cocosbuilder::CCBReader(); - cobj->autorelease(); - int ID = (int)cobj->_ID ; - int* luaID = &cobj->_luaID ; - toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.CCBReader"); - return 1; - } - }while(0); - ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "CCBReader",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_extension_CCBReader_constructor'.",&tolua_err); -#endif - - return 0; -} - -static int lua_cocos2dx_extension_CCBReader_finalize(lua_State* tolua_S) -{ - printf("luabindings: finalizing LUA object (CCBReader)"); - return 0; -} - -int lua_register_cocos2dx_extension_CCBReader(lua_State* tolua_S) -{ - tolua_usertype(tolua_S,"cc.CCBReader"); - tolua_cclass(tolua_S,"CCBReader","cc.CCBReader","cc.Ref",nullptr); - - tolua_beginmodule(tolua_S,"CCBReader"); - tolua_function(tolua_S,"new",lua_cocos2dx_extension_CCBReader_constructor); - tolua_function(tolua_S,"addOwnerOutletName",lua_cocos2dx_extension_CCBReader_addOwnerOutletName); - tolua_function(tolua_S,"getOwnerCallbackNames",lua_cocos2dx_extension_CCBReader_getOwnerCallbackNames); - tolua_function(tolua_S,"addDocumentCallbackControlEvents",lua_cocos2dx_extension_CCBReader_addDocumentCallbackControlEvents); - tolua_function(tolua_S,"setCCBRootPath",lua_cocos2dx_extension_CCBReader_setCCBRootPath); - tolua_function(tolua_S,"addOwnerOutletNode",lua_cocos2dx_extension_CCBReader_addOwnerOutletNode); - tolua_function(tolua_S,"getOwnerCallbackNodes",lua_cocos2dx_extension_CCBReader_getOwnerCallbackNodes); - tolua_function(tolua_S,"readSoundKeyframesForSeq",lua_cocos2dx_extension_CCBReader_readSoundKeyframesForSeq); - tolua_function(tolua_S,"getCCBRootPath",lua_cocos2dx_extension_CCBReader_getCCBRootPath); - tolua_function(tolua_S,"getOwnerCallbackControlEvents",lua_cocos2dx_extension_CCBReader_getOwnerCallbackControlEvents); - tolua_function(tolua_S,"getOwnerOutletNodes",lua_cocos2dx_extension_CCBReader_getOwnerOutletNodes); - tolua_function(tolua_S,"readUTF8",lua_cocos2dx_extension_CCBReader_readUTF8); - tolua_function(tolua_S,"addOwnerCallbackControlEvents",lua_cocos2dx_extension_CCBReader_addOwnerCallbackControlEvents); - tolua_function(tolua_S,"getOwnerOutletNames",lua_cocos2dx_extension_CCBReader_getOwnerOutletNames); - tolua_function(tolua_S,"setActionManager",lua_cocos2dx_extension_CCBReader_setAnimationManager); - tolua_function(tolua_S,"readCallbackKeyframesForSeq",lua_cocos2dx_extension_CCBReader_readCallbackKeyframesForSeq); - tolua_function(tolua_S,"getAnimationManagersForNodes",lua_cocos2dx_extension_CCBReader_getAnimationManagersForNodes); - tolua_function(tolua_S,"getNodesWithAnimationManagers",lua_cocos2dx_extension_CCBReader_getNodesWithAnimationManagers); - tolua_function(tolua_S,"getActionManager",lua_cocos2dx_extension_CCBReader_getAnimationManager); - tolua_function(tolua_S,"setResolutionScale", lua_cocos2dx_extension_CCBReader_setResolutionScale); - tolua_endmodule(tolua_S); - std::string typeName = typeid(cocosbuilder::CCBReader).name(); - g_luaType[typeName] = "cc.CCBReader"; - g_typeCast["CCBReader"] = "cc.CCBReader"; - return 1; -} TOLUA_API int register_all_cocos2dx_extension(lua_State* tolua_S) { tolua_open(tolua_S); @@ -16503,22 +13844,20 @@ TOLUA_API int register_all_cocos2dx_extension(lua_State* tolua_S) tolua_beginmodule(tolua_S,"cc"); lua_register_cocos2dx_extension_Control(tolua_S); - lua_register_cocos2dx_extension_ControlHuePicker(tolua_S); lua_register_cocos2dx_extension_TableViewCell(tolua_S); lua_register_cocos2dx_extension_Scale9Sprite(tolua_S); - lua_register_cocos2dx_extension_AssetsManager(tolua_S); - lua_register_cocos2dx_extension_ControlColourPicker(tolua_S); - lua_register_cocos2dx_extension_CCBAnimationManager(tolua_S); - lua_register_cocos2dx_extension_ControlButton(tolua_S); - lua_register_cocos2dx_extension_ControlSlider(tolua_S); - lua_register_cocos2dx_extension_ControlSaturationBrightnessPicker(tolua_S); - lua_register_cocos2dx_extension_ScrollView(tolua_S); - lua_register_cocos2dx_extension_ControlPotentiometer(tolua_S); - lua_register_cocos2dx_extension_ControlStepper(tolua_S); - lua_register_cocos2dx_extension_TableView(tolua_S); - lua_register_cocos2dx_extension_EditBox(tolua_S); - lua_register_cocos2dx_extension_CCBReader(tolua_S); lua_register_cocos2dx_extension_ControlSwitch(tolua_S); + lua_register_cocos2dx_extension_ScrollView(tolua_S); + lua_register_cocos2dx_extension_TableView(tolua_S); + lua_register_cocos2dx_extension_AssetsManager(tolua_S); + lua_register_cocos2dx_extension_ControlButton(tolua_S); + lua_register_cocos2dx_extension_EditBox(tolua_S); + lua_register_cocos2dx_extension_ControlSlider(tolua_S); + lua_register_cocos2dx_extension_ControlStepper(tolua_S); + lua_register_cocos2dx_extension_ControlSaturationBrightnessPicker(tolua_S); + lua_register_cocos2dx_extension_ControlColourPicker(tolua_S); + lua_register_cocos2dx_extension_ControlPotentiometer(tolua_S); + lua_register_cocos2dx_extension_ControlHuePicker(tolua_S); tolua_endmodule(tolua_S); return 1; diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_extension_auto.hpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_extension_auto.hpp index 4aeaa3a638..ce1bfeebc3 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_extension_auto.hpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_extension_auto.hpp @@ -290,63 +290,6 @@ int register_all_cocos2dx_extension(lua_State* tolua_S); - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_physics_auto.cpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_physics_auto.cpp index e6a4da2f3c..1bedeb5d24 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_physics_auto.cpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_physics_auto.cpp @@ -6,860 +6,6 @@ -int lua_cocos2dx_physics_PhysicsWorld_getGravity(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::PhysicsWorld* 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.PhysicsWorld",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::PhysicsWorld*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_getGravity'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - cocos2d::Vec2 ret = cobj->getGravity(); - vec2_to_luaval(tolua_S, ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getGravity",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_getGravity'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_physics_PhysicsWorld_getAllBodies(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::PhysicsWorld* 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.PhysicsWorld",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::PhysicsWorld*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_getAllBodies'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - const cocos2d::Vector& ret = cobj->getAllBodies(); - ccvector_to_luaval(tolua_S, ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAllBodies",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_getAllBodies'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_physics_PhysicsWorld_setGravity(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::PhysicsWorld* 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.PhysicsWorld",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::PhysicsWorld*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_setGravity'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 1) - { - cocos2d::Vec2 arg0; - - ok &= luaval_to_vec2(tolua_S, 2, &arg0); - if(!ok) - return 0; - cobj->setGravity(arg0); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setGravity",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_setGravity'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_physics_PhysicsWorld_getSpeed(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::PhysicsWorld* 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.PhysicsWorld",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::PhysicsWorld*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_getSpeed'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - double ret = cobj->getSpeed(); - tolua_pushnumber(tolua_S,(lua_Number)ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getSpeed",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_getSpeed'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_physics_PhysicsWorld_removeBody(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::PhysicsWorld* 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.PhysicsWorld",0,&tolua_err)) goto tolua_lerror; -#endif - cobj = (cocos2d::PhysicsWorld*)tolua_tousertype(tolua_S,1,0); -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_removeBody'", nullptr); - return 0; - } -#endif - argc = lua_gettop(tolua_S)-1; - do{ - if (argc == 1) { - int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); - - if (!ok) { break; } - cobj->removeBody(arg0); - return 0; - } - }while(0); - ok = true; - do{ - if (argc == 1) { - cocos2d::PhysicsBody* arg0; - ok &= luaval_to_object(tolua_S, 2, "cc.PhysicsBody",&arg0); - - if (!ok) { break; } - cobj->removeBody(arg0); - return 0; - } - }while(0); - ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeBody",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_removeBody'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_physics_PhysicsWorld_removeJoint(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::PhysicsWorld* 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.PhysicsWorld",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::PhysicsWorld*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_removeJoint'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 1) - { - cocos2d::PhysicsJoint* arg0; - - ok &= luaval_to_object(tolua_S, 2, "cc.PhysicsJoint",&arg0); - if(!ok) - return 0; - cobj->removeJoint(arg0); - return 0; - } - if (argc == 2) - { - cocos2d::PhysicsJoint* arg0; - bool arg1; - - ok &= luaval_to_object(tolua_S, 2, "cc.PhysicsJoint",&arg0); - - ok &= luaval_to_boolean(tolua_S, 3,&arg1); - if(!ok) - return 0; - cobj->removeJoint(arg0, arg1); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeJoint",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_removeJoint'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_physics_PhysicsWorld_getUpdateRate(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::PhysicsWorld* 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.PhysicsWorld",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::PhysicsWorld*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_getUpdateRate'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - int ret = cobj->getUpdateRate(); - tolua_pushnumber(tolua_S,(lua_Number)ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getUpdateRate",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_getUpdateRate'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_physics_PhysicsWorld_setSpeed(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::PhysicsWorld* 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.PhysicsWorld",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::PhysicsWorld*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_setSpeed'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 1) - { - double arg0; - - ok &= luaval_to_number(tolua_S, 2,&arg0); - if(!ok) - return 0; - cobj->setSpeed(arg0); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setSpeed",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_setSpeed'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_physics_PhysicsWorld_getShapes(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::PhysicsWorld* 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.PhysicsWorld",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::PhysicsWorld*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_getShapes'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 1) - { - cocos2d::Vec2 arg0; - - ok &= luaval_to_vec2(tolua_S, 2, &arg0); - if(!ok) - return 0; - cocos2d::Vector ret = cobj->getShapes(arg0); - ccvector_to_luaval(tolua_S, ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getShapes",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_getShapes'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_physics_PhysicsWorld_removeAllJoints(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::PhysicsWorld* 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.PhysicsWorld",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::PhysicsWorld*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_removeAllJoints'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - cobj->removeAllJoints(); - return 0; - } - if (argc == 1) - { - bool arg0; - - ok &= luaval_to_boolean(tolua_S, 2,&arg0); - if(!ok) - return 0; - cobj->removeAllJoints(arg0); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeAllJoints",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_removeAllJoints'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_physics_PhysicsWorld_getShape(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::PhysicsWorld* 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.PhysicsWorld",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::PhysicsWorld*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_getShape'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 1) - { - cocos2d::Vec2 arg0; - - ok &= luaval_to_vec2(tolua_S, 2, &arg0); - if(!ok) - return 0; - cocos2d::PhysicsShape* ret = cobj->getShape(arg0); - object_to_luaval(tolua_S, "cc.PhysicsShape",(cocos2d::PhysicsShape*)ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getShape",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_getShape'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_physics_PhysicsWorld_removeAllBodies(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::PhysicsWorld* 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.PhysicsWorld",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::PhysicsWorld*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_removeAllBodies'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - cobj->removeAllBodies(); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeAllBodies",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_removeAllBodies'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_physics_PhysicsWorld_getDebugDrawMask(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::PhysicsWorld* 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.PhysicsWorld",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::PhysicsWorld*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_getDebugDrawMask'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - int ret = cobj->getDebugDrawMask(); - tolua_pushnumber(tolua_S,(lua_Number)ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDebugDrawMask",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_getDebugDrawMask'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_physics_PhysicsWorld_setDebugDrawMask(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::PhysicsWorld* 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.PhysicsWorld",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::PhysicsWorld*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_setDebugDrawMask'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 1) - { - int arg0; - - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); - if(!ok) - return 0; - cobj->setDebugDrawMask(arg0); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setDebugDrawMask",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_setDebugDrawMask'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_physics_PhysicsWorld_getBody(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::PhysicsWorld* 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.PhysicsWorld",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::PhysicsWorld*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_getBody'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 1) - { - int arg0; - - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); - if(!ok) - return 0; - cocos2d::PhysicsBody* ret = cobj->getBody(arg0); - object_to_luaval(tolua_S, "cc.PhysicsBody",(cocos2d::PhysicsBody*)ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getBody",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_getBody'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_physics_PhysicsWorld_setUpdateRate(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::PhysicsWorld* 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.PhysicsWorld",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::PhysicsWorld*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_setUpdateRate'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 1) - { - int arg0; - - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); - if(!ok) - return 0; - cobj->setUpdateRate(arg0); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setUpdateRate",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_setUpdateRate'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_physics_PhysicsWorld_addJoint(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::PhysicsWorld* 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.PhysicsWorld",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::PhysicsWorld*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_addJoint'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 1) - { - cocos2d::PhysicsJoint* arg0; - - ok &= luaval_to_object(tolua_S, 2, "cc.PhysicsJoint",&arg0); - if(!ok) - return 0; - cobj->addJoint(arg0); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addJoint",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_addJoint'.",&tolua_err); -#endif - - return 0; -} -static int lua_cocos2dx_physics_PhysicsWorld_finalize(lua_State* tolua_S) -{ - printf("luabindings: finalizing LUA object (PhysicsWorld)"); - return 0; -} - -int lua_register_cocos2dx_physics_PhysicsWorld(lua_State* tolua_S) -{ - tolua_usertype(tolua_S,"cc.PhysicsWorld"); - tolua_cclass(tolua_S,"PhysicsWorld","cc.PhysicsWorld","",nullptr); - - tolua_beginmodule(tolua_S,"PhysicsWorld"); - tolua_function(tolua_S,"getGravity",lua_cocos2dx_physics_PhysicsWorld_getGravity); - tolua_function(tolua_S,"getAllBodies",lua_cocos2dx_physics_PhysicsWorld_getAllBodies); - tolua_function(tolua_S,"setGravity",lua_cocos2dx_physics_PhysicsWorld_setGravity); - tolua_function(tolua_S,"getSpeed",lua_cocos2dx_physics_PhysicsWorld_getSpeed); - tolua_function(tolua_S,"removeBody",lua_cocos2dx_physics_PhysicsWorld_removeBody); - tolua_function(tolua_S,"removeJoint",lua_cocos2dx_physics_PhysicsWorld_removeJoint); - tolua_function(tolua_S,"getUpdateRate",lua_cocos2dx_physics_PhysicsWorld_getUpdateRate); - tolua_function(tolua_S,"setSpeed",lua_cocos2dx_physics_PhysicsWorld_setSpeed); - tolua_function(tolua_S,"getShapes",lua_cocos2dx_physics_PhysicsWorld_getShapes); - tolua_function(tolua_S,"removeAllJoints",lua_cocos2dx_physics_PhysicsWorld_removeAllJoints); - tolua_function(tolua_S,"getShape",lua_cocos2dx_physics_PhysicsWorld_getShape); - tolua_function(tolua_S,"removeAllBodies",lua_cocos2dx_physics_PhysicsWorld_removeAllBodies); - tolua_function(tolua_S,"getDebugDrawMask",lua_cocos2dx_physics_PhysicsWorld_getDebugDrawMask); - tolua_function(tolua_S,"setDebugDrawMask",lua_cocos2dx_physics_PhysicsWorld_setDebugDrawMask); - tolua_function(tolua_S,"getBody",lua_cocos2dx_physics_PhysicsWorld_getBody); - tolua_function(tolua_S,"setUpdateRate",lua_cocos2dx_physics_PhysicsWorld_setUpdateRate); - tolua_function(tolua_S,"addJoint",lua_cocos2dx_physics_PhysicsWorld_addJoint); - tolua_endmodule(tolua_S); - std::string typeName = typeid(cocos2d::PhysicsWorld).name(); - g_luaType[typeName] = "cc.PhysicsWorld"; - g_typeCast["PhysicsWorld"] = "cc.PhysicsWorld"; - return 1; -} - -static int lua_cocos2dx_physics_PhysicsDebugDraw_finalize(lua_State* tolua_S) -{ - printf("luabindings: finalizing LUA object (PhysicsDebugDraw)"); - return 0; -} - -int lua_register_cocos2dx_physics_PhysicsDebugDraw(lua_State* tolua_S) -{ - tolua_usertype(tolua_S,"cc.PhysicsDebugDraw"); - tolua_cclass(tolua_S,"PhysicsDebugDraw","cc.PhysicsDebugDraw","",nullptr); - - tolua_beginmodule(tolua_S,"PhysicsDebugDraw"); - tolua_endmodule(tolua_S); - std::string typeName = typeid(cocos2d::PhysicsDebugDraw).name(); - g_luaType[typeName] = "cc.PhysicsDebugDraw"; - g_typeCast["PhysicsDebugDraw"] = "cc.PhysicsDebugDraw"; - return 1; -} - int lua_cocos2dx_physics_PhysicsShape_getFriction(lua_State* tolua_S) { int argc = 0; @@ -894,7 +40,7 @@ int lua_cocos2dx_physics_PhysicsShape_getFriction(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getFriction",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsShape:getFriction",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -934,13 +80,13 @@ int lua_cocos2dx_physics_PhysicsShape_setGroup(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.PhysicsShape:setGroup"); if(!ok) return 0; cobj->setGroup(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setGroup",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsShape:setGroup",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -980,13 +126,13 @@ int lua_cocos2dx_physics_PhysicsShape_setDensity(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsShape:setDensity"); if(!ok) return 0; cobj->setDensity(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setDensity",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsShape:setDensity",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -1030,7 +176,7 @@ int lua_cocos2dx_physics_PhysicsShape_getMass(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getMass",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsShape:getMass",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1074,7 +220,7 @@ int lua_cocos2dx_physics_PhysicsShape_getMaterial(lua_State* tolua_S) physics_material_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getMaterial",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsShape:getMaterial",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1118,7 +264,7 @@ int lua_cocos2dx_physics_PhysicsShape_getCollisionBitmask(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getCollisionBitmask",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsShape:getCollisionBitmask",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1162,7 +308,7 @@ int lua_cocos2dx_physics_PhysicsShape_getArea(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getArea",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsShape:getArea",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1202,13 +348,13 @@ int lua_cocos2dx_physics_PhysicsShape_setCategoryBitmask(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.PhysicsShape:setCategoryBitmask"); if(!ok) return 0; cobj->setCategoryBitmask(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setCategoryBitmask",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsShape:setCategoryBitmask",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -1252,7 +398,7 @@ int lua_cocos2dx_physics_PhysicsShape_getGroup(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getGroup",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsShape:getGroup",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1292,13 +438,13 @@ int lua_cocos2dx_physics_PhysicsShape_setMoment(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsShape:setMoment"); if(!ok) return 0; cobj->setMoment(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setMoment",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsShape:setMoment",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -1338,14 +484,14 @@ int lua_cocos2dx_physics_PhysicsShape_containsPoint(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.PhysicsShape:containsPoint"); if(!ok) return 0; bool ret = cobj->containsPoint(arg0); tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "containsPoint",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsShape:containsPoint",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -1389,7 +535,7 @@ int lua_cocos2dx_physics_PhysicsShape_getCategoryBitmask(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getCategoryBitmask",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsShape:getCategoryBitmask",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1433,7 +579,7 @@ int lua_cocos2dx_physics_PhysicsShape_getType(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getType",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsShape:getType",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1477,7 +623,7 @@ int lua_cocos2dx_physics_PhysicsShape_getContactTestBitmask(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getContactTestBitmask",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsShape:getContactTestBitmask",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1521,7 +667,7 @@ int lua_cocos2dx_physics_PhysicsShape_getCenter(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getCenter",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsShape:getCenter",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1565,7 +711,7 @@ int lua_cocos2dx_physics_PhysicsShape_getDensity(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDensity",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsShape:getDensity",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1605,13 +751,13 @@ int lua_cocos2dx_physics_PhysicsShape_setMass(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsShape:setMass"); if(!ok) return 0; cobj->setMass(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setMass",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsShape:setMass",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -1655,7 +801,7 @@ int lua_cocos2dx_physics_PhysicsShape_getTag(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTag",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsShape:getTag",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1699,7 +845,7 @@ int lua_cocos2dx_physics_PhysicsShape_calculateDefaultMoment(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "calculateDefaultMoment",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsShape:calculateDefaultMoment",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1739,13 +885,13 @@ int lua_cocos2dx_physics_PhysicsShape_setCollisionBitmask(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.PhysicsShape:setCollisionBitmask"); if(!ok) return 0; cobj->setCollisionBitmask(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setCollisionBitmask",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsShape:setCollisionBitmask",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -1789,7 +935,7 @@ int lua_cocos2dx_physics_PhysicsShape_getMoment(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getMoment",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsShape:getMoment",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1833,7 +979,7 @@ int lua_cocos2dx_physics_PhysicsShape_getOffset(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getOffset",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsShape:getOffset",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1877,7 +1023,7 @@ int lua_cocos2dx_physics_PhysicsShape_getRestitution(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getRestitution",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsShape:getRestitution",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1917,13 +1063,13 @@ int lua_cocos2dx_physics_PhysicsShape_setFriction(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsShape:setFriction"); if(!ok) return 0; cobj->setFriction(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setFriction",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsShape:setFriction",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -1963,13 +1109,13 @@ int lua_cocos2dx_physics_PhysicsShape_setMaterial(lua_State* tolua_S) { cocos2d::PhysicsMaterial arg0; - ok &= luaval_to_physics_material(tolua_S, 2, &arg0); + ok &= luaval_to_physics_material(tolua_S, 2, &arg0, "cc.PhysicsShape:setMaterial"); if(!ok) return 0; cobj->setMaterial(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setMaterial",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsShape:setMaterial",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2009,13 +1155,13 @@ int lua_cocos2dx_physics_PhysicsShape_setTag(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.PhysicsShape:setTag"); if(!ok) return 0; cobj->setTag(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTag",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsShape:setTag",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2055,13 +1201,13 @@ int lua_cocos2dx_physics_PhysicsShape_setContactTestBitmask(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.PhysicsShape:setContactTestBitmask"); if(!ok) return 0; cobj->setContactTestBitmask(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setContactTestBitmask",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsShape:setContactTestBitmask",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2101,13 +1247,13 @@ int lua_cocos2dx_physics_PhysicsShape_setRestitution(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsShape:setRestitution"); if(!ok) return 0; cobj->setRestitution(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setRestitution",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsShape:setRestitution",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2151,7 +1297,7 @@ int lua_cocos2dx_physics_PhysicsShape_getBody(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.PhysicsBody",(cocos2d::PhysicsBody*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getBody",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsShape:getBody",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2243,7 +1389,7 @@ int lua_cocos2dx_physics_PhysicsShapeCircle_getRadius(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getRadius",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsShapeCircle:getRadius",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2271,7 +1417,7 @@ int lua_cocos2dx_physics_PhysicsShapeCircle_create(lua_State* tolua_S) if (argc == 1) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsShapeCircle:create"); if(!ok) return 0; cocos2d::PhysicsShapeCircle* ret = cocos2d::PhysicsShapeCircle::create(arg0); @@ -2282,8 +1428,8 @@ int lua_cocos2dx_physics_PhysicsShapeCircle_create(lua_State* tolua_S) { double arg0; cocos2d::PhysicsMaterial arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); - ok &= luaval_to_physics_material(tolua_S, 3, &arg1); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsShapeCircle:create"); + ok &= luaval_to_physics_material(tolua_S, 3, &arg1, "cc.PhysicsShapeCircle:create"); if(!ok) return 0; cocos2d::PhysicsShapeCircle* ret = cocos2d::PhysicsShapeCircle::create(arg0, arg1); @@ -2295,16 +1441,16 @@ int lua_cocos2dx_physics_PhysicsShapeCircle_create(lua_State* tolua_S) double arg0; cocos2d::PhysicsMaterial arg1; cocos2d::Vec2 arg2; - ok &= luaval_to_number(tolua_S, 2,&arg0); - ok &= luaval_to_physics_material(tolua_S, 3, &arg1); - ok &= luaval_to_vec2(tolua_S, 4, &arg2); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsShapeCircle:create"); + ok &= luaval_to_physics_material(tolua_S, 3, &arg1, "cc.PhysicsShapeCircle:create"); + ok &= luaval_to_vec2(tolua_S, 4, &arg2, "cc.PhysicsShapeCircle:create"); if(!ok) return 0; cocos2d::PhysicsShapeCircle* ret = cocos2d::PhysicsShapeCircle::create(arg0, arg1, arg2); object_to_luaval(tolua_S, "cc.PhysicsShapeCircle",(cocos2d::PhysicsShapeCircle*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.PhysicsShapeCircle:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -2330,14 +1476,14 @@ int lua_cocos2dx_physics_PhysicsShapeCircle_calculateArea(lua_State* tolua_S) if (argc == 1) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsShapeCircle:calculateArea"); if(!ok) return 0; double ret = cocos2d::PhysicsShapeCircle::calculateArea(arg0); tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "calculateArea",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.PhysicsShapeCircle:calculateArea",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -2364,8 +1510,8 @@ int lua_cocos2dx_physics_PhysicsShapeCircle_calculateMoment(lua_State* tolua_S) { double arg0; double arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsShapeCircle:calculateMoment"); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.PhysicsShapeCircle:calculateMoment"); if(!ok) return 0; double ret = cocos2d::PhysicsShapeCircle::calculateMoment(arg0, arg1); @@ -2377,16 +1523,16 @@ int lua_cocos2dx_physics_PhysicsShapeCircle_calculateMoment(lua_State* tolua_S) double arg0; double arg1; cocos2d::Vec2 arg2; - ok &= luaval_to_number(tolua_S, 2,&arg0); - ok &= luaval_to_number(tolua_S, 3,&arg1); - ok &= luaval_to_vec2(tolua_S, 4, &arg2); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsShapeCircle:calculateMoment"); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.PhysicsShapeCircle:calculateMoment"); + ok &= luaval_to_vec2(tolua_S, 4, &arg2, "cc.PhysicsShapeCircle:calculateMoment"); if(!ok) return 0; double ret = cocos2d::PhysicsShapeCircle::calculateMoment(arg0, arg1, arg2); tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "calculateMoment",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.PhysicsShapeCircle:calculateMoment",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -2451,7 +1597,7 @@ int lua_cocos2dx_physics_PhysicsShapePolygon_getPointsCount(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPointsCount",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsShapePolygon:getPointsCount",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2491,14 +1637,14 @@ int lua_cocos2dx_physics_PhysicsShapePolygon_getPoint(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.PhysicsShapePolygon:getPoint"); if(!ok) return 0; cocos2d::Vec2 ret = cobj->getPoint(arg0); vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPoint",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsShapePolygon:getPoint",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2563,7 +1709,7 @@ int lua_cocos2dx_physics_PhysicsShapeBox_getSize(lua_State* tolua_S) size_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getSize",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsShapeBox:getSize",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2591,7 +1737,7 @@ int lua_cocos2dx_physics_PhysicsShapeBox_create(lua_State* tolua_S) if (argc == 1) { cocos2d::Size arg0; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.PhysicsShapeBox:create"); if(!ok) return 0; cocos2d::PhysicsShapeBox* ret = cocos2d::PhysicsShapeBox::create(arg0); @@ -2602,8 +1748,8 @@ int lua_cocos2dx_physics_PhysicsShapeBox_create(lua_State* tolua_S) { cocos2d::Size arg0; cocos2d::PhysicsMaterial arg1; - ok &= luaval_to_size(tolua_S, 2, &arg0); - ok &= luaval_to_physics_material(tolua_S, 3, &arg1); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.PhysicsShapeBox:create"); + ok &= luaval_to_physics_material(tolua_S, 3, &arg1, "cc.PhysicsShapeBox:create"); if(!ok) return 0; cocos2d::PhysicsShapeBox* ret = cocos2d::PhysicsShapeBox::create(arg0, arg1); @@ -2615,16 +1761,16 @@ int lua_cocos2dx_physics_PhysicsShapeBox_create(lua_State* tolua_S) cocos2d::Size arg0; cocos2d::PhysicsMaterial arg1; cocos2d::Vec2 arg2; - ok &= luaval_to_size(tolua_S, 2, &arg0); - ok &= luaval_to_physics_material(tolua_S, 3, &arg1); - ok &= luaval_to_vec2(tolua_S, 4, &arg2); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.PhysicsShapeBox:create"); + ok &= luaval_to_physics_material(tolua_S, 3, &arg1, "cc.PhysicsShapeBox:create"); + ok &= luaval_to_vec2(tolua_S, 4, &arg2, "cc.PhysicsShapeBox:create"); if(!ok) return 0; cocos2d::PhysicsShapeBox* ret = cocos2d::PhysicsShapeBox::create(arg0, arg1, arg2); object_to_luaval(tolua_S, "cc.PhysicsShapeBox",(cocos2d::PhysicsShapeBox*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.PhysicsShapeBox:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -2687,7 +1833,7 @@ int lua_cocos2dx_physics_PhysicsShapeEdgeSegment_getPointB(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPointB",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsShapeEdgeSegment:getPointB",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2731,7 +1877,7 @@ int lua_cocos2dx_physics_PhysicsShapeEdgeSegment_getPointA(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPointA",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsShapeEdgeSegment:getPointA",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2760,8 +1906,8 @@ int lua_cocos2dx_physics_PhysicsShapeEdgeSegment_create(lua_State* tolua_S) { cocos2d::Vec2 arg0; cocos2d::Vec2 arg1; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); - ok &= luaval_to_vec2(tolua_S, 3, &arg1); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.PhysicsShapeEdgeSegment:create"); + ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.PhysicsShapeEdgeSegment:create"); if(!ok) return 0; cocos2d::PhysicsShapeEdgeSegment* ret = cocos2d::PhysicsShapeEdgeSegment::create(arg0, arg1); @@ -2773,9 +1919,9 @@ int lua_cocos2dx_physics_PhysicsShapeEdgeSegment_create(lua_State* tolua_S) cocos2d::Vec2 arg0; cocos2d::Vec2 arg1; cocos2d::PhysicsMaterial arg2; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); - ok &= luaval_to_vec2(tolua_S, 3, &arg1); - ok &= luaval_to_physics_material(tolua_S, 4, &arg2); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.PhysicsShapeEdgeSegment:create"); + ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.PhysicsShapeEdgeSegment:create"); + ok &= luaval_to_physics_material(tolua_S, 4, &arg2, "cc.PhysicsShapeEdgeSegment:create"); if(!ok) return 0; cocos2d::PhysicsShapeEdgeSegment* ret = cocos2d::PhysicsShapeEdgeSegment::create(arg0, arg1, arg2); @@ -2788,17 +1934,17 @@ int lua_cocos2dx_physics_PhysicsShapeEdgeSegment_create(lua_State* tolua_S) cocos2d::Vec2 arg1; cocos2d::PhysicsMaterial arg2; double arg3; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); - ok &= luaval_to_vec2(tolua_S, 3, &arg1); - ok &= luaval_to_physics_material(tolua_S, 4, &arg2); - ok &= luaval_to_number(tolua_S, 5,&arg3); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.PhysicsShapeEdgeSegment:create"); + ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.PhysicsShapeEdgeSegment:create"); + ok &= luaval_to_physics_material(tolua_S, 4, &arg2, "cc.PhysicsShapeEdgeSegment:create"); + ok &= luaval_to_number(tolua_S, 5,&arg3, "cc.PhysicsShapeEdgeSegment:create"); if(!ok) return 0; cocos2d::PhysicsShapeEdgeSegment* ret = cocos2d::PhysicsShapeEdgeSegment::create(arg0, arg1, arg2, arg3); object_to_luaval(tolua_S, "cc.PhysicsShapeEdgeSegment",(cocos2d::PhysicsShapeEdgeSegment*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.PhysicsShapeEdgeSegment:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -2862,7 +2008,7 @@ int lua_cocos2dx_physics_PhysicsShapeEdgePolygon_getPointsCount(lua_State* tolua tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPointsCount",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsShapeEdgePolygon:getPointsCount",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2910,7 +2056,7 @@ int lua_cocos2dx_physics_PhysicsShapeEdgeBox_create(lua_State* tolua_S) if (argc == 1) { cocos2d::Size arg0; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.PhysicsShapeEdgeBox:create"); if(!ok) return 0; cocos2d::PhysicsShapeEdgeBox* ret = cocos2d::PhysicsShapeEdgeBox::create(arg0); @@ -2921,8 +2067,8 @@ int lua_cocos2dx_physics_PhysicsShapeEdgeBox_create(lua_State* tolua_S) { cocos2d::Size arg0; cocos2d::PhysicsMaterial arg1; - ok &= luaval_to_size(tolua_S, 2, &arg0); - ok &= luaval_to_physics_material(tolua_S, 3, &arg1); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.PhysicsShapeEdgeBox:create"); + ok &= luaval_to_physics_material(tolua_S, 3, &arg1, "cc.PhysicsShapeEdgeBox:create"); if(!ok) return 0; cocos2d::PhysicsShapeEdgeBox* ret = cocos2d::PhysicsShapeEdgeBox::create(arg0, arg1); @@ -2934,9 +2080,9 @@ int lua_cocos2dx_physics_PhysicsShapeEdgeBox_create(lua_State* tolua_S) cocos2d::Size arg0; cocos2d::PhysicsMaterial arg1; double arg2; - ok &= luaval_to_size(tolua_S, 2, &arg0); - ok &= luaval_to_physics_material(tolua_S, 3, &arg1); - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.PhysicsShapeEdgeBox:create"); + ok &= luaval_to_physics_material(tolua_S, 3, &arg1, "cc.PhysicsShapeEdgeBox:create"); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.PhysicsShapeEdgeBox:create"); if(!ok) return 0; cocos2d::PhysicsShapeEdgeBox* ret = cocos2d::PhysicsShapeEdgeBox::create(arg0, arg1, arg2); @@ -2949,17 +2095,17 @@ int lua_cocos2dx_physics_PhysicsShapeEdgeBox_create(lua_State* tolua_S) cocos2d::PhysicsMaterial arg1; double arg2; cocos2d::Vec2 arg3; - ok &= luaval_to_size(tolua_S, 2, &arg0); - ok &= luaval_to_physics_material(tolua_S, 3, &arg1); - ok &= luaval_to_number(tolua_S, 4,&arg2); - ok &= luaval_to_vec2(tolua_S, 5, &arg3); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.PhysicsShapeEdgeBox:create"); + ok &= luaval_to_physics_material(tolua_S, 3, &arg1, "cc.PhysicsShapeEdgeBox:create"); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.PhysicsShapeEdgeBox:create"); + ok &= luaval_to_vec2(tolua_S, 5, &arg3, "cc.PhysicsShapeEdgeBox:create"); if(!ok) return 0; cocos2d::PhysicsShapeEdgeBox* ret = cocos2d::PhysicsShapeEdgeBox::create(arg0, arg1, arg2, arg3); object_to_luaval(tolua_S, "cc.PhysicsShapeEdgeBox",(cocos2d::PhysicsShapeEdgeBox*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.PhysicsShapeEdgeBox:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -3021,7 +2167,7 @@ int lua_cocos2dx_physics_PhysicsShapeEdgeChain_getPointsCount(lua_State* tolua_S tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPointsCount",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsShapeEdgeChain:getPointsCount",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3085,7 +2231,7 @@ int lua_cocos2dx_physics_PhysicsBody_isGravityEnabled(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isGravityEnabled",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:isGravityEnabled",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3128,7 +2274,7 @@ int lua_cocos2dx_physics_PhysicsBody_resetForces(lua_State* tolua_S) cobj->resetForces(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "resetForces",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:resetForces",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3172,7 +2318,7 @@ int lua_cocos2dx_physics_PhysicsBody_getVelocityLimit(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getVelocityLimit",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:getVelocityLimit",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3212,13 +2358,13 @@ int lua_cocos2dx_physics_PhysicsBody_setGroup(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.PhysicsBody:setGroup"); if(!ok) return 0; cobj->setGroup(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setGroup",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:setGroup",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3262,7 +2408,7 @@ int lua_cocos2dx_physics_PhysicsBody_getMass(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getMass",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:getMass",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3306,7 +2452,7 @@ int lua_cocos2dx_physics_PhysicsBody_getCollisionBitmask(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getCollisionBitmask",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:getCollisionBitmask",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3350,7 +2496,7 @@ int lua_cocos2dx_physics_PhysicsBody_getRotationOffset(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getRotationOffset",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:getRotationOffset",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3394,7 +2540,7 @@ int lua_cocos2dx_physics_PhysicsBody_getRotation(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getRotation",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:getRotation",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3438,7 +2584,7 @@ int lua_cocos2dx_physics_PhysicsBody_getMoment(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getMoment",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:getMoment",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3472,11 +2618,11 @@ int lua_cocos2dx_physics_PhysicsBody_applyImpulse(lua_State* tolua_S) do{ if (argc == 2) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.PhysicsBody:applyImpulse"); if (!ok) { break; } cocos2d::Vec2 arg1; - ok &= luaval_to_vec2(tolua_S, 3, &arg1); + ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.PhysicsBody:applyImpulse"); if (!ok) { break; } cobj->applyImpulse(arg0, arg1); @@ -3487,7 +2633,7 @@ int lua_cocos2dx_physics_PhysicsBody_applyImpulse(lua_State* tolua_S) do{ if (argc == 1) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.PhysicsBody:applyImpulse"); if (!ok) { break; } cobj->applyImpulse(arg0); @@ -3495,7 +2641,7 @@ int lua_cocos2dx_physics_PhysicsBody_applyImpulse(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "applyImpulse",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:applyImpulse",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3535,13 +2681,13 @@ int lua_cocos2dx_physics_PhysicsBody_setRotationOffset(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsBody:setRotationOffset"); if(!ok) return 0; cobj->setRotationOffset(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setRotationOffset",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:setRotationOffset",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3575,11 +2721,11 @@ int lua_cocos2dx_physics_PhysicsBody_applyForce(lua_State* tolua_S) do{ if (argc == 2) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.PhysicsBody:applyForce"); if (!ok) { break; } cocos2d::Vec2 arg1; - ok &= luaval_to_vec2(tolua_S, 3, &arg1); + ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.PhysicsBody:applyForce"); if (!ok) { break; } cobj->applyForce(arg0, arg1); @@ -3590,7 +2736,7 @@ int lua_cocos2dx_physics_PhysicsBody_applyForce(lua_State* tolua_S) do{ if (argc == 1) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.PhysicsBody:applyForce"); if (!ok) { break; } cobj->applyForce(arg0); @@ -3598,7 +2744,7 @@ int lua_cocos2dx_physics_PhysicsBody_applyForce(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "applyForce",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:applyForce",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3652,14 +2798,14 @@ int lua_cocos2dx_physics_PhysicsBody_addShape(lua_State* tolua_S) ok &= luaval_to_object(tolua_S, 2, "cc.PhysicsShape",&arg0); - ok &= luaval_to_boolean(tolua_S, 3,&arg1); + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "cc.PhysicsBody:addShape"); if(!ok) return 0; cocos2d::PhysicsShape* ret = cobj->addShape(arg0, arg1); object_to_luaval(tolua_S, "cc.PhysicsShape",(cocos2d::PhysicsShape*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addShape",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:addShape",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3699,13 +2845,13 @@ int lua_cocos2dx_physics_PhysicsBody_applyTorque(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsBody:applyTorque"); if(!ok) return 0; cobj->applyTorque(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "applyTorque",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:applyTorque",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3749,7 +2895,7 @@ int lua_cocos2dx_physics_PhysicsBody_getAngularVelocityLimit(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAngularVelocityLimit",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:getAngularVelocityLimit",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3789,13 +2935,13 @@ int lua_cocos2dx_physics_PhysicsBody_setAngularVelocityLimit(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsBody:setAngularVelocityLimit"); if(!ok) return 0; cobj->setAngularVelocityLimit(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAngularVelocityLimit",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:setAngularVelocityLimit",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3839,7 +2985,7 @@ int lua_cocos2dx_physics_PhysicsBody_getVelocity(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getVelocity",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:getVelocity",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3883,7 +3029,7 @@ int lua_cocos2dx_physics_PhysicsBody_getLinearDamping(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getLinearDamping",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:getLinearDamping",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3930,13 +3076,13 @@ int lua_cocos2dx_physics_PhysicsBody_removeAllShapes(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.PhysicsBody:removeAllShapes"); if(!ok) return 0; cobj->removeAllShapes(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeAllShapes",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:removeAllShapes",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3976,13 +3122,13 @@ int lua_cocos2dx_physics_PhysicsBody_setAngularDamping(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsBody:setAngularDamping"); if(!ok) return 0; cobj->setAngularDamping(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAngularDamping",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:setAngularDamping",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4022,13 +3168,13 @@ int lua_cocos2dx_physics_PhysicsBody_setVelocityLimit(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsBody:setVelocityLimit"); if(!ok) return 0; cobj->setVelocityLimit(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setVelocityLimit",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:setVelocityLimit",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4068,13 +3214,13 @@ int lua_cocos2dx_physics_PhysicsBody_setResting(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.PhysicsBody:setResting"); if(!ok) return 0; cobj->setResting(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setResting",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:setResting",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4118,7 +3264,7 @@ int lua_cocos2dx_physics_PhysicsBody_getPositionOffset(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPositionOffset",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:getPositionOffset",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4158,13 +3304,13 @@ int lua_cocos2dx_physics_PhysicsBody_setCategoryBitmask(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.PhysicsBody:setCategoryBitmask"); if(!ok) return 0; cobj->setCategoryBitmask(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setCategoryBitmask",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:setCategoryBitmask",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4208,7 +3354,7 @@ int lua_cocos2dx_physics_PhysicsBody_getWorld(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.PhysicsWorld",(cocos2d::PhysicsWorld*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getWorld",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:getWorld",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4252,7 +3398,7 @@ int lua_cocos2dx_physics_PhysicsBody_getAngularVelocity(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAngularVelocity",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:getAngularVelocity",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4296,7 +3442,7 @@ int lua_cocos2dx_physics_PhysicsBody_getPosition(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPosition",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:getPosition",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4336,13 +3482,13 @@ int lua_cocos2dx_physics_PhysicsBody_setEnable(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.PhysicsBody:setEnable"); if(!ok) return 0; cobj->setEnable(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setEnable",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:setEnable",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4382,13 +3528,13 @@ int lua_cocos2dx_physics_PhysicsBody_setGravityEnable(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.PhysicsBody:setGravityEnable"); if(!ok) return 0; cobj->setGravityEnable(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setGravityEnable",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:setGravityEnable",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4432,7 +3578,7 @@ int lua_cocos2dx_physics_PhysicsBody_getGroup(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getGroup",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:getGroup",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4472,13 +3618,13 @@ int lua_cocos2dx_physics_PhysicsBody_setMoment(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsBody:setMoment"); if(!ok) return 0; cobj->setMoment(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setMoment",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:setMoment",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4522,7 +3668,7 @@ int lua_cocos2dx_physics_PhysicsBody_getTag(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTag",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:getTag",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4562,14 +3708,14 @@ int lua_cocos2dx_physics_PhysicsBody_local2World(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.PhysicsBody:local2World"); if(!ok) return 0; cocos2d::Vec2 ret = cobj->local2World(arg0); vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "local2World",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:local2World",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4613,7 +3759,7 @@ int lua_cocos2dx_physics_PhysicsBody_getCategoryBitmask(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getCategoryBitmask",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:getCategoryBitmask",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4653,13 +3799,13 @@ int lua_cocos2dx_physics_PhysicsBody_setDynamic(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.PhysicsBody:setDynamic"); if(!ok) return 0; cobj->setDynamic(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setDynamic",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:setDynamic",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4703,7 +3849,7 @@ int lua_cocos2dx_physics_PhysicsBody_getFirstShape(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.PhysicsShape",(cocos2d::PhysicsShape*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getFirstShape",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:getFirstShape",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4747,7 +3893,7 @@ int lua_cocos2dx_physics_PhysicsBody_getShapes(lua_State* tolua_S) ccvector_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getShapes",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:getShapes",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4791,7 +3937,7 @@ int lua_cocos2dx_physics_PhysicsBody_getContactTestBitmask(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getContactTestBitmask",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:getContactTestBitmask",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4831,13 +3977,13 @@ int lua_cocos2dx_physics_PhysicsBody_setAngularVelocity(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsBody:setAngularVelocity"); if(!ok) return 0; cobj->setAngularVelocity(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAngularVelocity",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:setAngularVelocity",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4877,14 +4023,14 @@ int lua_cocos2dx_physics_PhysicsBody_world2Local(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.PhysicsBody:world2Local"); if(!ok) return 0; cocos2d::Vec2 ret = cobj->world2Local(arg0); vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "world2Local",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:world2Local",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4928,7 +4074,7 @@ int lua_cocos2dx_physics_PhysicsBody_isEnabled(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isEnabled",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:isEnabled",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4962,7 +4108,7 @@ int lua_cocos2dx_physics_PhysicsBody_removeShape(lua_State* tolua_S) do{ if (argc == 1) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.PhysicsBody:removeShape"); if (!ok) { break; } cobj->removeShape(arg0); @@ -4973,11 +4119,11 @@ int lua_cocos2dx_physics_PhysicsBody_removeShape(lua_State* tolua_S) do{ if (argc == 2) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.PhysicsBody:removeShape"); if (!ok) { break; } bool arg1; - ok &= luaval_to_boolean(tolua_S, 3,&arg1); + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "cc.PhysicsBody:removeShape"); if (!ok) { break; } cobj->removeShape(arg0, arg1); @@ -5003,7 +4149,7 @@ int lua_cocos2dx_physics_PhysicsBody_removeShape(lua_State* tolua_S) if (!ok) { break; } bool arg1; - ok &= luaval_to_boolean(tolua_S, 3,&arg1); + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "cc.PhysicsBody:removeShape"); if (!ok) { break; } cobj->removeShape(arg0, arg1); @@ -5011,7 +4157,7 @@ int lua_cocos2dx_physics_PhysicsBody_removeShape(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeShape",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:removeShape",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5051,13 +4197,13 @@ int lua_cocos2dx_physics_PhysicsBody_setMass(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsBody:setMass"); if(!ok) return 0; cobj->setMass(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setMass",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:setMass",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5097,13 +4243,13 @@ int lua_cocos2dx_physics_PhysicsBody_addMoment(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsBody:addMoment"); if(!ok) return 0; cobj->addMoment(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addMoment",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:addMoment",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5143,13 +4289,13 @@ int lua_cocos2dx_physics_PhysicsBody_setVelocity(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.PhysicsBody:setVelocity"); if(!ok) return 0; cobj->setVelocity(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setVelocity",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:setVelocity",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5189,13 +4335,13 @@ int lua_cocos2dx_physics_PhysicsBody_setLinearDamping(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsBody:setLinearDamping"); if(!ok) return 0; cobj->setLinearDamping(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setLinearDamping",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:setLinearDamping",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5235,13 +4381,13 @@ int lua_cocos2dx_physics_PhysicsBody_setCollisionBitmask(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.PhysicsBody:setCollisionBitmask"); if(!ok) return 0; cobj->setCollisionBitmask(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setCollisionBitmask",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:setCollisionBitmask",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5281,13 +4427,13 @@ int lua_cocos2dx_physics_PhysicsBody_setPositionOffset(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.PhysicsBody:setPositionOffset"); if(!ok) return 0; cobj->setPositionOffset(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setPositionOffset",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:setPositionOffset",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5327,13 +4473,13 @@ int lua_cocos2dx_physics_PhysicsBody_setRotationEnable(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.PhysicsBody:setRotationEnable"); if(!ok) return 0; cobj->setRotationEnable(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setRotationEnable",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:setRotationEnable",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5377,7 +4523,7 @@ int lua_cocos2dx_physics_PhysicsBody_isRotationEnabled(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isRotationEnabled",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:isRotationEnabled",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -5421,7 +4567,7 @@ int lua_cocos2dx_physics_PhysicsBody_getAngularDamping(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAngularDamping",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:getAngularDamping",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -5461,14 +4607,14 @@ int lua_cocos2dx_physics_PhysicsBody_getVelocityAtLocalPoint(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.PhysicsBody:getVelocityAtLocalPoint"); if(!ok) return 0; cocos2d::Vec2 ret = cobj->getVelocityAtLocalPoint(arg0); vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getVelocityAtLocalPoint",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:getVelocityAtLocalPoint",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5512,7 +4658,7 @@ int lua_cocos2dx_physics_PhysicsBody_isResting(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isResting",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:isResting",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -5552,13 +4698,13 @@ int lua_cocos2dx_physics_PhysicsBody_addMass(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsBody:addMass"); if(!ok) return 0; cobj->addMass(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addMass",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:addMass",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5598,14 +4744,14 @@ int lua_cocos2dx_physics_PhysicsBody_getShape(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.PhysicsBody:getShape"); if(!ok) return 0; cocos2d::PhysicsShape* ret = cobj->getShape(arg0); object_to_luaval(tolua_S, "cc.PhysicsShape",(cocos2d::PhysicsShape*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getShape",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:getShape",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5645,13 +4791,13 @@ int lua_cocos2dx_physics_PhysicsBody_setTag(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.PhysicsBody:setTag"); if(!ok) return 0; cobj->setTag(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTag",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:setTag",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5691,14 +4837,14 @@ int lua_cocos2dx_physics_PhysicsBody_getVelocityAtWorldPoint(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.PhysicsBody:getVelocityAtWorldPoint"); if(!ok) return 0; cocos2d::Vec2 ret = cobj->getVelocityAtWorldPoint(arg0); vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getVelocityAtWorldPoint",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:getVelocityAtWorldPoint",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5738,13 +4884,13 @@ int lua_cocos2dx_physics_PhysicsBody_setContactTestBitmask(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.PhysicsBody:setContactTestBitmask"); if(!ok) return 0; cobj->setContactTestBitmask(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setContactTestBitmask",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:setContactTestBitmask",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5787,7 +4933,7 @@ int lua_cocos2dx_physics_PhysicsBody_removeFromWorld(lua_State* tolua_S) cobj->removeFromWorld(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeFromWorld",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:removeFromWorld",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -5831,7 +4977,7 @@ int lua_cocos2dx_physics_PhysicsBody_isDynamic(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isDynamic",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:isDynamic",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -5875,7 +5021,7 @@ int lua_cocos2dx_physics_PhysicsBody_getNode(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Node",(cocos2d::Node*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getNode",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsBody:getNode",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -5903,7 +5049,7 @@ int lua_cocos2dx_physics_PhysicsBody_createBox(lua_State* tolua_S) if (argc == 1) { cocos2d::Size arg0; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.PhysicsBody:createBox"); if(!ok) return 0; cocos2d::PhysicsBody* ret = cocos2d::PhysicsBody::createBox(arg0); @@ -5914,8 +5060,8 @@ int lua_cocos2dx_physics_PhysicsBody_createBox(lua_State* tolua_S) { cocos2d::Size arg0; cocos2d::PhysicsMaterial arg1; - ok &= luaval_to_size(tolua_S, 2, &arg0); - ok &= luaval_to_physics_material(tolua_S, 3, &arg1); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.PhysicsBody:createBox"); + ok &= luaval_to_physics_material(tolua_S, 3, &arg1, "cc.PhysicsBody:createBox"); if(!ok) return 0; cocos2d::PhysicsBody* ret = cocos2d::PhysicsBody::createBox(arg0, arg1); @@ -5927,16 +5073,16 @@ int lua_cocos2dx_physics_PhysicsBody_createBox(lua_State* tolua_S) cocos2d::Size arg0; cocos2d::PhysicsMaterial arg1; cocos2d::Vec2 arg2; - ok &= luaval_to_size(tolua_S, 2, &arg0); - ok &= luaval_to_physics_material(tolua_S, 3, &arg1); - ok &= luaval_to_vec2(tolua_S, 4, &arg2); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.PhysicsBody:createBox"); + ok &= luaval_to_physics_material(tolua_S, 3, &arg1, "cc.PhysicsBody:createBox"); + ok &= luaval_to_vec2(tolua_S, 4, &arg2, "cc.PhysicsBody:createBox"); if(!ok) return 0; cocos2d::PhysicsBody* ret = cocos2d::PhysicsBody::createBox(arg0, arg1, arg2); object_to_luaval(tolua_S, "cc.PhysicsBody",(cocos2d::PhysicsBody*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createBox",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.PhysicsBody:createBox",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -5963,8 +5109,8 @@ int lua_cocos2dx_physics_PhysicsBody_createEdgeSegment(lua_State* tolua_S) { cocos2d::Vec2 arg0; cocos2d::Vec2 arg1; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); - ok &= luaval_to_vec2(tolua_S, 3, &arg1); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.PhysicsBody:createEdgeSegment"); + ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.PhysicsBody:createEdgeSegment"); if(!ok) return 0; cocos2d::PhysicsBody* ret = cocos2d::PhysicsBody::createEdgeSegment(arg0, arg1); @@ -5976,9 +5122,9 @@ int lua_cocos2dx_physics_PhysicsBody_createEdgeSegment(lua_State* tolua_S) cocos2d::Vec2 arg0; cocos2d::Vec2 arg1; cocos2d::PhysicsMaterial arg2; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); - ok &= luaval_to_vec2(tolua_S, 3, &arg1); - ok &= luaval_to_physics_material(tolua_S, 4, &arg2); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.PhysicsBody:createEdgeSegment"); + ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.PhysicsBody:createEdgeSegment"); + ok &= luaval_to_physics_material(tolua_S, 4, &arg2, "cc.PhysicsBody:createEdgeSegment"); if(!ok) return 0; cocos2d::PhysicsBody* ret = cocos2d::PhysicsBody::createEdgeSegment(arg0, arg1, arg2); @@ -5991,17 +5137,17 @@ int lua_cocos2dx_physics_PhysicsBody_createEdgeSegment(lua_State* tolua_S) cocos2d::Vec2 arg1; cocos2d::PhysicsMaterial arg2; double arg3; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); - ok &= luaval_to_vec2(tolua_S, 3, &arg1); - ok &= luaval_to_physics_material(tolua_S, 4, &arg2); - ok &= luaval_to_number(tolua_S, 5,&arg3); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.PhysicsBody:createEdgeSegment"); + ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.PhysicsBody:createEdgeSegment"); + ok &= luaval_to_physics_material(tolua_S, 4, &arg2, "cc.PhysicsBody:createEdgeSegment"); + ok &= luaval_to_number(tolua_S, 5,&arg3, "cc.PhysicsBody:createEdgeSegment"); if(!ok) return 0; cocos2d::PhysicsBody* ret = cocos2d::PhysicsBody::createEdgeSegment(arg0, arg1, arg2, arg3); object_to_luaval(tolua_S, "cc.PhysicsBody",(cocos2d::PhysicsBody*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createEdgeSegment",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.PhysicsBody:createEdgeSegment",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -6028,7 +5174,7 @@ int lua_cocos2dx_physics_PhysicsBody_create(lua_State* tolua_S) if (argc == 1) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsBody:create"); if (!ok) { break; } cocos2d::PhysicsBody* ret = cocos2d::PhysicsBody::create(arg0); object_to_luaval(tolua_S, "cc.PhysicsBody",(cocos2d::PhysicsBody*)ret); @@ -6051,10 +5197,10 @@ int lua_cocos2dx_physics_PhysicsBody_create(lua_State* tolua_S) if (argc == 2) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsBody:create"); if (!ok) { break; } double arg1; - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.PhysicsBody:create"); if (!ok) { break; } cocos2d::PhysicsBody* ret = cocos2d::PhysicsBody::create(arg0, arg1); object_to_luaval(tolua_S, "cc.PhysicsBody",(cocos2d::PhysicsBody*)ret); @@ -6062,7 +5208,7 @@ int lua_cocos2dx_physics_PhysicsBody_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.PhysicsBody:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -6088,7 +5234,7 @@ int lua_cocos2dx_physics_PhysicsBody_createEdgeBox(lua_State* tolua_S) if (argc == 1) { cocos2d::Size arg0; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.PhysicsBody:createEdgeBox"); if(!ok) return 0; cocos2d::PhysicsBody* ret = cocos2d::PhysicsBody::createEdgeBox(arg0); @@ -6099,8 +5245,8 @@ int lua_cocos2dx_physics_PhysicsBody_createEdgeBox(lua_State* tolua_S) { cocos2d::Size arg0; cocos2d::PhysicsMaterial arg1; - ok &= luaval_to_size(tolua_S, 2, &arg0); - ok &= luaval_to_physics_material(tolua_S, 3, &arg1); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.PhysicsBody:createEdgeBox"); + ok &= luaval_to_physics_material(tolua_S, 3, &arg1, "cc.PhysicsBody:createEdgeBox"); if(!ok) return 0; cocos2d::PhysicsBody* ret = cocos2d::PhysicsBody::createEdgeBox(arg0, arg1); @@ -6112,9 +5258,9 @@ int lua_cocos2dx_physics_PhysicsBody_createEdgeBox(lua_State* tolua_S) cocos2d::Size arg0; cocos2d::PhysicsMaterial arg1; double arg2; - ok &= luaval_to_size(tolua_S, 2, &arg0); - ok &= luaval_to_physics_material(tolua_S, 3, &arg1); - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.PhysicsBody:createEdgeBox"); + ok &= luaval_to_physics_material(tolua_S, 3, &arg1, "cc.PhysicsBody:createEdgeBox"); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.PhysicsBody:createEdgeBox"); if(!ok) return 0; cocos2d::PhysicsBody* ret = cocos2d::PhysicsBody::createEdgeBox(arg0, arg1, arg2); @@ -6127,17 +5273,17 @@ int lua_cocos2dx_physics_PhysicsBody_createEdgeBox(lua_State* tolua_S) cocos2d::PhysicsMaterial arg1; double arg2; cocos2d::Vec2 arg3; - ok &= luaval_to_size(tolua_S, 2, &arg0); - ok &= luaval_to_physics_material(tolua_S, 3, &arg1); - ok &= luaval_to_number(tolua_S, 4,&arg2); - ok &= luaval_to_vec2(tolua_S, 5, &arg3); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.PhysicsBody:createEdgeBox"); + ok &= luaval_to_physics_material(tolua_S, 3, &arg1, "cc.PhysicsBody:createEdgeBox"); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.PhysicsBody:createEdgeBox"); + ok &= luaval_to_vec2(tolua_S, 5, &arg3, "cc.PhysicsBody:createEdgeBox"); if(!ok) return 0; cocos2d::PhysicsBody* ret = cocos2d::PhysicsBody::createEdgeBox(arg0, arg1, arg2, arg3); object_to_luaval(tolua_S, "cc.PhysicsBody",(cocos2d::PhysicsBody*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createEdgeBox",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.PhysicsBody:createEdgeBox",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -6163,7 +5309,7 @@ int lua_cocos2dx_physics_PhysicsBody_createCircle(lua_State* tolua_S) if (argc == 1) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsBody:createCircle"); if(!ok) return 0; cocos2d::PhysicsBody* ret = cocos2d::PhysicsBody::createCircle(arg0); @@ -6174,8 +5320,8 @@ int lua_cocos2dx_physics_PhysicsBody_createCircle(lua_State* tolua_S) { double arg0; cocos2d::PhysicsMaterial arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); - ok &= luaval_to_physics_material(tolua_S, 3, &arg1); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsBody:createCircle"); + ok &= luaval_to_physics_material(tolua_S, 3, &arg1, "cc.PhysicsBody:createCircle"); if(!ok) return 0; cocos2d::PhysicsBody* ret = cocos2d::PhysicsBody::createCircle(arg0, arg1); @@ -6187,16 +5333,16 @@ int lua_cocos2dx_physics_PhysicsBody_createCircle(lua_State* tolua_S) double arg0; cocos2d::PhysicsMaterial arg1; cocos2d::Vec2 arg2; - ok &= luaval_to_number(tolua_S, 2,&arg0); - ok &= luaval_to_physics_material(tolua_S, 3, &arg1); - ok &= luaval_to_vec2(tolua_S, 4, &arg2); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsBody:createCircle"); + ok &= luaval_to_physics_material(tolua_S, 3, &arg1, "cc.PhysicsBody:createCircle"); + ok &= luaval_to_vec2(tolua_S, 4, &arg2, "cc.PhysicsBody:createCircle"); if(!ok) return 0; cocos2d::PhysicsBody* ret = cocos2d::PhysicsBody::createCircle(arg0, arg1, arg2); object_to_luaval(tolua_S, "cc.PhysicsBody",(cocos2d::PhysicsBody*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createCircle",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.PhysicsBody:createCircle",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -6289,6 +5435,999 @@ int lua_register_cocos2dx_physics_PhysicsBody(lua_State* tolua_S) return 1; } +int lua_cocos2dx_physics_PhysicsWorld_setGravity(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::PhysicsWorld* 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.PhysicsWorld",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::PhysicsWorld*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_setGravity'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + cocos2d::Vec2 arg0; + + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.PhysicsWorld:setGravity"); + if(!ok) + return 0; + cobj->setGravity(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsWorld:setGravity",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_setGravity'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_physics_PhysicsWorld_getAllBodies(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::PhysicsWorld* 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.PhysicsWorld",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::PhysicsWorld*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_getAllBodies'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + const cocos2d::Vector& ret = cobj->getAllBodies(); + ccvector_to_luaval(tolua_S, ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsWorld:getAllBodies",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_getAllBodies'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_physics_PhysicsWorld_getDebugDrawMask(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::PhysicsWorld* 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.PhysicsWorld",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::PhysicsWorld*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_getDebugDrawMask'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + int ret = cobj->getDebugDrawMask(); + tolua_pushnumber(tolua_S,(lua_Number)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsWorld:getDebugDrawMask",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_getDebugDrawMask'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_physics_PhysicsWorld_setAutoStep(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::PhysicsWorld* 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.PhysicsWorld",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::PhysicsWorld*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_setAutoStep'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + bool arg0; + + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.PhysicsWorld:setAutoStep"); + if(!ok) + return 0; + cobj->setAutoStep(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsWorld:setAutoStep",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_setAutoStep'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_physics_PhysicsWorld_addJoint(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::PhysicsWorld* 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.PhysicsWorld",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::PhysicsWorld*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_addJoint'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + cocos2d::PhysicsJoint* arg0; + + ok &= luaval_to_object(tolua_S, 2, "cc.PhysicsJoint",&arg0); + if(!ok) + return 0; + cobj->addJoint(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsWorld:addJoint",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_addJoint'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_physics_PhysicsWorld_removeAllJoints(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::PhysicsWorld* 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.PhysicsWorld",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::PhysicsWorld*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_removeAllJoints'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + cobj->removeAllJoints(); + return 0; + } + if (argc == 1) + { + bool arg0; + + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.PhysicsWorld:removeAllJoints"); + if(!ok) + return 0; + cobj->removeAllJoints(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsWorld:removeAllJoints",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_removeAllJoints'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_physics_PhysicsWorld_isAutoStep(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::PhysicsWorld* 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.PhysicsWorld",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::PhysicsWorld*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_isAutoStep'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + bool ret = cobj->isAutoStep(); + tolua_pushboolean(tolua_S,(bool)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsWorld:isAutoStep",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_isAutoStep'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_physics_PhysicsWorld_removeBody(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::PhysicsWorld* 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.PhysicsWorld",0,&tolua_err)) goto tolua_lerror; +#endif + cobj = (cocos2d::PhysicsWorld*)tolua_tousertype(tolua_S,1,0); +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_removeBody'", nullptr); + return 0; + } +#endif + argc = lua_gettop(tolua_S)-1; + do{ + if (argc == 1) { + int arg0; + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.PhysicsWorld:removeBody"); + + if (!ok) { break; } + cobj->removeBody(arg0); + return 0; + } + }while(0); + ok = true; + do{ + if (argc == 1) { + cocos2d::PhysicsBody* arg0; + ok &= luaval_to_object(tolua_S, 2, "cc.PhysicsBody",&arg0); + + if (!ok) { break; } + cobj->removeBody(arg0); + return 0; + } + }while(0); + ok = true; + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsWorld:removeBody",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_removeBody'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_physics_PhysicsWorld_removeJoint(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::PhysicsWorld* 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.PhysicsWorld",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::PhysicsWorld*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_removeJoint'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + cocos2d::PhysicsJoint* arg0; + + ok &= luaval_to_object(tolua_S, 2, "cc.PhysicsJoint",&arg0); + if(!ok) + return 0; + cobj->removeJoint(arg0); + return 0; + } + if (argc == 2) + { + cocos2d::PhysicsJoint* arg0; + bool arg1; + + ok &= luaval_to_object(tolua_S, 2, "cc.PhysicsJoint",&arg0); + + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "cc.PhysicsWorld:removeJoint"); + if(!ok) + return 0; + cobj->removeJoint(arg0, arg1); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsWorld:removeJoint",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_removeJoint'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_physics_PhysicsWorld_getShapes(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::PhysicsWorld* 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.PhysicsWorld",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::PhysicsWorld*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_getShapes'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + cocos2d::Vec2 arg0; + + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.PhysicsWorld:getShapes"); + if(!ok) + return 0; + cocos2d::Vector ret = cobj->getShapes(arg0); + ccvector_to_luaval(tolua_S, ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsWorld:getShapes",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_getShapes'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_physics_PhysicsWorld_step(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::PhysicsWorld* 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.PhysicsWorld",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::PhysicsWorld*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_step'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + double arg0; + + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsWorld:step"); + if(!ok) + return 0; + cobj->step(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsWorld:step",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_step'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_physics_PhysicsWorld_setDebugDrawMask(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::PhysicsWorld* 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.PhysicsWorld",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::PhysicsWorld*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_setDebugDrawMask'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + int arg0; + + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.PhysicsWorld:setDebugDrawMask"); + if(!ok) + return 0; + cobj->setDebugDrawMask(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsWorld:setDebugDrawMask",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_setDebugDrawMask'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_physics_PhysicsWorld_getGravity(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::PhysicsWorld* 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.PhysicsWorld",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::PhysicsWorld*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_getGravity'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + cocos2d::Vec2 ret = cobj->getGravity(); + vec2_to_luaval(tolua_S, ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsWorld:getGravity",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_getGravity'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_physics_PhysicsWorld_setUpdateRate(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::PhysicsWorld* 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.PhysicsWorld",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::PhysicsWorld*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_setUpdateRate'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + int arg0; + + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.PhysicsWorld:setUpdateRate"); + if(!ok) + return 0; + cobj->setUpdateRate(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsWorld:setUpdateRate",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_setUpdateRate'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_physics_PhysicsWorld_getSpeed(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::PhysicsWorld* 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.PhysicsWorld",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::PhysicsWorld*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_getSpeed'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + double ret = cobj->getSpeed(); + tolua_pushnumber(tolua_S,(lua_Number)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsWorld:getSpeed",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_getSpeed'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_physics_PhysicsWorld_getUpdateRate(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::PhysicsWorld* 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.PhysicsWorld",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::PhysicsWorld*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_getUpdateRate'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + int ret = cobj->getUpdateRate(); + tolua_pushnumber(tolua_S,(lua_Number)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsWorld:getUpdateRate",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_getUpdateRate'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_physics_PhysicsWorld_removeAllBodies(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::PhysicsWorld* 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.PhysicsWorld",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::PhysicsWorld*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_removeAllBodies'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + cobj->removeAllBodies(); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsWorld:removeAllBodies",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_removeAllBodies'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_physics_PhysicsWorld_setSpeed(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::PhysicsWorld* 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.PhysicsWorld",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::PhysicsWorld*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_setSpeed'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + double arg0; + + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsWorld:setSpeed"); + if(!ok) + return 0; + cobj->setSpeed(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsWorld:setSpeed",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_setSpeed'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_physics_PhysicsWorld_getShape(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::PhysicsWorld* 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.PhysicsWorld",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::PhysicsWorld*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_getShape'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + cocos2d::Vec2 arg0; + + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.PhysicsWorld:getShape"); + if(!ok) + return 0; + cocos2d::PhysicsShape* ret = cobj->getShape(arg0); + object_to_luaval(tolua_S, "cc.PhysicsShape",(cocos2d::PhysicsShape*)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsWorld:getShape",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_getShape'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_physics_PhysicsWorld_getBody(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::PhysicsWorld* 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.PhysicsWorld",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::PhysicsWorld*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_physics_PhysicsWorld_getBody'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + int arg0; + + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.PhysicsWorld:getBody"); + if(!ok) + return 0; + cocos2d::PhysicsBody* ret = cobj->getBody(arg0); + object_to_luaval(tolua_S, "cc.PhysicsBody",(cocos2d::PhysicsBody*)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsWorld:getBody",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_physics_PhysicsWorld_getBody'.",&tolua_err); +#endif + + return 0; +} +static int lua_cocos2dx_physics_PhysicsWorld_finalize(lua_State* tolua_S) +{ + printf("luabindings: finalizing LUA object (PhysicsWorld)"); + return 0; +} + +int lua_register_cocos2dx_physics_PhysicsWorld(lua_State* tolua_S) +{ + tolua_usertype(tolua_S,"cc.PhysicsWorld"); + tolua_cclass(tolua_S,"PhysicsWorld","cc.PhysicsWorld","",nullptr); + + tolua_beginmodule(tolua_S,"PhysicsWorld"); + tolua_function(tolua_S,"setGravity",lua_cocos2dx_physics_PhysicsWorld_setGravity); + tolua_function(tolua_S,"getAllBodies",lua_cocos2dx_physics_PhysicsWorld_getAllBodies); + tolua_function(tolua_S,"getDebugDrawMask",lua_cocos2dx_physics_PhysicsWorld_getDebugDrawMask); + tolua_function(tolua_S,"setAutoStep",lua_cocos2dx_physics_PhysicsWorld_setAutoStep); + tolua_function(tolua_S,"addJoint",lua_cocos2dx_physics_PhysicsWorld_addJoint); + tolua_function(tolua_S,"removeAllJoints",lua_cocos2dx_physics_PhysicsWorld_removeAllJoints); + tolua_function(tolua_S,"isAutoStep",lua_cocos2dx_physics_PhysicsWorld_isAutoStep); + tolua_function(tolua_S,"removeBody",lua_cocos2dx_physics_PhysicsWorld_removeBody); + tolua_function(tolua_S,"removeJoint",lua_cocos2dx_physics_PhysicsWorld_removeJoint); + tolua_function(tolua_S,"getShapes",lua_cocos2dx_physics_PhysicsWorld_getShapes); + tolua_function(tolua_S,"step",lua_cocos2dx_physics_PhysicsWorld_step); + tolua_function(tolua_S,"setDebugDrawMask",lua_cocos2dx_physics_PhysicsWorld_setDebugDrawMask); + tolua_function(tolua_S,"getGravity",lua_cocos2dx_physics_PhysicsWorld_getGravity); + tolua_function(tolua_S,"setUpdateRate",lua_cocos2dx_physics_PhysicsWorld_setUpdateRate); + tolua_function(tolua_S,"getSpeed",lua_cocos2dx_physics_PhysicsWorld_getSpeed); + tolua_function(tolua_S,"getUpdateRate",lua_cocos2dx_physics_PhysicsWorld_getUpdateRate); + tolua_function(tolua_S,"removeAllBodies",lua_cocos2dx_physics_PhysicsWorld_removeAllBodies); + tolua_function(tolua_S,"setSpeed",lua_cocos2dx_physics_PhysicsWorld_setSpeed); + tolua_function(tolua_S,"getShape",lua_cocos2dx_physics_PhysicsWorld_getShape); + tolua_function(tolua_S,"getBody",lua_cocos2dx_physics_PhysicsWorld_getBody); + tolua_endmodule(tolua_S); + std::string typeName = typeid(cocos2d::PhysicsWorld).name(); + g_luaType[typeName] = "cc.PhysicsWorld"; + g_typeCast["PhysicsWorld"] = "cc.PhysicsWorld"; + return 1; +} + +static int lua_cocos2dx_physics_PhysicsDebugDraw_finalize(lua_State* tolua_S) +{ + printf("luabindings: finalizing LUA object (PhysicsDebugDraw)"); + return 0; +} + +int lua_register_cocos2dx_physics_PhysicsDebugDraw(lua_State* tolua_S) +{ + tolua_usertype(tolua_S,"cc.PhysicsDebugDraw"); + tolua_cclass(tolua_S,"PhysicsDebugDraw","cc.PhysicsDebugDraw","",nullptr); + + tolua_beginmodule(tolua_S,"PhysicsDebugDraw"); + tolua_endmodule(tolua_S); + std::string typeName = typeid(cocos2d::PhysicsDebugDraw).name(); + g_luaType[typeName] = "cc.PhysicsDebugDraw"; + g_typeCast["PhysicsDebugDraw"] = "cc.PhysicsDebugDraw"; + return 1; +} + int lua_cocos2dx_physics_PhysicsContact_getContactData(lua_State* tolua_S) { int argc = 0; @@ -6323,7 +6462,7 @@ int lua_cocos2dx_physics_PhysicsContact_getContactData(lua_State* tolua_S) physics_contactdata_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getContactData",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsContact:getContactData",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -6367,7 +6506,7 @@ int lua_cocos2dx_physics_PhysicsContact_getEventCode(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getEventCode",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsContact:getEventCode",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -6411,7 +6550,7 @@ int lua_cocos2dx_physics_PhysicsContact_getPreContactData(lua_State* tolua_S) physics_contactdata_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPreContactData",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsContact:getPreContactData",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -6455,7 +6594,7 @@ int lua_cocos2dx_physics_PhysicsContact_getShapeA(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.PhysicsShape",(cocos2d::PhysicsShape*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getShapeA",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsContact:getShapeA",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -6499,7 +6638,7 @@ int lua_cocos2dx_physics_PhysicsContact_getShapeB(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.PhysicsShape",(cocos2d::PhysicsShape*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getShapeB",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsContact:getShapeB",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -6567,7 +6706,7 @@ int lua_cocos2dx_physics_PhysicsContactPreSolve_getFriction(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getFriction",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsContactPreSolve:getFriction",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -6611,7 +6750,7 @@ int lua_cocos2dx_physics_PhysicsContactPreSolve_getRestitution(lua_State* tolua_ tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getRestitution",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsContactPreSolve:getRestitution",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -6651,13 +6790,13 @@ int lua_cocos2dx_physics_PhysicsContactPreSolve_setFriction(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsContactPreSolve:setFriction"); if(!ok) return 0; cobj->setFriction(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setFriction",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsContactPreSolve:setFriction",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -6700,7 +6839,7 @@ int lua_cocos2dx_physics_PhysicsContactPreSolve_ignore(lua_State* tolua_S) cobj->ignore(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ignore",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsContactPreSolve:ignore",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -6744,7 +6883,7 @@ int lua_cocos2dx_physics_PhysicsContactPreSolve_getSurfaceVelocity(lua_State* to vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getSurfaceVelocity",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsContactPreSolve:getSurfaceVelocity",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -6784,13 +6923,13 @@ int lua_cocos2dx_physics_PhysicsContactPreSolve_setSurfaceVelocity(lua_State* to { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.PhysicsContactPreSolve:setSurfaceVelocity"); if(!ok) return 0; cobj->setSurfaceVelocity(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setSurfaceVelocity",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsContactPreSolve:setSurfaceVelocity",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -6830,13 +6969,13 @@ int lua_cocos2dx_physics_PhysicsContactPreSolve_setRestitution(lua_State* tolua_ { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsContactPreSolve:setRestitution"); if(!ok) return 0; cobj->setRestitution(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setRestitution",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsContactPreSolve:setRestitution",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -6906,7 +7045,7 @@ int lua_cocos2dx_physics_PhysicsContactPostSolve_getFriction(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getFriction",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsContactPostSolve:getFriction",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -6950,7 +7089,7 @@ int lua_cocos2dx_physics_PhysicsContactPostSolve_getSurfaceVelocity(lua_State* t vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getSurfaceVelocity",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsContactPostSolve:getSurfaceVelocity",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -6994,7 +7133,7 @@ int lua_cocos2dx_physics_PhysicsContactPostSolve_getRestitution(lua_State* tolua tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getRestitution",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsContactPostSolve:getRestitution",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -7049,7 +7188,7 @@ int lua_cocos2dx_physics_EventListenerPhysicsContact_create(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.EventListenerPhysicsContact",(cocos2d::EventListenerPhysicsContact*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.EventListenerPhysicsContact:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -7117,7 +7256,7 @@ int lua_cocos2dx_physics_EventListenerPhysicsContactWithBodies_hitTest(lua_State tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "hitTest",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventListenerPhysicsContactWithBodies:hitTest",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -7154,7 +7293,7 @@ int lua_cocos2dx_physics_EventListenerPhysicsContactWithBodies_create(lua_State* object_to_luaval(tolua_S, "cc.EventListenerPhysicsContactWithBodies",(cocos2d::EventListenerPhysicsContactWithBodies*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.EventListenerPhysicsContactWithBodies:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -7223,7 +7362,7 @@ int lua_cocos2dx_physics_EventListenerPhysicsContactWithShapes_hitTest(lua_State tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "hitTest",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventListenerPhysicsContactWithShapes:hitTest",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -7260,7 +7399,7 @@ int lua_cocos2dx_physics_EventListenerPhysicsContactWithShapes_create(lua_State* object_to_luaval(tolua_S, "cc.EventListenerPhysicsContactWithShapes",(cocos2d::EventListenerPhysicsContactWithShapes*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.EventListenerPhysicsContactWithShapes:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -7329,7 +7468,7 @@ int lua_cocos2dx_physics_EventListenerPhysicsContactWithGroup_hitTest(lua_State* tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "hitTest",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.EventListenerPhysicsContactWithGroup:hitTest",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -7357,14 +7496,14 @@ int lua_cocos2dx_physics_EventListenerPhysicsContactWithGroup_create(lua_State* if (argc == 1) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.EventListenerPhysicsContactWithGroup:create"); if(!ok) return 0; cocos2d::EventListenerPhysicsContactWithGroup* ret = cocos2d::EventListenerPhysicsContactWithGroup::create(arg0); object_to_luaval(tolua_S, "cc.EventListenerPhysicsContactWithGroup",(cocos2d::EventListenerPhysicsContactWithGroup*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.EventListenerPhysicsContactWithGroup:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -7427,7 +7566,7 @@ int lua_cocos2dx_physics_PhysicsJoint_getBodyA(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.PhysicsBody",(cocos2d::PhysicsBody*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getBodyA",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJoint:getBodyA",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -7471,7 +7610,7 @@ int lua_cocos2dx_physics_PhysicsJoint_getBodyB(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.PhysicsBody",(cocos2d::PhysicsBody*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getBodyB",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJoint:getBodyB",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -7515,7 +7654,7 @@ int lua_cocos2dx_physics_PhysicsJoint_getMaxForce(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getMaxForce",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJoint:getMaxForce",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -7555,13 +7694,13 @@ int lua_cocos2dx_physics_PhysicsJoint_setMaxForce(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsJoint:setMaxForce"); if(!ok) return 0; cobj->setMaxForce(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setMaxForce",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJoint:setMaxForce",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -7605,7 +7744,7 @@ int lua_cocos2dx_physics_PhysicsJoint_isEnabled(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isEnabled",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJoint:isEnabled",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -7645,13 +7784,13 @@ int lua_cocos2dx_physics_PhysicsJoint_setEnable(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.PhysicsJoint:setEnable"); if(!ok) return 0; cobj->setEnable(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setEnable",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJoint:setEnable",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -7691,13 +7830,13 @@ int lua_cocos2dx_physics_PhysicsJoint_setCollisionEnable(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.PhysicsJoint:setCollisionEnable"); if(!ok) return 0; cobj->setCollisionEnable(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setCollisionEnable",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJoint:setCollisionEnable",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -7741,7 +7880,7 @@ int lua_cocos2dx_physics_PhysicsJoint_getWorld(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.PhysicsWorld",(cocos2d::PhysicsWorld*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getWorld",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJoint:getWorld",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -7781,13 +7920,13 @@ int lua_cocos2dx_physics_PhysicsJoint_setTag(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.PhysicsJoint:setTag"); if(!ok) return 0; cobj->setTag(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTag",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJoint:setTag",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -7830,7 +7969,7 @@ int lua_cocos2dx_physics_PhysicsJoint_removeFormWorld(lua_State* tolua_S) cobj->removeFormWorld(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeFormWorld",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJoint:removeFormWorld",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -7874,7 +8013,7 @@ int lua_cocos2dx_physics_PhysicsJoint_isCollisionEnabled(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isCollisionEnabled",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJoint:isCollisionEnabled",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -7918,7 +8057,7 @@ int lua_cocos2dx_physics_PhysicsJoint_getTag(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTag",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJoint:getTag",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -7952,7 +8091,7 @@ int lua_cocos2dx_physics_PhysicsJoint_destroy(lua_State* tolua_S) cocos2d::PhysicsJoint::destroy(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "destroy",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.PhysicsJoint:destroy",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -8014,14 +8153,14 @@ int lua_cocos2dx_physics_PhysicsJointFixed_construct(lua_State* tolua_S) cocos2d::Vec2 arg2; ok &= luaval_to_object(tolua_S, 2, "cc.PhysicsBody",&arg0); ok &= luaval_to_object(tolua_S, 3, "cc.PhysicsBody",&arg1); - ok &= luaval_to_vec2(tolua_S, 4, &arg2); + ok &= luaval_to_vec2(tolua_S, 4, &arg2, "cc.PhysicsJointFixed:construct"); if(!ok) return 0; cocos2d::PhysicsJointFixed* ret = cocos2d::PhysicsJointFixed::construct(arg0, arg1, arg2); object_to_luaval(tolua_S, "cc.PhysicsJointFixed",(cocos2d::PhysicsJointFixed*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "construct",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.PhysicsJointFixed:construct",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -8079,13 +8218,13 @@ int lua_cocos2dx_physics_PhysicsJointLimit_setAnchr2(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.PhysicsJointLimit:setAnchr2"); if(!ok) return 0; cobj->setAnchr2(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAnchr2",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJointLimit:setAnchr2",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -8125,13 +8264,13 @@ int lua_cocos2dx_physics_PhysicsJointLimit_setAnchr1(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.PhysicsJointLimit:setAnchr1"); if(!ok) return 0; cobj->setAnchr1(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAnchr1",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJointLimit:setAnchr1",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -8171,13 +8310,13 @@ int lua_cocos2dx_physics_PhysicsJointLimit_setMax(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsJointLimit:setMax"); if(!ok) return 0; cobj->setMax(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setMax",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJointLimit:setMax",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -8221,7 +8360,7 @@ int lua_cocos2dx_physics_PhysicsJointLimit_getAnchr2(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAnchr2",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJointLimit:getAnchr2",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -8265,7 +8404,7 @@ int lua_cocos2dx_physics_PhysicsJointLimit_getAnchr1(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAnchr1",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJointLimit:getAnchr1",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -8309,7 +8448,7 @@ int lua_cocos2dx_physics_PhysicsJointLimit_getMin(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getMin",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJointLimit:getMin",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -8353,7 +8492,7 @@ int lua_cocos2dx_physics_PhysicsJointLimit_getMax(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getMax",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJointLimit:getMax",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -8393,13 +8532,13 @@ int lua_cocos2dx_physics_PhysicsJointLimit_setMin(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsJointLimit:setMin"); if(!ok) return 0; cobj->setMin(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setMin",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJointLimit:setMin",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -8434,16 +8573,16 @@ int lua_cocos2dx_physics_PhysicsJointLimit_construct(lua_State* tolua_S) ok &= luaval_to_object(tolua_S, 3, "cc.PhysicsBody",&arg1); if (!ok) { break; } cocos2d::Vec2 arg2; - ok &= luaval_to_vec2(tolua_S, 4, &arg2); + ok &= luaval_to_vec2(tolua_S, 4, &arg2, "cc.PhysicsJointLimit:construct"); if (!ok) { break; } cocos2d::Vec2 arg3; - ok &= luaval_to_vec2(tolua_S, 5, &arg3); + ok &= luaval_to_vec2(tolua_S, 5, &arg3, "cc.PhysicsJointLimit:construct"); if (!ok) { break; } double arg4; - ok &= luaval_to_number(tolua_S, 6,&arg4); + ok &= luaval_to_number(tolua_S, 6,&arg4, "cc.PhysicsJointLimit:construct"); if (!ok) { break; } double arg5; - ok &= luaval_to_number(tolua_S, 7,&arg5); + ok &= luaval_to_number(tolua_S, 7,&arg5, "cc.PhysicsJointLimit:construct"); if (!ok) { break; } cocos2d::PhysicsJointLimit* ret = cocos2d::PhysicsJointLimit::construct(arg0, arg1, arg2, arg3, arg4, arg5); object_to_luaval(tolua_S, "cc.PhysicsJointLimit",(cocos2d::PhysicsJointLimit*)ret); @@ -8462,10 +8601,10 @@ int lua_cocos2dx_physics_PhysicsJointLimit_construct(lua_State* tolua_S) ok &= luaval_to_object(tolua_S, 3, "cc.PhysicsBody",&arg1); if (!ok) { break; } cocos2d::Vec2 arg2; - ok &= luaval_to_vec2(tolua_S, 4, &arg2); + ok &= luaval_to_vec2(tolua_S, 4, &arg2, "cc.PhysicsJointLimit:construct"); if (!ok) { break; } cocos2d::Vec2 arg3; - ok &= luaval_to_vec2(tolua_S, 5, &arg3); + ok &= luaval_to_vec2(tolua_S, 5, &arg3, "cc.PhysicsJointLimit:construct"); if (!ok) { break; } cocos2d::PhysicsJointLimit* ret = cocos2d::PhysicsJointLimit::construct(arg0, arg1, arg2, arg3); object_to_luaval(tolua_S, "cc.PhysicsJointLimit",(cocos2d::PhysicsJointLimit*)ret); @@ -8473,7 +8612,7 @@ int lua_cocos2dx_physics_PhysicsJointLimit_construct(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "construct",argc, 4); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.PhysicsJointLimit:construct",argc, 4); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -8531,14 +8670,14 @@ int lua_cocos2dx_physics_PhysicsJointPin_construct(lua_State* tolua_S) cocos2d::Vec2 arg2; ok &= luaval_to_object(tolua_S, 2, "cc.PhysicsBody",&arg0); ok &= luaval_to_object(tolua_S, 3, "cc.PhysicsBody",&arg1); - ok &= luaval_to_vec2(tolua_S, 4, &arg2); + ok &= luaval_to_vec2(tolua_S, 4, &arg2, "cc.PhysicsJointPin:construct"); if(!ok) return 0; cocos2d::PhysicsJointPin* ret = cocos2d::PhysicsJointPin::construct(arg0, arg1, arg2); object_to_luaval(tolua_S, "cc.PhysicsJointPin",(cocos2d::PhysicsJointPin*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "construct",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.PhysicsJointPin:construct",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -8596,13 +8735,13 @@ int lua_cocos2dx_physics_PhysicsJointDistance_setDistance(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsJointDistance:setDistance"); if(!ok) return 0; cobj->setDistance(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setDistance",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJointDistance:setDistance",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -8646,7 +8785,7 @@ int lua_cocos2dx_physics_PhysicsJointDistance_getDistance(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDistance",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJointDistance:getDistance",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -8679,15 +8818,15 @@ int lua_cocos2dx_physics_PhysicsJointDistance_construct(lua_State* tolua_S) cocos2d::Vec2 arg3; ok &= luaval_to_object(tolua_S, 2, "cc.PhysicsBody",&arg0); ok &= luaval_to_object(tolua_S, 3, "cc.PhysicsBody",&arg1); - ok &= luaval_to_vec2(tolua_S, 4, &arg2); - ok &= luaval_to_vec2(tolua_S, 5, &arg3); + ok &= luaval_to_vec2(tolua_S, 4, &arg2, "cc.PhysicsJointDistance:construct"); + ok &= luaval_to_vec2(tolua_S, 5, &arg3, "cc.PhysicsJointDistance:construct"); if(!ok) return 0; cocos2d::PhysicsJointDistance* ret = cocos2d::PhysicsJointDistance::construct(arg0, arg1, arg2, arg3); object_to_luaval(tolua_S, "cc.PhysicsJointDistance",(cocos2d::PhysicsJointDistance*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "construct",argc, 4); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.PhysicsJointDistance:construct",argc, 4); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -8747,13 +8886,13 @@ int lua_cocos2dx_physics_PhysicsJointSpring_setAnchr2(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.PhysicsJointSpring:setAnchr2"); if(!ok) return 0; cobj->setAnchr2(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAnchr2",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJointSpring:setAnchr2",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -8793,13 +8932,13 @@ int lua_cocos2dx_physics_PhysicsJointSpring_setAnchr1(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.PhysicsJointSpring:setAnchr1"); if(!ok) return 0; cobj->setAnchr1(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAnchr1",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJointSpring:setAnchr1",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -8843,7 +8982,7 @@ int lua_cocos2dx_physics_PhysicsJointSpring_getDamping(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDamping",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJointSpring:getDamping",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -8883,13 +9022,13 @@ int lua_cocos2dx_physics_PhysicsJointSpring_setStiffness(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsJointSpring:setStiffness"); if(!ok) return 0; cobj->setStiffness(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setStiffness",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJointSpring:setStiffness",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -8933,7 +9072,7 @@ int lua_cocos2dx_physics_PhysicsJointSpring_getRestLength(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getRestLength",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJointSpring:getRestLength",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -8977,7 +9116,7 @@ int lua_cocos2dx_physics_PhysicsJointSpring_getAnchr2(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAnchr2",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJointSpring:getAnchr2",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -9021,7 +9160,7 @@ int lua_cocos2dx_physics_PhysicsJointSpring_getAnchr1(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAnchr1",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJointSpring:getAnchr1",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -9065,7 +9204,7 @@ int lua_cocos2dx_physics_PhysicsJointSpring_getStiffness(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getStiffness",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJointSpring:getStiffness",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -9105,13 +9244,13 @@ int lua_cocos2dx_physics_PhysicsJointSpring_setRestLength(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsJointSpring:setRestLength"); if(!ok) return 0; cobj->setRestLength(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setRestLength",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJointSpring:setRestLength",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -9151,13 +9290,13 @@ int lua_cocos2dx_physics_PhysicsJointSpring_setDamping(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsJointSpring:setDamping"); if(!ok) return 0; cobj->setDamping(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setDamping",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJointSpring:setDamping",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -9192,17 +9331,17 @@ int lua_cocos2dx_physics_PhysicsJointSpring_construct(lua_State* tolua_S) double arg5; ok &= luaval_to_object(tolua_S, 2, "cc.PhysicsBody",&arg0); ok &= luaval_to_object(tolua_S, 3, "cc.PhysicsBody",&arg1); - ok &= luaval_to_vec2(tolua_S, 4, &arg2); - ok &= luaval_to_vec2(tolua_S, 5, &arg3); - ok &= luaval_to_number(tolua_S, 6,&arg4); - ok &= luaval_to_number(tolua_S, 7,&arg5); + ok &= luaval_to_vec2(tolua_S, 4, &arg2, "cc.PhysicsJointSpring:construct"); + ok &= luaval_to_vec2(tolua_S, 5, &arg3, "cc.PhysicsJointSpring:construct"); + ok &= luaval_to_number(tolua_S, 6,&arg4, "cc.PhysicsJointSpring:construct"); + ok &= luaval_to_number(tolua_S, 7,&arg5, "cc.PhysicsJointSpring:construct"); if(!ok) return 0; cocos2d::PhysicsJointSpring* ret = cocos2d::PhysicsJointSpring::construct(arg0, arg1, arg2, arg3, arg4, arg5); object_to_luaval(tolua_S, "cc.PhysicsJointSpring",(cocos2d::PhysicsJointSpring*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "construct",argc, 6); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.PhysicsJointSpring:construct",argc, 6); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -9270,13 +9409,13 @@ int lua_cocos2dx_physics_PhysicsJointGroove_setAnchr2(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.PhysicsJointGroove:setAnchr2"); if(!ok) return 0; cobj->setAnchr2(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAnchr2",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJointGroove:setAnchr2",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -9316,13 +9455,13 @@ int lua_cocos2dx_physics_PhysicsJointGroove_setGrooveA(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.PhysicsJointGroove:setGrooveA"); if(!ok) return 0; cobj->setGrooveA(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setGrooveA",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJointGroove:setGrooveA",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -9362,13 +9501,13 @@ int lua_cocos2dx_physics_PhysicsJointGroove_setGrooveB(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.PhysicsJointGroove:setGrooveB"); if(!ok) return 0; cobj->setGrooveB(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setGrooveB",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJointGroove:setGrooveB",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -9412,7 +9551,7 @@ int lua_cocos2dx_physics_PhysicsJointGroove_getGrooveA(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getGrooveA",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJointGroove:getGrooveA",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -9456,7 +9595,7 @@ int lua_cocos2dx_physics_PhysicsJointGroove_getGrooveB(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getGrooveB",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJointGroove:getGrooveB",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -9500,7 +9639,7 @@ int lua_cocos2dx_physics_PhysicsJointGroove_getAnchr2(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAnchr2",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJointGroove:getAnchr2",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -9534,16 +9673,16 @@ int lua_cocos2dx_physics_PhysicsJointGroove_construct(lua_State* tolua_S) cocos2d::Vec2 arg4; ok &= luaval_to_object(tolua_S, 2, "cc.PhysicsBody",&arg0); ok &= luaval_to_object(tolua_S, 3, "cc.PhysicsBody",&arg1); - ok &= luaval_to_vec2(tolua_S, 4, &arg2); - ok &= luaval_to_vec2(tolua_S, 5, &arg3); - ok &= luaval_to_vec2(tolua_S, 6, &arg4); + ok &= luaval_to_vec2(tolua_S, 4, &arg2, "cc.PhysicsJointGroove:construct"); + ok &= luaval_to_vec2(tolua_S, 5, &arg3, "cc.PhysicsJointGroove:construct"); + ok &= luaval_to_vec2(tolua_S, 6, &arg4, "cc.PhysicsJointGroove:construct"); if(!ok) return 0; cocos2d::PhysicsJointGroove* ret = cocos2d::PhysicsJointGroove::construct(arg0, arg1, arg2, arg3, arg4); object_to_luaval(tolua_S, "cc.PhysicsJointGroove",(cocos2d::PhysicsJointGroove*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "construct",argc, 5); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.PhysicsJointGroove:construct",argc, 5); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -9611,7 +9750,7 @@ int lua_cocos2dx_physics_PhysicsJointRotarySpring_getDamping(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDamping",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJointRotarySpring:getDamping",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -9651,13 +9790,13 @@ int lua_cocos2dx_physics_PhysicsJointRotarySpring_setRestAngle(lua_State* tolua_ { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsJointRotarySpring:setRestAngle"); if(!ok) return 0; cobj->setRestAngle(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setRestAngle",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJointRotarySpring:setRestAngle",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -9701,7 +9840,7 @@ int lua_cocos2dx_physics_PhysicsJointRotarySpring_getStiffness(lua_State* tolua_ tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getStiffness",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJointRotarySpring:getStiffness",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -9741,13 +9880,13 @@ int lua_cocos2dx_physics_PhysicsJointRotarySpring_setStiffness(lua_State* tolua_ { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsJointRotarySpring:setStiffness"); if(!ok) return 0; cobj->setStiffness(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setStiffness",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJointRotarySpring:setStiffness",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -9787,13 +9926,13 @@ int lua_cocos2dx_physics_PhysicsJointRotarySpring_setDamping(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsJointRotarySpring:setDamping"); if(!ok) return 0; cobj->setDamping(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setDamping",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJointRotarySpring:setDamping",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -9837,7 +9976,7 @@ int lua_cocos2dx_physics_PhysicsJointRotarySpring_getRestAngle(lua_State* tolua_ tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getRestAngle",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJointRotarySpring:getRestAngle",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -9870,15 +10009,15 @@ int lua_cocos2dx_physics_PhysicsJointRotarySpring_construct(lua_State* tolua_S) double arg3; ok &= luaval_to_object(tolua_S, 2, "cc.PhysicsBody",&arg0); ok &= luaval_to_object(tolua_S, 3, "cc.PhysicsBody",&arg1); - ok &= luaval_to_number(tolua_S, 4,&arg2); - ok &= luaval_to_number(tolua_S, 5,&arg3); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.PhysicsJointRotarySpring:construct"); + ok &= luaval_to_number(tolua_S, 5,&arg3, "cc.PhysicsJointRotarySpring:construct"); if(!ok) return 0; cocos2d::PhysicsJointRotarySpring* ret = cocos2d::PhysicsJointRotarySpring::construct(arg0, arg1, arg2, arg3); object_to_luaval(tolua_S, "cc.PhysicsJointRotarySpring",(cocos2d::PhysicsJointRotarySpring*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "construct",argc, 4); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.PhysicsJointRotarySpring:construct",argc, 4); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -9946,7 +10085,7 @@ int lua_cocos2dx_physics_PhysicsJointRotaryLimit_getMax(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getMax",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJointRotaryLimit:getMax",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -9986,13 +10125,13 @@ int lua_cocos2dx_physics_PhysicsJointRotaryLimit_setMin(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsJointRotaryLimit:setMin"); if(!ok) return 0; cobj->setMin(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setMin",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJointRotaryLimit:setMin",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -10032,13 +10171,13 @@ int lua_cocos2dx_physics_PhysicsJointRotaryLimit_setMax(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsJointRotaryLimit:setMax"); if(!ok) return 0; cobj->setMax(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setMax",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJointRotaryLimit:setMax",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -10082,7 +10221,7 @@ int lua_cocos2dx_physics_PhysicsJointRotaryLimit_getMin(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getMin",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJointRotaryLimit:getMin",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -10133,10 +10272,10 @@ int lua_cocos2dx_physics_PhysicsJointRotaryLimit_construct(lua_State* tolua_S) ok &= luaval_to_object(tolua_S, 3, "cc.PhysicsBody",&arg1); if (!ok) { break; } double arg2; - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.PhysicsJointRotaryLimit:construct"); if (!ok) { break; } double arg3; - ok &= luaval_to_number(tolua_S, 5,&arg3); + ok &= luaval_to_number(tolua_S, 5,&arg3, "cc.PhysicsJointRotaryLimit:construct"); if (!ok) { break; } cocos2d::PhysicsJointRotaryLimit* ret = cocos2d::PhysicsJointRotaryLimit::construct(arg0, arg1, arg2, arg3); object_to_luaval(tolua_S, "cc.PhysicsJointRotaryLimit",(cocos2d::PhysicsJointRotaryLimit*)ret); @@ -10144,7 +10283,7 @@ int lua_cocos2dx_physics_PhysicsJointRotaryLimit_construct(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "construct",argc, 4); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.PhysicsJointRotaryLimit:construct",argc, 4); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -10210,7 +10349,7 @@ int lua_cocos2dx_physics_PhysicsJointRatchet_getAngle(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAngle",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJointRatchet:getAngle",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -10250,13 +10389,13 @@ int lua_cocos2dx_physics_PhysicsJointRatchet_setAngle(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsJointRatchet:setAngle"); if(!ok) return 0; cobj->setAngle(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAngle",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJointRatchet:setAngle",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -10296,13 +10435,13 @@ int lua_cocos2dx_physics_PhysicsJointRatchet_setPhase(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsJointRatchet:setPhase"); if(!ok) return 0; cobj->setPhase(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setPhase",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJointRatchet:setPhase",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -10346,7 +10485,7 @@ int lua_cocos2dx_physics_PhysicsJointRatchet_getPhase(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPhase",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJointRatchet:getPhase",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -10386,13 +10525,13 @@ int lua_cocos2dx_physics_PhysicsJointRatchet_setRatchet(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsJointRatchet:setRatchet"); if(!ok) return 0; cobj->setRatchet(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setRatchet",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJointRatchet:setRatchet",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -10436,7 +10575,7 @@ int lua_cocos2dx_physics_PhysicsJointRatchet_getRatchet(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getRatchet",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJointRatchet:getRatchet",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -10469,15 +10608,15 @@ int lua_cocos2dx_physics_PhysicsJointRatchet_construct(lua_State* tolua_S) double arg3; ok &= luaval_to_object(tolua_S, 2, "cc.PhysicsBody",&arg0); ok &= luaval_to_object(tolua_S, 3, "cc.PhysicsBody",&arg1); - ok &= luaval_to_number(tolua_S, 4,&arg2); - ok &= luaval_to_number(tolua_S, 5,&arg3); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.PhysicsJointRatchet:construct"); + ok &= luaval_to_number(tolua_S, 5,&arg3, "cc.PhysicsJointRatchet:construct"); if(!ok) return 0; cocos2d::PhysicsJointRatchet* ret = cocos2d::PhysicsJointRatchet::construct(arg0, arg1, arg2, arg3); object_to_luaval(tolua_S, "cc.PhysicsJointRatchet",(cocos2d::PhysicsJointRatchet*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "construct",argc, 4); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.PhysicsJointRatchet:construct",argc, 4); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -10541,13 +10680,13 @@ int lua_cocos2dx_physics_PhysicsJointGear_setRatio(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsJointGear:setRatio"); if(!ok) return 0; cobj->setRatio(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setRatio",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJointGear:setRatio",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -10591,7 +10730,7 @@ int lua_cocos2dx_physics_PhysicsJointGear_getPhase(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPhase",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJointGear:getPhase",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -10631,13 +10770,13 @@ int lua_cocos2dx_physics_PhysicsJointGear_setPhase(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsJointGear:setPhase"); if(!ok) return 0; cobj->setPhase(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setPhase",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJointGear:setPhase",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -10681,7 +10820,7 @@ int lua_cocos2dx_physics_PhysicsJointGear_getRatio(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getRatio",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJointGear:getRatio",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -10714,15 +10853,15 @@ int lua_cocos2dx_physics_PhysicsJointGear_construct(lua_State* tolua_S) double arg3; ok &= luaval_to_object(tolua_S, 2, "cc.PhysicsBody",&arg0); ok &= luaval_to_object(tolua_S, 3, "cc.PhysicsBody",&arg1); - ok &= luaval_to_number(tolua_S, 4,&arg2); - ok &= luaval_to_number(tolua_S, 5,&arg3); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.PhysicsJointGear:construct"); + ok &= luaval_to_number(tolua_S, 5,&arg3, "cc.PhysicsJointGear:construct"); if(!ok) return 0; cocos2d::PhysicsJointGear* ret = cocos2d::PhysicsJointGear::construct(arg0, arg1, arg2, arg3); object_to_luaval(tolua_S, "cc.PhysicsJointGear",(cocos2d::PhysicsJointGear*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "construct",argc, 4); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.PhysicsJointGear:construct",argc, 4); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -10784,13 +10923,13 @@ int lua_cocos2dx_physics_PhysicsJointMotor_setRate(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsJointMotor:setRate"); if(!ok) return 0; cobj->setRate(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setRate",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJointMotor:setRate",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -10834,7 +10973,7 @@ int lua_cocos2dx_physics_PhysicsJointMotor_getRate(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getRate",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.PhysicsJointMotor:getRate",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -10866,14 +11005,14 @@ int lua_cocos2dx_physics_PhysicsJointMotor_construct(lua_State* tolua_S) double arg2; ok &= luaval_to_object(tolua_S, 2, "cc.PhysicsBody",&arg0); ok &= luaval_to_object(tolua_S, 3, "cc.PhysicsBody",&arg1); - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.PhysicsJointMotor:construct"); if(!ok) return 0; cocos2d::PhysicsJointMotor* ret = cocos2d::PhysicsJointMotor::construct(arg0, arg1, arg2); object_to_luaval(tolua_S, "cc.PhysicsJointMotor",(cocos2d::PhysicsJointMotor*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "construct",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.PhysicsJointMotor:construct",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_physics_auto.hpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_physics_auto.hpp index 6ef0ca4ab5..42884debc5 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_physics_auto.hpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_physics_auto.hpp @@ -259,6 +259,9 @@ int register_all_cocos2dx_physics(lua_State* tolua_S); + + + diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_spine_auto.cpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_spine_auto.cpp index fb68e466e2..e9a0cc19d0 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_spine_auto.cpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_spine_auto.cpp @@ -38,7 +38,7 @@ int lua_cocos2dx_spine_Skeleton_setToSetupPose(lua_State* tolua_S) cobj->setToSetupPose(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setToSetupPose",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "sp.Skeleton:setToSetupPose",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -84,7 +84,7 @@ int lua_cocos2dx_spine_Skeleton_setBlendFunc(lua_State* tolua_S) cobj->setBlendFunc(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setBlendFunc",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "sp.Skeleton:setBlendFunc",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -125,15 +125,15 @@ int lua_cocos2dx_spine_Skeleton_onDraw(lua_State* tolua_S) cocos2d::Mat4 arg0; unsigned int arg1; - ok &= luaval_to_mat4(tolua_S, 2, &arg0); + ok &= luaval_to_mat4(tolua_S, 2, &arg0, "sp.Skeleton:onDraw"); - ok &= luaval_to_uint32(tolua_S, 3,&arg1); + ok &= luaval_to_uint32(tolua_S, 3,&arg1, "sp.Skeleton:onDraw"); if(!ok) return 0; cobj->onDraw(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "onDraw",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "sp.Skeleton:onDraw",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -176,7 +176,7 @@ int lua_cocos2dx_spine_Skeleton_setSlotsToSetupPose(lua_State* tolua_S) cobj->setSlotsToSetupPose(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setSlotsToSetupPose",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "sp.Skeleton:setSlotsToSetupPose",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -220,7 +220,7 @@ int lua_cocos2dx_spine_Skeleton_getBlendFunc(lua_State* tolua_S) blendfunc_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getBlendFunc",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "sp.Skeleton:getBlendFunc",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -260,14 +260,14 @@ int lua_cocos2dx_spine_Skeleton_setSkin(lua_State* tolua_S) { const char* arg0; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "sp.Skeleton:setSkin"); arg0 = arg0_tmp.c_str(); if(!ok) return 0; bool ret = cobj->setSkin(arg0); tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setSkin",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "sp.Skeleton:setSkin",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -310,7 +310,7 @@ int lua_cocos2dx_spine_Skeleton_setBonesToSetupPose(lua_State* tolua_S) cobj->setBonesToSetupPose(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setBonesToSetupPose",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "sp.Skeleton:setBonesToSetupPose",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -378,17 +378,17 @@ int lua_cocos2dx_spine_SkeletonAnimation_setMix(lua_State* tolua_S) const char* arg1; double arg2; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "sp.SkeletonAnimation:setMix"); arg0 = arg0_tmp.c_str(); - std::string arg1_tmp; ok &= luaval_to_std_string(tolua_S, 3, &arg1_tmp); arg1 = arg1_tmp.c_str(); + std::string arg1_tmp; ok &= luaval_to_std_string(tolua_S, 3, &arg1_tmp, "sp.SkeletonAnimation:setMix"); arg1 = arg1_tmp.c_str(); - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "sp.SkeletonAnimation:setMix"); if(!ok) return 0; cobj->setMix(arg0, arg1, arg2); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setMix",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "sp.SkeletonAnimation:setMix",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 @@ -431,7 +431,7 @@ int lua_cocos2dx_spine_SkeletonAnimation_clearTracks(lua_State* tolua_S) cobj->clearTracks(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "clearTracks",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "sp.SkeletonAnimation:clearTracks",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -478,13 +478,13 @@ int lua_cocos2dx_spine_SkeletonAnimation_clearTrack(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "sp.SkeletonAnimation:clearTrack"); if(!ok) return 0; cobj->clearTrack(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "clearTrack",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "sp.SkeletonAnimation:clearTrack",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_studio_auto.cpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_studio_auto.cpp index b4352556a9..37d5766763 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_studio_auto.cpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_studio_auto.cpp @@ -29,7 +29,7 @@ int lua_cocos2dx_studio_ActionFrame_getAction(lua_State* tolua_S) do{ if (argc == 2) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccs.ActionFrame:getAction"); if (!ok) { break; } cocostudio::ActionFrame* arg1; @@ -45,7 +45,7 @@ int lua_cocos2dx_studio_ActionFrame_getAction(lua_State* tolua_S) do{ if (argc == 1) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccs.ActionFrame:getAction"); if (!ok) { break; } cocos2d::ActionInterval* ret = cobj->getAction(arg0); @@ -54,7 +54,7 @@ int lua_cocos2dx_studio_ActionFrame_getAction(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAction",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionFrame:getAction",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -98,7 +98,7 @@ int lua_cocos2dx_studio_ActionFrame_getFrameType(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getFrameType",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionFrame:getFrameType",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -138,13 +138,13 @@ int lua_cocos2dx_studio_ActionFrame_setFrameTime(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccs.ActionFrame:setFrameTime"); if(!ok) return 0; cobj->setFrameTime(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setFrameTime",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionFrame:setFrameTime",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -184,13 +184,13 @@ int lua_cocos2dx_studio_ActionFrame_setEasingType(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccs.ActionFrame:setEasingType"); if(!ok) return 0; cobj->setEasingType(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setEasingType",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionFrame:setEasingType",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -234,7 +234,7 @@ int lua_cocos2dx_studio_ActionFrame_getFrameTime(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getFrameTime",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionFrame:getFrameTime",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -278,7 +278,7 @@ int lua_cocos2dx_studio_ActionFrame_getFrameIndex(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getFrameIndex",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionFrame:getFrameIndex",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -318,13 +318,13 @@ int lua_cocos2dx_studio_ActionFrame_setFrameType(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccs.ActionFrame:setFrameType"); if(!ok) return 0; cobj->setFrameType(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setFrameType",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionFrame:setFrameType",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -364,13 +364,13 @@ int lua_cocos2dx_studio_ActionFrame_setFrameIndex(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccs.ActionFrame:setFrameIndex"); if(!ok) return 0; cobj->setFrameIndex(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setFrameIndex",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionFrame:setFrameIndex",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -410,13 +410,13 @@ int lua_cocos2dx_studio_ActionFrame_setEasingParameter(lua_State* tolua_S) { std::vector > arg0; - ok &= luaval_to_std_vector_float(tolua_S, 2, &arg0); + ok &= luaval_to_std_vector_float(tolua_S, 2, &arg0, "ccs.ActionFrame:setEasingParameter"); if(!ok) return 0; cobj->setEasingParameter(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setEasingParameter",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionFrame:setEasingParameter",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -460,7 +460,7 @@ int lua_cocos2dx_studio_ActionFrame_getEasingType(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getEasingType",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionFrame:getEasingType",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -494,7 +494,7 @@ int lua_cocos2dx_studio_ActionFrame_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccs.ActionFrame"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ActionFrame",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionFrame:ActionFrame",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -564,13 +564,13 @@ int lua_cocos2dx_studio_ActionMoveFrame_setPosition(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "ccs.ActionMoveFrame:setPosition"); if(!ok) return 0; cobj->setPosition(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setPosition",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionMoveFrame:setPosition",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -610,14 +610,14 @@ int lua_cocos2dx_studio_ActionMoveFrame_getAction(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccs.ActionMoveFrame:getAction"); if(!ok) return 0; cocos2d::ActionInterval* ret = cobj->getAction(arg0); object_to_luaval(tolua_S, "cc.ActionInterval",(cocos2d::ActionInterval*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAction",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionMoveFrame:getAction",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -661,7 +661,7 @@ int lua_cocos2dx_studio_ActionMoveFrame_getPosition(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPosition",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionMoveFrame:getPosition",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -695,7 +695,7 @@ int lua_cocos2dx_studio_ActionMoveFrame_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccs.ActionMoveFrame"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ActionMoveFrame",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionMoveFrame:ActionMoveFrame",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -758,13 +758,13 @@ int lua_cocos2dx_studio_ActionScaleFrame_setScaleY(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccs.ActionScaleFrame:setScaleY"); if(!ok) return 0; cobj->setScaleY(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setScaleY",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionScaleFrame:setScaleY",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -804,13 +804,13 @@ int lua_cocos2dx_studio_ActionScaleFrame_setScaleX(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccs.ActionScaleFrame:setScaleX"); if(!ok) return 0; cobj->setScaleX(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setScaleX",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionScaleFrame:setScaleX",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -854,7 +854,7 @@ int lua_cocos2dx_studio_ActionScaleFrame_getScaleY(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getScaleY",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionScaleFrame:getScaleY",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -898,7 +898,7 @@ int lua_cocos2dx_studio_ActionScaleFrame_getScaleX(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getScaleX",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionScaleFrame:getScaleX",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -938,14 +938,14 @@ int lua_cocos2dx_studio_ActionScaleFrame_getAction(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccs.ActionScaleFrame:getAction"); if(!ok) return 0; cocos2d::ActionInterval* ret = cobj->getAction(arg0); object_to_luaval(tolua_S, "cc.ActionInterval",(cocos2d::ActionInterval*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAction",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionScaleFrame:getAction",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -979,7 +979,7 @@ int lua_cocos2dx_studio_ActionScaleFrame_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccs.ActionScaleFrame"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ActionScaleFrame",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionScaleFrame:ActionScaleFrame",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1044,13 +1044,13 @@ int lua_cocos2dx_studio_ActionRotationFrame_setRotation(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccs.ActionRotationFrame:setRotation"); if(!ok) return 0; cobj->setRotation(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setRotation",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionRotationFrame:setRotation",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -1084,7 +1084,7 @@ int lua_cocos2dx_studio_ActionRotationFrame_getAction(lua_State* tolua_S) do{ if (argc == 2) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccs.ActionRotationFrame:getAction"); if (!ok) { break; } cocostudio::ActionFrame* arg1; @@ -1100,7 +1100,7 @@ int lua_cocos2dx_studio_ActionRotationFrame_getAction(lua_State* tolua_S) do{ if (argc == 1) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccs.ActionRotationFrame:getAction"); if (!ok) { break; } cocos2d::ActionInterval* ret = cobj->getAction(arg0); @@ -1109,7 +1109,7 @@ int lua_cocos2dx_studio_ActionRotationFrame_getAction(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAction",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionRotationFrame:getAction",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -1153,7 +1153,7 @@ int lua_cocos2dx_studio_ActionRotationFrame_getRotation(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getRotation",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionRotationFrame:getRotation",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1187,7 +1187,7 @@ int lua_cocos2dx_studio_ActionRotationFrame_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccs.ActionRotationFrame"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ActionRotationFrame",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionRotationFrame:ActionRotationFrame",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1254,7 +1254,7 @@ int lua_cocos2dx_studio_ActionFadeFrame_getOpacity(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getOpacity",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionFadeFrame:getOpacity",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1294,14 +1294,14 @@ int lua_cocos2dx_studio_ActionFadeFrame_getAction(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccs.ActionFadeFrame:getAction"); if(!ok) return 0; cocos2d::ActionInterval* ret = cobj->getAction(arg0); object_to_luaval(tolua_S, "cc.ActionInterval",(cocos2d::ActionInterval*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAction",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionFadeFrame:getAction",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -1341,13 +1341,13 @@ int lua_cocos2dx_studio_ActionFadeFrame_setOpacity(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccs.ActionFadeFrame:setOpacity"); if(!ok) return 0; cobj->setOpacity(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setOpacity",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionFadeFrame:setOpacity",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -1381,7 +1381,7 @@ int lua_cocos2dx_studio_ActionFadeFrame_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccs.ActionFadeFrame"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ActionFadeFrame",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionFadeFrame:ActionFadeFrame",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1448,7 +1448,7 @@ int lua_cocos2dx_studio_ActionTintFrame_getColor(lua_State* tolua_S) color3b_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getColor",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionTintFrame:getColor",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1488,14 +1488,14 @@ int lua_cocos2dx_studio_ActionTintFrame_getAction(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccs.ActionTintFrame:getAction"); if(!ok) return 0; cocos2d::ActionInterval* ret = cobj->getAction(arg0); object_to_luaval(tolua_S, "cc.ActionInterval",(cocos2d::ActionInterval*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAction",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionTintFrame:getAction",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -1535,13 +1535,13 @@ int lua_cocos2dx_studio_ActionTintFrame_setColor(lua_State* tolua_S) { cocos2d::Color3B arg0; - ok &= luaval_to_color3b(tolua_S, 2, &arg0); + ok &= luaval_to_color3b(tolua_S, 2, &arg0, "ccs.ActionTintFrame:setColor"); if(!ok) return 0; cobj->setColor(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setColor",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionTintFrame:setColor",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -1575,7 +1575,7 @@ int lua_cocos2dx_studio_ActionTintFrame_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccs.ActionTintFrame"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ActionTintFrame",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionTintFrame:ActionTintFrame",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1638,13 +1638,13 @@ int lua_cocos2dx_studio_ActionObject_setCurrentTime(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccs.ActionObject:setCurrentTime"); if(!ok) return 0; cobj->setCurrentTime(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setCurrentTime",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionObject:setCurrentTime",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -1687,7 +1687,7 @@ int lua_cocos2dx_studio_ActionObject_pause(lua_State* tolua_S) cobj->pause(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "pause",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionObject:pause",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1727,13 +1727,13 @@ int lua_cocos2dx_studio_ActionObject_setName(lua_State* tolua_S) { const char* arg0; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "ccs.ActionObject:setName"); arg0 = arg0_tmp.c_str(); if(!ok) return 0; cobj->setName(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setName",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionObject:setName",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -1773,13 +1773,13 @@ int lua_cocos2dx_studio_ActionObject_setUnitTime(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccs.ActionObject:setUnitTime"); if(!ok) return 0; cobj->setUnitTime(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setUnitTime",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionObject:setUnitTime",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -1823,7 +1823,7 @@ int lua_cocos2dx_studio_ActionObject_getTotalTime(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTotalTime",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionObject:getTotalTime",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1867,7 +1867,7 @@ int lua_cocos2dx_studio_ActionObject_getName(lua_State* tolua_S) tolua_pushstring(tolua_S,(const char*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getName",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionObject:getName",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1910,7 +1910,7 @@ int lua_cocos2dx_studio_ActionObject_stop(lua_State* tolua_S) cobj->stop(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "stop",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionObject:stop",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1959,7 +1959,7 @@ int lua_cocos2dx_studio_ActionObject_play(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "play",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionObject:play",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2003,7 +2003,7 @@ int lua_cocos2dx_studio_ActionObject_getCurrentTime(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getCurrentTime",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionObject:getCurrentTime",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2049,7 +2049,7 @@ int lua_cocos2dx_studio_ActionObject_removeActionNode(lua_State* tolua_S) cobj->removeActionNode(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeActionNode",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionObject:removeActionNode",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2093,7 +2093,7 @@ int lua_cocos2dx_studio_ActionObject_getLoop(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getLoop",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionObject:getLoop",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2139,7 +2139,7 @@ int lua_cocos2dx_studio_ActionObject_addActionNode(lua_State* tolua_S) cobj->addActionNode(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addActionNode",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionObject:addActionNode",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2183,7 +2183,7 @@ int lua_cocos2dx_studio_ActionObject_getUnitTime(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getUnitTime",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionObject:getUnitTime",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2227,7 +2227,7 @@ int lua_cocos2dx_studio_ActionObject_isPlaying(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isPlaying",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionObject:isPlaying",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2267,13 +2267,13 @@ int lua_cocos2dx_studio_ActionObject_updateToFrameByTime(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccs.ActionObject:updateToFrameByTime"); if(!ok) return 0; cobj->updateToFrameByTime(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "updateToFrameByTime",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionObject:updateToFrameByTime",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2313,13 +2313,13 @@ int lua_cocos2dx_studio_ActionObject_setLoop(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccs.ActionObject:setLoop"); if(!ok) return 0; cobj->setLoop(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setLoop",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionObject:setLoop",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2359,13 +2359,13 @@ int lua_cocos2dx_studio_ActionObject_simulationActionUpdate(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccs.ActionObject:simulationActionUpdate"); if(!ok) return 0; cobj->simulationActionUpdate(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "simulationActionUpdate",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionObject:simulationActionUpdate",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2399,7 +2399,7 @@ int lua_cocos2dx_studio_ActionObject_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccs.ActionObject"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ActionObject",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionObject:ActionObject",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2470,11 +2470,11 @@ int lua_cocos2dx_studio_ActionManagerEx_playActionByName(lua_State* tolua_S) do{ if (argc == 3) { const char* arg0; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "ccs.ActionManagerEx:playActionByName"); arg0 = arg0_tmp.c_str(); if (!ok) { break; } const char* arg1; - std::string arg1_tmp; ok &= luaval_to_std_string(tolua_S, 3, &arg1_tmp); arg1 = arg1_tmp.c_str(); + std::string arg1_tmp; ok &= luaval_to_std_string(tolua_S, 3, &arg1_tmp, "ccs.ActionManagerEx:playActionByName"); arg1 = arg1_tmp.c_str(); if (!ok) { break; } cocos2d::CallFunc* arg2; @@ -2490,11 +2490,11 @@ int lua_cocos2dx_studio_ActionManagerEx_playActionByName(lua_State* tolua_S) 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(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "ccs.ActionManagerEx:playActionByName"); arg0 = arg0_tmp.c_str(); if (!ok) { break; } const char* arg1; - std::string arg1_tmp; ok &= luaval_to_std_string(tolua_S, 3, &arg1_tmp); arg1 = arg1_tmp.c_str(); + std::string arg1_tmp; ok &= luaval_to_std_string(tolua_S, 3, &arg1_tmp, "ccs.ActionManagerEx:playActionByName"); arg1 = arg1_tmp.c_str(); if (!ok) { break; } cocostudio::ActionObject* ret = cobj->playActionByName(arg0, arg1); @@ -2503,7 +2503,7 @@ int lua_cocos2dx_studio_ActionManagerEx_playActionByName(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "playActionByName",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionManagerEx:playActionByName",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -2544,16 +2544,16 @@ int lua_cocos2dx_studio_ActionManagerEx_getActionByName(lua_State* tolua_S) const char* arg0; const char* arg1; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "ccs.ActionManagerEx:getActionByName"); arg0 = arg0_tmp.c_str(); - std::string arg1_tmp; ok &= luaval_to_std_string(tolua_S, 3, &arg1_tmp); arg1 = arg1_tmp.c_str(); + std::string arg1_tmp; ok &= luaval_to_std_string(tolua_S, 3, &arg1_tmp, "ccs.ActionManagerEx:getActionByName"); arg1 = arg1_tmp.c_str(); if(!ok) return 0; cocostudio::ActionObject* ret = cobj->getActionByName(arg0, arg1); object_to_luaval(tolua_S, "ccs.ActionObject",(cocostudio::ActionObject*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getActionByName",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionManagerEx:getActionByName",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -2596,7 +2596,7 @@ int lua_cocos2dx_studio_ActionManagerEx_releaseActions(lua_State* tolua_S) cobj->releaseActions(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "releaseActions",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionManagerEx:releaseActions",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2628,7 +2628,7 @@ int lua_cocos2dx_studio_ActionManagerEx_destroyInstance(lua_State* tolua_S) cocostudio::ActionManagerEx::destroyInstance(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "destroyInstance",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.ActionManagerEx:destroyInstance",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -2659,7 +2659,7 @@ int lua_cocos2dx_studio_ActionManagerEx_getInstance(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.ActionManagerEx",(cocostudio::ActionManagerEx*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "getInstance",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.ActionManagerEx:getInstance",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -2725,7 +2725,7 @@ int lua_cocos2dx_studio_BaseData_getColor(lua_State* tolua_S) color4b_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getColor",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.BaseData:getColor",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2765,13 +2765,13 @@ int lua_cocos2dx_studio_BaseData_setColor(lua_State* tolua_S) { cocos2d::Color4B arg0; - ok &=luaval_to_color4b(tolua_S, 2, &arg0); + ok &=luaval_to_color4b(tolua_S, 2, &arg0, "ccs.BaseData:setColor"); if(!ok) return 0; cobj->setColor(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setColor",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.BaseData:setColor",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2804,7 +2804,7 @@ int lua_cocos2dx_studio_BaseData_create(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.BaseData",(cocostudio::BaseData*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.BaseData:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -2836,7 +2836,7 @@ int lua_cocos2dx_studio_BaseData_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccs.BaseData"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "BaseData",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.BaseData:BaseData",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2905,7 +2905,7 @@ int lua_cocos2dx_studio_DisplayData_copy(lua_State* tolua_S) cobj->copy(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "copy",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.DisplayData:copy",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2933,14 +2933,14 @@ int lua_cocos2dx_studio_DisplayData_changeDisplayToTexture(lua_State* tolua_S) if (argc == 1) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.DisplayData:changeDisplayToTexture"); if(!ok) return 0; const std::string ret = cocostudio::DisplayData::changeDisplayToTexture(arg0); tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "changeDisplayToTexture",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.DisplayData:changeDisplayToTexture",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -2971,7 +2971,7 @@ int lua_cocos2dx_studio_DisplayData_create(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.DisplayData",(cocostudio::DisplayData*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.DisplayData:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -3003,7 +3003,7 @@ int lua_cocos2dx_studio_DisplayData_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccs.DisplayData"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "DisplayData",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.DisplayData:DisplayData",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3072,7 +3072,7 @@ int lua_cocos2dx_studio_SpriteDisplayData_copy(lua_State* tolua_S) cobj->copy(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "copy",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.SpriteDisplayData:copy",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3105,7 +3105,7 @@ int lua_cocos2dx_studio_SpriteDisplayData_create(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.SpriteDisplayData",(cocostudio::SpriteDisplayData*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.SpriteDisplayData:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -3137,7 +3137,7 @@ int lua_cocos2dx_studio_SpriteDisplayData_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccs.SpriteDisplayData"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "SpriteDisplayData",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.SpriteDisplayData:SpriteDisplayData",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3192,7 +3192,7 @@ int lua_cocos2dx_studio_ArmatureDisplayData_create(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.ArmatureDisplayData",(cocostudio::ArmatureDisplayData*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.ArmatureDisplayData:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -3224,7 +3224,7 @@ int lua_cocos2dx_studio_ArmatureDisplayData_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccs.ArmatureDisplayData"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ArmatureDisplayData",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ArmatureDisplayData:ArmatureDisplayData",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3278,7 +3278,7 @@ int lua_cocos2dx_studio_ParticleDisplayData_create(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.ParticleDisplayData",(cocostudio::ParticleDisplayData*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.ParticleDisplayData:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -3310,7 +3310,7 @@ int lua_cocos2dx_studio_ParticleDisplayData_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccs.ParticleDisplayData"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ParticleDisplayData",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ParticleDisplayData:ParticleDisplayData",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3371,14 +3371,14 @@ int lua_cocos2dx_studio_BoneData_getDisplayData(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccs.BoneData:getDisplayData"); if(!ok) return 0; cocostudio::DisplayData* ret = cobj->getDisplayData(arg0); object_to_luaval(tolua_S, "ccs.DisplayData",(cocostudio::DisplayData*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDisplayData",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.BoneData:getDisplayData",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3422,7 +3422,7 @@ int lua_cocos2dx_studio_BoneData_init(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "init",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.BoneData:init",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3468,7 +3468,7 @@ int lua_cocos2dx_studio_BoneData_addDisplayData(lua_State* tolua_S) cobj->addDisplayData(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addDisplayData",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.BoneData:addDisplayData",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3501,7 +3501,7 @@ int lua_cocos2dx_studio_BoneData_create(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.BoneData",(cocostudio::BoneData*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.BoneData:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -3533,7 +3533,7 @@ int lua_cocos2dx_studio_BoneData_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccs.BoneData"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "BoneData",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.BoneData:BoneData",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3603,7 +3603,7 @@ int lua_cocos2dx_studio_ArmatureData_addBoneData(lua_State* tolua_S) cobj->addBoneData(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addBoneData",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ArmatureData:addBoneData",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3647,7 +3647,7 @@ int lua_cocos2dx_studio_ArmatureData_init(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "init",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ArmatureData:init",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3687,14 +3687,14 @@ int lua_cocos2dx_studio_ArmatureData_getBoneData(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ArmatureData:getBoneData"); if(!ok) return 0; cocostudio::BoneData* ret = cobj->getBoneData(arg0); object_to_luaval(tolua_S, "ccs.BoneData",(cocostudio::BoneData*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getBoneData",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ArmatureData:getBoneData",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3727,7 +3727,7 @@ int lua_cocos2dx_studio_ArmatureData_create(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.ArmatureData",(cocostudio::ArmatureData*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.ArmatureData:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -3759,7 +3759,7 @@ int lua_cocos2dx_studio_ArmatureData_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccs.ArmatureData"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ArmatureData",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ArmatureData:ArmatureData",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3829,7 +3829,7 @@ int lua_cocos2dx_studio_FrameData_copy(lua_State* tolua_S) cobj->copy(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "copy",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.FrameData:copy",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3862,7 +3862,7 @@ int lua_cocos2dx_studio_FrameData_create(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.FrameData",(cocostudio::FrameData*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.FrameData:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -3894,7 +3894,7 @@ int lua_cocos2dx_studio_FrameData_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccs.FrameData"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "FrameData",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.FrameData:FrameData",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3960,7 +3960,7 @@ int lua_cocos2dx_studio_MovementBoneData_init(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "init",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.MovementBoneData:init",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4000,14 +4000,14 @@ int lua_cocos2dx_studio_MovementBoneData_getFrameData(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccs.MovementBoneData:getFrameData"); if(!ok) return 0; cocostudio::FrameData* ret = cobj->getFrameData(arg0); object_to_luaval(tolua_S, "ccs.FrameData",(cocostudio::FrameData*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getFrameData",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.MovementBoneData:getFrameData",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4053,7 +4053,7 @@ int lua_cocos2dx_studio_MovementBoneData_addFrameData(lua_State* tolua_S) cobj->addFrameData(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addFrameData",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.MovementBoneData:addFrameData",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4086,7 +4086,7 @@ int lua_cocos2dx_studio_MovementBoneData_create(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.MovementBoneData",(cocostudio::MovementBoneData*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.MovementBoneData:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -4118,7 +4118,7 @@ int lua_cocos2dx_studio_MovementBoneData_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccs.MovementBoneData"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "MovementBoneData",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.MovementBoneData:MovementBoneData",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4182,14 +4182,14 @@ int lua_cocos2dx_studio_MovementData_getMovementBoneData(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.MovementData:getMovementBoneData"); if(!ok) return 0; cocostudio::MovementBoneData* ret = cobj->getMovementBoneData(arg0); object_to_luaval(tolua_S, "ccs.MovementBoneData",(cocostudio::MovementBoneData*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getMovementBoneData",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.MovementData:getMovementBoneData",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4235,7 +4235,7 @@ int lua_cocos2dx_studio_MovementData_addMovementBoneData(lua_State* tolua_S) cobj->addMovementBoneData(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addMovementBoneData",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.MovementData:addMovementBoneData",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4268,7 +4268,7 @@ int lua_cocos2dx_studio_MovementData_create(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.MovementData",(cocostudio::MovementData*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.MovementData:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -4300,7 +4300,7 @@ int lua_cocos2dx_studio_MovementData_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccs.MovementData"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "MovementData",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.MovementData:MovementData",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4363,14 +4363,14 @@ int lua_cocos2dx_studio_AnimationData_getMovement(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.AnimationData:getMovement"); if(!ok) return 0; cocostudio::MovementData* ret = cobj->getMovement(arg0); object_to_luaval(tolua_S, "ccs.MovementData",(cocostudio::MovementData*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getMovement",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.AnimationData:getMovement",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4414,7 +4414,7 @@ int lua_cocos2dx_studio_AnimationData_getMovementCount(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getMovementCount",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.AnimationData:getMovementCount",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4460,7 +4460,7 @@ int lua_cocos2dx_studio_AnimationData_addMovement(lua_State* tolua_S) cobj->addMovement(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addMovement",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.AnimationData:addMovement",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4493,7 +4493,7 @@ int lua_cocos2dx_studio_AnimationData_create(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.AnimationData",(cocostudio::AnimationData*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.AnimationData:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -4525,7 +4525,7 @@ int lua_cocos2dx_studio_AnimationData_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccs.AnimationData"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "AnimationData",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.AnimationData:AnimationData",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4593,7 +4593,7 @@ int lua_cocos2dx_studio_ContourData_init(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "init",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ContourData:init",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4633,13 +4633,13 @@ int lua_cocos2dx_studio_ContourData_addVertex(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "ccs.ContourData:addVertex"); if(!ok) return 0; cobj->addVertex(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addVertex",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ContourData:addVertex",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4672,7 +4672,7 @@ int lua_cocos2dx_studio_ContourData_create(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.ContourData",(cocostudio::ContourData*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.ContourData:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -4704,7 +4704,7 @@ int lua_cocos2dx_studio_ContourData_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccs.ContourData"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ContourData",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ContourData:ContourData",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4767,14 +4767,14 @@ int lua_cocos2dx_studio_TextureData_getContourData(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccs.TextureData:getContourData"); if(!ok) return 0; cocostudio::ContourData* ret = cobj->getContourData(arg0); object_to_luaval(tolua_S, "ccs.ContourData",(cocostudio::ContourData*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getContourData",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.TextureData:getContourData",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4818,7 +4818,7 @@ int lua_cocos2dx_studio_TextureData_init(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "init",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.TextureData:init",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4864,7 +4864,7 @@ int lua_cocos2dx_studio_TextureData_addContourData(lua_State* tolua_S) cobj->addContourData(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addContourData",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.TextureData:addContourData",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4897,7 +4897,7 @@ int lua_cocos2dx_studio_TextureData_create(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.TextureData",(cocostudio::TextureData*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.TextureData:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -4929,7 +4929,7 @@ int lua_cocos2dx_studio_TextureData_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccs.TextureData"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "TextureData",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.TextureData:TextureData",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4997,7 +4997,7 @@ int lua_cocos2dx_studio_Tween_getAnimation(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.ArmatureAnimation",(cocostudio::ArmatureAnimation*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAnimation",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Tween:getAnimation",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -5037,13 +5037,13 @@ int lua_cocos2dx_studio_Tween_gotoAndPause(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccs.Tween:gotoAndPause"); if(!ok) return 0; cobj->gotoAndPause(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "gotoAndPause",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Tween:gotoAndPause",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5089,19 +5089,19 @@ int lua_cocos2dx_studio_Tween_play(lua_State* tolua_S) ok &= luaval_to_object(tolua_S, 2, "ccs.MovementBoneData",&arg0); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccs.Tween:play"); - ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2); + ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "ccs.Tween:play"); - ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3); + ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3, "ccs.Tween:play"); - ok &= luaval_to_int32(tolua_S, 6,(int *)&arg4); + ok &= luaval_to_int32(tolua_S, 6,(int *)&arg4, "ccs.Tween:play"); if(!ok) return 0; cobj->play(arg0, arg1, arg2, arg3, arg4); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "play",argc, 5); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Tween:play",argc, 5); return 0; #if COCOS2D_DEBUG >= 1 @@ -5141,13 +5141,13 @@ int lua_cocos2dx_studio_Tween_gotoAndPlay(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccs.Tween:gotoAndPlay"); if(!ok) return 0; cobj->gotoAndPlay(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "gotoAndPlay",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Tween:gotoAndPlay",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5194,7 +5194,7 @@ int lua_cocos2dx_studio_Tween_init(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "init",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Tween:init",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5240,7 +5240,7 @@ int lua_cocos2dx_studio_Tween_setAnimation(lua_State* tolua_S) cobj->setAnimation(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAnimation",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Tween:setAnimation",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5275,7 +5275,7 @@ int lua_cocos2dx_studio_Tween_create(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.Tween",(cocostudio::Tween*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.Tween:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -5307,7 +5307,7 @@ int lua_cocos2dx_studio_Tween_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccs.Tween"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "Tween",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Tween:Tween",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -5378,7 +5378,7 @@ int lua_cocos2dx_studio_DisplayManager_getDisplayRenderNode(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Node",(cocos2d::Node*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDisplayRenderNode",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.DisplayManager:getDisplayRenderNode",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -5422,7 +5422,7 @@ int lua_cocos2dx_studio_DisplayManager_getAnchorPointInPoints(lua_State* tolua_S vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAnchorPointInPoints",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.DisplayManager:getAnchorPointInPoints",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -5466,7 +5466,7 @@ int lua_cocos2dx_studio_DisplayManager_getDisplayRenderNodeType(lua_State* tolua tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDisplayRenderNodeType",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.DisplayManager:getDisplayRenderNodeType",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -5506,13 +5506,13 @@ int lua_cocos2dx_studio_DisplayManager_removeDisplay(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccs.DisplayManager:removeDisplay"); if(!ok) return 0; cobj->removeDisplay(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeDisplay",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.DisplayManager:removeDisplay",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5552,13 +5552,13 @@ int lua_cocos2dx_studio_DisplayManager_setForceChangeDisplay(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccs.DisplayManager:setForceChangeDisplay"); if(!ok) return 0; cobj->setForceChangeDisplay(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setForceChangeDisplay",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.DisplayManager:setForceChangeDisplay",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5605,7 +5605,7 @@ int lua_cocos2dx_studio_DisplayManager_init(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "init",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.DisplayManager:init",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5649,7 +5649,7 @@ int lua_cocos2dx_studio_DisplayManager_getContentSize(lua_State* tolua_S) size_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getContentSize",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.DisplayManager:getContentSize",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -5693,7 +5693,7 @@ int lua_cocos2dx_studio_DisplayManager_getBoundingBox(lua_State* tolua_S) rect_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getBoundingBox",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.DisplayManager:getBoundingBox",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -5731,7 +5731,7 @@ int lua_cocos2dx_studio_DisplayManager_addDisplay(lua_State* tolua_S) if (!ok) { break; } int arg1; - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccs.DisplayManager:addDisplay"); if (!ok) { break; } cobj->addDisplay(arg0, arg1); @@ -5746,7 +5746,7 @@ int lua_cocos2dx_studio_DisplayManager_addDisplay(lua_State* tolua_S) if (!ok) { break; } int arg1; - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccs.DisplayManager:addDisplay"); if (!ok) { break; } cobj->addDisplay(arg0, arg1); @@ -5754,7 +5754,7 @@ int lua_cocos2dx_studio_DisplayManager_addDisplay(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addDisplay",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.DisplayManager:addDisplay",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -5788,11 +5788,11 @@ int lua_cocos2dx_studio_DisplayManager_containPoint(lua_State* tolua_S) do{ if (argc == 2) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccs.DisplayManager:containPoint"); if (!ok) { break; } double arg1; - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "ccs.DisplayManager:containPoint"); if (!ok) { break; } bool ret = cobj->containPoint(arg0, arg1); @@ -5804,7 +5804,7 @@ int lua_cocos2dx_studio_DisplayManager_containPoint(lua_State* tolua_S) do{ if (argc == 1) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "ccs.DisplayManager:containPoint"); if (!ok) { break; } bool ret = cobj->containPoint(arg0); @@ -5813,7 +5813,7 @@ int lua_cocos2dx_studio_DisplayManager_containPoint(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "containPoint",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.DisplayManager:containPoint",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5854,15 +5854,15 @@ int lua_cocos2dx_studio_DisplayManager_changeDisplayWithIndex(lua_State* tolua_S int arg0; bool arg1; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccs.DisplayManager:changeDisplayWithIndex"); - ok &= luaval_to_boolean(tolua_S, 3,&arg1); + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "ccs.DisplayManager:changeDisplayWithIndex"); if(!ok) return 0; cobj->changeDisplayWithIndex(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "changeDisplayWithIndex",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.DisplayManager:changeDisplayWithIndex",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -5903,15 +5903,15 @@ int lua_cocos2dx_studio_DisplayManager_changeDisplayWithName(lua_State* tolua_S) std::string arg0; bool arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.DisplayManager:changeDisplayWithName"); - ok &= luaval_to_boolean(tolua_S, 3,&arg1); + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "ccs.DisplayManager:changeDisplayWithName"); if(!ok) return 0; cobj->changeDisplayWithName(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "changeDisplayWithName",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.DisplayManager:changeDisplayWithName",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -5955,7 +5955,7 @@ int lua_cocos2dx_studio_DisplayManager_isForceChangeDisplay(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isForceChangeDisplay",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.DisplayManager:isForceChangeDisplay",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -5999,7 +5999,7 @@ int lua_cocos2dx_studio_DisplayManager_getCurrentDisplayIndex(lua_State* tolua_S tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getCurrentDisplayIndex",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.DisplayManager:getCurrentDisplayIndex",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -6043,7 +6043,7 @@ int lua_cocos2dx_studio_DisplayManager_getAnchorPoint(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAnchorPoint",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.DisplayManager:getAnchorPoint",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -6087,7 +6087,7 @@ int lua_cocos2dx_studio_DisplayManager_getDecorativeDisplayList(lua_State* tolua ccvector_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDecorativeDisplayList",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.DisplayManager:getDecorativeDisplayList",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -6131,7 +6131,7 @@ int lua_cocos2dx_studio_DisplayManager_isVisible(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isVisible",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.DisplayManager:isVisible",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -6171,13 +6171,13 @@ int lua_cocos2dx_studio_DisplayManager_setVisible(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccs.DisplayManager:setVisible"); if(!ok) return 0; cobj->setVisible(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setVisible",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.DisplayManager:setVisible",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -6212,7 +6212,7 @@ int lua_cocos2dx_studio_DisplayManager_create(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.DisplayManager",(cocostudio::DisplayManager*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.DisplayManager:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -6244,7 +6244,7 @@ int lua_cocos2dx_studio_DisplayManager_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccs.DisplayManager"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "DisplayManager",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.DisplayManager:DisplayManager",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -6327,7 +6327,7 @@ int lua_cocos2dx_studio_Bone_isTransformDirty(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isTransformDirty",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Bone:isTransformDirty",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -6371,7 +6371,7 @@ int lua_cocos2dx_studio_Bone_isIgnoreMovementBoneData(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isIgnoreMovementBoneData",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Bone:isIgnoreMovementBoneData",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -6414,7 +6414,7 @@ int lua_cocos2dx_studio_Bone_updateZOrder(lua_State* tolua_S) cobj->updateZOrder(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "updateZOrder",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Bone:updateZOrder",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -6458,7 +6458,7 @@ int lua_cocos2dx_studio_Bone_getDisplayRenderNode(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Node",(cocos2d::Node*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDisplayRenderNode",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Bone:getDisplayRenderNode",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -6502,7 +6502,7 @@ int lua_cocos2dx_studio_Bone_isBlendDirty(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isBlendDirty",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Bone:isBlendDirty",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -6548,7 +6548,7 @@ int lua_cocos2dx_studio_Bone_addChildBone(lua_State* tolua_S) cobj->addChildBone(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addChildBone",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Bone:addChildBone",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -6592,7 +6592,7 @@ int lua_cocos2dx_studio_Bone_getWorldInfo(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.BaseData",(cocostudio::BaseData*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getWorldInfo",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Bone:getWorldInfo",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -6636,7 +6636,7 @@ int lua_cocos2dx_studio_Bone_getTween(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.Tween",(cocostudio::Tween*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTween",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Bone:getTween",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -6680,7 +6680,7 @@ int lua_cocos2dx_studio_Bone_getParentBone(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.Bone",(cocostudio::Bone*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getParentBone",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Bone:getParentBone",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -6723,7 +6723,7 @@ int lua_cocos2dx_studio_Bone_updateColor(lua_State* tolua_S) cobj->updateColor(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "updateColor",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Bone:updateColor",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -6763,13 +6763,13 @@ int lua_cocos2dx_studio_Bone_setTransformDirty(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccs.Bone:setTransformDirty"); if(!ok) return 0; cobj->setTransformDirty(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTransformDirty",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Bone:setTransformDirty",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -6813,7 +6813,7 @@ int lua_cocos2dx_studio_Bone_getDisplayRenderNodeType(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDisplayRenderNodeType",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Bone:getDisplayRenderNodeType",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -6853,13 +6853,13 @@ int lua_cocos2dx_studio_Bone_removeDisplay(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccs.Bone:removeDisplay"); if(!ok) return 0; cobj->removeDisplay(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeDisplay",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Bone:removeDisplay",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -6905,7 +6905,7 @@ int lua_cocos2dx_studio_Bone_setBoneData(lua_State* tolua_S) cobj->setBoneData(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setBoneData",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Bone:setBoneData",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -6939,7 +6939,7 @@ int lua_cocos2dx_studio_Bone_init(lua_State* tolua_S) do{ if (argc == 1) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.Bone:init"); if (!ok) { break; } bool ret = cobj->init(arg0); @@ -6956,7 +6956,7 @@ int lua_cocos2dx_studio_Bone_init(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "init",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Bone:init",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -7002,7 +7002,7 @@ int lua_cocos2dx_studio_Bone_setParentBone(lua_State* tolua_S) cobj->setParentBone(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setParentBone",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Bone:setParentBone",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -7040,7 +7040,7 @@ int lua_cocos2dx_studio_Bone_addDisplay(lua_State* tolua_S) if (!ok) { break; } int arg1; - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccs.Bone:addDisplay"); if (!ok) { break; } cobj->addDisplay(arg0, arg1); @@ -7055,7 +7055,7 @@ int lua_cocos2dx_studio_Bone_addDisplay(lua_State* tolua_S) if (!ok) { break; } int arg1; - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccs.Bone:addDisplay"); if (!ok) { break; } cobj->addDisplay(arg0, arg1); @@ -7063,7 +7063,7 @@ int lua_cocos2dx_studio_Bone_addDisplay(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addDisplay",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Bone:addDisplay",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -7103,13 +7103,13 @@ int lua_cocos2dx_studio_Bone_removeFromParent(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccs.Bone:removeFromParent"); if(!ok) return 0; cobj->removeFromParent(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeFromParent",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Bone:removeFromParent",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -7153,7 +7153,7 @@ int lua_cocos2dx_studio_Bone_getColliderDetector(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.ColliderDetector",(cocostudio::ColliderDetector*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getColliderDetector",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Bone:getColliderDetector",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -7197,7 +7197,7 @@ int lua_cocos2dx_studio_Bone_getChildArmature(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.Armature",(cocostudio::Armature*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getChildArmature",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Bone:getChildArmature",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -7241,7 +7241,7 @@ int lua_cocos2dx_studio_Bone_getTweenData(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.FrameData",(cocostudio::FrameData*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTweenData",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Bone:getTweenData",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -7282,15 +7282,15 @@ int lua_cocos2dx_studio_Bone_changeDisplayWithIndex(lua_State* tolua_S) int arg0; bool arg1; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccs.Bone:changeDisplayWithIndex"); - ok &= luaval_to_boolean(tolua_S, 3,&arg1); + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "ccs.Bone:changeDisplayWithIndex"); if(!ok) return 0; cobj->changeDisplayWithIndex(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "changeDisplayWithIndex",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Bone:changeDisplayWithIndex",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -7331,15 +7331,15 @@ int lua_cocos2dx_studio_Bone_changeDisplayWithName(lua_State* tolua_S) std::string arg0; bool arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.Bone:changeDisplayWithName"); - ok &= luaval_to_boolean(tolua_S, 3,&arg1); + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "ccs.Bone:changeDisplayWithName"); if(!ok) return 0; cobj->changeDisplayWithName(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "changeDisplayWithName",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Bone:changeDisplayWithName",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -7385,7 +7385,7 @@ int lua_cocos2dx_studio_Bone_setArmature(lua_State* tolua_S) cobj->setArmature(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setArmature",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Bone:setArmature",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -7425,13 +7425,13 @@ int lua_cocos2dx_studio_Bone_setBlendDirty(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccs.Bone:setBlendDirty"); if(!ok) return 0; cobj->setBlendDirty(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setBlendDirty",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Bone:setBlendDirty",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -7474,13 +7474,13 @@ int lua_cocos2dx_studio_Bone_removeChildBone(lua_State* tolua_S) ok &= luaval_to_object(tolua_S, 2, "ccs.Bone",&arg0); - ok &= luaval_to_boolean(tolua_S, 3,&arg1); + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "ccs.Bone:removeChildBone"); if(!ok) return 0; cobj->removeChildBone(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeChildBone",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Bone:removeChildBone",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -7526,7 +7526,7 @@ int lua_cocos2dx_studio_Bone_setChildArmature(lua_State* tolua_S) cobj->setChildArmature(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setChildArmature",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Bone:setChildArmature",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -7570,7 +7570,7 @@ int lua_cocos2dx_studio_Bone_getNodeToArmatureTransform(lua_State* tolua_S) mat4_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getNodeToArmatureTransform",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Bone:getNodeToArmatureTransform",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -7614,7 +7614,7 @@ int lua_cocos2dx_studio_Bone_getDisplayManager(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.DisplayManager",(cocostudio::DisplayManager*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDisplayManager",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Bone:getDisplayManager",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -7658,7 +7658,7 @@ int lua_cocos2dx_studio_Bone_getArmature(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.Armature",(cocostudio::Armature*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getArmature",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Bone:getArmature",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -7702,7 +7702,7 @@ int lua_cocos2dx_studio_Bone_getBoneData(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.BoneData",(cocostudio::BoneData*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getBoneData",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Bone:getBoneData",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -7731,7 +7731,7 @@ int lua_cocos2dx_studio_Bone_create(lua_State* tolua_S) if (argc == 1) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.Bone:create"); if (!ok) { break; } cocostudio::Bone* ret = cocostudio::Bone::create(arg0); object_to_luaval(tolua_S, "ccs.Bone",(cocostudio::Bone*)ret); @@ -7749,7 +7749,7 @@ int lua_cocos2dx_studio_Bone_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "ccs.Bone:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -7781,7 +7781,7 @@ int lua_cocos2dx_studio_Bone_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccs.Bone"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "Bone",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Bone:Bone",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -7877,7 +7877,7 @@ int lua_cocos2dx_studio_BatchNode_init(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "init",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.BatchNode:init",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -7910,7 +7910,7 @@ int lua_cocos2dx_studio_BatchNode_create(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.BatchNode",(cocostudio::BatchNode*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.BatchNode:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -7973,7 +7973,7 @@ int lua_cocos2dx_studio_ArmatureAnimation_getSpeedScale(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getSpeedScale",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ArmatureAnimation:getSpeedScale",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -8016,7 +8016,7 @@ int lua_cocos2dx_studio_ArmatureAnimation_pause(lua_State* tolua_S) cobj->pause(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "pause",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ArmatureAnimation:pause",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -8056,13 +8056,13 @@ int lua_cocos2dx_studio_ArmatureAnimation_setSpeedScale(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccs.ArmatureAnimation:setSpeedScale"); if(!ok) return 0; cobj->setSpeedScale(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setSpeedScale",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ArmatureAnimation:setSpeedScale",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -8109,7 +8109,7 @@ int lua_cocos2dx_studio_ArmatureAnimation_init(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "init",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ArmatureAnimation:init",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -8149,7 +8149,7 @@ int lua_cocos2dx_studio_ArmatureAnimation_playWithIndexes(lua_State* tolua_S) { std::vector arg0; - ok &= luaval_to_std_vector_int(tolua_S, 2, &arg0); + ok &= luaval_to_std_vector_int(tolua_S, 2, &arg0, "ccs.ArmatureAnimation:playWithIndexes"); if(!ok) return 0; cobj->playWithIndexes(arg0); @@ -8160,9 +8160,9 @@ int lua_cocos2dx_studio_ArmatureAnimation_playWithIndexes(lua_State* tolua_S) std::vector arg0; int arg1; - ok &= luaval_to_std_vector_int(tolua_S, 2, &arg0); + ok &= luaval_to_std_vector_int(tolua_S, 2, &arg0, "ccs.ArmatureAnimation:playWithIndexes"); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccs.ArmatureAnimation:playWithIndexes"); if(!ok) return 0; cobj->playWithIndexes(arg0, arg1); @@ -8174,17 +8174,17 @@ int lua_cocos2dx_studio_ArmatureAnimation_playWithIndexes(lua_State* tolua_S) int arg1; bool arg2; - ok &= luaval_to_std_vector_int(tolua_S, 2, &arg0); + ok &= luaval_to_std_vector_int(tolua_S, 2, &arg0, "ccs.ArmatureAnimation:playWithIndexes"); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccs.ArmatureAnimation:playWithIndexes"); - ok &= luaval_to_boolean(tolua_S, 4,&arg2); + ok &= luaval_to_boolean(tolua_S, 4,&arg2, "ccs.ArmatureAnimation:playWithIndexes"); if(!ok) return 0; cobj->playWithIndexes(arg0, arg1, arg2); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "playWithIndexes",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ArmatureAnimation:playWithIndexes",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -8224,7 +8224,7 @@ int lua_cocos2dx_studio_ArmatureAnimation_play(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ArmatureAnimation:play"); if(!ok) return 0; cobj->play(arg0); @@ -8235,9 +8235,9 @@ int lua_cocos2dx_studio_ArmatureAnimation_play(lua_State* tolua_S) std::string arg0; int arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ArmatureAnimation:play"); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccs.ArmatureAnimation:play"); if(!ok) return 0; cobj->play(arg0, arg1); @@ -8249,17 +8249,17 @@ int lua_cocos2dx_studio_ArmatureAnimation_play(lua_State* tolua_S) int arg1; int arg2; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ArmatureAnimation:play"); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccs.ArmatureAnimation:play"); - ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2); + ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "ccs.ArmatureAnimation:play"); if(!ok) return 0; cobj->play(arg0, arg1, arg2); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "play",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ArmatureAnimation:play",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -8299,13 +8299,13 @@ int lua_cocos2dx_studio_ArmatureAnimation_gotoAndPause(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccs.ArmatureAnimation:gotoAndPause"); if(!ok) return 0; cobj->gotoAndPause(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "gotoAndPause",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ArmatureAnimation:gotoAndPause",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -8348,7 +8348,7 @@ int lua_cocos2dx_studio_ArmatureAnimation_resume(lua_State* tolua_S) cobj->resume(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "resume",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ArmatureAnimation:resume",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -8391,7 +8391,7 @@ int lua_cocos2dx_studio_ArmatureAnimation_stop(lua_State* tolua_S) cobj->stop(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "stop",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ArmatureAnimation:stop",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -8431,13 +8431,13 @@ int lua_cocos2dx_studio_ArmatureAnimation_update(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccs.ArmatureAnimation:update"); if(!ok) return 0; cobj->update(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "update",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ArmatureAnimation:update",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -8481,7 +8481,7 @@ int lua_cocos2dx_studio_ArmatureAnimation_getAnimationData(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.AnimationData",(cocostudio::AnimationData*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAnimationData",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ArmatureAnimation:getAnimationData",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -8521,7 +8521,7 @@ int lua_cocos2dx_studio_ArmatureAnimation_playWithIndex(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccs.ArmatureAnimation:playWithIndex"); if(!ok) return 0; cobj->playWithIndex(arg0); @@ -8532,9 +8532,9 @@ int lua_cocos2dx_studio_ArmatureAnimation_playWithIndex(lua_State* tolua_S) int arg0; int arg1; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccs.ArmatureAnimation:playWithIndex"); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccs.ArmatureAnimation:playWithIndex"); if(!ok) return 0; cobj->playWithIndex(arg0, arg1); @@ -8546,17 +8546,17 @@ int lua_cocos2dx_studio_ArmatureAnimation_playWithIndex(lua_State* tolua_S) int arg1; int arg2; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccs.ArmatureAnimation:playWithIndex"); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccs.ArmatureAnimation:playWithIndex"); - ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2); + ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "ccs.ArmatureAnimation:playWithIndex"); if(!ok) return 0; cobj->playWithIndex(arg0, arg1, arg2); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "playWithIndex",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ArmatureAnimation:playWithIndex",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -8600,7 +8600,7 @@ int lua_cocos2dx_studio_ArmatureAnimation_getCurrentMovementID(lua_State* tolua_ tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getCurrentMovementID",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ArmatureAnimation:getCurrentMovementID",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -8646,7 +8646,7 @@ int lua_cocos2dx_studio_ArmatureAnimation_setAnimationData(lua_State* tolua_S) cobj->setAnimationData(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAnimationData",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ArmatureAnimation:setAnimationData",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -8686,13 +8686,13 @@ int lua_cocos2dx_studio_ArmatureAnimation_gotoAndPlay(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccs.ArmatureAnimation:gotoAndPlay"); if(!ok) return 0; cobj->gotoAndPlay(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "gotoAndPlay",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ArmatureAnimation:gotoAndPlay",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -8732,7 +8732,7 @@ int lua_cocos2dx_studio_ArmatureAnimation_playWithNames(lua_State* tolua_S) { std::vector arg0; - ok &= luaval_to_std_vector_string(tolua_S, 2, &arg0); + ok &= luaval_to_std_vector_string(tolua_S, 2, &arg0, "ccs.ArmatureAnimation:playWithNames"); if(!ok) return 0; cobj->playWithNames(arg0); @@ -8743,9 +8743,9 @@ int lua_cocos2dx_studio_ArmatureAnimation_playWithNames(lua_State* tolua_S) std::vector arg0; int arg1; - ok &= luaval_to_std_vector_string(tolua_S, 2, &arg0); + ok &= luaval_to_std_vector_string(tolua_S, 2, &arg0, "ccs.ArmatureAnimation:playWithNames"); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccs.ArmatureAnimation:playWithNames"); if(!ok) return 0; cobj->playWithNames(arg0, arg1); @@ -8757,17 +8757,17 @@ int lua_cocos2dx_studio_ArmatureAnimation_playWithNames(lua_State* tolua_S) int arg1; bool arg2; - ok &= luaval_to_std_vector_string(tolua_S, 2, &arg0); + ok &= luaval_to_std_vector_string(tolua_S, 2, &arg0, "ccs.ArmatureAnimation:playWithNames"); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccs.ArmatureAnimation:playWithNames"); - ok &= luaval_to_boolean(tolua_S, 4,&arg2); + ok &= luaval_to_boolean(tolua_S, 4,&arg2, "ccs.ArmatureAnimation:playWithNames"); if(!ok) return 0; cobj->playWithNames(arg0, arg1, arg2); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "playWithNames",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ArmatureAnimation:playWithNames",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -8811,7 +8811,7 @@ int lua_cocos2dx_studio_ArmatureAnimation_getMovementCount(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getMovementCount",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ArmatureAnimation:getMovementCount",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -8846,7 +8846,7 @@ int lua_cocos2dx_studio_ArmatureAnimation_create(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.ArmatureAnimation",(cocostudio::ArmatureAnimation*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.ArmatureAnimation:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -8878,7 +8878,7 @@ int lua_cocos2dx_studio_ArmatureAnimation_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccs.ArmatureAnimation"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ArmatureAnimation",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ArmatureAnimation:ArmatureAnimation",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -8960,7 +8960,7 @@ int lua_cocos2dx_studio_ArmatureDataManager_getAnimationDatas(lua_State* tolua_S ccmap_string_key_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAnimationDatas",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ArmatureDataManager:getAnimationDatas",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -9000,13 +9000,13 @@ int lua_cocos2dx_studio_ArmatureDataManager_removeAnimationData(lua_State* tolua { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ArmatureDataManager:removeAnimationData"); if(!ok) return 0; cobj->removeAnimationData(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeAnimationData",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ArmatureDataManager:removeAnimationData",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -9047,7 +9047,7 @@ int lua_cocos2dx_studio_ArmatureDataManager_addArmatureData(lua_State* tolua_S) std::string arg0; cocostudio::ArmatureData* arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ArmatureDataManager:addArmatureData"); ok &= luaval_to_object(tolua_S, 3, "ccs.ArmatureData",&arg1); if(!ok) @@ -9061,17 +9061,17 @@ int lua_cocos2dx_studio_ArmatureDataManager_addArmatureData(lua_State* tolua_S) cocostudio::ArmatureData* arg1; std::string arg2; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ArmatureDataManager:addArmatureData"); ok &= luaval_to_object(tolua_S, 3, "ccs.ArmatureData",&arg1); - ok &= luaval_to_std_string(tolua_S, 4,&arg2); + ok &= luaval_to_std_string(tolua_S, 4,&arg2, "ccs.ArmatureDataManager:addArmatureData"); if(!ok) return 0; cobj->addArmatureData(arg0, arg1, arg2); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addArmatureData",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ArmatureDataManager:addArmatureData",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -9105,15 +9105,15 @@ int lua_cocos2dx_studio_ArmatureDataManager_addArmatureFileInfo(lua_State* tolua do{ if (argc == 3) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ArmatureDataManager:addArmatureFileInfo"); if (!ok) { break; } std::string arg1; - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccs.ArmatureDataManager:addArmatureFileInfo"); if (!ok) { break; } std::string arg2; - ok &= luaval_to_std_string(tolua_S, 4,&arg2); + ok &= luaval_to_std_string(tolua_S, 4,&arg2, "ccs.ArmatureDataManager:addArmatureFileInfo"); if (!ok) { break; } cobj->addArmatureFileInfo(arg0, arg1, arg2); @@ -9124,7 +9124,7 @@ int lua_cocos2dx_studio_ArmatureDataManager_addArmatureFileInfo(lua_State* tolua do{ if (argc == 1) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ArmatureDataManager:addArmatureFileInfo"); if (!ok) { break; } cobj->addArmatureFileInfo(arg0); @@ -9132,7 +9132,7 @@ int lua_cocos2dx_studio_ArmatureDataManager_addArmatureFileInfo(lua_State* tolua } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addArmatureFileInfo",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ArmatureDataManager:addArmatureFileInfo",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -9172,13 +9172,13 @@ int lua_cocos2dx_studio_ArmatureDataManager_removeArmatureFileInfo(lua_State* to { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ArmatureDataManager:removeArmatureFileInfo"); if(!ok) return 0; cobj->removeArmatureFileInfo(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeArmatureFileInfo",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ArmatureDataManager:removeArmatureFileInfo",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -9222,7 +9222,7 @@ int lua_cocos2dx_studio_ArmatureDataManager_getTextureDatas(lua_State* tolua_S) ccmap_string_key_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTextureDatas",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ArmatureDataManager:getTextureDatas",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -9262,14 +9262,14 @@ int lua_cocos2dx_studio_ArmatureDataManager_getTextureData(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ArmatureDataManager:getTextureData"); if(!ok) return 0; cocostudio::TextureData* ret = cobj->getTextureData(arg0); object_to_luaval(tolua_S, "ccs.TextureData",(cocostudio::TextureData*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTextureData",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ArmatureDataManager:getTextureData",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -9309,14 +9309,14 @@ int lua_cocos2dx_studio_ArmatureDataManager_getArmatureData(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ArmatureDataManager:getArmatureData"); if(!ok) return 0; cocostudio::ArmatureData* ret = cobj->getArmatureData(arg0); object_to_luaval(tolua_S, "ccs.ArmatureData",(cocostudio::ArmatureData*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getArmatureData",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ArmatureDataManager:getArmatureData",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -9356,14 +9356,14 @@ int lua_cocos2dx_studio_ArmatureDataManager_getAnimationData(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ArmatureDataManager:getAnimationData"); if(!ok) return 0; cocostudio::AnimationData* ret = cobj->getAnimationData(arg0); object_to_luaval(tolua_S, "ccs.AnimationData",(cocostudio::AnimationData*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAnimationData",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ArmatureDataManager:getAnimationData",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -9404,7 +9404,7 @@ int lua_cocos2dx_studio_ArmatureDataManager_addAnimationData(lua_State* tolua_S) std::string arg0; cocostudio::AnimationData* arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ArmatureDataManager:addAnimationData"); ok &= luaval_to_object(tolua_S, 3, "ccs.AnimationData",&arg1); if(!ok) @@ -9418,17 +9418,17 @@ int lua_cocos2dx_studio_ArmatureDataManager_addAnimationData(lua_State* tolua_S) cocostudio::AnimationData* arg1; std::string arg2; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ArmatureDataManager:addAnimationData"); ok &= luaval_to_object(tolua_S, 3, "ccs.AnimationData",&arg1); - ok &= luaval_to_std_string(tolua_S, 4,&arg2); + ok &= luaval_to_std_string(tolua_S, 4,&arg2, "ccs.ArmatureDataManager:addAnimationData"); if(!ok) return 0; cobj->addAnimationData(arg0, arg1, arg2); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addAnimationData",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ArmatureDataManager:addAnimationData",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -9472,7 +9472,7 @@ int lua_cocos2dx_studio_ArmatureDataManager_init(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "init",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ArmatureDataManager:init",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -9512,13 +9512,13 @@ int lua_cocos2dx_studio_ArmatureDataManager_removeArmatureData(lua_State* tolua_ { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ArmatureDataManager:removeArmatureData"); if(!ok) return 0; cobj->removeArmatureData(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeArmatureData",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ArmatureDataManager:removeArmatureData",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -9562,7 +9562,7 @@ int lua_cocos2dx_studio_ArmatureDataManager_getArmatureDatas(lua_State* tolua_S) ccmap_string_key_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getArmatureDatas",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ArmatureDataManager:getArmatureDatas",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -9602,13 +9602,13 @@ int lua_cocos2dx_studio_ArmatureDataManager_removeTextureData(lua_State* tolua_S { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ArmatureDataManager:removeTextureData"); if(!ok) return 0; cobj->removeTextureData(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeTextureData",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ArmatureDataManager:removeTextureData",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -9649,7 +9649,7 @@ int lua_cocos2dx_studio_ArmatureDataManager_addTextureData(lua_State* tolua_S) std::string arg0; cocostudio::TextureData* arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ArmatureDataManager:addTextureData"); ok &= luaval_to_object(tolua_S, 3, "ccs.TextureData",&arg1); if(!ok) @@ -9663,17 +9663,17 @@ int lua_cocos2dx_studio_ArmatureDataManager_addTextureData(lua_State* tolua_S) cocostudio::TextureData* arg1; std::string arg2; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ArmatureDataManager:addTextureData"); ok &= luaval_to_object(tolua_S, 3, "ccs.TextureData",&arg1); - ok &= luaval_to_std_string(tolua_S, 4,&arg2); + ok &= luaval_to_std_string(tolua_S, 4,&arg2, "ccs.ArmatureDataManager:addTextureData"); if(!ok) return 0; cobj->addTextureData(arg0, arg1, arg2); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addTextureData",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ArmatureDataManager:addTextureData",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -9717,7 +9717,7 @@ int lua_cocos2dx_studio_ArmatureDataManager_isAutoLoadSpriteFile(lua_State* tolu tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isAutoLoadSpriteFile",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ArmatureDataManager:isAutoLoadSpriteFile",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -9758,9 +9758,9 @@ int lua_cocos2dx_studio_ArmatureDataManager_addSpriteFrameFromFile(lua_State* to std::string arg0; std::string arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ArmatureDataManager:addSpriteFrameFromFile"); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccs.ArmatureDataManager:addSpriteFrameFromFile"); if(!ok) return 0; cobj->addSpriteFrameFromFile(arg0, arg1); @@ -9772,17 +9772,17 @@ int lua_cocos2dx_studio_ArmatureDataManager_addSpriteFrameFromFile(lua_State* to std::string arg1; std::string arg2; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ArmatureDataManager:addSpriteFrameFromFile"); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccs.ArmatureDataManager:addSpriteFrameFromFile"); - ok &= luaval_to_std_string(tolua_S, 4,&arg2); + ok &= luaval_to_std_string(tolua_S, 4,&arg2, "ccs.ArmatureDataManager:addSpriteFrameFromFile"); if(!ok) return 0; cobj->addSpriteFrameFromFile(arg0, arg1, arg2); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addSpriteFrameFromFile",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ArmatureDataManager:addSpriteFrameFromFile",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -9814,7 +9814,7 @@ int lua_cocos2dx_studio_ArmatureDataManager_destroyInstance(lua_State* tolua_S) cocostudio::ArmatureDataManager::destroyInstance(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "destroyInstance",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.ArmatureDataManager:destroyInstance",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -9845,7 +9845,7 @@ int lua_cocos2dx_studio_ArmatureDataManager_getInstance(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.ArmatureDataManager",(cocostudio::ArmatureDataManager*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "getInstance",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.ArmatureDataManager:getInstance",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -9921,14 +9921,14 @@ int lua_cocos2dx_studio_Armature_getBone(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.Armature:getBone"); if(!ok) return 0; cocostudio::Bone* ret = cobj->getBone(arg0); object_to_luaval(tolua_S, "ccs.Bone",(cocostudio::Bone*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getBone",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Armature:getBone",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -9971,13 +9971,13 @@ int lua_cocos2dx_studio_Armature_changeBoneParent(lua_State* tolua_S) ok &= luaval_to_object(tolua_S, 2, "ccs.Bone",&arg0); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccs.Armature:changeBoneParent"); if(!ok) return 0; cobj->changeBoneParent(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "changeBoneParent",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Armature:changeBoneParent",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -10023,7 +10023,7 @@ int lua_cocos2dx_studio_Armature_setAnimation(lua_State* tolua_S) cobj->setAnimation(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAnimation",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Armature:setAnimation",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -10064,16 +10064,16 @@ int lua_cocos2dx_studio_Armature_getBoneAtPoint(lua_State* tolua_S) double arg0; double arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccs.Armature:getBoneAtPoint"); - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "ccs.Armature:getBoneAtPoint"); if(!ok) return 0; cocostudio::Bone* ret = cobj->getBoneAtPoint(arg0, arg1); object_to_luaval(tolua_S, "ccs.Bone",(cocostudio::Bone*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getBoneAtPoint",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Armature:getBoneAtPoint",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -10117,7 +10117,7 @@ int lua_cocos2dx_studio_Armature_getArmatureTransformDirty(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getArmatureTransformDirty",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Armature:getArmatureTransformDirty",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -10157,13 +10157,13 @@ int lua_cocos2dx_studio_Armature_setVersion(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccs.Armature:setVersion"); if(!ok) return 0; cobj->setVersion(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setVersion",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Armature:setVersion",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -10206,7 +10206,7 @@ int lua_cocos2dx_studio_Armature_updateOffsetPoint(lua_State* tolua_S) cobj->updateOffsetPoint(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "updateOffsetPoint",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Armature:updateOffsetPoint",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -10250,7 +10250,7 @@ int lua_cocos2dx_studio_Armature_getParentBone(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.Bone",(cocostudio::Bone*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getParentBone",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Armature:getParentBone",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -10293,13 +10293,13 @@ int lua_cocos2dx_studio_Armature_removeBone(lua_State* tolua_S) ok &= luaval_to_object(tolua_S, 2, "ccs.Bone",&arg0); - ok &= luaval_to_boolean(tolua_S, 3,&arg1); + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "ccs.Armature:removeBone"); if(!ok) return 0; cobj->removeBone(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeBone",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Armature:removeBone",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -10343,7 +10343,7 @@ int lua_cocos2dx_studio_Armature_getBatchNode(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.BatchNode",(cocostudio::BatchNode*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getBatchNode",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Armature:getBatchNode",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -10377,7 +10377,7 @@ int lua_cocos2dx_studio_Armature_init(lua_State* tolua_S) do{ if (argc == 1) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.Armature:init"); if (!ok) { break; } bool ret = cobj->init(arg0); @@ -10397,7 +10397,7 @@ int lua_cocos2dx_studio_Armature_init(lua_State* tolua_S) do{ if (argc == 2) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.Armature:init"); if (!ok) { break; } cocostudio::Bone* arg1; @@ -10410,7 +10410,7 @@ int lua_cocos2dx_studio_Armature_init(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "init",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Armature:init",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -10456,7 +10456,7 @@ int lua_cocos2dx_studio_Armature_setParentBone(lua_State* tolua_S) cobj->setParentBone(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setParentBone",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Armature:setParentBone",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -10499,7 +10499,7 @@ int lua_cocos2dx_studio_Armature_drawContour(lua_State* tolua_S) cobj->drawContour(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "drawContour",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Armature:drawContour",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -10545,7 +10545,7 @@ int lua_cocos2dx_studio_Armature_setBatchNode(lua_State* tolua_S) cobj->setBatchNode(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setBatchNode",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Armature:setBatchNode",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -10591,7 +10591,7 @@ int lua_cocos2dx_studio_Armature_setArmatureData(lua_State* tolua_S) cobj->setArmatureData(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setArmatureData",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Armature:setArmatureData",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -10634,13 +10634,13 @@ int lua_cocos2dx_studio_Armature_addBone(lua_State* tolua_S) ok &= luaval_to_object(tolua_S, 2, "ccs.Bone",&arg0); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccs.Armature:addBone"); if(!ok) return 0; cobj->addBone(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addBone",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Armature:addBone",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -10684,7 +10684,7 @@ int lua_cocos2dx_studio_Armature_getArmatureData(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.ArmatureData",(cocostudio::ArmatureData*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getArmatureData",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Armature:getArmatureData",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -10728,7 +10728,7 @@ int lua_cocos2dx_studio_Armature_getVersion(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getVersion",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Armature:getVersion",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -10772,7 +10772,7 @@ int lua_cocos2dx_studio_Armature_getAnimation(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.ArmatureAnimation",(cocostudio::ArmatureAnimation*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAnimation",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Armature:getAnimation",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -10816,7 +10816,7 @@ int lua_cocos2dx_studio_Armature_getBoneDic(lua_State* tolua_S) ccmap_string_key_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getBoneDic",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Armature:getBoneDic",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -10845,7 +10845,7 @@ int lua_cocos2dx_studio_Armature_create(lua_State* tolua_S) if (argc == 1) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.Armature:create"); if (!ok) { break; } cocostudio::Armature* ret = cocostudio::Armature::create(arg0); object_to_luaval(tolua_S, "ccs.Armature",(cocostudio::Armature*)ret); @@ -10868,7 +10868,7 @@ int lua_cocos2dx_studio_Armature_create(lua_State* tolua_S) if (argc == 2) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.Armature:create"); if (!ok) { break; } cocostudio::Bone* arg1; ok &= luaval_to_object(tolua_S, 3, "ccs.Bone",&arg1); @@ -10879,7 +10879,7 @@ int lua_cocos2dx_studio_Armature_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "ccs.Armature:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -10911,7 +10911,7 @@ int lua_cocos2dx_studio_Armature_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccs.Armature"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "Armature",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Armature:Armature",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -10996,7 +10996,7 @@ int lua_cocos2dx_studio_Skin_getBone(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.Bone",(cocostudio::Bone*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getBone",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Skin:getBone",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -11040,7 +11040,7 @@ int lua_cocos2dx_studio_Skin_getNodeToWorldTransformAR(lua_State* tolua_S) mat4_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getNodeToWorldTransformAR",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Skin:getNodeToWorldTransformAR",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -11080,14 +11080,14 @@ int lua_cocos2dx_studio_Skin_initWithFile(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.Skin:initWithFile"); if(!ok) return 0; bool ret = cobj->initWithFile(arg0); tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "initWithFile",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Skin:initWithFile",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -11131,7 +11131,7 @@ int lua_cocos2dx_studio_Skin_getDisplayName(lua_State* tolua_S) tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDisplayName",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Skin:getDisplayName",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -11174,7 +11174,7 @@ int lua_cocos2dx_studio_Skin_updateArmatureTransform(lua_State* tolua_S) cobj->updateArmatureTransform(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "updateArmatureTransform",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Skin:updateArmatureTransform",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -11214,14 +11214,14 @@ int lua_cocos2dx_studio_Skin_initWithSpriteFrameName(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.Skin:initWithSpriteFrameName"); if(!ok) return 0; bool ret = cobj->initWithSpriteFrameName(arg0); tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "initWithSpriteFrameName",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Skin:initWithSpriteFrameName",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -11267,7 +11267,7 @@ int lua_cocos2dx_studio_Skin_setBone(lua_State* tolua_S) cobj->setBone(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setBone",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Skin:setBone",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -11296,7 +11296,7 @@ int lua_cocos2dx_studio_Skin_create(lua_State* tolua_S) if (argc == 1) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.Skin:create"); if (!ok) { break; } cocostudio::Skin* ret = cocostudio::Skin::create(arg0); object_to_luaval(tolua_S, "ccs.Skin",(cocostudio::Skin*)ret); @@ -11314,7 +11314,7 @@ int lua_cocos2dx_studio_Skin_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "ccs.Skin:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -11340,14 +11340,14 @@ int lua_cocos2dx_studio_Skin_createWithSpriteFrameName(lua_State* tolua_S) if (argc == 1) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.Skin:createWithSpriteFrameName"); if(!ok) return 0; cocostudio::Skin* ret = cocostudio::Skin::createWithSpriteFrameName(arg0); object_to_luaval(tolua_S, "ccs.Skin",(cocostudio::Skin*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createWithSpriteFrameName",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.Skin:createWithSpriteFrameName",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -11379,7 +11379,7 @@ int lua_cocos2dx_studio_Skin_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccs.Skin"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "Skin",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Skin:Skin",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -11448,7 +11448,7 @@ int lua_cocos2dx_studio_ComAttribute_getFloat(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ComAttribute:getFloat"); if(!ok) return 0; double ret = cobj->getFloat(arg0); @@ -11460,16 +11460,16 @@ int lua_cocos2dx_studio_ComAttribute_getFloat(lua_State* tolua_S) std::string arg0; double arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ComAttribute:getFloat"); - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "ccs.ComAttribute:getFloat"); if(!ok) return 0; double ret = cobj->getFloat(arg0, arg1); tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getFloat",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ComAttribute:getFloat",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -11509,7 +11509,7 @@ int lua_cocos2dx_studio_ComAttribute_getString(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ComAttribute:getString"); if(!ok) return 0; std::string ret = cobj->getString(arg0); @@ -11521,16 +11521,16 @@ int lua_cocos2dx_studio_ComAttribute_getString(lua_State* tolua_S) std::string arg0; std::string arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ComAttribute:getString"); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccs.ComAttribute:getString"); if(!ok) return 0; std::string ret = cobj->getString(arg0, arg1); tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getString",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ComAttribute:getString",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -11571,15 +11571,15 @@ int lua_cocos2dx_studio_ComAttribute_setFloat(lua_State* tolua_S) std::string arg0; double arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ComAttribute:setFloat"); - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "ccs.ComAttribute:setFloat"); if(!ok) return 0; cobj->setFloat(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setFloat",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ComAttribute:setFloat",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -11620,15 +11620,15 @@ int lua_cocos2dx_studio_ComAttribute_setString(lua_State* tolua_S) std::string arg0; std::string arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ComAttribute:setString"); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccs.ComAttribute:setString"); if(!ok) return 0; cobj->setString(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setString",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ComAttribute:setString",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -11668,7 +11668,7 @@ int lua_cocos2dx_studio_ComAttribute_getBool(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ComAttribute:getBool"); if(!ok) return 0; bool ret = cobj->getBool(arg0); @@ -11680,16 +11680,16 @@ int lua_cocos2dx_studio_ComAttribute_getBool(lua_State* tolua_S) std::string arg0; bool arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ComAttribute:getBool"); - ok &= luaval_to_boolean(tolua_S, 3,&arg1); + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "ccs.ComAttribute:getBool"); if(!ok) return 0; bool ret = cobj->getBool(arg0, arg1); tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getBool",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ComAttribute:getBool",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -11730,15 +11730,15 @@ int lua_cocos2dx_studio_ComAttribute_setInt(lua_State* tolua_S) std::string arg0; int arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ComAttribute:setInt"); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccs.ComAttribute:setInt"); if(!ok) return 0; cobj->setInt(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setInt",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ComAttribute:setInt",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -11778,14 +11778,14 @@ int lua_cocos2dx_studio_ComAttribute_parse(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ComAttribute:parse"); if(!ok) return 0; bool ret = cobj->parse(arg0); tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "parse",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ComAttribute:parse",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -11825,7 +11825,7 @@ int lua_cocos2dx_studio_ComAttribute_getInt(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ComAttribute:getInt"); if(!ok) return 0; int ret = cobj->getInt(arg0); @@ -11837,16 +11837,16 @@ int lua_cocos2dx_studio_ComAttribute_getInt(lua_State* tolua_S) std::string arg0; int arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ComAttribute:getInt"); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccs.ComAttribute:getInt"); if(!ok) return 0; int ret = cobj->getInt(arg0, arg1); tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getInt",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ComAttribute:getInt",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -11887,15 +11887,15 @@ int lua_cocos2dx_studio_ComAttribute_setBool(lua_State* tolua_S) std::string arg0; bool arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ComAttribute:setBool"); - ok &= luaval_to_boolean(tolua_S, 3,&arg1); + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "ccs.ComAttribute:setBool"); if(!ok) return 0; cobj->setBool(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setBool",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ComAttribute:setBool",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -11928,7 +11928,7 @@ int lua_cocos2dx_studio_ComAttribute_create(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.ComAttribute",(cocostudio::ComAttribute*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.ComAttribute:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -11959,7 +11959,7 @@ int lua_cocos2dx_studio_ComAttribute_createInstance(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Ref",(cocos2d::Ref*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createInstance",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.ComAttribute:createInstance",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -12030,7 +12030,7 @@ int lua_cocos2dx_studio_ComAudio_stopAllEffects(lua_State* tolua_S) cobj->stopAllEffects(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "stopAllEffects",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ComAudio:stopAllEffects",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -12074,7 +12074,7 @@ int lua_cocos2dx_studio_ComAudio_getEffectsVolume(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getEffectsVolume",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ComAudio:getEffectsVolume",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -12114,13 +12114,13 @@ int lua_cocos2dx_studio_ComAudio_stopEffect(lua_State* tolua_S) { unsigned int arg0; - ok &= luaval_to_uint32(tolua_S, 2,&arg0); + ok &= luaval_to_uint32(tolua_S, 2,&arg0, "ccs.ComAudio:stopEffect"); if(!ok) return 0; cobj->stopEffect(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "stopEffect",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ComAudio:stopEffect",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -12164,7 +12164,7 @@ int lua_cocos2dx_studio_ComAudio_getBackgroundMusicVolume(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getBackgroundMusicVolume",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ComAudio:getBackgroundMusicVolume",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -12208,7 +12208,7 @@ int lua_cocos2dx_studio_ComAudio_willPlayBackgroundMusic(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "willPlayBackgroundMusic",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ComAudio:willPlayBackgroundMusic",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -12248,13 +12248,13 @@ int lua_cocos2dx_studio_ComAudio_setBackgroundMusicVolume(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccs.ComAudio:setBackgroundMusicVolume"); if(!ok) return 0; cobj->setBackgroundMusicVolume(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setBackgroundMusicVolume",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ComAudio:setBackgroundMusicVolume",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -12297,7 +12297,7 @@ int lua_cocos2dx_studio_ComAudio_end(lua_State* tolua_S) cobj->end(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "end",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ComAudio:end",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -12338,7 +12338,7 @@ int lua_cocos2dx_studio_ComAudio_stopBackgroundMusic(lua_State* tolua_S) do{ if (argc == 1) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccs.ComAudio:stopBackgroundMusic"); if (!ok) { break; } cobj->stopBackgroundMusic(arg0); @@ -12346,7 +12346,7 @@ int lua_cocos2dx_studio_ComAudio_stopBackgroundMusic(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "stopBackgroundMusic",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ComAudio:stopBackgroundMusic",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -12389,7 +12389,7 @@ int lua_cocos2dx_studio_ComAudio_pauseBackgroundMusic(lua_State* tolua_S) cobj->pauseBackgroundMusic(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "pauseBackgroundMusic",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ComAudio:pauseBackgroundMusic",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -12433,7 +12433,7 @@ int lua_cocos2dx_studio_ComAudio_isBackgroundMusicPlaying(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isBackgroundMusicPlaying",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ComAudio:isBackgroundMusicPlaying",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -12477,7 +12477,7 @@ int lua_cocos2dx_studio_ComAudio_isLoop(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isLoop",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ComAudio:isLoop",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -12520,7 +12520,7 @@ int lua_cocos2dx_studio_ComAudio_resumeAllEffects(lua_State* tolua_S) cobj->resumeAllEffects(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "resumeAllEffects",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ComAudio:resumeAllEffects",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -12563,7 +12563,7 @@ int lua_cocos2dx_studio_ComAudio_pauseAllEffects(lua_State* tolua_S) cobj->pauseAllEffects(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "pauseAllEffects",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ComAudio:pauseAllEffects",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -12603,13 +12603,13 @@ int lua_cocos2dx_studio_ComAudio_preloadBackgroundMusic(lua_State* tolua_S) { const char* arg0; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "ccs.ComAudio:preloadBackgroundMusic"); arg0 = arg0_tmp.c_str(); if(!ok) return 0; cobj->preloadBackgroundMusic(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "preloadBackgroundMusic",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ComAudio:preloadBackgroundMusic",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -12643,7 +12643,7 @@ int lua_cocos2dx_studio_ComAudio_playBackgroundMusic(lua_State* tolua_S) 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(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "ccs.ComAudio:playBackgroundMusic"); arg0 = arg0_tmp.c_str(); if (!ok) { break; } cobj->playBackgroundMusic(arg0); @@ -12654,11 +12654,11 @@ int lua_cocos2dx_studio_ComAudio_playBackgroundMusic(lua_State* tolua_S) 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(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "ccs.ComAudio:playBackgroundMusic"); arg0 = arg0_tmp.c_str(); if (!ok) { break; } bool arg1; - ok &= luaval_to_boolean(tolua_S, 3,&arg1); + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "ccs.ComAudio:playBackgroundMusic"); if (!ok) { break; } cobj->playBackgroundMusic(arg0, arg1); @@ -12673,7 +12673,7 @@ int lua_cocos2dx_studio_ComAudio_playBackgroundMusic(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "playBackgroundMusic",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ComAudio:playBackgroundMusic",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -12707,7 +12707,7 @@ int lua_cocos2dx_studio_ComAudio_playEffect(lua_State* tolua_S) 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(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "ccs.ComAudio:playEffect"); arg0 = arg0_tmp.c_str(); if (!ok) { break; } unsigned int ret = cobj->playEffect(arg0); @@ -12719,11 +12719,11 @@ int lua_cocos2dx_studio_ComAudio_playEffect(lua_State* tolua_S) 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(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "ccs.ComAudio:playEffect"); arg0 = arg0_tmp.c_str(); if (!ok) { break; } bool arg1; - ok &= luaval_to_boolean(tolua_S, 3,&arg1); + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "ccs.ComAudio:playEffect"); if (!ok) { break; } unsigned int ret = cobj->playEffect(arg0, arg1); @@ -12740,7 +12740,7 @@ int lua_cocos2dx_studio_ComAudio_playEffect(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "playEffect",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ComAudio:playEffect",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -12780,13 +12780,13 @@ int lua_cocos2dx_studio_ComAudio_preloadEffect(lua_State* tolua_S) { const char* arg0; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "ccs.ComAudio:preloadEffect"); arg0 = arg0_tmp.c_str(); if(!ok) return 0; cobj->preloadEffect(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "preloadEffect",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ComAudio:preloadEffect",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -12826,13 +12826,13 @@ int lua_cocos2dx_studio_ComAudio_setLoop(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccs.ComAudio:setLoop"); if(!ok) return 0; cobj->setLoop(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setLoop",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ComAudio:setLoop",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -12872,13 +12872,13 @@ int lua_cocos2dx_studio_ComAudio_unloadEffect(lua_State* tolua_S) { const char* arg0; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "ccs.ComAudio:unloadEffect"); arg0 = arg0_tmp.c_str(); if(!ok) return 0; cobj->unloadEffect(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "unloadEffect",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ComAudio:unloadEffect",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -12921,7 +12921,7 @@ int lua_cocos2dx_studio_ComAudio_rewindBackgroundMusic(lua_State* tolua_S) cobj->rewindBackgroundMusic(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "rewindBackgroundMusic",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ComAudio:rewindBackgroundMusic",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -12961,13 +12961,13 @@ int lua_cocos2dx_studio_ComAudio_pauseEffect(lua_State* tolua_S) { unsigned int arg0; - ok &= luaval_to_uint32(tolua_S, 2,&arg0); + ok &= luaval_to_uint32(tolua_S, 2,&arg0, "ccs.ComAudio:pauseEffect"); if(!ok) return 0; cobj->pauseEffect(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "pauseEffect",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ComAudio:pauseEffect",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -13010,7 +13010,7 @@ int lua_cocos2dx_studio_ComAudio_resumeBackgroundMusic(lua_State* tolua_S) cobj->resumeBackgroundMusic(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "resumeBackgroundMusic",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ComAudio:resumeBackgroundMusic",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -13050,13 +13050,13 @@ int lua_cocos2dx_studio_ComAudio_setFile(lua_State* tolua_S) { const char* arg0; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "ccs.ComAudio:setFile"); arg0 = arg0_tmp.c_str(); if(!ok) return 0; cobj->setFile(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setFile",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ComAudio:setFile",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -13096,13 +13096,13 @@ int lua_cocos2dx_studio_ComAudio_setEffectsVolume(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccs.ComAudio:setEffectsVolume"); if(!ok) return 0; cobj->setEffectsVolume(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setEffectsVolume",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ComAudio:setEffectsVolume",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -13146,7 +13146,7 @@ int lua_cocos2dx_studio_ComAudio_getFile(lua_State* tolua_S) tolua_pushstring(tolua_S,(const char*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getFile",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ComAudio:getFile",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -13186,13 +13186,13 @@ int lua_cocos2dx_studio_ComAudio_resumeEffect(lua_State* tolua_S) { unsigned int arg0; - ok &= luaval_to_uint32(tolua_S, 2,&arg0); + ok &= luaval_to_uint32(tolua_S, 2,&arg0, "ccs.ComAudio:resumeEffect"); if(!ok) return 0; cobj->resumeEffect(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "resumeEffect",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ComAudio:resumeEffect",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -13225,7 +13225,7 @@ int lua_cocos2dx_studio_ComAudio_create(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.ComAudio",(cocostudio::ComAudio*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.ComAudio:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -13256,7 +13256,7 @@ int lua_cocos2dx_studio_ComAudio_createInstance(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Ref",(cocos2d::Ref*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createInstance",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.ComAudio:createInstance",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -13334,7 +13334,7 @@ int lua_cocos2dx_studio_ComController_create(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.ComController",(cocostudio::ComController*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.ComController:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -13365,7 +13365,7 @@ int lua_cocos2dx_studio_ComController_createInstance(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Ref",(cocos2d::Ref*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createInstance",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.ComController:createInstance",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -13397,7 +13397,7 @@ int lua_cocos2dx_studio_ComController_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccs.ComController"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ComController",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ComController:ComController",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -13465,7 +13465,7 @@ int lua_cocos2dx_studio_ComRender_setNode(lua_State* tolua_S) cobj->setNode(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setNode",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ComRender:setNode",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -13509,7 +13509,7 @@ int lua_cocos2dx_studio_ComRender_getNode(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Node",(cocos2d::Node*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getNode",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ComRender:getNode",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -13541,7 +13541,7 @@ int lua_cocos2dx_studio_ComRender_create(lua_State* tolua_S) ok &= luaval_to_object(tolua_S, 2, "cc.Node",&arg0); if (!ok) { break; } const char* arg1; - std::string arg1_tmp; ok &= luaval_to_std_string(tolua_S, 3, &arg1_tmp); arg1 = arg1_tmp.c_str(); + std::string arg1_tmp; ok &= luaval_to_std_string(tolua_S, 3, &arg1_tmp, "ccs.ComRender:create"); arg1 = arg1_tmp.c_str(); if (!ok) { break; } cocostudio::ComRender* ret = cocostudio::ComRender::create(arg0, arg1); object_to_luaval(tolua_S, "ccs.ComRender",(cocostudio::ComRender*)ret); @@ -13559,7 +13559,7 @@ int lua_cocos2dx_studio_ComRender_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "ccs.ComRender:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -13590,7 +13590,7 @@ int lua_cocos2dx_studio_ComRender_createInstance(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Ref",(cocos2d::Ref*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createInstance",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.ComRender:createInstance",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -13651,13 +13651,13 @@ int lua_cocos2dx_studio_GUIReader_setFilePath(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.GUIReader:setFilePath"); if(!ok) return 0; cobj->setFilePath(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setFilePath",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.GUIReader:setFilePath",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -13697,14 +13697,14 @@ int lua_cocos2dx_studio_GUIReader_widgetFromJsonFile(lua_State* tolua_S) { const char* arg0; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "ccs.GUIReader:widgetFromJsonFile"); arg0 = arg0_tmp.c_str(); if(!ok) return 0; cocos2d::ui::Widget* ret = cobj->widgetFromJsonFile(arg0); object_to_luaval(tolua_S, "ccui.Widget",(cocos2d::ui::Widget*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "widgetFromJsonFile",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.GUIReader:widgetFromJsonFile",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -13748,7 +13748,7 @@ int lua_cocos2dx_studio_GUIReader_getFilePath(lua_State* tolua_S) tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getFilePath",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.GUIReader:getFilePath",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -13788,14 +13788,14 @@ int lua_cocos2dx_studio_GUIReader_widgetFromBinaryFile(lua_State* tolua_S) { const char* arg0; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "ccs.GUIReader:widgetFromBinaryFile"); arg0 = arg0_tmp.c_str(); if(!ok) return 0; cocos2d::ui::Widget* ret = cobj->widgetFromBinaryFile(arg0); object_to_luaval(tolua_S, "ccui.Widget",(cocos2d::ui::Widget*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "widgetFromBinaryFile",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.GUIReader:widgetFromBinaryFile",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -13835,14 +13835,14 @@ int lua_cocos2dx_studio_GUIReader_getVersionInteger(lua_State* tolua_S) { const char* arg0; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "ccs.GUIReader:getVersionInteger"); arg0 = arg0_tmp.c_str(); if(!ok) return 0; int ret = cobj->getVersionInteger(arg0); tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getVersionInteger",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.GUIReader:getVersionInteger",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -13874,7 +13874,7 @@ int lua_cocos2dx_studio_GUIReader_destroyInstance(lua_State* tolua_S) cocostudio::GUIReader::destroyInstance(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "destroyInstance",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.GUIReader:destroyInstance",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -13905,7 +13905,7 @@ int lua_cocos2dx_studio_GUIReader_getInstance(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.GUIReader",(cocostudio::GUIReader*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "getInstance",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.GUIReader:getInstance",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -13979,7 +13979,7 @@ int lua_cocos2dx_studio_SceneReader_setTarget(lua_State* tolua_S) cobj->setTarget(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTarget",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.SceneReader:setTarget",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -14019,7 +14019,7 @@ int lua_cocos2dx_studio_SceneReader_createNodeWithSceneFile(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.SceneReader:createNodeWithSceneFile"); if(!ok) return 0; cocos2d::Node* ret = cobj->createNodeWithSceneFile(arg0); @@ -14031,16 +14031,16 @@ int lua_cocos2dx_studio_SceneReader_createNodeWithSceneFile(lua_State* tolua_S) std::string arg0; cocostudio::SceneReader::AttachComponentType arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.SceneReader:createNodeWithSceneFile"); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccs.SceneReader:createNodeWithSceneFile"); if(!ok) return 0; cocos2d::Node* ret = cobj->createNodeWithSceneFile(arg0, arg1); object_to_luaval(tolua_S, "cc.Node",(cocos2d::Node*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "createNodeWithSceneFile",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.SceneReader:createNodeWithSceneFile",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -14084,7 +14084,7 @@ int lua_cocos2dx_studio_SceneReader_getAttachComponentType(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAttachComponentType",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.SceneReader:getAttachComponentType",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -14124,14 +14124,14 @@ int lua_cocos2dx_studio_SceneReader_getNodeByTag(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccs.SceneReader:getNodeByTag"); if(!ok) return 0; cocos2d::Node* ret = cobj->getNodeByTag(arg0); object_to_luaval(tolua_S, "cc.Node",(cocos2d::Node*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getNodeByTag",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.SceneReader:getNodeByTag",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -14163,7 +14163,7 @@ int lua_cocos2dx_studio_SceneReader_destroyInstance(lua_State* tolua_S) cocostudio::SceneReader::destroyInstance(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "destroyInstance",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.SceneReader:destroyInstance",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -14194,7 +14194,7 @@ int lua_cocos2dx_studio_SceneReader_sceneReaderVersion(lua_State* tolua_S) tolua_pushstring(tolua_S,(const char*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "sceneReaderVersion",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.SceneReader:sceneReaderVersion",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -14225,7 +14225,7 @@ int lua_cocos2dx_studio_SceneReader_getInstance(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.SceneReader",(cocostudio::SceneReader*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "getInstance",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.SceneReader:getInstance",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -14289,13 +14289,13 @@ int lua_cocos2dx_studio_NodeReader_setJsonPath(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.NodeReader:setJsonPath"); if(!ok) return 0; cobj->setJsonPath(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setJsonPath",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.NodeReader:setJsonPath",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -14335,14 +14335,14 @@ int lua_cocos2dx_studio_NodeReader_createNode(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.NodeReader:createNode"); if(!ok) return 0; cocos2d::Node* ret = cobj->createNode(arg0); object_to_luaval(tolua_S, "cc.Node",(cocos2d::Node*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "createNode",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.NodeReader:createNode",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -14382,14 +14382,14 @@ int lua_cocos2dx_studio_NodeReader_loadNodeWithFile(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.NodeReader:loadNodeWithFile"); if(!ok) return 0; cocos2d::Node* ret = cobj->loadNodeWithFile(arg0); object_to_luaval(tolua_S, "cc.Node",(cocos2d::Node*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "loadNodeWithFile",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.NodeReader:loadNodeWithFile",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -14432,7 +14432,7 @@ int lua_cocos2dx_studio_NodeReader_purge(lua_State* tolua_S) cobj->purge(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "purge",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.NodeReader:purge",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -14475,7 +14475,7 @@ int lua_cocos2dx_studio_NodeReader_init(lua_State* tolua_S) cobj->init(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "init",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.NodeReader:init",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -14515,14 +14515,14 @@ int lua_cocos2dx_studio_NodeReader_loadNodeWithContent(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.NodeReader:loadNodeWithContent"); if(!ok) return 0; cocos2d::Node* ret = cobj->loadNodeWithContent(arg0); object_to_luaval(tolua_S, "cc.Node",(cocos2d::Node*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "loadNodeWithContent",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.NodeReader:loadNodeWithContent",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -14566,7 +14566,7 @@ int lua_cocos2dx_studio_NodeReader_isRecordJsonPath(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isRecordJsonPath",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.NodeReader:isRecordJsonPath",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -14610,7 +14610,7 @@ int lua_cocos2dx_studio_NodeReader_getJsonPath(lua_State* tolua_S) tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getJsonPath",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.NodeReader:getJsonPath",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -14650,13 +14650,13 @@ int lua_cocos2dx_studio_NodeReader_setRecordJsonPath(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccs.NodeReader:setRecordJsonPath"); if(!ok) return 0; cobj->setRecordJsonPath(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setRecordJsonPath",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.NodeReader:setRecordJsonPath",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -14688,7 +14688,7 @@ int lua_cocos2dx_studio_NodeReader_destroyInstance(lua_State* tolua_S) cocostudio::timeline::NodeReader::destroyInstance(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "destroyInstance",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.NodeReader:destroyInstance",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -14718,7 +14718,7 @@ int lua_cocos2dx_studio_NodeReader_constructor(lua_State* tolua_S) tolua_register_gc(tolua_S,lua_gettop(tolua_S)); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "NodeReader",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.NodeReader:NodeReader",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -14788,14 +14788,14 @@ int lua_cocos2dx_studio_ActionTimelineCache_createAction(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ActionTimelineCache:createAction"); if(!ok) return 0; cocostudio::timeline::ActionTimeline* ret = cobj->createAction(arg0); object_to_luaval(tolua_S, "ccs.ActionTimeline",(cocostudio::timeline::ActionTimeline*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "createAction",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionTimelineCache:createAction",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -14838,7 +14838,7 @@ int lua_cocos2dx_studio_ActionTimelineCache_purge(lua_State* tolua_S) cobj->purge(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "purge",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionTimelineCache:purge",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -14881,7 +14881,7 @@ int lua_cocos2dx_studio_ActionTimelineCache_init(lua_State* tolua_S) cobj->init(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "init",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionTimelineCache:init",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -14922,16 +14922,16 @@ int lua_cocos2dx_studio_ActionTimelineCache_loadAnimationActionWithContent(lua_S std::string arg0; std::string arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ActionTimelineCache:loadAnimationActionWithContent"); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccs.ActionTimelineCache:loadAnimationActionWithContent"); if(!ok) return 0; cocostudio::timeline::ActionTimeline* ret = cobj->loadAnimationActionWithContent(arg0, arg1); object_to_luaval(tolua_S, "ccs.ActionTimeline",(cocostudio::timeline::ActionTimeline*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "loadAnimationActionWithContent",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionTimelineCache:loadAnimationActionWithContent",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -14971,14 +14971,14 @@ int lua_cocos2dx_studio_ActionTimelineCache_loadAnimationActionWithFile(lua_Stat { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ActionTimelineCache:loadAnimationActionWithFile"); if(!ok) return 0; cocostudio::timeline::ActionTimeline* ret = cobj->loadAnimationActionWithFile(arg0); object_to_luaval(tolua_S, "ccs.ActionTimeline",(cocostudio::timeline::ActionTimeline*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "loadAnimationActionWithFile",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionTimelineCache:loadAnimationActionWithFile",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -15018,13 +15018,13 @@ int lua_cocos2dx_studio_ActionTimelineCache_removeAction(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.ActionTimelineCache:removeAction"); if(!ok) return 0; cobj->removeAction(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeAction",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionTimelineCache:removeAction",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -15056,7 +15056,7 @@ int lua_cocos2dx_studio_ActionTimelineCache_destroyInstance(lua_State* tolua_S) cocostudio::timeline::ActionTimelineCache::destroyInstance(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "destroyInstance",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.ActionTimelineCache:destroyInstance",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -15124,7 +15124,7 @@ int lua_cocos2dx_studio_Frame_clone(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.Frame",(cocostudio::timeline::Frame*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "clone",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Frame:clone",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -15170,7 +15170,7 @@ int lua_cocos2dx_studio_Frame_setNode(lua_State* tolua_S) cobj->setNode(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setNode",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Frame:setNode",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -15216,7 +15216,7 @@ int lua_cocos2dx_studio_Frame_setTimeline(lua_State* tolua_S) cobj->setTimeline(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTimeline",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Frame:setTimeline",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -15260,7 +15260,7 @@ int lua_cocos2dx_studio_Frame_getFrameIndex(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getFrameIndex",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Frame:getFrameIndex",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -15300,13 +15300,13 @@ int lua_cocos2dx_studio_Frame_apply(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccs.Frame:apply"); if(!ok) return 0; cobj->apply(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "apply",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Frame:apply",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -15350,7 +15350,7 @@ int lua_cocos2dx_studio_Frame_isTween(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isTween",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Frame:isTween",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -15390,13 +15390,13 @@ int lua_cocos2dx_studio_Frame_setFrameIndex(lua_State* tolua_S) { unsigned int arg0; - ok &= luaval_to_uint32(tolua_S, 2,&arg0); + ok &= luaval_to_uint32(tolua_S, 2,&arg0, "ccs.Frame:setFrameIndex"); if(!ok) return 0; cobj->setFrameIndex(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setFrameIndex",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Frame:setFrameIndex",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -15436,13 +15436,13 @@ int lua_cocos2dx_studio_Frame_setTween(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccs.Frame:setTween"); if(!ok) return 0; cobj->setTween(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTween",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Frame:setTween",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -15486,7 +15486,7 @@ int lua_cocos2dx_studio_Frame_getTimeline(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.Timeline",(cocostudio::timeline::Timeline*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTimeline",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Frame:getTimeline",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -15530,7 +15530,7 @@ int lua_cocos2dx_studio_Frame_getNode(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Node",(cocos2d::Node*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getNode",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Frame:getNode",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -15603,7 +15603,7 @@ int lua_cocos2dx_studio_VisibleFrame_isVisible(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isVisible",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.VisibleFrame:isVisible",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -15643,13 +15643,13 @@ int lua_cocos2dx_studio_VisibleFrame_setVisible(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccs.VisibleFrame:setVisible"); if(!ok) return 0; cobj->setVisible(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setVisible",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.VisibleFrame:setVisible",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -15682,7 +15682,7 @@ int lua_cocos2dx_studio_VisibleFrame_create(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.VisibleFrame",(cocostudio::timeline::VisibleFrame*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.VisibleFrame:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -15714,7 +15714,7 @@ int lua_cocos2dx_studio_VisibleFrame_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccs.VisibleFrame"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "VisibleFrame",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.VisibleFrame:VisibleFrame",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -15781,7 +15781,7 @@ int lua_cocos2dx_studio_TextureFrame_getTextureName(lua_State* tolua_S) tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTextureName",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.TextureFrame:getTextureName",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -15827,7 +15827,7 @@ int lua_cocos2dx_studio_TextureFrame_setNode(lua_State* tolua_S) cobj->setNode(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setNode",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.TextureFrame:setNode",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -15867,13 +15867,13 @@ int lua_cocos2dx_studio_TextureFrame_setTextureName(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.TextureFrame:setTextureName"); if(!ok) return 0; cobj->setTextureName(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTextureName",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.TextureFrame:setTextureName",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -15906,7 +15906,7 @@ int lua_cocos2dx_studio_TextureFrame_create(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.TextureFrame",(cocostudio::timeline::TextureFrame*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.TextureFrame:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -15938,7 +15938,7 @@ int lua_cocos2dx_studio_TextureFrame_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccs.TextureFrame"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "TextureFrame",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.TextureFrame:TextureFrame",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -16002,13 +16002,13 @@ int lua_cocos2dx_studio_RotationFrame_setRotation(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccs.RotationFrame:setRotation"); if(!ok) return 0; cobj->setRotation(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setRotation",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.RotationFrame:setRotation",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -16052,7 +16052,7 @@ int lua_cocos2dx_studio_RotationFrame_getRotation(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getRotation",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.RotationFrame:getRotation",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -16085,7 +16085,7 @@ int lua_cocos2dx_studio_RotationFrame_create(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.RotationFrame",(cocostudio::timeline::RotationFrame*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.RotationFrame:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -16117,7 +16117,7 @@ int lua_cocos2dx_studio_RotationFrame_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccs.RotationFrame"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "RotationFrame",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.RotationFrame:RotationFrame",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -16184,7 +16184,7 @@ int lua_cocos2dx_studio_SkewFrame_getSkewY(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getSkewY",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.SkewFrame:getSkewY",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -16224,13 +16224,13 @@ int lua_cocos2dx_studio_SkewFrame_setSkewX(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccs.SkewFrame:setSkewX"); if(!ok) return 0; cobj->setSkewX(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setSkewX",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.SkewFrame:setSkewX",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -16270,13 +16270,13 @@ int lua_cocos2dx_studio_SkewFrame_setSkewY(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccs.SkewFrame:setSkewY"); if(!ok) return 0; cobj->setSkewY(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setSkewY",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.SkewFrame:setSkewY",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -16320,7 +16320,7 @@ int lua_cocos2dx_studio_SkewFrame_getSkewX(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getSkewX",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.SkewFrame:getSkewX",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -16353,7 +16353,7 @@ int lua_cocos2dx_studio_SkewFrame_create(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.SkewFrame",(cocostudio::timeline::SkewFrame*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.SkewFrame:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -16385,7 +16385,7 @@ int lua_cocos2dx_studio_SkewFrame_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccs.SkewFrame"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "SkewFrame",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.SkewFrame:SkewFrame",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -16443,7 +16443,7 @@ int lua_cocos2dx_studio_RotationSkewFrame_create(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.RotationSkewFrame",(cocostudio::timeline::RotationSkewFrame*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.RotationSkewFrame:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -16475,7 +16475,7 @@ int lua_cocos2dx_studio_RotationSkewFrame_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccs.RotationSkewFrame"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "RotationSkewFrame",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.RotationSkewFrame:RotationSkewFrame",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -16540,7 +16540,7 @@ int lua_cocos2dx_studio_PositionFrame_getX(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getX",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.PositionFrame:getX",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -16584,7 +16584,7 @@ int lua_cocos2dx_studio_PositionFrame_getY(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getY",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.PositionFrame:getY",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -16624,13 +16624,13 @@ int lua_cocos2dx_studio_PositionFrame_setPosition(lua_State* tolua_S) { cocos2d::Point arg0; - ok &= luaval_to_point(tolua_S, 2, &arg0); + ok &= luaval_to_point(tolua_S, 2, &arg0, "ccs.PositionFrame:setPosition"); if(!ok) return 0; cobj->setPosition(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setPosition",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.PositionFrame:setPosition",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -16670,13 +16670,13 @@ int lua_cocos2dx_studio_PositionFrame_setX(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccs.PositionFrame:setX"); if(!ok) return 0; cobj->setX(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setX",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.PositionFrame:setX",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -16716,13 +16716,13 @@ int lua_cocos2dx_studio_PositionFrame_setY(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccs.PositionFrame:setY"); if(!ok) return 0; cobj->setY(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setY",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.PositionFrame:setY",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -16766,7 +16766,7 @@ int lua_cocos2dx_studio_PositionFrame_getPosition(lua_State* tolua_S) point_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPosition",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.PositionFrame:getPosition",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -16799,7 +16799,7 @@ int lua_cocos2dx_studio_PositionFrame_create(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.PositionFrame",(cocostudio::timeline::PositionFrame*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.PositionFrame:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -16831,7 +16831,7 @@ int lua_cocos2dx_studio_PositionFrame_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccs.PositionFrame"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "PositionFrame",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.PositionFrame:PositionFrame",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -16898,13 +16898,13 @@ int lua_cocos2dx_studio_ScaleFrame_setScaleY(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccs.ScaleFrame:setScaleY"); if(!ok) return 0; cobj->setScaleY(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setScaleY",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ScaleFrame:setScaleY",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -16944,13 +16944,13 @@ int lua_cocos2dx_studio_ScaleFrame_setScaleX(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccs.ScaleFrame:setScaleX"); if(!ok) return 0; cobj->setScaleX(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setScaleX",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ScaleFrame:setScaleX",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -16994,7 +16994,7 @@ int lua_cocos2dx_studio_ScaleFrame_getScaleY(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getScaleY",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ScaleFrame:getScaleY",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -17038,7 +17038,7 @@ int lua_cocos2dx_studio_ScaleFrame_getScaleX(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getScaleX",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ScaleFrame:getScaleX",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -17078,13 +17078,13 @@ int lua_cocos2dx_studio_ScaleFrame_setScale(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccs.ScaleFrame:setScale"); if(!ok) return 0; cobj->setScale(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setScale",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ScaleFrame:setScale",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -17117,7 +17117,7 @@ int lua_cocos2dx_studio_ScaleFrame_create(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.ScaleFrame",(cocostudio::timeline::ScaleFrame*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.ScaleFrame:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -17149,7 +17149,7 @@ int lua_cocos2dx_studio_ScaleFrame_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccs.ScaleFrame"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ScaleFrame",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ScaleFrame:ScaleFrame",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -17215,13 +17215,13 @@ int lua_cocos2dx_studio_AnchorPointFrame_setAnchorPoint(lua_State* tolua_S) { cocos2d::Point arg0; - ok &= luaval_to_point(tolua_S, 2, &arg0); + ok &= luaval_to_point(tolua_S, 2, &arg0, "ccs.AnchorPointFrame:setAnchorPoint"); if(!ok) return 0; cobj->setAnchorPoint(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAnchorPoint",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.AnchorPointFrame:setAnchorPoint",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -17265,7 +17265,7 @@ int lua_cocos2dx_studio_AnchorPointFrame_getAnchorPoint(lua_State* tolua_S) point_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAnchorPoint",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.AnchorPointFrame:getAnchorPoint",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -17298,7 +17298,7 @@ int lua_cocos2dx_studio_AnchorPointFrame_create(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.AnchorPointFrame",(cocostudio::timeline::AnchorPointFrame*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.AnchorPointFrame:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -17330,7 +17330,7 @@ int lua_cocos2dx_studio_AnchorPointFrame_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccs.AnchorPointFrame"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "AnchorPointFrame",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.AnchorPointFrame:AnchorPointFrame",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -17397,7 +17397,7 @@ int lua_cocos2dx_studio_InnerActionFrame_getInnerActionType(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getInnerActionType",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.InnerActionFrame:getInnerActionType",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -17437,13 +17437,13 @@ int lua_cocos2dx_studio_InnerActionFrame_setStartFrameIndex(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccs.InnerActionFrame:setStartFrameIndex"); if(!ok) return 0; cobj->setStartFrameIndex(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setStartFrameIndex",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.InnerActionFrame:setStartFrameIndex",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -17483,13 +17483,13 @@ int lua_cocos2dx_studio_InnerActionFrame_setInnerActionType(lua_State* tolua_S) { cocostudio::timeline::InnerActionType arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccs.InnerActionFrame:setInnerActionType"); if(!ok) return 0; cobj->setInnerActionType(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setInnerActionType",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.InnerActionFrame:setInnerActionType",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -17533,7 +17533,7 @@ int lua_cocos2dx_studio_InnerActionFrame_getStartFrameIndex(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getStartFrameIndex",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.InnerActionFrame:getStartFrameIndex",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -17566,7 +17566,7 @@ int lua_cocos2dx_studio_InnerActionFrame_create(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.InnerActionFrame",(cocostudio::timeline::InnerActionFrame*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.InnerActionFrame:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -17598,7 +17598,7 @@ int lua_cocos2dx_studio_InnerActionFrame_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccs.InnerActionFrame"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "InnerActionFrame",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.InnerActionFrame:InnerActionFrame",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -17667,7 +17667,7 @@ int lua_cocos2dx_studio_ColorFrame_getAlpha(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAlpha",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ColorFrame:getAlpha",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -17711,7 +17711,7 @@ int lua_cocos2dx_studio_ColorFrame_getColor(lua_State* tolua_S) color3b_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getColor",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ColorFrame:getColor",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -17751,13 +17751,13 @@ int lua_cocos2dx_studio_ColorFrame_setAlpha(lua_State* tolua_S) { uint16_t arg0; - ok &= luaval_to_uint16(tolua_S, 2,&arg0); + ok &= luaval_to_uint16(tolua_S, 2,&arg0, "ccs.ColorFrame:setAlpha"); if(!ok) return 0; cobj->setAlpha(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAlpha",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ColorFrame:setAlpha",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -17797,13 +17797,13 @@ int lua_cocos2dx_studio_ColorFrame_setColor(lua_State* tolua_S) { cocos2d::Color3B arg0; - ok &= luaval_to_color3b(tolua_S, 2, &arg0); + ok &= luaval_to_color3b(tolua_S, 2, &arg0, "ccs.ColorFrame:setColor"); if(!ok) return 0; cobj->setColor(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setColor",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ColorFrame:setColor",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -17836,7 +17836,7 @@ int lua_cocos2dx_studio_ColorFrame_create(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.ColorFrame",(cocostudio::timeline::ColorFrame*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.ColorFrame:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -17868,7 +17868,7 @@ int lua_cocos2dx_studio_ColorFrame_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccs.ColorFrame"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ColorFrame",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ColorFrame:ColorFrame",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -17933,13 +17933,13 @@ int lua_cocos2dx_studio_EventFrame_setEvent(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccs.EventFrame:setEvent"); if(!ok) return 0; cobj->setEvent(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setEvent",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.EventFrame:setEvent",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -17983,7 +17983,7 @@ int lua_cocos2dx_studio_EventFrame_getEvent(lua_State* tolua_S) tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getEvent",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.EventFrame:getEvent",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -18016,7 +18016,7 @@ int lua_cocos2dx_studio_EventFrame_create(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.EventFrame",(cocostudio::timeline::EventFrame*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.EventFrame:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -18048,7 +18048,7 @@ int lua_cocos2dx_studio_EventFrame_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccs.EventFrame"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "EventFrame",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.EventFrame:EventFrame",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -18115,7 +18115,7 @@ int lua_cocos2dx_studio_ZOrderFrame_getZOrder(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getZOrder",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ZOrderFrame:getZOrder",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -18155,13 +18155,13 @@ int lua_cocos2dx_studio_ZOrderFrame_setZOrder(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccs.ZOrderFrame:setZOrder"); if(!ok) return 0; cobj->setZOrder(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setZOrder",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ZOrderFrame:setZOrder",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -18194,7 +18194,7 @@ int lua_cocos2dx_studio_ZOrderFrame_create(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.ZOrderFrame",(cocostudio::timeline::ZOrderFrame*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.ZOrderFrame:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -18226,7 +18226,7 @@ int lua_cocos2dx_studio_ZOrderFrame_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccs.ZOrderFrame"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ZOrderFrame",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ZOrderFrame:ZOrderFrame",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -18293,7 +18293,7 @@ int lua_cocos2dx_studio_Timeline_clone(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.Timeline",(cocostudio::timeline::Timeline*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "clone",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Timeline:clone",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -18333,13 +18333,13 @@ int lua_cocos2dx_studio_Timeline_gotoFrame(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccs.Timeline:gotoFrame"); if(!ok) return 0; cobj->gotoFrame(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "gotoFrame",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Timeline:gotoFrame",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -18385,7 +18385,7 @@ int lua_cocos2dx_studio_Timeline_setNode(lua_State* tolua_S) cobj->setNode(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setNode",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Timeline:setNode",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -18429,7 +18429,7 @@ int lua_cocos2dx_studio_Timeline_getActionTimeline(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.ActionTimeline",(cocostudio::timeline::ActionTimeline*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getActionTimeline",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Timeline:getActionTimeline",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -18472,13 +18472,13 @@ int lua_cocos2dx_studio_Timeline_insertFrame(lua_State* tolua_S) ok &= luaval_to_object(tolua_S, 2, "ccs.Frame",&arg0); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccs.Timeline:insertFrame"); if(!ok) return 0; cobj->insertFrame(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "insertFrame",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Timeline:insertFrame",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -18518,13 +18518,13 @@ int lua_cocos2dx_studio_Timeline_setActionTag(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccs.Timeline:setActionTag"); if(!ok) return 0; cobj->setActionTag(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setActionTag",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Timeline:setActionTag",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -18570,7 +18570,7 @@ int lua_cocos2dx_studio_Timeline_addFrame(lua_State* tolua_S) cobj->addFrame(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addFrame",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Timeline:addFrame",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -18614,7 +18614,7 @@ int lua_cocos2dx_studio_Timeline_getFrames(lua_State* tolua_S) ccvector_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getFrames",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Timeline:getFrames",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -18658,7 +18658,7 @@ int lua_cocos2dx_studio_Timeline_getActionTag(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getActionTag",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Timeline:getActionTag",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -18702,7 +18702,7 @@ int lua_cocos2dx_studio_Timeline_getNode(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Node",(cocos2d::Node*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getNode",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Timeline:getNode",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -18748,7 +18748,7 @@ int lua_cocos2dx_studio_Timeline_removeFrame(lua_State* tolua_S) cobj->removeFrame(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeFrame",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Timeline:removeFrame",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -18794,7 +18794,7 @@ int lua_cocos2dx_studio_Timeline_setActionTimeline(lua_State* tolua_S) cobj->setActionTimeline(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setActionTimeline",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Timeline:setActionTimeline",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -18834,13 +18834,13 @@ int lua_cocos2dx_studio_Timeline_stepToFrame(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccs.Timeline:stepToFrame"); if(!ok) return 0; cobj->stepToFrame(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "stepToFrame",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Timeline:stepToFrame",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -18873,7 +18873,7 @@ int lua_cocos2dx_studio_Timeline_create(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.Timeline",(cocostudio::timeline::Timeline*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.Timeline:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -18905,7 +18905,7 @@ int lua_cocos2dx_studio_Timeline_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccs.Timeline"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "Timeline",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.Timeline:Timeline",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -18979,13 +18979,13 @@ int lua_cocos2dx_studio_ActionTimelineData_setActionTag(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccs.ActionTimelineData:setActionTag"); if(!ok) return 0; cobj->setActionTag(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setActionTag",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionTimelineData:setActionTag",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -19029,7 +19029,7 @@ int lua_cocos2dx_studio_ActionTimelineData_getActionTag(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getActionTag",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionTimelineData:getActionTag",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -19057,14 +19057,14 @@ int lua_cocos2dx_studio_ActionTimelineData_create(lua_State* tolua_S) if (argc == 1) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccs.ActionTimelineData:create"); if(!ok) return 0; cocostudio::timeline::ActionTimelineData* ret = cocostudio::timeline::ActionTimelineData::create(arg0); object_to_luaval(tolua_S, "ccs.ActionTimelineData",(cocostudio::timeline::ActionTimelineData*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.ActionTimelineData:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -19128,7 +19128,7 @@ int lua_cocos2dx_studio_ActionTimeline_getTimelines(lua_State* tolua_S) ccvector_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTimelines",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionTimeline:getTimelines",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -19172,7 +19172,7 @@ int lua_cocos2dx_studio_ActionTimeline_getCurrentFrame(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getCurrentFrame",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionTimeline:getCurrentFrame",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -19216,7 +19216,7 @@ int lua_cocos2dx_studio_ActionTimeline_getStartFrame(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getStartFrame",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionTimeline:getStartFrame",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -19259,7 +19259,7 @@ int lua_cocos2dx_studio_ActionTimeline_pause(lua_State* tolua_S) cobj->pause(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "pause",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionTimeline:pause",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -19309,7 +19309,7 @@ int lua_cocos2dx_studio_ActionTimeline_setFrameEventCallFunc(lua_State* tolua_S) cobj->setFrameEventCallFunc(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setFrameEventCallFunc",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionTimeline:setFrameEventCallFunc",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -19352,7 +19352,7 @@ int lua_cocos2dx_studio_ActionTimeline_resume(lua_State* tolua_S) cobj->resume(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "resume",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionTimeline:resume",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -19396,7 +19396,7 @@ int lua_cocos2dx_studio_ActionTimeline_getDuration(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDuration",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionTimeline:getDuration",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -19442,7 +19442,7 @@ int lua_cocos2dx_studio_ActionTimeline_addTimeline(lua_State* tolua_S) cobj->addTimeline(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addTimeline",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionTimeline:addTimeline",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -19486,7 +19486,7 @@ int lua_cocos2dx_studio_ActionTimeline_getEndFrame(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getEndFrame",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionTimeline:getEndFrame",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -19526,13 +19526,13 @@ int lua_cocos2dx_studio_ActionTimeline_setCurrentFrame(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccs.ActionTimeline:setCurrentFrame"); if(!ok) return 0; cobj->setCurrentFrame(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setCurrentFrame",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionTimeline:setCurrentFrame",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -19572,13 +19572,13 @@ int lua_cocos2dx_studio_ActionTimeline_setTimeSpeed(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccs.ActionTimeline:setTimeSpeed"); if(!ok) return 0; cobj->setTimeSpeed(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTimeSpeed",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionTimeline:setTimeSpeed",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -19622,7 +19622,7 @@ int lua_cocos2dx_studio_ActionTimeline_init(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "init",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionTimeline:init",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -19662,13 +19662,13 @@ int lua_cocos2dx_studio_ActionTimeline_setDuration(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccs.ActionTimeline:setDuration"); if(!ok) return 0; cobj->setDuration(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setDuration",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionTimeline:setDuration",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -19712,7 +19712,7 @@ int lua_cocos2dx_studio_ActionTimeline_getTimeSpeed(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTimeSpeed",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionTimeline:getTimeSpeed",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -19752,13 +19752,13 @@ int lua_cocos2dx_studio_ActionTimeline_gotoFrameAndPause(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccs.ActionTimeline:gotoFrameAndPause"); if(!ok) return 0; cobj->gotoFrameAndPause(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "gotoFrameAndPause",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionTimeline:gotoFrameAndPause",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -19802,7 +19802,7 @@ int lua_cocos2dx_studio_ActionTimeline_isPlaying(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isPlaying",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionTimeline:isPlaying",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -19836,11 +19836,11 @@ int lua_cocos2dx_studio_ActionTimeline_gotoFrameAndPlay(lua_State* tolua_S) do{ if (argc == 2) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccs.ActionTimeline:gotoFrameAndPlay"); if (!ok) { break; } bool arg1; - ok &= luaval_to_boolean(tolua_S, 3,&arg1); + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "ccs.ActionTimeline:gotoFrameAndPlay"); if (!ok) { break; } cobj->gotoFrameAndPlay(arg0, arg1); @@ -19851,7 +19851,7 @@ int lua_cocos2dx_studio_ActionTimeline_gotoFrameAndPlay(lua_State* tolua_S) do{ if (argc == 1) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccs.ActionTimeline:gotoFrameAndPlay"); if (!ok) { break; } cobj->gotoFrameAndPlay(arg0); @@ -19862,15 +19862,15 @@ int lua_cocos2dx_studio_ActionTimeline_gotoFrameAndPlay(lua_State* tolua_S) do{ if (argc == 3) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccs.ActionTimeline:gotoFrameAndPlay"); if (!ok) { break; } int arg1; - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccs.ActionTimeline:gotoFrameAndPlay"); if (!ok) { break; } bool arg2; - ok &= luaval_to_boolean(tolua_S, 4,&arg2); + ok &= luaval_to_boolean(tolua_S, 4,&arg2, "ccs.ActionTimeline:gotoFrameAndPlay"); if (!ok) { break; } cobj->gotoFrameAndPlay(arg0, arg1, arg2); @@ -19881,19 +19881,19 @@ int lua_cocos2dx_studio_ActionTimeline_gotoFrameAndPlay(lua_State* tolua_S) do{ if (argc == 4) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccs.ActionTimeline:gotoFrameAndPlay"); if (!ok) { break; } int arg1; - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccs.ActionTimeline:gotoFrameAndPlay"); if (!ok) { break; } int arg2; - ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2); + ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "ccs.ActionTimeline:gotoFrameAndPlay"); if (!ok) { break; } bool arg3; - ok &= luaval_to_boolean(tolua_S, 5,&arg3); + ok &= luaval_to_boolean(tolua_S, 5,&arg3, "ccs.ActionTimeline:gotoFrameAndPlay"); if (!ok) { break; } cobj->gotoFrameAndPlay(arg0, arg1, arg2, arg3); @@ -19901,7 +19901,7 @@ int lua_cocos2dx_studio_ActionTimeline_gotoFrameAndPlay(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "gotoFrameAndPlay",argc, 4); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionTimeline:gotoFrameAndPlay",argc, 4); return 0; #if COCOS2D_DEBUG >= 1 @@ -19947,7 +19947,7 @@ int lua_cocos2dx_studio_ActionTimeline_removeTimeline(lua_State* tolua_S) cobj->removeTimeline(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeTimeline",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionTimeline:removeTimeline",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -19990,7 +19990,7 @@ int lua_cocos2dx_studio_ActionTimeline_clearFrameEventCallFunc(lua_State* tolua_ cobj->clearFrameEventCallFunc(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "clearFrameEventCallFunc",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionTimeline:clearFrameEventCallFunc",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -20023,7 +20023,7 @@ int lua_cocos2dx_studio_ActionTimeline_create(lua_State* tolua_S) object_to_luaval(tolua_S, "ccs.ActionTimeline",(cocostudio::timeline::ActionTimeline*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.ActionTimeline:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -20055,7 +20055,7 @@ int lua_cocos2dx_studio_ActionTimeline_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccs.ActionTimeline"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ActionTimeline",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccs.ActionTimeline:ActionTimeline",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.cpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.cpp index 0b309b14cd..d94dd2ccf2 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.cpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.cpp @@ -39,7 +39,7 @@ int lua_cocos2dx_ui_LayoutParameter_clone(lua_State* tolua_S) object_to_luaval(tolua_S, "ccui.LayoutParameter",(cocos2d::ui::LayoutParameter*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "clone",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.LayoutParameter:clone",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -83,7 +83,7 @@ int lua_cocos2dx_ui_LayoutParameter_getLayoutType(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getLayoutType",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.LayoutParameter:getLayoutType",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -127,7 +127,7 @@ int lua_cocos2dx_ui_LayoutParameter_createCloneInstance(lua_State* tolua_S) object_to_luaval(tolua_S, "ccui.LayoutParameter",(cocos2d::ui::LayoutParameter*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "createCloneInstance",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.LayoutParameter:createCloneInstance",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -173,7 +173,7 @@ int lua_cocos2dx_ui_LayoutParameter_copyProperties(lua_State* tolua_S) cobj->copyProperties(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "copyProperties",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.LayoutParameter:copyProperties",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -206,7 +206,7 @@ int lua_cocos2dx_ui_LayoutParameter_create(lua_State* tolua_S) object_to_luaval(tolua_S, "ccui.LayoutParameter",(cocos2d::ui::LayoutParameter*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccui.LayoutParameter:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -238,7 +238,7 @@ int lua_cocos2dx_ui_LayoutParameter_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccui.LayoutParameter"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "LayoutParameter",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.LayoutParameter:LayoutParameter",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -303,13 +303,13 @@ int lua_cocos2dx_ui_LinearLayoutParameter_setGravity(lua_State* tolua_S) { cocos2d::ui::LinearLayoutParameter::LinearGravity arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccui.LinearLayoutParameter:setGravity"); if(!ok) return 0; cobj->setGravity(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setGravity",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.LinearLayoutParameter:setGravity",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -353,7 +353,7 @@ int lua_cocos2dx_ui_LinearLayoutParameter_getGravity(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getGravity",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.LinearLayoutParameter:getGravity",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -386,7 +386,7 @@ int lua_cocos2dx_ui_LinearLayoutParameter_create(lua_State* tolua_S) object_to_luaval(tolua_S, "ccui.LinearLayoutParameter",(cocos2d::ui::LinearLayoutParameter*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccui.LinearLayoutParameter:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -418,7 +418,7 @@ int lua_cocos2dx_ui_LinearLayoutParameter_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccui.LinearLayoutParameter"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "LinearLayoutParameter",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.LinearLayoutParameter:LinearLayoutParameter",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -481,13 +481,13 @@ int lua_cocos2dx_ui_RelativeLayoutParameter_setAlign(lua_State* tolua_S) { cocos2d::ui::RelativeLayoutParameter::RelativeAlign arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccui.RelativeLayoutParameter:setAlign"); if(!ok) return 0; cobj->setAlign(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAlign",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.RelativeLayoutParameter:setAlign",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -527,13 +527,13 @@ int lua_cocos2dx_ui_RelativeLayoutParameter_setRelativeToWidgetName(lua_State* t { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.RelativeLayoutParameter:setRelativeToWidgetName"); if(!ok) return 0; cobj->setRelativeToWidgetName(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setRelativeToWidgetName",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.RelativeLayoutParameter:setRelativeToWidgetName",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -577,7 +577,7 @@ int lua_cocos2dx_ui_RelativeLayoutParameter_getRelativeName(lua_State* tolua_S) tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getRelativeName",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.RelativeLayoutParameter:getRelativeName",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -621,7 +621,7 @@ int lua_cocos2dx_ui_RelativeLayoutParameter_getRelativeToWidgetName(lua_State* t tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getRelativeToWidgetName",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.RelativeLayoutParameter:getRelativeToWidgetName",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -661,13 +661,13 @@ int lua_cocos2dx_ui_RelativeLayoutParameter_setRelativeName(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.RelativeLayoutParameter:setRelativeName"); if(!ok) return 0; cobj->setRelativeName(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setRelativeName",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.RelativeLayoutParameter:setRelativeName",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -711,7 +711,7 @@ int lua_cocos2dx_ui_RelativeLayoutParameter_getAlign(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAlign",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.RelativeLayoutParameter:getAlign",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -744,7 +744,7 @@ int lua_cocos2dx_ui_RelativeLayoutParameter_create(lua_State* tolua_S) object_to_luaval(tolua_S, "ccui.RelativeLayoutParameter",(cocos2d::ui::RelativeLayoutParameter*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccui.RelativeLayoutParameter:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -776,7 +776,7 @@ int lua_cocos2dx_ui_RelativeLayoutParameter_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccui.RelativeLayoutParameter"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "RelativeLayoutParameter",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.RelativeLayoutParameter:RelativeLayoutParameter",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -843,13 +843,13 @@ int lua_cocos2dx_ui_Widget_setSizePercent(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "ccui.Widget:setSizePercent"); if(!ok) return 0; cobj->setSizePercent(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setSizePercent",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:setSizePercent",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -893,7 +893,7 @@ int lua_cocos2dx_ui_Widget_getCustomSize(lua_State* tolua_S) size_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getCustomSize",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:getCustomSize",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -933,13 +933,13 @@ int lua_cocos2dx_ui_Widget_setFlippedY(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccui.Widget:setFlippedY"); if(!ok) return 0; cobj->setFlippedY(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setFlippedY",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:setFlippedY",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -979,13 +979,13 @@ int lua_cocos2dx_ui_Widget_setFlippedX(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccui.Widget:setFlippedX"); if(!ok) return 0; cobj->setFlippedX(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setFlippedX",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:setFlippedX",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -1029,7 +1029,7 @@ int lua_cocos2dx_ui_Widget_getVirtualRenderer(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Node",(cocos2d::Node*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getVirtualRenderer",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:getVirtualRenderer",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1039,6 +1039,52 @@ int lua_cocos2dx_ui_Widget_getVirtualRenderer(lua_State* tolua_S) return 0; } +int lua_cocos2dx_ui_Widget_setPropagateTouchEvents(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::ui::Widget* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccui.Widget",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::ui::Widget*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_Widget_setPropagateTouchEvents'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + bool arg0; + + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccui.Widget:setPropagateTouchEvents"); + if(!ok) + return 0; + cobj->setPropagateTouchEvents(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:setPropagateTouchEvents",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_Widget_setPropagateTouchEvents'.",&tolua_err); +#endif + + return 0; +} int lua_cocos2dx_ui_Widget_getSizePercent(lua_State* tolua_S) { int argc = 0; @@ -1073,7 +1119,7 @@ int lua_cocos2dx_ui_Widget_getSizePercent(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getSizePercent",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:getSizePercent",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1113,13 +1159,13 @@ int lua_cocos2dx_ui_Widget_setPositionPercent(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "ccui.Widget:setPositionPercent"); if(!ok) return 0; cobj->setPositionPercent(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setPositionPercent",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:setPositionPercent",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -1129,6 +1175,52 @@ int lua_cocos2dx_ui_Widget_setPositionPercent(lua_State* tolua_S) return 0; } +int lua_cocos2dx_ui_Widget_setSwallowTouches(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::ui::Widget* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccui.Widget",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::ui::Widget*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_Widget_setSwallowTouches'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + bool arg0; + + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccui.Widget:setSwallowTouches"); + if(!ok) + return 0; + cobj->setSwallowTouches(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:setSwallowTouches",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_Widget_setSwallowTouches'.",&tolua_err); +#endif + + return 0; +} int lua_cocos2dx_ui_Widget_getLayoutSize(lua_State* tolua_S) { int argc = 0; @@ -1163,7 +1255,7 @@ int lua_cocos2dx_ui_Widget_getLayoutSize(lua_State* tolua_S) size_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getLayoutSize",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:getLayoutSize",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1203,13 +1295,13 @@ int lua_cocos2dx_ui_Widget_setHighlighted(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccui.Widget:setHighlighted"); if(!ok) return 0; cobj->setHighlighted(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setHighlighted",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:setHighlighted",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -1249,13 +1341,13 @@ int lua_cocos2dx_ui_Widget_setPositionType(lua_State* tolua_S) { cocos2d::ui::Widget::PositionType arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccui.Widget:setPositionType"); if(!ok) return 0; cobj->setPositionType(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setPositionType",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:setPositionType",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -1299,7 +1391,7 @@ int lua_cocos2dx_ui_Widget_isIgnoreContentAdaptWithSize(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isIgnoreContentAdaptWithSize",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:isIgnoreContentAdaptWithSize",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1343,7 +1435,7 @@ int lua_cocos2dx_ui_Widget_getVirtualRendererSize(lua_State* tolua_S) size_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getVirtualRendererSize",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:getVirtualRendererSize",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1387,7 +1479,7 @@ int lua_cocos2dx_ui_Widget_isHighlighted(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isHighlighted",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:isHighlighted",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1431,7 +1523,7 @@ int lua_cocos2dx_ui_Widget_getLayoutParameter(lua_State* tolua_S) object_to_luaval(tolua_S, "ccui.LayoutParameter",(cocos2d::ui::LayoutParameter*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getLayoutParameter",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:getLayoutParameter",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1472,7 +1564,7 @@ int lua_cocos2dx_ui_Widget_findNextFocusedWidget(lua_State* tolua_S) cocos2d::ui::Widget::FocusDirection arg0; cocos2d::ui::Widget* arg1; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccui.Widget:findNextFocusedWidget"); ok &= luaval_to_object(tolua_S, 3, "ccui.Widget",&arg1); if(!ok) @@ -1481,7 +1573,7 @@ int lua_cocos2dx_ui_Widget_findNextFocusedWidget(lua_State* tolua_S) object_to_luaval(tolua_S, "ccui.Widget",(cocos2d::ui::Widget*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "findNextFocusedWidget",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:findNextFocusedWidget",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -1525,7 +1617,7 @@ int lua_cocos2dx_ui_Widget_getPositionType(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPositionType",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:getPositionType",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1569,7 +1661,7 @@ int lua_cocos2dx_ui_Widget_getTopBoundary(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTopBoundary",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:getTopBoundary",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1609,13 +1701,13 @@ int lua_cocos2dx_ui_Widget_ignoreContentAdaptWithSize(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccui.Widget:ignoreContentAdaptWithSize"); if(!ok) return 0; cobj->ignoreContentAdaptWithSize(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ignoreContentAdaptWithSize",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:ignoreContentAdaptWithSize",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -1659,7 +1751,7 @@ int lua_cocos2dx_ui_Widget_isEnabled(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isEnabled",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:isEnabled",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1703,7 +1795,7 @@ int lua_cocos2dx_ui_Widget_isFocused(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isFocused",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:isFocused",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1747,7 +1839,7 @@ int lua_cocos2dx_ui_Widget_getTouchBeganPosition(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTouchBeganPosition",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:getTouchBeganPosition",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1791,7 +1883,7 @@ int lua_cocos2dx_ui_Widget_isTouchEnabled(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isTouchEnabled",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:isTouchEnabled",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1835,7 +1927,7 @@ int lua_cocos2dx_ui_Widget_getActionTag(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getActionTag",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:getActionTag",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1879,7 +1971,7 @@ int lua_cocos2dx_ui_Widget_getWorldPosition(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getWorldPosition",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:getWorldPosition",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -1889,6 +1981,50 @@ int lua_cocos2dx_ui_Widget_getWorldPosition(lua_State* tolua_S) return 0; } +int lua_cocos2dx_ui_Widget_isFocusEnabled(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::ui::Widget* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccui.Widget",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::ui::Widget*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_Widget_isFocusEnabled'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + bool ret = cobj->isFocusEnabled(); + tolua_pushboolean(tolua_S,(bool)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:isFocusEnabled",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_Widget_isFocusEnabled'.",&tolua_err); +#endif + + return 0; +} int lua_cocos2dx_ui_Widget_setFocused(lua_State* tolua_S) { int argc = 0; @@ -1919,13 +2055,13 @@ int lua_cocos2dx_ui_Widget_setFocused(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccui.Widget:setFocused"); if(!ok) return 0; cobj->setFocused(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setFocused",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:setFocused",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -1965,13 +2101,13 @@ int lua_cocos2dx_ui_Widget_setActionTag(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccui.Widget:setActionTag"); if(!ok) return 0; cobj->setActionTag(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setActionTag",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:setActionTag",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2011,13 +2147,13 @@ int lua_cocos2dx_ui_Widget_setTouchEnabled(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccui.Widget:setTouchEnabled"); if(!ok) return 0; cobj->setTouchEnabled(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTouchEnabled",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:setTouchEnabled",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2061,7 +2197,7 @@ int lua_cocos2dx_ui_Widget_getLeftBoundary(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getLeftBoundary",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:getLeftBoundary",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2101,13 +2237,13 @@ int lua_cocos2dx_ui_Widget_setEnabled(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccui.Widget:setEnabled"); if(!ok) return 0; cobj->setEnabled(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setEnabled",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:setEnabled",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2151,7 +2287,7 @@ int lua_cocos2dx_ui_Widget_getRightBoundary(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getRightBoundary",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:getRightBoundary",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2191,13 +2327,13 @@ int lua_cocos2dx_ui_Widget_setBrightStyle(lua_State* tolua_S) { cocos2d::ui::Widget::BrightStyle arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccui.Widget:setBrightStyle"); if(!ok) return 0; cobj->setBrightStyle(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setBrightStyle",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:setBrightStyle",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2243,7 +2379,7 @@ int lua_cocos2dx_ui_Widget_setLayoutParameter(lua_State* tolua_S) cobj->setLayoutParameter(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setLayoutParameter",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:setLayoutParameter",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2287,7 +2423,7 @@ int lua_cocos2dx_ui_Widget_clone(lua_State* tolua_S) object_to_luaval(tolua_S, "ccui.Widget",(cocos2d::ui::Widget*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "clone",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:clone",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2327,13 +2463,13 @@ int lua_cocos2dx_ui_Widget_setFocusEnabled(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccui.Widget:setFocusEnabled"); if(!ok) return 0; cobj->setFocusEnabled(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setFocusEnabled",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:setFocusEnabled",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2377,7 +2513,7 @@ int lua_cocos2dx_ui_Widget_getBottomBoundary(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getBottomBoundary",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:getBottomBoundary",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2421,7 +2557,7 @@ int lua_cocos2dx_ui_Widget_isBright(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isBright",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:isBright",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2431,6 +2567,50 @@ int lua_cocos2dx_ui_Widget_isBright(lua_State* tolua_S) return 0; } +int lua_cocos2dx_ui_Widget_isPropagateTouchEvents(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::ui::Widget* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccui.Widget",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::ui::Widget*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_Widget_isPropagateTouchEvents'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + bool ret = cobj->isPropagateTouchEvents(); + tolua_pushboolean(tolua_S,(bool)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:isPropagateTouchEvents",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_Widget_isPropagateTouchEvents'.",&tolua_err); +#endif + + return 0; +} int lua_cocos2dx_ui_Widget_getCurrentFocusedWidget(lua_State* tolua_S) { int argc = 0; @@ -2465,7 +2645,7 @@ int lua_cocos2dx_ui_Widget_getCurrentFocusedWidget(lua_State* tolua_S) object_to_luaval(tolua_S, "ccui.Widget",(cocos2d::ui::Widget*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getCurrentFocusedWidget",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:getCurrentFocusedWidget",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2508,7 +2688,7 @@ int lua_cocos2dx_ui_Widget_requestFocus(lua_State* tolua_S) cobj->requestFocus(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "requestFocus",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:requestFocus",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2542,7 +2722,7 @@ int lua_cocos2dx_ui_Widget_updateSizeAndPosition(lua_State* tolua_S) do{ if (argc == 1) { cocos2d::Size arg0; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "ccui.Widget:updateSizeAndPosition"); if (!ok) { break; } cobj->updateSizeAndPosition(arg0); @@ -2557,7 +2737,7 @@ int lua_cocos2dx_ui_Widget_updateSizeAndPosition(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "updateSizeAndPosition",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:updateSizeAndPosition",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2601,7 +2781,7 @@ int lua_cocos2dx_ui_Widget_getTouchMovePosition(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTouchMovePosition",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:getTouchMovePosition",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2645,7 +2825,7 @@ int lua_cocos2dx_ui_Widget_getSizeType(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getSizeType",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:getSizeType",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2695,7 +2875,7 @@ int lua_cocos2dx_ui_Widget_addTouchEventListener(lua_State* tolua_S) cobj->addTouchEventListener(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addTouchEventListener",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:addTouchEventListener",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2739,7 +2919,7 @@ int lua_cocos2dx_ui_Widget_getTouchEndPosition(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTouchEndPosition",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:getTouchEndPosition",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2783,7 +2963,7 @@ int lua_cocos2dx_ui_Widget_getPositionPercent(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPositionPercent",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:getPositionPercent",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2823,14 +3003,14 @@ int lua_cocos2dx_ui_Widget_hitTest(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "ccui.Widget:hitTest"); if(!ok) return 0; bool ret = cobj->hitTest(arg0); tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "hitTest",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:hitTest",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2874,7 +3054,7 @@ int lua_cocos2dx_ui_Widget_isFlippedX(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isFlippedX",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:isFlippedX",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2918,7 +3098,7 @@ int lua_cocos2dx_ui_Widget_isFlippedY(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isFlippedY",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:isFlippedY",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2958,14 +3138,14 @@ int lua_cocos2dx_ui_Widget_isClippingParentContainsPoint(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "ccui.Widget:isClippingParentContainsPoint"); if(!ok) return 0; bool ret = cobj->isClippingParentContainsPoint(arg0); tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isClippingParentContainsPoint",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:isClippingParentContainsPoint",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3005,13 +3185,13 @@ int lua_cocos2dx_ui_Widget_setSizeType(lua_State* tolua_S) { cocos2d::ui::Widget::SizeType arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccui.Widget:setSizeType"); if(!ok) return 0; cobj->setSizeType(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setSizeType",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:setSizeType",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3051,13 +3231,13 @@ int lua_cocos2dx_ui_Widget_setBright(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccui.Widget:setBright"); if(!ok) return 0; cobj->setBright(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setBright",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:setBright",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3067,7 +3247,7 @@ int lua_cocos2dx_ui_Widget_setBright(lua_State* tolua_S) return 0; } -int lua_cocos2dx_ui_Widget_isFocusEnabled(lua_State* tolua_S) +int lua_cocos2dx_ui_Widget_isSwallowTouches(lua_State* tolua_S) { int argc = 0; cocos2d::ui::Widget* cobj = nullptr; @@ -3087,7 +3267,7 @@ int lua_cocos2dx_ui_Widget_isFocusEnabled(lua_State* tolua_S) #if COCOS2D_DEBUG >= 1 if (!cobj) { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_Widget_isFocusEnabled'", nullptr); + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_Widget_isSwallowTouches'", nullptr); return 0; } #endif @@ -3097,16 +3277,16 @@ int lua_cocos2dx_ui_Widget_isFocusEnabled(lua_State* tolua_S) { if(!ok) return 0; - bool ret = cobj->isFocusEnabled(); + bool ret = cobj->isSwallowTouches(); tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isFocusEnabled",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:isSwallowTouches",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_Widget_isFocusEnabled'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_Widget_isSwallowTouches'.",&tolua_err); #endif return 0; @@ -3129,13 +3309,13 @@ int lua_cocos2dx_ui_Widget_enableDpadNavigation(lua_State* tolua_S) if (argc == 1) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccui.Widget:enableDpadNavigation"); if(!ok) return 0; cocos2d::ui::Widget::enableDpadNavigation(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "enableDpadNavigation",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccui.Widget:enableDpadNavigation",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -3166,7 +3346,7 @@ int lua_cocos2dx_ui_Widget_create(lua_State* tolua_S) object_to_luaval(tolua_S, "ccui.Widget",(cocos2d::ui::Widget*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccui.Widget:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -3198,7 +3378,7 @@ int lua_cocos2dx_ui_Widget_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccui.Widget"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "Widget",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Widget:Widget",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3226,8 +3406,10 @@ int lua_register_cocos2dx_ui_Widget(lua_State* tolua_S) tolua_function(tolua_S,"setFlippedY",lua_cocos2dx_ui_Widget_setFlippedY); tolua_function(tolua_S,"setFlippedX",lua_cocos2dx_ui_Widget_setFlippedX); tolua_function(tolua_S,"getVirtualRenderer",lua_cocos2dx_ui_Widget_getVirtualRenderer); + tolua_function(tolua_S,"setPropagateTouchEvents",lua_cocos2dx_ui_Widget_setPropagateTouchEvents); tolua_function(tolua_S,"getSizePercent",lua_cocos2dx_ui_Widget_getSizePercent); tolua_function(tolua_S,"setPositionPercent",lua_cocos2dx_ui_Widget_setPositionPercent); + tolua_function(tolua_S,"setSwallowTouches",lua_cocos2dx_ui_Widget_setSwallowTouches); tolua_function(tolua_S,"getLayoutSize",lua_cocos2dx_ui_Widget_getLayoutSize); tolua_function(tolua_S,"setHighlighted",lua_cocos2dx_ui_Widget_setHighlighted); tolua_function(tolua_S,"setPositionType",lua_cocos2dx_ui_Widget_setPositionType); @@ -3245,6 +3427,7 @@ int lua_register_cocos2dx_ui_Widget(lua_State* tolua_S) tolua_function(tolua_S,"isTouchEnabled",lua_cocos2dx_ui_Widget_isTouchEnabled); tolua_function(tolua_S,"getActionTag",lua_cocos2dx_ui_Widget_getActionTag); tolua_function(tolua_S,"getWorldPosition",lua_cocos2dx_ui_Widget_getWorldPosition); + tolua_function(tolua_S,"isFocusEnabled",lua_cocos2dx_ui_Widget_isFocusEnabled); tolua_function(tolua_S,"setFocused",lua_cocos2dx_ui_Widget_setFocused); tolua_function(tolua_S,"setActionTag",lua_cocos2dx_ui_Widget_setActionTag); tolua_function(tolua_S,"setTouchEnabled",lua_cocos2dx_ui_Widget_setTouchEnabled); @@ -3257,6 +3440,7 @@ int lua_register_cocos2dx_ui_Widget(lua_State* tolua_S) tolua_function(tolua_S,"setFocusEnabled",lua_cocos2dx_ui_Widget_setFocusEnabled); tolua_function(tolua_S,"getBottomBoundary",lua_cocos2dx_ui_Widget_getBottomBoundary); tolua_function(tolua_S,"isBright",lua_cocos2dx_ui_Widget_isBright); + tolua_function(tolua_S,"isPropagateTouchEvents",lua_cocos2dx_ui_Widget_isPropagateTouchEvents); tolua_function(tolua_S,"getCurrentFocusedWidget",lua_cocos2dx_ui_Widget_getCurrentFocusedWidget); tolua_function(tolua_S,"requestFocus",lua_cocos2dx_ui_Widget_requestFocus); tolua_function(tolua_S,"updateSizeAndPosition",lua_cocos2dx_ui_Widget_updateSizeAndPosition); @@ -3271,7 +3455,7 @@ int lua_register_cocos2dx_ui_Widget(lua_State* tolua_S) tolua_function(tolua_S,"isClippingParentContainsPoint",lua_cocos2dx_ui_Widget_isClippingParentContainsPoint); tolua_function(tolua_S,"setSizeType",lua_cocos2dx_ui_Widget_setSizeType); tolua_function(tolua_S,"setBright",lua_cocos2dx_ui_Widget_setBright); - tolua_function(tolua_S,"isFocusEnabled",lua_cocos2dx_ui_Widget_isFocusEnabled); + tolua_function(tolua_S,"isSwallowTouches",lua_cocos2dx_ui_Widget_isSwallowTouches); tolua_function(tolua_S,"enableDpadNavigation", lua_cocos2dx_ui_Widget_enableDpadNavigation); tolua_function(tolua_S,"create", lua_cocos2dx_ui_Widget_create); tolua_endmodule(tolua_S); @@ -3311,13 +3495,13 @@ int lua_cocos2dx_ui_Layout_setBackGroundColorVector(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "ccui.Layout:setBackGroundColorVector"); if(!ok) return 0; cobj->setBackGroundColorVector(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setBackGroundColorVector",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Layout:setBackGroundColorVector",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3357,13 +3541,13 @@ int lua_cocos2dx_ui_Layout_setClippingType(lua_State* tolua_S) { cocos2d::ui::Layout::ClippingType arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccui.Layout:setClippingType"); if(!ok) return 0; cobj->setClippingType(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setClippingType",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Layout:setClippingType",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3403,13 +3587,13 @@ int lua_cocos2dx_ui_Layout_setBackGroundColorType(lua_State* tolua_S) { cocos2d::ui::Layout::BackGroundColorType arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccui.Layout:setBackGroundColorType"); if(!ok) return 0; cobj->setBackGroundColorType(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setBackGroundColorType",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Layout:setBackGroundColorType",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3449,13 +3633,13 @@ int lua_cocos2dx_ui_Layout_setLoopFocus(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccui.Layout:setLoopFocus"); if(!ok) return 0; cobj->setLoopFocus(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setLoopFocus",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Layout:setLoopFocus",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3495,13 +3679,13 @@ int lua_cocos2dx_ui_Layout_setBackGroundImageColor(lua_State* tolua_S) { cocos2d::Color3B arg0; - ok &= luaval_to_color3b(tolua_S, 2, &arg0); + ok &= luaval_to_color3b(tolua_S, 2, &arg0, "ccui.Layout:setBackGroundImageColor"); if(!ok) return 0; cobj->setBackGroundImageColor(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setBackGroundImageColor",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Layout:setBackGroundImageColor",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3545,7 +3729,7 @@ int lua_cocos2dx_ui_Layout_getBackGroundColorVector(lua_State* tolua_S) vec2_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getBackGroundColorVector",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Layout:getBackGroundColorVector",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3589,7 +3773,7 @@ int lua_cocos2dx_ui_Layout_getClippingType(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getClippingType",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Layout:getClippingType",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3633,7 +3817,7 @@ int lua_cocos2dx_ui_Layout_isLoopFocus(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isLoopFocus",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Layout:isLoopFocus",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3676,7 +3860,7 @@ int lua_cocos2dx_ui_Layout_removeBackGroundImage(lua_State* tolua_S) cobj->removeBackGroundImage(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeBackGroundImage",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Layout:removeBackGroundImage",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3720,7 +3904,7 @@ int lua_cocos2dx_ui_Layout_getBackGroundColorOpacity(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getBackGroundColorOpacity",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Layout:getBackGroundColorOpacity",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3764,7 +3948,7 @@ int lua_cocos2dx_ui_Layout_isClippingEnabled(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isClippingEnabled",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Layout:isClippingEnabled",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3804,13 +3988,13 @@ int lua_cocos2dx_ui_Layout_setBackGroundImageOpacity(lua_State* tolua_S) { uint16_t arg0; - ok &= luaval_to_uint16(tolua_S, 2,&arg0); + ok &= luaval_to_uint16(tolua_S, 2,&arg0, "ccui.Layout:setBackGroundImageOpacity"); if(!ok) return 0; cobj->setBackGroundImageOpacity(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setBackGroundImageOpacity",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Layout:setBackGroundImageOpacity",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3850,7 +4034,7 @@ int lua_cocos2dx_ui_Layout_setBackGroundImage(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Layout:setBackGroundImage"); if(!ok) return 0; cobj->setBackGroundImage(arg0); @@ -3861,15 +4045,15 @@ int lua_cocos2dx_ui_Layout_setBackGroundImage(lua_State* tolua_S) std::string arg0; cocos2d::ui::Widget::TextureResType arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Layout:setBackGroundImage"); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccui.Layout:setBackGroundImage"); if(!ok) return 0; cobj->setBackGroundImage(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setBackGroundImage",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Layout:setBackGroundImage",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3903,11 +4087,11 @@ int lua_cocos2dx_ui_Layout_setBackGroundColor(lua_State* tolua_S) do{ if (argc == 2) { cocos2d::Color3B arg0; - ok &= luaval_to_color3b(tolua_S, 2, &arg0); + ok &= luaval_to_color3b(tolua_S, 2, &arg0, "ccui.Layout:setBackGroundColor"); if (!ok) { break; } cocos2d::Color3B arg1; - ok &= luaval_to_color3b(tolua_S, 3, &arg1); + ok &= luaval_to_color3b(tolua_S, 3, &arg1, "ccui.Layout:setBackGroundColor"); if (!ok) { break; } cobj->setBackGroundColor(arg0, arg1); @@ -3918,7 +4102,7 @@ int lua_cocos2dx_ui_Layout_setBackGroundColor(lua_State* tolua_S) do{ if (argc == 1) { cocos2d::Color3B arg0; - ok &= luaval_to_color3b(tolua_S, 2, &arg0); + ok &= luaval_to_color3b(tolua_S, 2, &arg0, "ccui.Layout:setBackGroundColor"); if (!ok) { break; } cobj->setBackGroundColor(arg0); @@ -3926,7 +4110,7 @@ int lua_cocos2dx_ui_Layout_setBackGroundColor(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setBackGroundColor",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Layout:setBackGroundColor",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3969,7 +4153,7 @@ int lua_cocos2dx_ui_Layout_requestDoLayout(lua_State* tolua_S) cobj->requestDoLayout(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "requestDoLayout",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Layout:requestDoLayout",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4013,7 +4197,7 @@ int lua_cocos2dx_ui_Layout_getBackGroundImageCapInsets(lua_State* tolua_S) rect_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getBackGroundImageCapInsets",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Layout:getBackGroundImageCapInsets",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4057,7 +4241,7 @@ int lua_cocos2dx_ui_Layout_getBackGroundColor(lua_State* tolua_S) color3b_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getBackGroundColor",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Layout:getBackGroundColor",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4097,13 +4281,13 @@ int lua_cocos2dx_ui_Layout_setClippingEnabled(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccui.Layout:setClippingEnabled"); if(!ok) return 0; cobj->setClippingEnabled(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setClippingEnabled",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Layout:setClippingEnabled",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4147,7 +4331,7 @@ int lua_cocos2dx_ui_Layout_getBackGroundImageColor(lua_State* tolua_S) color3b_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getBackGroundImageColor",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Layout:getBackGroundImageColor",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4191,7 +4375,7 @@ int lua_cocos2dx_ui_Layout_isBackGroundImageScale9Enabled(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isBackGroundImageScale9Enabled",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Layout:isBackGroundImageScale9Enabled",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4235,7 +4419,7 @@ int lua_cocos2dx_ui_Layout_getBackGroundColorType(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getBackGroundColorType",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Layout:getBackGroundColorType",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4279,7 +4463,7 @@ int lua_cocos2dx_ui_Layout_getBackGroundEndColor(lua_State* tolua_S) color3b_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getBackGroundEndColor",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Layout:getBackGroundEndColor",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4319,13 +4503,13 @@ int lua_cocos2dx_ui_Layout_setBackGroundColorOpacity(lua_State* tolua_S) { uint16_t arg0; - ok &= luaval_to_uint16(tolua_S, 2,&arg0); + ok &= luaval_to_uint16(tolua_S, 2,&arg0, "ccui.Layout:setBackGroundColorOpacity"); if(!ok) return 0; cobj->setBackGroundColorOpacity(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setBackGroundColorOpacity",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Layout:setBackGroundColorOpacity",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4369,7 +4553,7 @@ int lua_cocos2dx_ui_Layout_getBackGroundImageOpacity(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getBackGroundImageOpacity",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Layout:getBackGroundImageOpacity",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4413,7 +4597,7 @@ int lua_cocos2dx_ui_Layout_isPassFocusToChild(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isPassFocusToChild",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Layout:isPassFocusToChild",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4453,13 +4637,13 @@ int lua_cocos2dx_ui_Layout_setBackGroundImageCapInsets(lua_State* tolua_S) { cocos2d::Rect arg0; - ok &= luaval_to_rect(tolua_S, 2, &arg0); + ok &= luaval_to_rect(tolua_S, 2, &arg0, "ccui.Layout:setBackGroundImageCapInsets"); if(!ok) return 0; cobj->setBackGroundImageCapInsets(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setBackGroundImageCapInsets",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Layout:setBackGroundImageCapInsets",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4503,7 +4687,7 @@ int lua_cocos2dx_ui_Layout_getBackGroundImageTextureSize(lua_State* tolua_S) size_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getBackGroundImageTextureSize",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Layout:getBackGroundImageTextureSize",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4513,6 +4697,49 @@ int lua_cocos2dx_ui_Layout_getBackGroundImageTextureSize(lua_State* tolua_S) return 0; } +int lua_cocos2dx_ui_Layout_forceDoLayout(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::ui::Layout* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccui.Layout",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::ui::Layout*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_Layout_forceDoLayout'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + cobj->forceDoLayout(); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Layout:forceDoLayout",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_Layout_forceDoLayout'.",&tolua_err); +#endif + + return 0; +} int lua_cocos2dx_ui_Layout_getLayoutType(lua_State* tolua_S) { int argc = 0; @@ -4547,7 +4774,7 @@ int lua_cocos2dx_ui_Layout_getLayoutType(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getLayoutType",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Layout:getLayoutType",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4587,13 +4814,13 @@ int lua_cocos2dx_ui_Layout_setPassFocusToChild(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccui.Layout:setPassFocusToChild"); if(!ok) return 0; cobj->setPassFocusToChild(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setPassFocusToChild",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Layout:setPassFocusToChild",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4637,7 +4864,7 @@ int lua_cocos2dx_ui_Layout_getBackGroundStartColor(lua_State* tolua_S) color3b_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getBackGroundStartColor",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Layout:getBackGroundStartColor",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4677,13 +4904,13 @@ int lua_cocos2dx_ui_Layout_setBackGroundImageScale9Enabled(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccui.Layout:setBackGroundImageScale9Enabled"); if(!ok) return 0; cobj->setBackGroundImageScale9Enabled(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setBackGroundImageScale9Enabled",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Layout:setBackGroundImageScale9Enabled",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4723,13 +4950,13 @@ int lua_cocos2dx_ui_Layout_setLayoutType(lua_State* tolua_S) { cocos2d::ui::Layout::Type arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccui.Layout:setLayoutType"); if(!ok) return 0; cobj->setLayoutType(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setLayoutType",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Layout:setLayoutType",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4762,7 +4989,7 @@ int lua_cocos2dx_ui_Layout_create(lua_State* tolua_S) object_to_luaval(tolua_S, "ccui.Layout",(cocos2d::ui::Layout*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccui.Layout:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -4793,7 +5020,7 @@ int lua_cocos2dx_ui_Layout_createInstance(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Ref",(cocos2d::Ref*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createInstance",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccui.Layout:createInstance",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -4825,7 +5052,7 @@ int lua_cocos2dx_ui_Layout_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccui.Layout"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "Layout",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Layout:Layout",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4875,6 +5102,7 @@ int lua_register_cocos2dx_ui_Layout(lua_State* tolua_S) tolua_function(tolua_S,"isPassFocusToChild",lua_cocos2dx_ui_Layout_isPassFocusToChild); tolua_function(tolua_S,"setBackGroundImageCapInsets",lua_cocos2dx_ui_Layout_setBackGroundImageCapInsets); tolua_function(tolua_S,"getBackGroundImageTextureSize",lua_cocos2dx_ui_Layout_getBackGroundImageTextureSize); + tolua_function(tolua_S,"forceDoLayout",lua_cocos2dx_ui_Layout_forceDoLayout); tolua_function(tolua_S,"getLayoutType",lua_cocos2dx_ui_Layout_getLayoutType); tolua_function(tolua_S,"setPassFocusToChild",lua_cocos2dx_ui_Layout_setPassFocusToChild); tolua_function(tolua_S,"getBackGroundStartColor",lua_cocos2dx_ui_Layout_getBackGroundStartColor); @@ -4923,7 +5151,7 @@ int lua_cocos2dx_ui_Button_getTitleText(lua_State* tolua_S) tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTitleText",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Button:getTitleText",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4963,13 +5191,13 @@ int lua_cocos2dx_ui_Button_setTitleFontSize(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccui.Button:setTitleFontSize"); if(!ok) return 0; cobj->setTitleFontSize(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTitleFontSize",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Button:setTitleFontSize",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5009,13 +5237,13 @@ int lua_cocos2dx_ui_Button_setScale9Enabled(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccui.Button:setScale9Enabled"); if(!ok) return 0; cobj->setScale9Enabled(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setScale9Enabled",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Button:setScale9Enabled",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5025,6 +5253,50 @@ int lua_cocos2dx_ui_Button_setScale9Enabled(lua_State* tolua_S) return 0; } +int lua_cocos2dx_ui_Button_getZoomScale(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::ui::Button* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccui.Button",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::ui::Button*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_Button_getZoomScale'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + double ret = cobj->getZoomScale(); + tolua_pushnumber(tolua_S,(lua_Number)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Button:getZoomScale",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_Button_getZoomScale'.",&tolua_err); +#endif + + return 0; +} int lua_cocos2dx_ui_Button_getCapInsetsDisabledRenderer(lua_State* tolua_S) { int argc = 0; @@ -5059,7 +5331,7 @@ int lua_cocos2dx_ui_Button_getCapInsetsDisabledRenderer(lua_State* tolua_S) rect_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getCapInsetsDisabledRenderer",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Button:getCapInsetsDisabledRenderer",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -5099,13 +5371,13 @@ int lua_cocos2dx_ui_Button_setTitleColor(lua_State* tolua_S) { cocos2d::Color3B arg0; - ok &= luaval_to_color3b(tolua_S, 2, &arg0); + ok &= luaval_to_color3b(tolua_S, 2, &arg0, "ccui.Button:setTitleColor"); if(!ok) return 0; cobj->setTitleColor(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTitleColor",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Button:setTitleColor",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5145,13 +5417,13 @@ int lua_cocos2dx_ui_Button_setCapInsetsDisabledRenderer(lua_State* tolua_S) { cocos2d::Rect arg0; - ok &= luaval_to_rect(tolua_S, 2, &arg0); + ok &= luaval_to_rect(tolua_S, 2, &arg0, "ccui.Button:setCapInsetsDisabledRenderer"); if(!ok) return 0; cobj->setCapInsetsDisabledRenderer(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setCapInsetsDisabledRenderer",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Button:setCapInsetsDisabledRenderer",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5191,13 +5463,13 @@ int lua_cocos2dx_ui_Button_setCapInsets(lua_State* tolua_S) { cocos2d::Rect arg0; - ok &= luaval_to_rect(tolua_S, 2, &arg0); + ok &= luaval_to_rect(tolua_S, 2, &arg0, "ccui.Button:setCapInsets"); if(!ok) return 0; cobj->setCapInsets(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setCapInsets",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Button:setCapInsets",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5237,7 +5509,7 @@ int lua_cocos2dx_ui_Button_loadTextureDisabled(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Button:loadTextureDisabled"); if(!ok) return 0; cobj->loadTextureDisabled(arg0); @@ -5248,15 +5520,15 @@ int lua_cocos2dx_ui_Button_loadTextureDisabled(lua_State* tolua_S) std::string arg0; cocos2d::ui::Widget::TextureResType arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Button:loadTextureDisabled"); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccui.Button:loadTextureDisabled"); if(!ok) return 0; cobj->loadTextureDisabled(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "loadTextureDisabled",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Button:loadTextureDisabled",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5296,13 +5568,13 @@ int lua_cocos2dx_ui_Button_setTitleText(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Button:setTitleText"); if(!ok) return 0; cobj->setTitleText(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTitleText",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Button:setTitleText",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5342,13 +5614,13 @@ int lua_cocos2dx_ui_Button_setCapInsetsNormalRenderer(lua_State* tolua_S) { cocos2d::Rect arg0; - ok &= luaval_to_rect(tolua_S, 2, &arg0); + ok &= luaval_to_rect(tolua_S, 2, &arg0, "ccui.Button:setCapInsetsNormalRenderer"); if(!ok) return 0; cobj->setCapInsetsNormalRenderer(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setCapInsetsNormalRenderer",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Button:setCapInsetsNormalRenderer",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5388,7 +5660,7 @@ int lua_cocos2dx_ui_Button_loadTexturePressed(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Button:loadTexturePressed"); if(!ok) return 0; cobj->loadTexturePressed(arg0); @@ -5399,15 +5671,15 @@ int lua_cocos2dx_ui_Button_loadTexturePressed(lua_State* tolua_S) std::string arg0; cocos2d::ui::Widget::TextureResType arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Button:loadTexturePressed"); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccui.Button:loadTexturePressed"); if(!ok) return 0; cobj->loadTexturePressed(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "loadTexturePressed",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Button:loadTexturePressed",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5447,13 +5719,13 @@ int lua_cocos2dx_ui_Button_setTitleFontName(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Button:setTitleFontName"); if(!ok) return 0; cobj->setTitleFontName(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTitleFontName",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Button:setTitleFontName",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5497,7 +5769,7 @@ int lua_cocos2dx_ui_Button_getCapInsetsNormalRenderer(lua_State* tolua_S) rect_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getCapInsetsNormalRenderer",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Button:getCapInsetsNormalRenderer",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -5541,7 +5813,7 @@ int lua_cocos2dx_ui_Button_getCapInsetsPressedRenderer(lua_State* tolua_S) rect_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getCapInsetsPressedRenderer",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Button:getCapInsetsPressedRenderer",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -5582,9 +5854,9 @@ int lua_cocos2dx_ui_Button_loadTextures(lua_State* tolua_S) std::string arg0; std::string arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Button:loadTextures"); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccui.Button:loadTextures"); if(!ok) return 0; cobj->loadTextures(arg0, arg1); @@ -5596,11 +5868,11 @@ int lua_cocos2dx_ui_Button_loadTextures(lua_State* tolua_S) std::string arg1; std::string arg2; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Button:loadTextures"); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccui.Button:loadTextures"); - ok &= luaval_to_std_string(tolua_S, 4,&arg2); + ok &= luaval_to_std_string(tolua_S, 4,&arg2, "ccui.Button:loadTextures"); if(!ok) return 0; cobj->loadTextures(arg0, arg1, arg2); @@ -5613,19 +5885,19 @@ int lua_cocos2dx_ui_Button_loadTextures(lua_State* tolua_S) std::string arg2; cocos2d::ui::Widget::TextureResType arg3; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Button:loadTextures"); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccui.Button:loadTextures"); - ok &= luaval_to_std_string(tolua_S, 4,&arg2); + ok &= luaval_to_std_string(tolua_S, 4,&arg2, "ccui.Button:loadTextures"); - ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3); + ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3, "ccui.Button:loadTextures"); if(!ok) return 0; cobj->loadTextures(arg0, arg1, arg2, arg3); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "loadTextures",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Button:loadTextures",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -5669,7 +5941,7 @@ int lua_cocos2dx_ui_Button_isScale9Enabled(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isScale9Enabled",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Button:isScale9Enabled",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -5709,7 +5981,7 @@ int lua_cocos2dx_ui_Button_loadTextureNormal(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Button:loadTextureNormal"); if(!ok) return 0; cobj->loadTextureNormal(arg0); @@ -5720,15 +5992,15 @@ int lua_cocos2dx_ui_Button_loadTextureNormal(lua_State* tolua_S) std::string arg0; cocos2d::ui::Widget::TextureResType arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Button:loadTextureNormal"); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccui.Button:loadTextureNormal"); if(!ok) return 0; cobj->loadTextureNormal(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "loadTextureNormal",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Button:loadTextureNormal",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5768,13 +6040,13 @@ int lua_cocos2dx_ui_Button_setCapInsetsPressedRenderer(lua_State* tolua_S) { cocos2d::Rect arg0; - ok &= luaval_to_rect(tolua_S, 2, &arg0); + ok &= luaval_to_rect(tolua_S, 2, &arg0, "ccui.Button:setCapInsetsPressedRenderer"); if(!ok) return 0; cobj->setCapInsetsPressedRenderer(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setCapInsetsPressedRenderer",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Button:setCapInsetsPressedRenderer",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5818,7 +6090,7 @@ int lua_cocos2dx_ui_Button_getTitleFontSize(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTitleFontSize",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Button:getTitleFontSize",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -5862,7 +6134,7 @@ int lua_cocos2dx_ui_Button_getTitleFontName(lua_State* tolua_S) tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTitleFontName",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Button:getTitleFontName",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -5906,7 +6178,7 @@ int lua_cocos2dx_ui_Button_getTitleColor(lua_State* tolua_S) color3b_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTitleColor",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Button:getTitleColor",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -5946,13 +6218,13 @@ int lua_cocos2dx_ui_Button_setPressedActionEnabled(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccui.Button:setPressedActionEnabled"); if(!ok) return 0; cobj->setPressedActionEnabled(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setPressedActionEnabled",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Button:setPressedActionEnabled",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5962,6 +6234,52 @@ int lua_cocos2dx_ui_Button_setPressedActionEnabled(lua_State* tolua_S) return 0; } +int lua_cocos2dx_ui_Button_setZoomScale(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::ui::Button* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccui.Button",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::ui::Button*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_Button_setZoomScale'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + double arg0; + + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccui.Button:setZoomScale"); + if(!ok) + return 0; + cobj->setZoomScale(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Button:setZoomScale",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_Button_setZoomScale'.",&tolua_err); +#endif + + return 0; +} int lua_cocos2dx_ui_Button_create(lua_State* tolua_S) { int argc = 0; @@ -5981,7 +6299,7 @@ int lua_cocos2dx_ui_Button_create(lua_State* tolua_S) if (argc == 1) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Button:create"); if (!ok) { break; } cocos2d::ui::Button* ret = cocos2d::ui::Button::create(arg0); object_to_luaval(tolua_S, "ccui.Button",(cocos2d::ui::Button*)ret); @@ -5994,10 +6312,10 @@ int lua_cocos2dx_ui_Button_create(lua_State* tolua_S) if (argc == 2) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Button:create"); if (!ok) { break; } std::string arg1; - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccui.Button:create"); if (!ok) { break; } cocos2d::ui::Button* ret = cocos2d::ui::Button::create(arg0, arg1); object_to_luaval(tolua_S, "ccui.Button",(cocos2d::ui::Button*)ret); @@ -6010,13 +6328,13 @@ int lua_cocos2dx_ui_Button_create(lua_State* tolua_S) if (argc == 3) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Button:create"); if (!ok) { break; } std::string arg1; - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccui.Button:create"); if (!ok) { break; } std::string arg2; - ok &= luaval_to_std_string(tolua_S, 4,&arg2); + ok &= luaval_to_std_string(tolua_S, 4,&arg2, "ccui.Button:create"); if (!ok) { break; } cocos2d::ui::Button* ret = cocos2d::ui::Button::create(arg0, arg1, arg2); object_to_luaval(tolua_S, "ccui.Button",(cocos2d::ui::Button*)ret); @@ -6029,16 +6347,16 @@ int lua_cocos2dx_ui_Button_create(lua_State* tolua_S) if (argc == 4) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Button:create"); if (!ok) { break; } std::string arg1; - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccui.Button:create"); if (!ok) { break; } std::string arg2; - ok &= luaval_to_std_string(tolua_S, 4,&arg2); + ok &= luaval_to_std_string(tolua_S, 4,&arg2, "ccui.Button:create"); if (!ok) { break; } cocos2d::ui::Widget::TextureResType arg3; - ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3); + ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3, "ccui.Button:create"); if (!ok) { break; } cocos2d::ui::Button* ret = cocos2d::ui::Button::create(arg0, arg1, arg2, arg3); object_to_luaval(tolua_S, "ccui.Button",(cocos2d::ui::Button*)ret); @@ -6056,7 +6374,7 @@ int lua_cocos2dx_ui_Button_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "ccui.Button:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -6087,7 +6405,7 @@ int lua_cocos2dx_ui_Button_createInstance(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Ref",(cocos2d::Ref*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createInstance",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccui.Button:createInstance",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -6119,7 +6437,7 @@ int lua_cocos2dx_ui_Button_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccui.Button"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "Button",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Button:Button",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -6145,6 +6463,7 @@ int lua_register_cocos2dx_ui_Button(lua_State* tolua_S) tolua_function(tolua_S,"getTitleText",lua_cocos2dx_ui_Button_getTitleText); tolua_function(tolua_S,"setTitleFontSize",lua_cocos2dx_ui_Button_setTitleFontSize); tolua_function(tolua_S,"setScale9Enabled",lua_cocos2dx_ui_Button_setScale9Enabled); + tolua_function(tolua_S,"getZoomScale",lua_cocos2dx_ui_Button_getZoomScale); tolua_function(tolua_S,"getCapInsetsDisabledRenderer",lua_cocos2dx_ui_Button_getCapInsetsDisabledRenderer); tolua_function(tolua_S,"setTitleColor",lua_cocos2dx_ui_Button_setTitleColor); tolua_function(tolua_S,"setCapInsetsDisabledRenderer",lua_cocos2dx_ui_Button_setCapInsetsDisabledRenderer); @@ -6164,6 +6483,7 @@ int lua_register_cocos2dx_ui_Button(lua_State* tolua_S) tolua_function(tolua_S,"getTitleFontName",lua_cocos2dx_ui_Button_getTitleFontName); tolua_function(tolua_S,"getTitleColor",lua_cocos2dx_ui_Button_getTitleColor); tolua_function(tolua_S,"setPressedActionEnabled",lua_cocos2dx_ui_Button_setPressedActionEnabled); + tolua_function(tolua_S,"setZoomScale",lua_cocos2dx_ui_Button_setZoomScale); tolua_function(tolua_S,"create", lua_cocos2dx_ui_Button_create); tolua_function(tolua_S,"createInstance", lua_cocos2dx_ui_Button_createInstance); tolua_endmodule(tolua_S); @@ -6173,50 +6493,6 @@ int lua_register_cocos2dx_ui_Button(lua_State* tolua_S) return 1; } -int lua_cocos2dx_ui_CheckBox_getSelectedState(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::ui::CheckBox* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"ccui.CheckBox",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::ui::CheckBox*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_CheckBox_getSelectedState'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - bool ret = cobj->getSelectedState(); - tolua_pushboolean(tolua_S,(bool)ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getSelectedState",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_CheckBox_getSelectedState'.",&tolua_err); -#endif - - return 0; -} int lua_cocos2dx_ui_CheckBox_loadTextureBackGroundSelected(lua_State* tolua_S) { int argc = 0; @@ -6247,7 +6523,7 @@ int lua_cocos2dx_ui_CheckBox_loadTextureBackGroundSelected(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.CheckBox:loadTextureBackGroundSelected"); if(!ok) return 0; cobj->loadTextureBackGroundSelected(arg0); @@ -6258,15 +6534,15 @@ int lua_cocos2dx_ui_CheckBox_loadTextureBackGroundSelected(lua_State* tolua_S) std::string arg0; cocos2d::ui::Widget::TextureResType arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.CheckBox:loadTextureBackGroundSelected"); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccui.CheckBox:loadTextureBackGroundSelected"); if(!ok) return 0; cobj->loadTextureBackGroundSelected(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "loadTextureBackGroundSelected",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.CheckBox:loadTextureBackGroundSelected",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -6306,7 +6582,7 @@ int lua_cocos2dx_ui_CheckBox_loadTextureBackGroundDisabled(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.CheckBox:loadTextureBackGroundDisabled"); if(!ok) return 0; cobj->loadTextureBackGroundDisabled(arg0); @@ -6317,15 +6593,15 @@ int lua_cocos2dx_ui_CheckBox_loadTextureBackGroundDisabled(lua_State* tolua_S) std::string arg0; cocos2d::ui::Widget::TextureResType arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.CheckBox:loadTextureBackGroundDisabled"); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccui.CheckBox:loadTextureBackGroundDisabled"); if(!ok) return 0; cobj->loadTextureBackGroundDisabled(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "loadTextureBackGroundDisabled",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.CheckBox:loadTextureBackGroundDisabled",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -6335,6 +6611,52 @@ int lua_cocos2dx_ui_CheckBox_loadTextureBackGroundDisabled(lua_State* tolua_S) return 0; } +int lua_cocos2dx_ui_CheckBox_setSelected(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::ui::CheckBox* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccui.CheckBox",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::ui::CheckBox*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_CheckBox_setSelected'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + bool arg0; + + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccui.CheckBox:setSelected"); + if(!ok) + return 0; + cobj->setSelected(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.CheckBox:setSelected",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_CheckBox_setSelected'.",&tolua_err); +#endif + + return 0; +} int lua_cocos2dx_ui_CheckBox_addEventListener(lua_State* tolua_S) { int argc = 0; @@ -6375,7 +6697,7 @@ int lua_cocos2dx_ui_CheckBox_addEventListener(lua_State* tolua_S) cobj->addEventListener(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addEventListener",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.CheckBox:addEventListener",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -6415,7 +6737,7 @@ int lua_cocos2dx_ui_CheckBox_loadTextureFrontCross(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.CheckBox:loadTextureFrontCross"); if(!ok) return 0; cobj->loadTextureFrontCross(arg0); @@ -6426,15 +6748,15 @@ int lua_cocos2dx_ui_CheckBox_loadTextureFrontCross(lua_State* tolua_S) std::string arg0; cocos2d::ui::Widget::TextureResType arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.CheckBox:loadTextureFrontCross"); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccui.CheckBox:loadTextureFrontCross"); if(!ok) return 0; cobj->loadTextureFrontCross(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "loadTextureFrontCross",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.CheckBox:loadTextureFrontCross",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -6444,6 +6766,50 @@ int lua_cocos2dx_ui_CheckBox_loadTextureFrontCross(lua_State* tolua_S) return 0; } +int lua_cocos2dx_ui_CheckBox_isSelected(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::ui::CheckBox* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccui.CheckBox",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::ui::CheckBox*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_CheckBox_isSelected'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + bool ret = cobj->isSelected(); + tolua_pushboolean(tolua_S,(bool)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.CheckBox:isSelected",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_CheckBox_isSelected'.",&tolua_err); +#endif + + return 0; +} int lua_cocos2dx_ui_CheckBox_loadTextures(lua_State* tolua_S) { int argc = 0; @@ -6478,15 +6844,15 @@ int lua_cocos2dx_ui_CheckBox_loadTextures(lua_State* tolua_S) std::string arg3; std::string arg4; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.CheckBox:loadTextures"); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccui.CheckBox:loadTextures"); - ok &= luaval_to_std_string(tolua_S, 4,&arg2); + ok &= luaval_to_std_string(tolua_S, 4,&arg2, "ccui.CheckBox:loadTextures"); - ok &= luaval_to_std_string(tolua_S, 5,&arg3); + ok &= luaval_to_std_string(tolua_S, 5,&arg3, "ccui.CheckBox:loadTextures"); - ok &= luaval_to_std_string(tolua_S, 6,&arg4); + ok &= luaval_to_std_string(tolua_S, 6,&arg4, "ccui.CheckBox:loadTextures"); if(!ok) return 0; cobj->loadTextures(arg0, arg1, arg2, arg3, arg4); @@ -6501,23 +6867,23 @@ int lua_cocos2dx_ui_CheckBox_loadTextures(lua_State* tolua_S) std::string arg4; cocos2d::ui::Widget::TextureResType arg5; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.CheckBox:loadTextures"); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccui.CheckBox:loadTextures"); - ok &= luaval_to_std_string(tolua_S, 4,&arg2); + ok &= luaval_to_std_string(tolua_S, 4,&arg2, "ccui.CheckBox:loadTextures"); - ok &= luaval_to_std_string(tolua_S, 5,&arg3); + ok &= luaval_to_std_string(tolua_S, 5,&arg3, "ccui.CheckBox:loadTextures"); - ok &= luaval_to_std_string(tolua_S, 6,&arg4); + ok &= luaval_to_std_string(tolua_S, 6,&arg4, "ccui.CheckBox:loadTextures"); - ok &= luaval_to_int32(tolua_S, 7,(int *)&arg5); + ok &= luaval_to_int32(tolua_S, 7,(int *)&arg5, "ccui.CheckBox:loadTextures"); if(!ok) return 0; cobj->loadTextures(arg0, arg1, arg2, arg3, arg4, arg5); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "loadTextures",argc, 5); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.CheckBox:loadTextures",argc, 5); return 0; #if COCOS2D_DEBUG >= 1 @@ -6557,7 +6923,7 @@ int lua_cocos2dx_ui_CheckBox_loadTextureBackGround(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.CheckBox:loadTextureBackGround"); if(!ok) return 0; cobj->loadTextureBackGround(arg0); @@ -6568,15 +6934,15 @@ int lua_cocos2dx_ui_CheckBox_loadTextureBackGround(lua_State* tolua_S) std::string arg0; cocos2d::ui::Widget::TextureResType arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.CheckBox:loadTextureBackGround"); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccui.CheckBox:loadTextureBackGround"); if(!ok) return 0; cobj->loadTextureBackGround(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "loadTextureBackGround",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.CheckBox:loadTextureBackGround",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -6586,52 +6952,6 @@ int lua_cocos2dx_ui_CheckBox_loadTextureBackGround(lua_State* tolua_S) return 0; } -int lua_cocos2dx_ui_CheckBox_setSelectedState(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::ui::CheckBox* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"ccui.CheckBox",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::ui::CheckBox*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_CheckBox_setSelectedState'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 1) - { - bool arg0; - - ok &= luaval_to_boolean(tolua_S, 2,&arg0); - if(!ok) - return 0; - cobj->setSelectedState(arg0); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setSelectedState",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_CheckBox_setSelectedState'.",&tolua_err); -#endif - - return 0; -} int lua_cocos2dx_ui_CheckBox_loadTextureFrontCrossDisabled(lua_State* tolua_S) { int argc = 0; @@ -6662,7 +6982,7 @@ int lua_cocos2dx_ui_CheckBox_loadTextureFrontCrossDisabled(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.CheckBox:loadTextureFrontCrossDisabled"); if(!ok) return 0; cobj->loadTextureFrontCrossDisabled(arg0); @@ -6673,15 +6993,15 @@ int lua_cocos2dx_ui_CheckBox_loadTextureFrontCrossDisabled(lua_State* tolua_S) std::string arg0; cocos2d::ui::Widget::TextureResType arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.CheckBox:loadTextureFrontCrossDisabled"); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccui.CheckBox:loadTextureFrontCrossDisabled"); if(!ok) return 0; cobj->loadTextureFrontCrossDisabled(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "loadTextureFrontCrossDisabled",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.CheckBox:loadTextureFrontCrossDisabled",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -6710,19 +7030,19 @@ int lua_cocos2dx_ui_CheckBox_create(lua_State* tolua_S) if (argc == 5) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.CheckBox:create"); if (!ok) { break; } std::string arg1; - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccui.CheckBox:create"); if (!ok) { break; } std::string arg2; - ok &= luaval_to_std_string(tolua_S, 4,&arg2); + ok &= luaval_to_std_string(tolua_S, 4,&arg2, "ccui.CheckBox:create"); if (!ok) { break; } std::string arg3; - ok &= luaval_to_std_string(tolua_S, 5,&arg3); + ok &= luaval_to_std_string(tolua_S, 5,&arg3, "ccui.CheckBox:create"); if (!ok) { break; } std::string arg4; - ok &= luaval_to_std_string(tolua_S, 6,&arg4); + ok &= luaval_to_std_string(tolua_S, 6,&arg4, "ccui.CheckBox:create"); if (!ok) { break; } cocos2d::ui::CheckBox* ret = cocos2d::ui::CheckBox::create(arg0, arg1, arg2, arg3, arg4); object_to_luaval(tolua_S, "ccui.CheckBox",(cocos2d::ui::CheckBox*)ret); @@ -6735,22 +7055,22 @@ int lua_cocos2dx_ui_CheckBox_create(lua_State* tolua_S) if (argc == 6) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.CheckBox:create"); if (!ok) { break; } std::string arg1; - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccui.CheckBox:create"); if (!ok) { break; } std::string arg2; - ok &= luaval_to_std_string(tolua_S, 4,&arg2); + ok &= luaval_to_std_string(tolua_S, 4,&arg2, "ccui.CheckBox:create"); if (!ok) { break; } std::string arg3; - ok &= luaval_to_std_string(tolua_S, 5,&arg3); + ok &= luaval_to_std_string(tolua_S, 5,&arg3, "ccui.CheckBox:create"); if (!ok) { break; } std::string arg4; - ok &= luaval_to_std_string(tolua_S, 6,&arg4); + ok &= luaval_to_std_string(tolua_S, 6,&arg4, "ccui.CheckBox:create"); if (!ok) { break; } cocos2d::ui::Widget::TextureResType arg5; - ok &= luaval_to_int32(tolua_S, 7,(int *)&arg5); + ok &= luaval_to_int32(tolua_S, 7,(int *)&arg5, "ccui.CheckBox:create"); if (!ok) { break; } cocos2d::ui::CheckBox* ret = cocos2d::ui::CheckBox::create(arg0, arg1, arg2, arg3, arg4, arg5); object_to_luaval(tolua_S, "ccui.CheckBox",(cocos2d::ui::CheckBox*)ret); @@ -6768,7 +7088,7 @@ int lua_cocos2dx_ui_CheckBox_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "ccui.CheckBox:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -6799,7 +7119,7 @@ int lua_cocos2dx_ui_CheckBox_createInstance(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Ref",(cocos2d::Ref*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createInstance",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccui.CheckBox:createInstance",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -6831,7 +7151,7 @@ int lua_cocos2dx_ui_CheckBox_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccui.CheckBox"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "CheckBox",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.CheckBox:CheckBox",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -6854,14 +7174,14 @@ int lua_register_cocos2dx_ui_CheckBox(lua_State* tolua_S) tolua_beginmodule(tolua_S,"CheckBox"); tolua_function(tolua_S,"new",lua_cocos2dx_ui_CheckBox_constructor); - tolua_function(tolua_S,"getSelectedState",lua_cocos2dx_ui_CheckBox_getSelectedState); tolua_function(tolua_S,"loadTextureBackGroundSelected",lua_cocos2dx_ui_CheckBox_loadTextureBackGroundSelected); tolua_function(tolua_S,"loadTextureBackGroundDisabled",lua_cocos2dx_ui_CheckBox_loadTextureBackGroundDisabled); + tolua_function(tolua_S,"setSelected",lua_cocos2dx_ui_CheckBox_setSelected); tolua_function(tolua_S,"addEventListener",lua_cocos2dx_ui_CheckBox_addEventListener); tolua_function(tolua_S,"loadTextureFrontCross",lua_cocos2dx_ui_CheckBox_loadTextureFrontCross); + tolua_function(tolua_S,"isSelected",lua_cocos2dx_ui_CheckBox_isSelected); tolua_function(tolua_S,"loadTextures",lua_cocos2dx_ui_CheckBox_loadTextures); tolua_function(tolua_S,"loadTextureBackGround",lua_cocos2dx_ui_CheckBox_loadTextureBackGround); - tolua_function(tolua_S,"setSelectedState",lua_cocos2dx_ui_CheckBox_setSelectedState); tolua_function(tolua_S,"loadTextureFrontCrossDisabled",lua_cocos2dx_ui_CheckBox_loadTextureFrontCrossDisabled); tolua_function(tolua_S,"create", lua_cocos2dx_ui_CheckBox_create); tolua_function(tolua_S,"createInstance", lua_cocos2dx_ui_CheckBox_createInstance); @@ -6902,7 +7222,7 @@ int lua_cocos2dx_ui_ImageView_loadTexture(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.ImageView:loadTexture"); if(!ok) return 0; cobj->loadTexture(arg0); @@ -6913,15 +7233,15 @@ int lua_cocos2dx_ui_ImageView_loadTexture(lua_State* tolua_S) std::string arg0; cocos2d::ui::Widget::TextureResType arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.ImageView:loadTexture"); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccui.ImageView:loadTexture"); if(!ok) return 0; cobj->loadTexture(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "loadTexture",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ImageView:loadTexture",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -6961,13 +7281,13 @@ int lua_cocos2dx_ui_ImageView_setScale9Enabled(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccui.ImageView:setScale9Enabled"); if(!ok) return 0; cobj->setScale9Enabled(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setScale9Enabled",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ImageView:setScale9Enabled",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -7007,13 +7327,13 @@ int lua_cocos2dx_ui_ImageView_setTextureRect(lua_State* tolua_S) { cocos2d::Rect arg0; - ok &= luaval_to_rect(tolua_S, 2, &arg0); + ok &= luaval_to_rect(tolua_S, 2, &arg0, "ccui.ImageView:setTextureRect"); if(!ok) return 0; cobj->setTextureRect(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTextureRect",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ImageView:setTextureRect",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -7053,13 +7373,13 @@ int lua_cocos2dx_ui_ImageView_setCapInsets(lua_State* tolua_S) { cocos2d::Rect arg0; - ok &= luaval_to_rect(tolua_S, 2, &arg0); + ok &= luaval_to_rect(tolua_S, 2, &arg0, "ccui.ImageView:setCapInsets"); if(!ok) return 0; cobj->setCapInsets(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setCapInsets",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ImageView:setCapInsets",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -7103,7 +7423,7 @@ int lua_cocos2dx_ui_ImageView_getCapInsets(lua_State* tolua_S) rect_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getCapInsets",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ImageView:getCapInsets",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -7147,7 +7467,7 @@ int lua_cocos2dx_ui_ImageView_isScale9Enabled(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isScale9Enabled",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ImageView:isScale9Enabled",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -7176,7 +7496,7 @@ int lua_cocos2dx_ui_ImageView_create(lua_State* tolua_S) if (argc == 1) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.ImageView:create"); if (!ok) { break; } cocos2d::ui::ImageView* ret = cocos2d::ui::ImageView::create(arg0); object_to_luaval(tolua_S, "ccui.ImageView",(cocos2d::ui::ImageView*)ret); @@ -7189,10 +7509,10 @@ int lua_cocos2dx_ui_ImageView_create(lua_State* tolua_S) if (argc == 2) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.ImageView:create"); if (!ok) { break; } cocos2d::ui::Widget::TextureResType arg1; - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccui.ImageView:create"); if (!ok) { break; } cocos2d::ui::ImageView* ret = cocos2d::ui::ImageView::create(arg0, arg1); object_to_luaval(tolua_S, "ccui.ImageView",(cocos2d::ui::ImageView*)ret); @@ -7210,7 +7530,7 @@ int lua_cocos2dx_ui_ImageView_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "ccui.ImageView:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -7241,7 +7561,7 @@ int lua_cocos2dx_ui_ImageView_createInstance(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Ref",(cocos2d::Ref*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createInstance",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccui.ImageView:createInstance",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -7273,7 +7593,7 @@ int lua_cocos2dx_ui_ImageView_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccui.ImageView"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ImageView",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ImageView:ImageView",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -7311,7 +7631,7 @@ int lua_register_cocos2dx_ui_ImageView(lua_State* tolua_S) return 1; } -int lua_cocos2dx_ui_Text_getStringLength(lua_State* tolua_S) +int lua_cocos2dx_ui_Text_enableShadow(lua_State* tolua_S) { int argc = 0; cocos2d::ui::Text* cobj = nullptr; @@ -7331,7 +7651,7 @@ int lua_cocos2dx_ui_Text_getStringLength(lua_State* tolua_S) #if COCOS2D_DEBUG >= 1 if (!cobj) { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_Text_getStringLength'", nullptr); + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_Text_enableShadow'", nullptr); return 0; } #endif @@ -7341,16 +7661,275 @@ int lua_cocos2dx_ui_Text_getStringLength(lua_State* tolua_S) { if(!ok) return 0; - ssize_t ret = cobj->getStringLength(); - tolua_pushnumber(tolua_S,(lua_Number)ret); - return 1; + cobj->enableShadow(); + return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getStringLength",argc, 0); + if (argc == 1) + { + cocos2d::Color4B arg0; + + ok &=luaval_to_color4b(tolua_S, 2, &arg0, "ccui.Text:enableShadow"); + if(!ok) + return 0; + cobj->enableShadow(arg0); + return 0; + } + if (argc == 2) + { + cocos2d::Color4B arg0; + cocos2d::Size arg1; + + ok &=luaval_to_color4b(tolua_S, 2, &arg0, "ccui.Text:enableShadow"); + + ok &= luaval_to_size(tolua_S, 3, &arg1, "ccui.Text:enableShadow"); + if(!ok) + return 0; + cobj->enableShadow(arg0, arg1); + return 0; + } + if (argc == 3) + { + cocos2d::Color4B arg0; + cocos2d::Size arg1; + int arg2; + + ok &=luaval_to_color4b(tolua_S, 2, &arg0, "ccui.Text:enableShadow"); + + ok &= luaval_to_size(tolua_S, 3, &arg1, "ccui.Text:enableShadow"); + + ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "ccui.Text:enableShadow"); + if(!ok) + return 0; + cobj->enableShadow(arg0, arg1, arg2); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Text:enableShadow",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_Text_getStringLength'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_Text_enableShadow'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_ui_Text_getFontSize(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::ui::Text* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccui.Text",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::ui::Text*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_Text_getFontSize'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + int ret = cobj->getFontSize(); + tolua_pushnumber(tolua_S,(lua_Number)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Text:getFontSize",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_Text_getFontSize'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_ui_Text_getString(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::ui::Text* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccui.Text",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::ui::Text*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_Text_getString'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + const std::string& ret = cobj->getString(); + tolua_pushcppstring(tolua_S,ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Text:getString",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_Text_getString'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_ui_Text_disableEffect(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::ui::Text* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccui.Text",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::ui::Text*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_Text_disableEffect'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + cobj->disableEffect(); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Text:disableEffect",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_Text_disableEffect'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_ui_Text_getTextColor(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::ui::Text* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccui.Text",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::ui::Text*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_Text_getTextColor'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + const cocos2d::Color4B& ret = cobj->getTextColor(); + color4b_to_luaval(tolua_S, ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Text:getTextColor",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_Text_getTextColor'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_ui_Text_setTextVerticalAlignment(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::ui::Text* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccui.Text",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::ui::Text*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_Text_setTextVerticalAlignment'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + cocos2d::TextVAlignment arg0; + + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccui.Text:setTextVerticalAlignment"); + if(!ok) + return 0; + cobj->setTextVerticalAlignment(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Text:setTextVerticalAlignment",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_Text_setTextVerticalAlignment'.",&tolua_err); #endif return 0; @@ -7385,13 +7964,13 @@ int lua_cocos2dx_ui_Text_setFontName(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Text:setFontName"); if(!ok) return 0; cobj->setFontName(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setFontName",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Text:setFontName",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -7431,13 +8010,13 @@ int lua_cocos2dx_ui_Text_setTouchScaleChangeEnabled(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccui.Text:setTouchScaleChangeEnabled"); if(!ok) return 0; cobj->setTouchScaleChangeEnabled(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTouchScaleChangeEnabled",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Text:setTouchScaleChangeEnabled",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -7447,279 +8026,6 @@ int lua_cocos2dx_ui_Text_setTouchScaleChangeEnabled(lua_State* tolua_S) return 0; } -int lua_cocos2dx_ui_Text_getFontSize(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::ui::Text* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"ccui.Text",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::ui::Text*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_Text_getFontSize'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - int ret = cobj->getFontSize(); - tolua_pushnumber(tolua_S,(lua_Number)ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getFontSize",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_Text_getFontSize'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_ui_Text_enableOutline(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::ui::Text* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"ccui.Text",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::ui::Text*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_Text_enableOutline'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 1) - { - cocos2d::Color4B arg0; - - ok &=luaval_to_color4b(tolua_S, 2, &arg0); - if(!ok) - return 0; - cobj->enableOutline(arg0); - return 0; - } - if (argc == 2) - { - cocos2d::Color4B arg0; - int arg1; - - ok &=luaval_to_color4b(tolua_S, 2, &arg0); - - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); - if(!ok) - return 0; - cobj->enableOutline(arg0, arg1); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "enableOutline",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_Text_enableOutline'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_ui_Text_getTextVerticalAlignment(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::ui::Text* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"ccui.Text",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::ui::Text*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_Text_getTextVerticalAlignment'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - int ret = (int)cobj->getTextVerticalAlignment(); - tolua_pushnumber(tolua_S,(lua_Number)ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTextVerticalAlignment",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_Text_getTextVerticalAlignment'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_ui_Text_getString(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::ui::Text* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"ccui.Text",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::ui::Text*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_Text_getString'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - const std::string& ret = cobj->getString(); - tolua_pushcppstring(tolua_S,ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getString",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_Text_getString'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_ui_Text_enableShadow(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::ui::Text* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"ccui.Text",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::ui::Text*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_Text_enableShadow'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - cobj->enableShadow(); - return 0; - } - if (argc == 1) - { - cocos2d::Color4B arg0; - - ok &=luaval_to_color4b(tolua_S, 2, &arg0); - if(!ok) - return 0; - cobj->enableShadow(arg0); - return 0; - } - if (argc == 2) - { - cocos2d::Color4B arg0; - cocos2d::Size arg1; - - ok &=luaval_to_color4b(tolua_S, 2, &arg0); - - ok &= luaval_to_size(tolua_S, 3, &arg1); - if(!ok) - return 0; - cobj->enableShadow(arg0, arg1); - return 0; - } - if (argc == 3) - { - cocos2d::Color4B arg0; - cocos2d::Size arg1; - int arg2; - - ok &=luaval_to_color4b(tolua_S, 2, &arg0); - - ok &= luaval_to_size(tolua_S, 3, &arg1); - - ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2); - if(!ok) - return 0; - cobj->enableShadow(arg0, arg1, arg2); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "enableShadow",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_Text_enableShadow'.",&tolua_err); -#endif - - return 0; -} int lua_cocos2dx_ui_Text_setString(lua_State* tolua_S) { int argc = 0; @@ -7750,13 +8056,13 @@ int lua_cocos2dx_ui_Text_setString(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Text:setString"); if(!ok) return 0; cobj->setString(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setString",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Text:setString",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -7766,278 +8072,6 @@ int lua_cocos2dx_ui_Text_setString(lua_State* tolua_S) return 0; } -int lua_cocos2dx_ui_Text_getTextHorizontalAlignment(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::ui::Text* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"ccui.Text",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::ui::Text*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_Text_getTextHorizontalAlignment'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - int ret = (int)cobj->getTextHorizontalAlignment(); - tolua_pushnumber(tolua_S,(lua_Number)ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTextHorizontalAlignment",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_Text_getTextHorizontalAlignment'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_ui_Text_setTextVerticalAlignment(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::ui::Text* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"ccui.Text",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::ui::Text*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_Text_setTextVerticalAlignment'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 1) - { - cocos2d::TextVAlignment arg0; - - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); - if(!ok) - return 0; - cobj->setTextVerticalAlignment(arg0); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTextVerticalAlignment",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_Text_setTextVerticalAlignment'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_ui_Text_enableGlow(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::ui::Text* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"ccui.Text",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::ui::Text*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_Text_enableGlow'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 1) - { - cocos2d::Color4B arg0; - - ok &=luaval_to_color4b(tolua_S, 2, &arg0); - if(!ok) - return 0; - cobj->enableGlow(arg0); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "enableGlow",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_Text_enableGlow'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_ui_Text_getTextAreaSize(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::ui::Text* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"ccui.Text",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::ui::Text*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_Text_getTextAreaSize'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - const cocos2d::Size& ret = cobj->getTextAreaSize(); - size_to_luaval(tolua_S, ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTextAreaSize",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_Text_getTextAreaSize'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_ui_Text_setTextHorizontalAlignment(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::ui::Text* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"ccui.Text",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::ui::Text*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_Text_setTextHorizontalAlignment'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 1) - { - cocos2d::TextHAlignment arg0; - - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); - if(!ok) - return 0; - cobj->setTextHorizontalAlignment(arg0); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTextHorizontalAlignment",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_Text_setTextHorizontalAlignment'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_ui_Text_setFontSize(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::ui::Text* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"ccui.Text",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::ui::Text*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_Text_setFontSize'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 1) - { - int arg0; - - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); - if(!ok) - return 0; - cobj->setFontSize(arg0); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setFontSize",argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_Text_setFontSize'.",&tolua_err); -#endif - - return 0; -} int lua_cocos2dx_ui_Text_isTouchScaleChangeEnabled(lua_State* tolua_S) { int argc = 0; @@ -8072,7 +8106,7 @@ int lua_cocos2dx_ui_Text_isTouchScaleChangeEnabled(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isTouchScaleChangeEnabled",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Text:isTouchScaleChangeEnabled",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -8082,93 +8116,6 @@ int lua_cocos2dx_ui_Text_isTouchScaleChangeEnabled(lua_State* tolua_S) return 0; } -int lua_cocos2dx_ui_Text_getType(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::ui::Text* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"ccui.Text",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::ui::Text*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_Text_getType'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - int ret = (int)cobj->getType(); - tolua_pushnumber(tolua_S,(lua_Number)ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getType",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_Text_getType'.",&tolua_err); -#endif - - return 0; -} -int lua_cocos2dx_ui_Text_disableEffect(lua_State* tolua_S) -{ - int argc = 0; - cocos2d::ui::Text* cobj = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; -#endif - - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"ccui.Text",0,&tolua_err)) goto tolua_lerror; -#endif - - cobj = (cocos2d::ui::Text*)tolua_tousertype(tolua_S,1,0); - -#if COCOS2D_DEBUG >= 1 - if (!cobj) - { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_Text_disableEffect'", nullptr); - return 0; - } -#endif - - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) - return 0; - cobj->disableEffect(); - return 0; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "disableEffect",argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_Text_disableEffect'.",&tolua_err); -#endif - - return 0; -} int lua_cocos2dx_ui_Text_getFontName(lua_State* tolua_S) { int argc = 0; @@ -8203,7 +8150,7 @@ int lua_cocos2dx_ui_Text_getFontName(lua_State* tolua_S) tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getFontName",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Text:getFontName",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -8243,13 +8190,13 @@ int lua_cocos2dx_ui_Text_setTextAreaSize(lua_State* tolua_S) { cocos2d::Size arg0; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "ccui.Text:setTextAreaSize"); if(!ok) return 0; cobj->setTextAreaSize(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTextAreaSize",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Text:setTextAreaSize",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -8259,6 +8206,469 @@ int lua_cocos2dx_ui_Text_setTextAreaSize(lua_State* tolua_S) return 0; } +int lua_cocos2dx_ui_Text_getStringLength(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::ui::Text* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccui.Text",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::ui::Text*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_Text_getStringLength'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + ssize_t ret = cobj->getStringLength(); + tolua_pushnumber(tolua_S,(lua_Number)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Text:getStringLength",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_Text_getStringLength'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_ui_Text_enableOutline(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::ui::Text* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccui.Text",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::ui::Text*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_Text_enableOutline'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + cocos2d::Color4B arg0; + + ok &=luaval_to_color4b(tolua_S, 2, &arg0, "ccui.Text:enableOutline"); + if(!ok) + return 0; + cobj->enableOutline(arg0); + return 0; + } + if (argc == 2) + { + cocos2d::Color4B arg0; + int arg1; + + ok &=luaval_to_color4b(tolua_S, 2, &arg0, "ccui.Text:enableOutline"); + + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccui.Text:enableOutline"); + if(!ok) + return 0; + cobj->enableOutline(arg0, arg1); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Text:enableOutline",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_Text_enableOutline'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_ui_Text_getType(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::ui::Text* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccui.Text",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::ui::Text*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_Text_getType'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + int ret = (int)cobj->getType(); + tolua_pushnumber(tolua_S,(lua_Number)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Text:getType",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_Text_getType'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_ui_Text_getTextHorizontalAlignment(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::ui::Text* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccui.Text",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::ui::Text*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_Text_getTextHorizontalAlignment'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + int ret = (int)cobj->getTextHorizontalAlignment(); + tolua_pushnumber(tolua_S,(lua_Number)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Text:getTextHorizontalAlignment",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_Text_getTextHorizontalAlignment'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_ui_Text_setFontSize(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::ui::Text* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccui.Text",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::ui::Text*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_Text_setFontSize'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + int arg0; + + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccui.Text:setFontSize"); + if(!ok) + return 0; + cobj->setFontSize(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Text:setFontSize",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_Text_setFontSize'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_ui_Text_setTextColor(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::ui::Text* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccui.Text",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::ui::Text*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_Text_setTextColor'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + cocos2d::Color4B arg0; + + ok &=luaval_to_color4b(tolua_S, 2, &arg0, "ccui.Text:setTextColor"); + if(!ok) + return 0; + cobj->setTextColor(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Text:setTextColor",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_Text_setTextColor'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_ui_Text_enableGlow(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::ui::Text* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccui.Text",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::ui::Text*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_Text_enableGlow'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + cocos2d::Color4B arg0; + + ok &=luaval_to_color4b(tolua_S, 2, &arg0, "ccui.Text:enableGlow"); + if(!ok) + return 0; + cobj->enableGlow(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Text:enableGlow",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_Text_enableGlow'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_ui_Text_getTextVerticalAlignment(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::ui::Text* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccui.Text",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::ui::Text*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_Text_getTextVerticalAlignment'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + int ret = (int)cobj->getTextVerticalAlignment(); + tolua_pushnumber(tolua_S,(lua_Number)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Text:getTextVerticalAlignment",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_Text_getTextVerticalAlignment'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_ui_Text_getTextAreaSize(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::ui::Text* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccui.Text",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::ui::Text*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_Text_getTextAreaSize'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + const cocos2d::Size& ret = cobj->getTextAreaSize(); + size_to_luaval(tolua_S, ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Text:getTextAreaSize",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_Text_getTextAreaSize'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_ui_Text_setTextHorizontalAlignment(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::ui::Text* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccui.Text",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::ui::Text*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_Text_setTextHorizontalAlignment'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + cocos2d::TextHAlignment arg0; + + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccui.Text:setTextHorizontalAlignment"); + if(!ok) + return 0; + cobj->setTextHorizontalAlignment(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Text:setTextHorizontalAlignment",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_Text_setTextHorizontalAlignment'.",&tolua_err); +#endif + + return 0; +} int lua_cocos2dx_ui_Text_create(lua_State* tolua_S) { int argc = 0; @@ -8278,13 +8688,13 @@ int lua_cocos2dx_ui_Text_create(lua_State* tolua_S) if (argc == 3) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Text:create"); if (!ok) { break; } std::string arg1; - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccui.Text:create"); if (!ok) { break; } int arg2; - ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2); + ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "ccui.Text:create"); if (!ok) { break; } cocos2d::ui::Text* ret = cocos2d::ui::Text::create(arg0, arg1, arg2); object_to_luaval(tolua_S, "ccui.Text",(cocos2d::ui::Text*)ret); @@ -8302,7 +8712,7 @@ int lua_cocos2dx_ui_Text_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "ccui.Text:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -8333,7 +8743,7 @@ int lua_cocos2dx_ui_Text_createInstance(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Ref",(cocos2d::Ref*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createInstance",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccui.Text:createInstance",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -8365,7 +8775,7 @@ int lua_cocos2dx_ui_Text_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccui.Text"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "Text",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Text:Text",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -8388,26 +8798,28 @@ int lua_register_cocos2dx_ui_Text(lua_State* tolua_S) tolua_beginmodule(tolua_S,"Text"); tolua_function(tolua_S,"new",lua_cocos2dx_ui_Text_constructor); - tolua_function(tolua_S,"getStringLength",lua_cocos2dx_ui_Text_getStringLength); + tolua_function(tolua_S,"enableShadow",lua_cocos2dx_ui_Text_enableShadow); + tolua_function(tolua_S,"getFontSize",lua_cocos2dx_ui_Text_getFontSize); + tolua_function(tolua_S,"getString",lua_cocos2dx_ui_Text_getString); + tolua_function(tolua_S,"disableEffect",lua_cocos2dx_ui_Text_disableEffect); + tolua_function(tolua_S,"getTextColor",lua_cocos2dx_ui_Text_getTextColor); + tolua_function(tolua_S,"setTextVerticalAlignment",lua_cocos2dx_ui_Text_setTextVerticalAlignment); tolua_function(tolua_S,"setFontName",lua_cocos2dx_ui_Text_setFontName); tolua_function(tolua_S,"setTouchScaleChangeEnabled",lua_cocos2dx_ui_Text_setTouchScaleChangeEnabled); - tolua_function(tolua_S,"getFontSize",lua_cocos2dx_ui_Text_getFontSize); - tolua_function(tolua_S,"enableOutline",lua_cocos2dx_ui_Text_enableOutline); - tolua_function(tolua_S,"getTextVerticalAlignment",lua_cocos2dx_ui_Text_getTextVerticalAlignment); - tolua_function(tolua_S,"getString",lua_cocos2dx_ui_Text_getString); - tolua_function(tolua_S,"enableShadow",lua_cocos2dx_ui_Text_enableShadow); tolua_function(tolua_S,"setString",lua_cocos2dx_ui_Text_setString); - tolua_function(tolua_S,"getTextHorizontalAlignment",lua_cocos2dx_ui_Text_getTextHorizontalAlignment); - tolua_function(tolua_S,"setTextVerticalAlignment",lua_cocos2dx_ui_Text_setTextVerticalAlignment); - tolua_function(tolua_S,"enableGlow",lua_cocos2dx_ui_Text_enableGlow); - tolua_function(tolua_S,"getTextAreaSize",lua_cocos2dx_ui_Text_getTextAreaSize); - tolua_function(tolua_S,"setTextHorizontalAlignment",lua_cocos2dx_ui_Text_setTextHorizontalAlignment); - tolua_function(tolua_S,"setFontSize",lua_cocos2dx_ui_Text_setFontSize); tolua_function(tolua_S,"isTouchScaleChangeEnabled",lua_cocos2dx_ui_Text_isTouchScaleChangeEnabled); - tolua_function(tolua_S,"getType",lua_cocos2dx_ui_Text_getType); - tolua_function(tolua_S,"disableEffect",lua_cocos2dx_ui_Text_disableEffect); tolua_function(tolua_S,"getFontName",lua_cocos2dx_ui_Text_getFontName); tolua_function(tolua_S,"setTextAreaSize",lua_cocos2dx_ui_Text_setTextAreaSize); + tolua_function(tolua_S,"getStringLength",lua_cocos2dx_ui_Text_getStringLength); + tolua_function(tolua_S,"enableOutline",lua_cocos2dx_ui_Text_enableOutline); + tolua_function(tolua_S,"getType",lua_cocos2dx_ui_Text_getType); + tolua_function(tolua_S,"getTextHorizontalAlignment",lua_cocos2dx_ui_Text_getTextHorizontalAlignment); + tolua_function(tolua_S,"setFontSize",lua_cocos2dx_ui_Text_setFontSize); + tolua_function(tolua_S,"setTextColor",lua_cocos2dx_ui_Text_setTextColor); + tolua_function(tolua_S,"enableGlow",lua_cocos2dx_ui_Text_enableGlow); + tolua_function(tolua_S,"getTextVerticalAlignment",lua_cocos2dx_ui_Text_getTextVerticalAlignment); + tolua_function(tolua_S,"getTextAreaSize",lua_cocos2dx_ui_Text_getTextAreaSize); + tolua_function(tolua_S,"setTextHorizontalAlignment",lua_cocos2dx_ui_Text_setTextHorizontalAlignment); tolua_function(tolua_S,"create", lua_cocos2dx_ui_Text_create); tolua_function(tolua_S,"createInstance", lua_cocos2dx_ui_Text_createInstance); tolua_endmodule(tolua_S); @@ -8451,7 +8863,7 @@ int lua_cocos2dx_ui_TextAtlas_getStringLength(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getStringLength",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextAtlas:getStringLength",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -8495,7 +8907,7 @@ int lua_cocos2dx_ui_TextAtlas_getString(lua_State* tolua_S) tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getString",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextAtlas:getString",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -8535,13 +8947,13 @@ int lua_cocos2dx_ui_TextAtlas_setString(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.TextAtlas:setString"); if(!ok) return 0; cobj->setString(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setString",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextAtlas:setString",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -8585,21 +8997,21 @@ int lua_cocos2dx_ui_TextAtlas_setProperty(lua_State* tolua_S) int arg3; std::string arg4; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.TextAtlas:setProperty"); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccui.TextAtlas:setProperty"); - ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2); + ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "ccui.TextAtlas:setProperty"); - ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3); + ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3, "ccui.TextAtlas:setProperty"); - ok &= luaval_to_std_string(tolua_S, 6,&arg4); + ok &= luaval_to_std_string(tolua_S, 6,&arg4, "ccui.TextAtlas:setProperty"); if(!ok) return 0; cobj->setProperty(arg0, arg1, arg2, arg3, arg4); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setProperty",argc, 5); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextAtlas:setProperty",argc, 5); return 0; #if COCOS2D_DEBUG >= 1 @@ -8642,7 +9054,7 @@ int lua_cocos2dx_ui_TextAtlas_adaptRenderers(lua_State* tolua_S) cobj->adaptRenderers(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "adaptRenderers",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextAtlas:adaptRenderers",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -8671,19 +9083,19 @@ int lua_cocos2dx_ui_TextAtlas_create(lua_State* tolua_S) if (argc == 5) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.TextAtlas:create"); if (!ok) { break; } std::string arg1; - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccui.TextAtlas:create"); if (!ok) { break; } int arg2; - ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2); + ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "ccui.TextAtlas:create"); if (!ok) { break; } int arg3; - ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3); + ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3, "ccui.TextAtlas:create"); if (!ok) { break; } std::string arg4; - ok &= luaval_to_std_string(tolua_S, 6,&arg4); + ok &= luaval_to_std_string(tolua_S, 6,&arg4, "ccui.TextAtlas:create"); if (!ok) { break; } cocos2d::ui::TextAtlas* ret = cocos2d::ui::TextAtlas::create(arg0, arg1, arg2, arg3, arg4); object_to_luaval(tolua_S, "ccui.TextAtlas",(cocos2d::ui::TextAtlas*)ret); @@ -8701,7 +9113,7 @@ int lua_cocos2dx_ui_TextAtlas_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "ccui.TextAtlas:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -8732,7 +9144,7 @@ int lua_cocos2dx_ui_TextAtlas_createInstance(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Ref",(cocos2d::Ref*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createInstance",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccui.TextAtlas:createInstance",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -8764,7 +9176,7 @@ int lua_cocos2dx_ui_TextAtlas_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccui.TextAtlas"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "TextAtlas",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextAtlas:TextAtlas",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -8831,13 +9243,13 @@ int lua_cocos2dx_ui_LoadingBar_setPercent(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccui.LoadingBar:setPercent"); if(!ok) return 0; cobj->setPercent(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setPercent",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.LoadingBar:setPercent",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -8877,7 +9289,7 @@ int lua_cocos2dx_ui_LoadingBar_loadTexture(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.LoadingBar:loadTexture"); if(!ok) return 0; cobj->loadTexture(arg0); @@ -8888,15 +9300,15 @@ int lua_cocos2dx_ui_LoadingBar_loadTexture(lua_State* tolua_S) std::string arg0; cocos2d::ui::Widget::TextureResType arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.LoadingBar:loadTexture"); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccui.LoadingBar:loadTexture"); if(!ok) return 0; cobj->loadTexture(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "loadTexture",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.LoadingBar:loadTexture",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -8936,13 +9348,13 @@ int lua_cocos2dx_ui_LoadingBar_setDirection(lua_State* tolua_S) { cocos2d::ui::LoadingBar::Direction arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccui.LoadingBar:setDirection"); if(!ok) return 0; cobj->setDirection(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setDirection",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.LoadingBar:setDirection",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -8982,13 +9394,13 @@ int lua_cocos2dx_ui_LoadingBar_setScale9Enabled(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccui.LoadingBar:setScale9Enabled"); if(!ok) return 0; cobj->setScale9Enabled(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setScale9Enabled",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.LoadingBar:setScale9Enabled",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -9028,13 +9440,13 @@ int lua_cocos2dx_ui_LoadingBar_setCapInsets(lua_State* tolua_S) { cocos2d::Rect arg0; - ok &= luaval_to_rect(tolua_S, 2, &arg0); + ok &= luaval_to_rect(tolua_S, 2, &arg0, "ccui.LoadingBar:setCapInsets"); if(!ok) return 0; cobj->setCapInsets(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setCapInsets",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.LoadingBar:setCapInsets",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -9078,7 +9490,7 @@ int lua_cocos2dx_ui_LoadingBar_getDirection(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDirection",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.LoadingBar:getDirection",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -9122,7 +9534,7 @@ int lua_cocos2dx_ui_LoadingBar_getCapInsets(lua_State* tolua_S) rect_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getCapInsets",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.LoadingBar:getCapInsets",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -9166,7 +9578,7 @@ int lua_cocos2dx_ui_LoadingBar_isScale9Enabled(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isScale9Enabled",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.LoadingBar:isScale9Enabled",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -9210,7 +9622,7 @@ int lua_cocos2dx_ui_LoadingBar_getPercent(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPercent",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.LoadingBar:getPercent",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -9239,7 +9651,7 @@ int lua_cocos2dx_ui_LoadingBar_create(lua_State* tolua_S) if (argc == 1) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.LoadingBar:create"); if (!ok) { break; } cocos2d::ui::LoadingBar* ret = cocos2d::ui::LoadingBar::create(arg0); object_to_luaval(tolua_S, "ccui.LoadingBar",(cocos2d::ui::LoadingBar*)ret); @@ -9252,10 +9664,10 @@ int lua_cocos2dx_ui_LoadingBar_create(lua_State* tolua_S) if (argc == 2) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.LoadingBar:create"); if (!ok) { break; } double arg1; - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "ccui.LoadingBar:create"); if (!ok) { break; } cocos2d::ui::LoadingBar* ret = cocos2d::ui::LoadingBar::create(arg0, arg1); object_to_luaval(tolua_S, "ccui.LoadingBar",(cocos2d::ui::LoadingBar*)ret); @@ -9273,7 +9685,7 @@ int lua_cocos2dx_ui_LoadingBar_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "ccui.LoadingBar:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -9304,7 +9716,7 @@ int lua_cocos2dx_ui_LoadingBar_createInstance(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Ref",(cocos2d::Ref*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createInstance",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccui.LoadingBar:createInstance",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -9336,7 +9748,7 @@ int lua_cocos2dx_ui_LoadingBar_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccui.LoadingBar"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "LoadingBar",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.LoadingBar:LoadingBar",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -9408,15 +9820,15 @@ int lua_cocos2dx_ui_ScrollView_scrollToTop(lua_State* tolua_S) double arg0; bool arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccui.ScrollView:scrollToTop"); - ok &= luaval_to_boolean(tolua_S, 3,&arg1); + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "ccui.ScrollView:scrollToTop"); if(!ok) return 0; cobj->scrollToTop(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "scrollToTop",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ScrollView:scrollToTop",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -9458,17 +9870,17 @@ int lua_cocos2dx_ui_ScrollView_scrollToPercentHorizontal(lua_State* tolua_S) double arg1; bool arg2; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccui.ScrollView:scrollToPercentHorizontal"); - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "ccui.ScrollView:scrollToPercentHorizontal"); - ok &= luaval_to_boolean(tolua_S, 4,&arg2); + ok &= luaval_to_boolean(tolua_S, 4,&arg2, "ccui.ScrollView:scrollToPercentHorizontal"); if(!ok) return 0; cobj->scrollToPercentHorizontal(arg0, arg1, arg2); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "scrollToPercentHorizontal",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ScrollView:scrollToPercentHorizontal",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 @@ -9512,7 +9924,7 @@ int lua_cocos2dx_ui_ScrollView_isInertiaScrollEnabled(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isInertiaScrollEnabled",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ScrollView:isInertiaScrollEnabled",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -9554,17 +9966,17 @@ int lua_cocos2dx_ui_ScrollView_scrollToPercentBothDirection(lua_State* tolua_S) double arg1; bool arg2; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "ccui.ScrollView:scrollToPercentBothDirection"); - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "ccui.ScrollView:scrollToPercentBothDirection"); - ok &= luaval_to_boolean(tolua_S, 4,&arg2); + ok &= luaval_to_boolean(tolua_S, 4,&arg2, "ccui.ScrollView:scrollToPercentBothDirection"); if(!ok) return 0; cobj->scrollToPercentBothDirection(arg0, arg1, arg2); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "scrollToPercentBothDirection",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ScrollView:scrollToPercentBothDirection",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 @@ -9608,7 +10020,7 @@ int lua_cocos2dx_ui_ScrollView_getDirection(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDirection",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ScrollView:getDirection",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -9649,15 +10061,15 @@ int lua_cocos2dx_ui_ScrollView_scrollToBottomLeft(lua_State* tolua_S) double arg0; bool arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccui.ScrollView:scrollToBottomLeft"); - ok &= luaval_to_boolean(tolua_S, 3,&arg1); + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "ccui.ScrollView:scrollToBottomLeft"); if(!ok) return 0; cobj->scrollToBottomLeft(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "scrollToBottomLeft",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ScrollView:scrollToBottomLeft",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -9701,7 +10113,7 @@ int lua_cocos2dx_ui_ScrollView_getInnerContainer(lua_State* tolua_S) object_to_luaval(tolua_S, "ccui.Layout",(cocos2d::ui::Layout*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getInnerContainer",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ScrollView:getInnerContainer",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -9744,7 +10156,7 @@ int lua_cocos2dx_ui_ScrollView_jumpToBottom(lua_State* tolua_S) cobj->jumpToBottom(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "jumpToBottom",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ScrollView:jumpToBottom",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -9784,13 +10196,13 @@ int lua_cocos2dx_ui_ScrollView_setDirection(lua_State* tolua_S) { cocos2d::ui::ScrollView::Direction arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccui.ScrollView:setDirection"); if(!ok) return 0; cobj->setDirection(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setDirection",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ScrollView:setDirection",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -9831,15 +10243,15 @@ int lua_cocos2dx_ui_ScrollView_scrollToTopLeft(lua_State* tolua_S) double arg0; bool arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccui.ScrollView:scrollToTopLeft"); - ok &= luaval_to_boolean(tolua_S, 3,&arg1); + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "ccui.ScrollView:scrollToTopLeft"); if(!ok) return 0; cobj->scrollToTopLeft(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "scrollToTopLeft",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ScrollView:scrollToTopLeft",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -9882,7 +10294,7 @@ int lua_cocos2dx_ui_ScrollView_jumpToTopRight(lua_State* tolua_S) cobj->jumpToTopRight(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "jumpToTopRight",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ScrollView:jumpToTopRight",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -9925,7 +10337,7 @@ int lua_cocos2dx_ui_ScrollView_jumpToBottomLeft(lua_State* tolua_S) cobj->jumpToBottomLeft(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "jumpToBottomLeft",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ScrollView:jumpToBottomLeft",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -9965,13 +10377,13 @@ int lua_cocos2dx_ui_ScrollView_setInnerContainerSize(lua_State* tolua_S) { cocos2d::Size arg0; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "ccui.ScrollView:setInnerContainerSize"); if(!ok) return 0; cobj->setInnerContainerSize(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setInnerContainerSize",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ScrollView:setInnerContainerSize",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -10015,7 +10427,7 @@ int lua_cocos2dx_ui_ScrollView_getInnerContainerSize(lua_State* tolua_S) size_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getInnerContainerSize",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ScrollView:getInnerContainerSize",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -10059,7 +10471,7 @@ int lua_cocos2dx_ui_ScrollView_isBounceEnabled(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isBounceEnabled",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ScrollView:isBounceEnabled",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -10099,13 +10511,13 @@ int lua_cocos2dx_ui_ScrollView_jumpToPercentVertical(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccui.ScrollView:jumpToPercentVertical"); if(!ok) return 0; cobj->jumpToPercentVertical(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "jumpToPercentVertical",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ScrollView:jumpToPercentVertical",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -10155,7 +10567,7 @@ int lua_cocos2dx_ui_ScrollView_addEventListener(lua_State* tolua_S) cobj->addEventListener(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addEventListener",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ScrollView:addEventListener",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -10195,13 +10607,13 @@ int lua_cocos2dx_ui_ScrollView_setInertiaScrollEnabled(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccui.ScrollView:setInertiaScrollEnabled"); if(!ok) return 0; cobj->setInertiaScrollEnabled(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setInertiaScrollEnabled",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ScrollView:setInertiaScrollEnabled",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -10244,7 +10656,7 @@ int lua_cocos2dx_ui_ScrollView_jumpToTopLeft(lua_State* tolua_S) cobj->jumpToTopLeft(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "jumpToTopLeft",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ScrollView:jumpToTopLeft",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -10284,13 +10696,13 @@ int lua_cocos2dx_ui_ScrollView_jumpToPercentHorizontal(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccui.ScrollView:jumpToPercentHorizontal"); if(!ok) return 0; cobj->jumpToPercentHorizontal(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "jumpToPercentHorizontal",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ScrollView:jumpToPercentHorizontal",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -10333,7 +10745,7 @@ int lua_cocos2dx_ui_ScrollView_jumpToBottomRight(lua_State* tolua_S) cobj->jumpToBottomRight(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "jumpToBottomRight",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ScrollView:jumpToBottomRight",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -10373,13 +10785,13 @@ int lua_cocos2dx_ui_ScrollView_setBounceEnabled(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccui.ScrollView:setBounceEnabled"); if(!ok) return 0; cobj->setBounceEnabled(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setBounceEnabled",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ScrollView:setBounceEnabled",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -10422,7 +10834,7 @@ int lua_cocos2dx_ui_ScrollView_jumpToTop(lua_State* tolua_S) cobj->jumpToTop(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "jumpToTop",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ScrollView:jumpToTop",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -10463,15 +10875,15 @@ int lua_cocos2dx_ui_ScrollView_scrollToLeft(lua_State* tolua_S) double arg0; bool arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccui.ScrollView:scrollToLeft"); - ok &= luaval_to_boolean(tolua_S, 3,&arg1); + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "ccui.ScrollView:scrollToLeft"); if(!ok) return 0; cobj->scrollToLeft(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "scrollToLeft",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ScrollView:scrollToLeft",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -10511,13 +10923,13 @@ int lua_cocos2dx_ui_ScrollView_jumpToPercentBothDirection(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "ccui.ScrollView:jumpToPercentBothDirection"); if(!ok) return 0; cobj->jumpToPercentBothDirection(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "jumpToPercentBothDirection",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ScrollView:jumpToPercentBothDirection",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -10559,17 +10971,17 @@ int lua_cocos2dx_ui_ScrollView_scrollToPercentVertical(lua_State* tolua_S) double arg1; bool arg2; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccui.ScrollView:scrollToPercentVertical"); - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "ccui.ScrollView:scrollToPercentVertical"); - ok &= luaval_to_boolean(tolua_S, 4,&arg2); + ok &= luaval_to_boolean(tolua_S, 4,&arg2, "ccui.ScrollView:scrollToPercentVertical"); if(!ok) return 0; cobj->scrollToPercentVertical(arg0, arg1, arg2); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "scrollToPercentVertical",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ScrollView:scrollToPercentVertical",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 @@ -10610,15 +11022,15 @@ int lua_cocos2dx_ui_ScrollView_scrollToBottom(lua_State* tolua_S) double arg0; bool arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccui.ScrollView:scrollToBottom"); - ok &= luaval_to_boolean(tolua_S, 3,&arg1); + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "ccui.ScrollView:scrollToBottom"); if(!ok) return 0; cobj->scrollToBottom(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "scrollToBottom",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ScrollView:scrollToBottom",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -10659,15 +11071,15 @@ int lua_cocos2dx_ui_ScrollView_scrollToBottomRight(lua_State* tolua_S) double arg0; bool arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccui.ScrollView:scrollToBottomRight"); - ok &= luaval_to_boolean(tolua_S, 3,&arg1); + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "ccui.ScrollView:scrollToBottomRight"); if(!ok) return 0; cobj->scrollToBottomRight(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "scrollToBottomRight",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ScrollView:scrollToBottomRight",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -10710,7 +11122,7 @@ int lua_cocos2dx_ui_ScrollView_jumpToLeft(lua_State* tolua_S) cobj->jumpToLeft(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "jumpToLeft",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ScrollView:jumpToLeft",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -10751,15 +11163,15 @@ int lua_cocos2dx_ui_ScrollView_scrollToRight(lua_State* tolua_S) double arg0; bool arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccui.ScrollView:scrollToRight"); - ok &= luaval_to_boolean(tolua_S, 3,&arg1); + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "ccui.ScrollView:scrollToRight"); if(!ok) return 0; cobj->scrollToRight(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "scrollToRight",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ScrollView:scrollToRight",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -10802,7 +11214,7 @@ int lua_cocos2dx_ui_ScrollView_jumpToRight(lua_State* tolua_S) cobj->jumpToRight(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "jumpToRight",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ScrollView:jumpToRight",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -10843,15 +11255,15 @@ int lua_cocos2dx_ui_ScrollView_scrollToTopRight(lua_State* tolua_S) double arg0; bool arg1; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccui.ScrollView:scrollToTopRight"); - ok &= luaval_to_boolean(tolua_S, 3,&arg1); + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "ccui.ScrollView:scrollToTopRight"); if(!ok) return 0; cobj->scrollToTopRight(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "scrollToTopRight",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ScrollView:scrollToTopRight",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -10884,7 +11296,7 @@ int lua_cocos2dx_ui_ScrollView_create(lua_State* tolua_S) object_to_luaval(tolua_S, "ccui.ScrollView",(cocos2d::ui::ScrollView*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccui.ScrollView:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -10915,7 +11327,7 @@ int lua_cocos2dx_ui_ScrollView_createInstance(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Ref",(cocos2d::Ref*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createInstance",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccui.ScrollView:createInstance",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -10947,7 +11359,7 @@ int lua_cocos2dx_ui_ScrollView_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccui.ScrollView"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ScrollView",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ScrollView:ScrollView",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -11048,7 +11460,7 @@ int lua_cocos2dx_ui_ListView_getIndex(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getIndex",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ListView:getIndex",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -11091,7 +11503,7 @@ int lua_cocos2dx_ui_ListView_removeAllItems(lua_State* tolua_S) cobj->removeAllItems(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeAllItems",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ListView:removeAllItems",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -11131,13 +11543,13 @@ int lua_cocos2dx_ui_ListView_setGravity(lua_State* tolua_S) { cocos2d::ui::ListView::Gravity arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccui.ListView:setGravity"); if(!ok) return 0; cobj->setGravity(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setGravity",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ListView:setGravity",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -11183,7 +11595,7 @@ int lua_cocos2dx_ui_ListView_pushBackCustomItem(lua_State* tolua_S) cobj->pushBackCustomItem(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "pushBackCustomItem",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ListView:pushBackCustomItem",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -11227,7 +11639,7 @@ int lua_cocos2dx_ui_ListView_getItems(lua_State* tolua_S) ccvector_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getItems",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ListView:getItems",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -11267,13 +11679,13 @@ int lua_cocos2dx_ui_ListView_removeItem(lua_State* tolua_S) { ssize_t arg0; - ok &= luaval_to_ssize(tolua_S, 2, &arg0); + ok &= luaval_to_ssize(tolua_S, 2, &arg0, "ccui.ListView:removeItem"); if(!ok) return 0; cobj->removeItem(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeItem",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ListView:removeItem",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -11317,7 +11729,7 @@ int lua_cocos2dx_ui_ListView_getCurSelectedIndex(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getCurSelectedIndex",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ListView:getCurSelectedIndex",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -11357,13 +11769,13 @@ int lua_cocos2dx_ui_ListView_insertDefaultItem(lua_State* tolua_S) { ssize_t arg0; - ok &= luaval_to_ssize(tolua_S, 2, &arg0); + ok &= luaval_to_ssize(tolua_S, 2, &arg0, "ccui.ListView:insertDefaultItem"); if(!ok) return 0; cobj->insertDefaultItem(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "insertDefaultItem",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ListView:insertDefaultItem",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -11406,7 +11818,7 @@ int lua_cocos2dx_ui_ListView_requestRefreshView(lua_State* tolua_S) cobj->requestRefreshView(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "requestRefreshView",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ListView:requestRefreshView",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -11446,13 +11858,13 @@ int lua_cocos2dx_ui_ListView_setItemsMargin(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccui.ListView:setItemsMargin"); if(!ok) return 0; cobj->setItemsMargin(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setItemsMargin",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ListView:setItemsMargin",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -11495,7 +11907,7 @@ int lua_cocos2dx_ui_ListView_refreshView(lua_State* tolua_S) cobj->refreshView(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "refreshView",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ListView:refreshView",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -11538,7 +11950,7 @@ int lua_cocos2dx_ui_ListView_removeLastItem(lua_State* tolua_S) cobj->removeLastItem(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeLastItem",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ListView:removeLastItem",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -11582,7 +11994,7 @@ int lua_cocos2dx_ui_ListView_getItemsMargin(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getItemsMargin",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ListView:getItemsMargin",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -11632,7 +12044,7 @@ int lua_cocos2dx_ui_ListView_addEventListener(lua_State* tolua_S) cobj->addEventListener(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addEventListener",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ListView:addEventListener",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -11672,14 +12084,14 @@ int lua_cocos2dx_ui_ListView_getItem(lua_State* tolua_S) { ssize_t arg0; - ok &= luaval_to_ssize(tolua_S, 2, &arg0); + ok &= luaval_to_ssize(tolua_S, 2, &arg0, "ccui.ListView:getItem"); if(!ok) return 0; cocos2d::ui::Widget* ret = cobj->getItem(arg0); object_to_luaval(tolua_S, "ccui.Widget",(cocos2d::ui::Widget*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getItem",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ListView:getItem",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -11725,7 +12137,7 @@ int lua_cocos2dx_ui_ListView_setItemModel(lua_State* tolua_S) cobj->setItemModel(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setItemModel",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ListView:setItemModel",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -11768,7 +12180,7 @@ int lua_cocos2dx_ui_ListView_doLayout(lua_State* tolua_S) cobj->doLayout(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "doLayout",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ListView:doLayout",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -11811,7 +12223,7 @@ int lua_cocos2dx_ui_ListView_pushBackDefaultItem(lua_State* tolua_S) cobj->pushBackDefaultItem(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "pushBackDefaultItem",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ListView:pushBackDefaultItem",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -11854,13 +12266,13 @@ int lua_cocos2dx_ui_ListView_insertCustomItem(lua_State* tolua_S) ok &= luaval_to_object(tolua_S, 2, "ccui.Widget",&arg0); - ok &= luaval_to_ssize(tolua_S, 3, &arg1); + ok &= luaval_to_ssize(tolua_S, 3, &arg1, "ccui.ListView:insertCustomItem"); if(!ok) return 0; cobj->insertCustomItem(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "insertCustomItem",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ListView:insertCustomItem",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -11893,7 +12305,7 @@ int lua_cocos2dx_ui_ListView_create(lua_State* tolua_S) object_to_luaval(tolua_S, "ccui.ListView",(cocos2d::ui::ListView*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccui.ListView:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -11924,7 +12336,7 @@ int lua_cocos2dx_ui_ListView_createInstance(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Ref",(cocos2d::Ref*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createInstance",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccui.ListView:createInstance",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -11956,7 +12368,7 @@ int lua_cocos2dx_ui_ListView_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccui.ListView"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ListView",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.ListView:ListView",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -12037,13 +12449,13 @@ int lua_cocos2dx_ui_Slider_setPercent(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccui.Slider:setPercent"); if(!ok) return 0; cobj->setPercent(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setPercent",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Slider:setPercent",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -12083,7 +12495,7 @@ int lua_cocos2dx_ui_Slider_loadSlidBallTextureDisabled(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Slider:loadSlidBallTextureDisabled"); if(!ok) return 0; cobj->loadSlidBallTextureDisabled(arg0); @@ -12094,15 +12506,15 @@ int lua_cocos2dx_ui_Slider_loadSlidBallTextureDisabled(lua_State* tolua_S) std::string arg0; cocos2d::ui::Widget::TextureResType arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Slider:loadSlidBallTextureDisabled"); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccui.Slider:loadSlidBallTextureDisabled"); if(!ok) return 0; cobj->loadSlidBallTextureDisabled(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "loadSlidBallTextureDisabled",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Slider:loadSlidBallTextureDisabled",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -12142,7 +12554,7 @@ int lua_cocos2dx_ui_Slider_loadSlidBallTextureNormal(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Slider:loadSlidBallTextureNormal"); if(!ok) return 0; cobj->loadSlidBallTextureNormal(arg0); @@ -12153,15 +12565,15 @@ int lua_cocos2dx_ui_Slider_loadSlidBallTextureNormal(lua_State* tolua_S) std::string arg0; cocos2d::ui::Widget::TextureResType arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Slider:loadSlidBallTextureNormal"); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccui.Slider:loadSlidBallTextureNormal"); if(!ok) return 0; cobj->loadSlidBallTextureNormal(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "loadSlidBallTextureNormal",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Slider:loadSlidBallTextureNormal",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -12201,7 +12613,7 @@ int lua_cocos2dx_ui_Slider_loadBarTexture(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Slider:loadBarTexture"); if(!ok) return 0; cobj->loadBarTexture(arg0); @@ -12212,15 +12624,15 @@ int lua_cocos2dx_ui_Slider_loadBarTexture(lua_State* tolua_S) std::string arg0; cocos2d::ui::Widget::TextureResType arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Slider:loadBarTexture"); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccui.Slider:loadBarTexture"); if(!ok) return 0; cobj->loadBarTexture(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "loadBarTexture",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Slider:loadBarTexture",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -12260,7 +12672,7 @@ int lua_cocos2dx_ui_Slider_loadProgressBarTexture(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Slider:loadProgressBarTexture"); if(!ok) return 0; cobj->loadProgressBarTexture(arg0); @@ -12271,15 +12683,15 @@ int lua_cocos2dx_ui_Slider_loadProgressBarTexture(lua_State* tolua_S) std::string arg0; cocos2d::ui::Widget::TextureResType arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Slider:loadProgressBarTexture"); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccui.Slider:loadProgressBarTexture"); if(!ok) return 0; cobj->loadProgressBarTexture(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "loadProgressBarTexture",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Slider:loadProgressBarTexture",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -12321,11 +12733,11 @@ int lua_cocos2dx_ui_Slider_loadSlidBallTextures(lua_State* tolua_S) std::string arg1; std::string arg2; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Slider:loadSlidBallTextures"); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccui.Slider:loadSlidBallTextures"); - ok &= luaval_to_std_string(tolua_S, 4,&arg2); + ok &= luaval_to_std_string(tolua_S, 4,&arg2, "ccui.Slider:loadSlidBallTextures"); if(!ok) return 0; cobj->loadSlidBallTextures(arg0, arg1, arg2); @@ -12338,19 +12750,19 @@ int lua_cocos2dx_ui_Slider_loadSlidBallTextures(lua_State* tolua_S) std::string arg2; cocos2d::ui::Widget::TextureResType arg3; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Slider:loadSlidBallTextures"); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccui.Slider:loadSlidBallTextures"); - ok &= luaval_to_std_string(tolua_S, 4,&arg2); + ok &= luaval_to_std_string(tolua_S, 4,&arg2, "ccui.Slider:loadSlidBallTextures"); - ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3); + ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3, "ccui.Slider:loadSlidBallTextures"); if(!ok) return 0; cobj->loadSlidBallTextures(arg0, arg1, arg2, arg3); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "loadSlidBallTextures",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Slider:loadSlidBallTextures",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 @@ -12390,13 +12802,13 @@ int lua_cocos2dx_ui_Slider_setCapInsetProgressBarRebderer(lua_State* tolua_S) { cocos2d::Rect arg0; - ok &= luaval_to_rect(tolua_S, 2, &arg0); + ok &= luaval_to_rect(tolua_S, 2, &arg0, "ccui.Slider:setCapInsetProgressBarRebderer"); if(!ok) return 0; cobj->setCapInsetProgressBarRebderer(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setCapInsetProgressBarRebderer",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Slider:setCapInsetProgressBarRebderer",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -12436,13 +12848,13 @@ int lua_cocos2dx_ui_Slider_setCapInsetsBarRenderer(lua_State* tolua_S) { cocos2d::Rect arg0; - ok &= luaval_to_rect(tolua_S, 2, &arg0); + ok &= luaval_to_rect(tolua_S, 2, &arg0, "ccui.Slider:setCapInsetsBarRenderer"); if(!ok) return 0; cobj->setCapInsetsBarRenderer(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setCapInsetsBarRenderer",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Slider:setCapInsetsBarRenderer",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -12486,7 +12898,7 @@ int lua_cocos2dx_ui_Slider_getCapInsetsProgressBarRebderer(lua_State* tolua_S) rect_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getCapInsetsProgressBarRebderer",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Slider:getCapInsetsProgressBarRebderer",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -12526,13 +12938,13 @@ int lua_cocos2dx_ui_Slider_setScale9Enabled(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccui.Slider:setScale9Enabled"); if(!ok) return 0; cobj->setScale9Enabled(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setScale9Enabled",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Slider:setScale9Enabled",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -12572,13 +12984,13 @@ int lua_cocos2dx_ui_Slider_setCapInsets(lua_State* tolua_S) { cocos2d::Rect arg0; - ok &= luaval_to_rect(tolua_S, 2, &arg0); + ok &= luaval_to_rect(tolua_S, 2, &arg0, "ccui.Slider:setCapInsets"); if(!ok) return 0; cobj->setCapInsets(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setCapInsets",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Slider:setCapInsets",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -12628,7 +13040,7 @@ int lua_cocos2dx_ui_Slider_addEventListener(lua_State* tolua_S) cobj->addEventListener(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addEventListener",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Slider:addEventListener",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -12668,7 +13080,7 @@ int lua_cocos2dx_ui_Slider_loadSlidBallTexturePressed(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Slider:loadSlidBallTexturePressed"); if(!ok) return 0; cobj->loadSlidBallTexturePressed(arg0); @@ -12679,15 +13091,15 @@ int lua_cocos2dx_ui_Slider_loadSlidBallTexturePressed(lua_State* tolua_S) std::string arg0; cocos2d::ui::Widget::TextureResType arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Slider:loadSlidBallTexturePressed"); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccui.Slider:loadSlidBallTexturePressed"); if(!ok) return 0; cobj->loadSlidBallTexturePressed(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "loadSlidBallTexturePressed",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Slider:loadSlidBallTexturePressed",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -12731,7 +13143,7 @@ int lua_cocos2dx_ui_Slider_isScale9Enabled(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isScale9Enabled",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Slider:isScale9Enabled",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -12775,7 +13187,7 @@ int lua_cocos2dx_ui_Slider_getCapInsetsBarRenderer(lua_State* tolua_S) rect_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getCapInsetsBarRenderer",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Slider:getCapInsetsBarRenderer",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -12819,7 +13231,7 @@ int lua_cocos2dx_ui_Slider_getPercent(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPercent",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Slider:getPercent",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -12852,7 +13264,7 @@ int lua_cocos2dx_ui_Slider_create(lua_State* tolua_S) object_to_luaval(tolua_S, "ccui.Slider",(cocos2d::ui::Slider*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccui.Slider:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -12883,7 +13295,7 @@ int lua_cocos2dx_ui_Slider_createInstance(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Ref",(cocos2d::Ref*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createInstance",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccui.Slider:createInstance",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -12915,7 +13327,7 @@ int lua_cocos2dx_ui_Slider_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccui.Slider"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "Slider",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.Slider:Slider",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -12993,13 +13405,13 @@ int lua_cocos2dx_ui_TextField_setAttachWithIME(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccui.TextField:setAttachWithIME"); if(!ok) return 0; cobj->setAttachWithIME(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAttachWithIME",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextField:setAttachWithIME",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -13043,7 +13455,7 @@ int lua_cocos2dx_ui_TextField_getFontSize(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getFontSize",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextField:getFontSize",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -13087,7 +13499,7 @@ int lua_cocos2dx_ui_TextField_getStringValue(lua_State* tolua_S) tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getStringValue",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextField:getStringValue",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -13097,6 +13509,52 @@ int lua_cocos2dx_ui_TextField_getStringValue(lua_State* tolua_S) return 0; } +int lua_cocos2dx_ui_TextField_setPasswordStyleText(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::ui::TextField* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccui.TextField",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::ui::TextField*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_TextField_setPasswordStyleText'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + const char* arg0; + + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "ccui.TextField:setPasswordStyleText"); arg0 = arg0_tmp.c_str(); + if(!ok) + return 0; + cobj->setPasswordStyleText(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextField:setPasswordStyleText",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_TextField_setPasswordStyleText'.",&tolua_err); +#endif + + return 0; +} int lua_cocos2dx_ui_TextField_getDeleteBackward(lua_State* tolua_S) { int argc = 0; @@ -13131,7 +13589,7 @@ int lua_cocos2dx_ui_TextField_getDeleteBackward(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDeleteBackward",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextField:getDeleteBackward",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -13175,7 +13633,7 @@ int lua_cocos2dx_ui_TextField_getPlaceHolder(lua_State* tolua_S) tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPlaceHolder",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextField:getPlaceHolder",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -13219,7 +13677,7 @@ int lua_cocos2dx_ui_TextField_getAttachWithIME(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getAttachWithIME",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextField:getAttachWithIME",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -13259,13 +13717,13 @@ int lua_cocos2dx_ui_TextField_setFontName(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.TextField:setFontName"); if(!ok) return 0; cobj->setFontName(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setFontName",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextField:setFontName",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -13309,7 +13767,7 @@ int lua_cocos2dx_ui_TextField_getInsertText(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getInsertText",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextField:getInsertText",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -13349,13 +13807,13 @@ int lua_cocos2dx_ui_TextField_setInsertText(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccui.TextField:setInsertText"); if(!ok) return 0; cobj->setInsertText(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setInsertText",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextField:setInsertText",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -13399,7 +13857,7 @@ int lua_cocos2dx_ui_TextField_getDetachWithIME(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDetachWithIME",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextField:getDetachWithIME",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -13439,13 +13897,13 @@ int lua_cocos2dx_ui_TextField_setTextVerticalAlignment(lua_State* tolua_S) { cocos2d::TextVAlignment arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccui.TextField:setTextVerticalAlignment"); if(!ok) return 0; cobj->setTextVerticalAlignment(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTextVerticalAlignment",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextField:setTextVerticalAlignment",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -13495,7 +13953,7 @@ int lua_cocos2dx_ui_TextField_addEventListener(lua_State* tolua_S) cobj->addEventListener(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addEventListener",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextField:addEventListener",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -13538,7 +13996,7 @@ int lua_cocos2dx_ui_TextField_didNotSelectSelf(lua_State* tolua_S) cobj->didNotSelectSelf(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "didNotSelectSelf",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextField:didNotSelectSelf",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -13582,7 +14040,7 @@ int lua_cocos2dx_ui_TextField_getFontName(lua_State* tolua_S) tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getFontName",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextField:getFontName",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -13622,13 +14080,13 @@ int lua_cocos2dx_ui_TextField_setTextAreaSize(lua_State* tolua_S) { cocos2d::Size arg0; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "ccui.TextField:setTextAreaSize"); if(!ok) return 0; cobj->setTextAreaSize(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTextAreaSize",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextField:setTextAreaSize",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -13671,7 +14129,7 @@ int lua_cocos2dx_ui_TextField_attachWithIME(lua_State* tolua_S) cobj->attachWithIME(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "attachWithIME",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextField:attachWithIME",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -13715,7 +14173,7 @@ int lua_cocos2dx_ui_TextField_getStringLength(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getStringLength",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextField:getStringLength",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -13755,13 +14213,13 @@ int lua_cocos2dx_ui_TextField_setPasswordEnabled(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccui.TextField:setPasswordEnabled"); if(!ok) return 0; cobj->setPasswordEnabled(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setPasswordEnabled",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextField:setPasswordEnabled",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -13771,6 +14229,50 @@ int lua_cocos2dx_ui_TextField_setPasswordEnabled(lua_State* tolua_S) return 0; } +int lua_cocos2dx_ui_TextField_getPlaceHolderColor(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::ui::TextField* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccui.TextField",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::ui::TextField*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_TextField_getPlaceHolderColor'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + const cocos2d::Color4B& ret = cobj->getPlaceHolderColor(); + color4b_to_luaval(tolua_S, ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextField:getPlaceHolderColor",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_TextField_getPlaceHolderColor'.",&tolua_err); +#endif + + return 0; +} int lua_cocos2dx_ui_TextField_getPasswordStyleText(lua_State* tolua_S) { int argc = 0; @@ -13805,7 +14307,7 @@ int lua_cocos2dx_ui_TextField_getPasswordStyleText(lua_State* tolua_S) tolua_pushstring(tolua_S,(const char*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPasswordStyleText",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextField:getPasswordStyleText",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -13845,13 +14347,13 @@ int lua_cocos2dx_ui_TextField_setMaxLengthEnabled(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccui.TextField:setMaxLengthEnabled"); if(!ok) return 0; cobj->setMaxLengthEnabled(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setMaxLengthEnabled",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextField:setMaxLengthEnabled",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -13861,7 +14363,7 @@ int lua_cocos2dx_ui_TextField_setMaxLengthEnabled(lua_State* tolua_S) return 0; } -int lua_cocos2dx_ui_TextField_setPasswordStyleText(lua_State* tolua_S) +int lua_cocos2dx_ui_TextField_isPasswordEnabled(lua_State* tolua_S) { int argc = 0; cocos2d::ui::TextField* cobj = nullptr; @@ -13881,28 +14383,26 @@ int lua_cocos2dx_ui_TextField_setPasswordStyleText(lua_State* tolua_S) #if COCOS2D_DEBUG >= 1 if (!cobj) { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_TextField_setPasswordStyleText'", nullptr); + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_TextField_isPasswordEnabled'", nullptr); return 0; } #endif argc = lua_gettop(tolua_S)-1; - if (argc == 1) + if (argc == 0) { - const char* arg0; - - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); if(!ok) return 0; - cobj->setPasswordStyleText(arg0); - return 0; + bool ret = cobj->isPasswordEnabled(); + tolua_pushboolean(tolua_S,(bool)ret); + return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setPasswordStyleText",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextField:isPasswordEnabled",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_TextField_setPasswordStyleText'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_TextField_isPasswordEnabled'.",&tolua_err); #endif return 0; @@ -13937,13 +14437,13 @@ int lua_cocos2dx_ui_TextField_setDeleteBackward(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccui.TextField:setDeleteBackward"); if(!ok) return 0; cobj->setDeleteBackward(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setDeleteBackward",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextField:setDeleteBackward",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -13983,13 +14483,13 @@ int lua_cocos2dx_ui_TextField_setFontSize(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccui.TextField:setFontSize"); if(!ok) return 0; cobj->setFontSize(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setFontSize",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextField:setFontSize",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -14029,13 +14529,13 @@ int lua_cocos2dx_ui_TextField_setPlaceHolder(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.TextField:setPlaceHolder"); if(!ok) return 0; cobj->setPlaceHolder(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setPlaceHolder",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextField:setPlaceHolder",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -14045,46 +14545,55 @@ int lua_cocos2dx_ui_TextField_setPlaceHolder(lua_State* tolua_S) return 0; } -int lua_cocos2dx_ui_TextField_isPasswordEnabled(lua_State* tolua_S) +int lua_cocos2dx_ui_TextField_setPlaceHolderColor(lua_State* tolua_S) { int argc = 0; cocos2d::ui::TextField* cobj = nullptr; bool ok = true; - #if COCOS2D_DEBUG >= 1 tolua_Error tolua_err; #endif - #if COCOS2D_DEBUG >= 1 if (!tolua_isusertype(tolua_S,1,"ccui.TextField",0,&tolua_err)) goto tolua_lerror; #endif - cobj = (cocos2d::ui::TextField*)tolua_tousertype(tolua_S,1,0); - #if COCOS2D_DEBUG >= 1 - if (!cobj) + if (!cobj) { - tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_TextField_isPasswordEnabled'", nullptr); + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_TextField_setPlaceHolderColor'", nullptr); return 0; } #endif - argc = lua_gettop(tolua_S)-1; - if (argc == 0) - { - if(!ok) + do{ + if (argc == 1) { + cocos2d::Color4B arg0; + ok &=luaval_to_color4b(tolua_S, 2, &arg0, "ccui.TextField:setPlaceHolderColor"); + + if (!ok) { break; } + cobj->setPlaceHolderColor(arg0); return 0; - bool ret = cobj->isPasswordEnabled(); - tolua_pushboolean(tolua_S,(bool)ret); - return 1; - } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isPasswordEnabled",argc, 0); + } + }while(0); + ok = true; + do{ + if (argc == 1) { + cocos2d::Color3B arg0; + ok &= luaval_to_color3b(tolua_S, 2, &arg0, "ccui.TextField:setPlaceHolderColor"); + + if (!ok) { break; } + cobj->setPlaceHolderColor(arg0); + return 0; + } + }while(0); + ok = true; + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextField:setPlaceHolderColor",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_TextField_isPasswordEnabled'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_TextField_setPlaceHolderColor'.",&tolua_err); #endif return 0; @@ -14119,13 +14628,13 @@ int lua_cocos2dx_ui_TextField_setTextHorizontalAlignment(lua_State* tolua_S) { cocos2d::TextHAlignment arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccui.TextField:setTextHorizontalAlignment"); if(!ok) return 0; cobj->setTextHorizontalAlignment(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTextHorizontalAlignment",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextField:setTextHorizontalAlignment",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -14135,6 +14644,52 @@ int lua_cocos2dx_ui_TextField_setTextHorizontalAlignment(lua_State* tolua_S) return 0; } +int lua_cocos2dx_ui_TextField_setTextColor(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::ui::TextField* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccui.TextField",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::ui::TextField*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_TextField_setTextColor'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + cocos2d::Color4B arg0; + + ok &=luaval_to_color4b(tolua_S, 2, &arg0, "ccui.TextField:setTextColor"); + if(!ok) + return 0; + cobj->setTextColor(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextField:setTextColor",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_TextField_setTextColor'.",&tolua_err); +#endif + + return 0; +} int lua_cocos2dx_ui_TextField_getMaxLength(lua_State* tolua_S) { int argc = 0; @@ -14169,7 +14724,7 @@ int lua_cocos2dx_ui_TextField_getMaxLength(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getMaxLength",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextField:getMaxLength",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -14213,7 +14768,7 @@ int lua_cocos2dx_ui_TextField_isMaxLengthEnabled(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isMaxLengthEnabled",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextField:isMaxLengthEnabled",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -14253,13 +14808,13 @@ int lua_cocos2dx_ui_TextField_setDetachWithIME(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccui.TextField:setDetachWithIME"); if(!ok) return 0; cobj->setDetachWithIME(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setDetachWithIME",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextField:setDetachWithIME",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -14299,13 +14854,13 @@ int lua_cocos2dx_ui_TextField_setText(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.TextField:setText"); if(!ok) return 0; cobj->setText(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setText",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextField:setText",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -14345,13 +14900,13 @@ int lua_cocos2dx_ui_TextField_setTouchAreaEnabled(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccui.TextField:setTouchAreaEnabled"); if(!ok) return 0; cobj->setTouchAreaEnabled(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTouchAreaEnabled",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextField:setTouchAreaEnabled",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -14391,14 +14946,14 @@ int lua_cocos2dx_ui_TextField_hitTest(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "ccui.TextField:hitTest"); if(!ok) return 0; bool ret = cobj->hitTest(arg0); tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "hitTest",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextField:hitTest",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -14438,13 +14993,13 @@ int lua_cocos2dx_ui_TextField_setMaxLength(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccui.TextField:setMaxLength"); if(!ok) return 0; cobj->setMaxLength(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setMaxLength",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextField:setMaxLength",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -14484,13 +15039,13 @@ int lua_cocos2dx_ui_TextField_setTouchSize(lua_State* tolua_S) { cocos2d::Size arg0; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "ccui.TextField:setTouchSize"); if(!ok) return 0; cobj->setTouchSize(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTouchSize",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextField:setTouchSize",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -14534,7 +15089,7 @@ int lua_cocos2dx_ui_TextField_getTouchSize(lua_State* tolua_S) size_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTouchSize",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextField:getTouchSize",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -14563,13 +15118,13 @@ int lua_cocos2dx_ui_TextField_create(lua_State* tolua_S) if (argc == 3) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.TextField:create"); if (!ok) { break; } std::string arg1; - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccui.TextField:create"); if (!ok) { break; } int arg2; - ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2); + ok &= luaval_to_int32(tolua_S, 4,(int *)&arg2, "ccui.TextField:create"); if (!ok) { break; } cocos2d::ui::TextField* ret = cocos2d::ui::TextField::create(arg0, arg1, arg2); object_to_luaval(tolua_S, "ccui.TextField",(cocos2d::ui::TextField*)ret); @@ -14587,7 +15142,7 @@ int lua_cocos2dx_ui_TextField_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "ccui.TextField:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -14618,7 +15173,7 @@ int lua_cocos2dx_ui_TextField_createInstance(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Ref",(cocos2d::Ref*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createInstance",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccui.TextField:createInstance",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -14650,7 +15205,7 @@ int lua_cocos2dx_ui_TextField_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccui.TextField"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "TextField",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextField:TextField",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -14676,6 +15231,7 @@ int lua_register_cocos2dx_ui_TextField(lua_State* tolua_S) tolua_function(tolua_S,"setAttachWithIME",lua_cocos2dx_ui_TextField_setAttachWithIME); tolua_function(tolua_S,"getFontSize",lua_cocos2dx_ui_TextField_getFontSize); tolua_function(tolua_S,"getStringValue",lua_cocos2dx_ui_TextField_getStringValue); + tolua_function(tolua_S,"setPasswordStyleText",lua_cocos2dx_ui_TextField_setPasswordStyleText); tolua_function(tolua_S,"getDeleteBackward",lua_cocos2dx_ui_TextField_getDeleteBackward); tolua_function(tolua_S,"getPlaceHolder",lua_cocos2dx_ui_TextField_getPlaceHolder); tolua_function(tolua_S,"getAttachWithIME",lua_cocos2dx_ui_TextField_getAttachWithIME); @@ -14691,14 +15247,16 @@ int lua_register_cocos2dx_ui_TextField(lua_State* tolua_S) tolua_function(tolua_S,"attachWithIME",lua_cocos2dx_ui_TextField_attachWithIME); tolua_function(tolua_S,"getStringLength",lua_cocos2dx_ui_TextField_getStringLength); tolua_function(tolua_S,"setPasswordEnabled",lua_cocos2dx_ui_TextField_setPasswordEnabled); + tolua_function(tolua_S,"getPlaceHolderColor",lua_cocos2dx_ui_TextField_getPlaceHolderColor); tolua_function(tolua_S,"getPasswordStyleText",lua_cocos2dx_ui_TextField_getPasswordStyleText); tolua_function(tolua_S,"setMaxLengthEnabled",lua_cocos2dx_ui_TextField_setMaxLengthEnabled); - tolua_function(tolua_S,"setPasswordStyleText",lua_cocos2dx_ui_TextField_setPasswordStyleText); + tolua_function(tolua_S,"isPasswordEnabled",lua_cocos2dx_ui_TextField_isPasswordEnabled); tolua_function(tolua_S,"setDeleteBackward",lua_cocos2dx_ui_TextField_setDeleteBackward); tolua_function(tolua_S,"setFontSize",lua_cocos2dx_ui_TextField_setFontSize); tolua_function(tolua_S,"setPlaceHolder",lua_cocos2dx_ui_TextField_setPlaceHolder); - tolua_function(tolua_S,"isPasswordEnabled",lua_cocos2dx_ui_TextField_isPasswordEnabled); + tolua_function(tolua_S,"setPlaceHolderColor",lua_cocos2dx_ui_TextField_setPlaceHolderColor); tolua_function(tolua_S,"setTextHorizontalAlignment",lua_cocos2dx_ui_TextField_setTextHorizontalAlignment); + tolua_function(tolua_S,"setTextColor",lua_cocos2dx_ui_TextField_setTextColor); tolua_function(tolua_S,"getMaxLength",lua_cocos2dx_ui_TextField_getMaxLength); tolua_function(tolua_S,"isMaxLengthEnabled",lua_cocos2dx_ui_TextField_isMaxLengthEnabled); tolua_function(tolua_S,"setDetachWithIME",lua_cocos2dx_ui_TextField_setDetachWithIME); @@ -14747,13 +15305,13 @@ int lua_cocos2dx_ui_TextBMFont_setFntFile(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.TextBMFont:setFntFile"); if(!ok) return 0; cobj->setFntFile(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setFntFile",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextBMFont:setFntFile",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -14797,7 +15355,7 @@ int lua_cocos2dx_ui_TextBMFont_getStringLength(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getStringLength",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextBMFont:getStringLength",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -14837,13 +15395,13 @@ int lua_cocos2dx_ui_TextBMFont_setString(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.TextBMFont:setString"); if(!ok) return 0; cobj->setString(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setString",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextBMFont:setString",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -14887,7 +15445,7 @@ int lua_cocos2dx_ui_TextBMFont_getString(lua_State* tolua_S) tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getString",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextBMFont:getString",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -14916,10 +15474,10 @@ int lua_cocos2dx_ui_TextBMFont_create(lua_State* tolua_S) if (argc == 2) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.TextBMFont:create"); if (!ok) { break; } std::string arg1; - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccui.TextBMFont:create"); if (!ok) { break; } cocos2d::ui::TextBMFont* ret = cocos2d::ui::TextBMFont::create(arg0, arg1); object_to_luaval(tolua_S, "ccui.TextBMFont",(cocos2d::ui::TextBMFont*)ret); @@ -14937,7 +15495,7 @@ int lua_cocos2dx_ui_TextBMFont_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "ccui.TextBMFont:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -14968,7 +15526,7 @@ int lua_cocos2dx_ui_TextBMFont_createInstance(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Ref",(cocos2d::Ref*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createInstance",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccui.TextBMFont:createInstance",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -15000,7 +15558,7 @@ int lua_cocos2dx_ui_TextBMFont_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccui.TextBMFont"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "TextBMFont",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.TextBMFont:TextBMFont",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -15036,6 +15594,50 @@ int lua_register_cocos2dx_ui_TextBMFont(lua_State* tolua_S) return 1; } +int lua_cocos2dx_ui_PageView_getCustomScrollThreshold(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::ui::PageView* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccui.PageView",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::ui::PageView*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_PageView_getCustomScrollThreshold'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + double ret = cobj->getCustomScrollThreshold(); + tolua_pushnumber(tolua_S,(lua_Number)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.PageView:getCustomScrollThreshold",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_PageView_getCustomScrollThreshold'.",&tolua_err); +#endif + + return 0; +} int lua_cocos2dx_ui_PageView_getCurPageIndex(lua_State* tolua_S) { int argc = 0; @@ -15070,7 +15672,7 @@ int lua_cocos2dx_ui_PageView_getCurPageIndex(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getCurPageIndex",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.PageView:getCurPageIndex",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -15114,15 +15716,15 @@ int lua_cocos2dx_ui_PageView_addWidgetToPage(lua_State* tolua_S) ok &= luaval_to_object(tolua_S, 2, "ccui.Widget",&arg0); - ok &= luaval_to_ssize(tolua_S, 3, &arg1); + ok &= luaval_to_ssize(tolua_S, 3, &arg1, "ccui.PageView:addWidgetToPage"); - ok &= luaval_to_boolean(tolua_S, 4,&arg2); + ok &= luaval_to_boolean(tolua_S, 4,&arg2, "ccui.PageView:addWidgetToPage"); if(!ok) return 0; cobj->addWidgetToPage(arg0, arg1, arg2); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addWidgetToPage",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.PageView:addWidgetToPage",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 @@ -15132,6 +15734,50 @@ int lua_cocos2dx_ui_PageView_addWidgetToPage(lua_State* tolua_S) return 0; } +int lua_cocos2dx_ui_PageView_isUsingCustomScrollThreshold(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::ui::PageView* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccui.PageView",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::ui::PageView*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_PageView_isUsingCustomScrollThreshold'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 0) + { + if(!ok) + return 0; + bool ret = cobj->isUsingCustomScrollThreshold(); + tolua_pushboolean(tolua_S,(bool)ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.PageView:isUsingCustomScrollThreshold",argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_PageView_isUsingCustomScrollThreshold'.",&tolua_err); +#endif + + return 0; +} int lua_cocos2dx_ui_PageView_getPage(lua_State* tolua_S) { int argc = 0; @@ -15162,14 +15808,14 @@ int lua_cocos2dx_ui_PageView_getPage(lua_State* tolua_S) { ssize_t arg0; - ok &= luaval_to_ssize(tolua_S, 2, &arg0); + ok &= luaval_to_ssize(tolua_S, 2, &arg0, "ccui.PageView:getPage"); if(!ok) return 0; cocos2d::ui::Layout* ret = cobj->getPage(arg0); object_to_luaval(tolua_S, "ccui.Layout",(cocos2d::ui::Layout*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPage",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.PageView:getPage",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -15215,7 +15861,7 @@ int lua_cocos2dx_ui_PageView_removePage(lua_State* tolua_S) cobj->removePage(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removePage",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.PageView:removePage",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -15265,7 +15911,7 @@ int lua_cocos2dx_ui_PageView_addEventListener(lua_State* tolua_S) cobj->addEventListener(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addEventListener",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.PageView:addEventListener",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -15275,6 +15921,98 @@ int lua_cocos2dx_ui_PageView_addEventListener(lua_State* tolua_S) return 0; } +int lua_cocos2dx_ui_PageView_setUsingCustomScrollThreshold(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::ui::PageView* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccui.PageView",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::ui::PageView*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_PageView_setUsingCustomScrollThreshold'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + bool arg0; + + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccui.PageView:setUsingCustomScrollThreshold"); + if(!ok) + return 0; + cobj->setUsingCustomScrollThreshold(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.PageView:setUsingCustomScrollThreshold",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_PageView_setUsingCustomScrollThreshold'.",&tolua_err); +#endif + + return 0; +} +int lua_cocos2dx_ui_PageView_setCustomScrollThreshold(lua_State* tolua_S) +{ + int argc = 0; + cocos2d::ui::PageView* cobj = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; +#endif + + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"ccui.PageView",0,&tolua_err)) goto tolua_lerror; +#endif + + cobj = (cocos2d::ui::PageView*)tolua_tousertype(tolua_S,1,0); + +#if COCOS2D_DEBUG >= 1 + if (!cobj) + { + tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_ui_PageView_setCustomScrollThreshold'", nullptr); + return 0; + } +#endif + + argc = lua_gettop(tolua_S)-1; + if (argc == 1) + { + double arg0; + + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccui.PageView:setCustomScrollThreshold"); + if(!ok) + return 0; + cobj->setCustomScrollThreshold(arg0); + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.PageView:setCustomScrollThreshold",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_PageView_setCustomScrollThreshold'.",&tolua_err); +#endif + + return 0; +} int lua_cocos2dx_ui_PageView_insertPage(lua_State* tolua_S) { int argc = 0; @@ -15308,13 +16046,13 @@ int lua_cocos2dx_ui_PageView_insertPage(lua_State* tolua_S) ok &= luaval_to_object(tolua_S, 2, "ccui.Layout",&arg0); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccui.PageView:insertPage"); if(!ok) return 0; cobj->insertPage(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "insertPage",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.PageView:insertPage",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -15354,13 +16092,13 @@ int lua_cocos2dx_ui_PageView_scrollToPage(lua_State* tolua_S) { ssize_t arg0; - ok &= luaval_to_ssize(tolua_S, 2, &arg0); + ok &= luaval_to_ssize(tolua_S, 2, &arg0, "ccui.PageView:scrollToPage"); if(!ok) return 0; cobj->scrollToPage(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "scrollToPage",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.PageView:scrollToPage",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -15400,13 +16138,13 @@ int lua_cocos2dx_ui_PageView_removePageAtIndex(lua_State* tolua_S) { ssize_t arg0; - ok &= luaval_to_ssize(tolua_S, 2, &arg0); + ok &= luaval_to_ssize(tolua_S, 2, &arg0, "ccui.PageView:removePageAtIndex"); if(!ok) return 0; cobj->removePageAtIndex(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removePageAtIndex",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.PageView:removePageAtIndex",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -15450,7 +16188,7 @@ int lua_cocos2dx_ui_PageView_getPages(lua_State* tolua_S) ccvector_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPages",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.PageView:getPages",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -15493,7 +16231,7 @@ int lua_cocos2dx_ui_PageView_removeAllPages(lua_State* tolua_S) cobj->removeAllPages(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeAllPages",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.PageView:removeAllPages",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -15539,7 +16277,7 @@ int lua_cocos2dx_ui_PageView_addPage(lua_State* tolua_S) cobj->addPage(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "addPage",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.PageView:addPage",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -15572,7 +16310,7 @@ int lua_cocos2dx_ui_PageView_create(lua_State* tolua_S) object_to_luaval(tolua_S, "ccui.PageView",(cocos2d::ui::PageView*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccui.PageView:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -15603,7 +16341,7 @@ int lua_cocos2dx_ui_PageView_createInstance(lua_State* tolua_S) object_to_luaval(tolua_S, "cc.Ref",(cocos2d::Ref*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createInstance",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccui.PageView:createInstance",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -15635,7 +16373,7 @@ int lua_cocos2dx_ui_PageView_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccui.PageView"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "PageView",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.PageView:PageView",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -15658,11 +16396,15 @@ int lua_register_cocos2dx_ui_PageView(lua_State* tolua_S) tolua_beginmodule(tolua_S,"PageView"); tolua_function(tolua_S,"new",lua_cocos2dx_ui_PageView_constructor); + tolua_function(tolua_S,"getCustomScrollThreshold",lua_cocos2dx_ui_PageView_getCustomScrollThreshold); tolua_function(tolua_S,"getCurPageIndex",lua_cocos2dx_ui_PageView_getCurPageIndex); tolua_function(tolua_S,"addWidgetToPage",lua_cocos2dx_ui_PageView_addWidgetToPage); + tolua_function(tolua_S,"isUsingCustomScrollThreshold",lua_cocos2dx_ui_PageView_isUsingCustomScrollThreshold); tolua_function(tolua_S,"getPage",lua_cocos2dx_ui_PageView_getPage); tolua_function(tolua_S,"removePage",lua_cocos2dx_ui_PageView_removePage); tolua_function(tolua_S,"addEventListener",lua_cocos2dx_ui_PageView_addEventListener); + tolua_function(tolua_S,"setUsingCustomScrollThreshold",lua_cocos2dx_ui_PageView_setUsingCustomScrollThreshold); + tolua_function(tolua_S,"setCustomScrollThreshold",lua_cocos2dx_ui_PageView_setCustomScrollThreshold); tolua_function(tolua_S,"insertPage",lua_cocos2dx_ui_PageView_insertPage); tolua_function(tolua_S,"scrollToPage",lua_cocos2dx_ui_PageView_scrollToPage); tolua_function(tolua_S,"removePageAtIndex",lua_cocos2dx_ui_PageView_removePageAtIndex); @@ -15678,6 +16420,43 @@ int lua_register_cocos2dx_ui_PageView(lua_State* tolua_S) return 1; } +int lua_cocos2dx_ui_Helper_getSubStringOfUTF8String(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,"ccui.Helper",0,&tolua_err)) goto tolua_lerror; +#endif + + argc = lua_gettop(tolua_S) - 1; + + if (argc == 3) + { + std::string arg0; + unsigned long arg1; + unsigned long arg2; + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "ccui.Helper:getSubStringOfUTF8String"); + ok &= luaval_to_ulong(tolua_S, 3, &arg1, "ccui.Helper:getSubStringOfUTF8String"); + ok &= luaval_to_ulong(tolua_S, 4, &arg2, "ccui.Helper:getSubStringOfUTF8String"); + if(!ok) + return 0; + std::string ret = cocos2d::ui::Helper::getSubStringOfUTF8String(arg0, arg1, arg2); + tolua_pushcppstring(tolua_S,ret); + return 1; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccui.Helper:getSubStringOfUTF8String",argc, 3); + return 0; +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_ui_Helper_getSubStringOfUTF8String'.",&tolua_err); +#endif + return 0; +} int lua_cocos2dx_ui_Helper_seekWidgetByTag(lua_State* tolua_S) { int argc = 0; @@ -15698,14 +16477,14 @@ int lua_cocos2dx_ui_Helper_seekWidgetByTag(lua_State* tolua_S) cocos2d::ui::Widget* arg0; int arg1; ok &= luaval_to_object(tolua_S, 2, "ccui.Widget",&arg0); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccui.Helper:seekWidgetByTag"); if(!ok) return 0; cocos2d::ui::Widget* ret = cocos2d::ui::Helper::seekWidgetByTag(arg0, arg1); object_to_luaval(tolua_S, "ccui.Widget",(cocos2d::ui::Widget*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "seekWidgetByTag",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccui.Helper:seekWidgetByTag",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -15733,14 +16512,14 @@ int lua_cocos2dx_ui_Helper_seekActionWidgetByActionTag(lua_State* tolua_S) cocos2d::ui::Widget* arg0; int arg1; ok &= luaval_to_object(tolua_S, 2, "ccui.Widget",&arg0); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccui.Helper:seekActionWidgetByActionTag"); if(!ok) return 0; cocos2d::ui::Widget* ret = cocos2d::ui::Helper::seekActionWidgetByActionTag(arg0, arg1); object_to_luaval(tolua_S, "ccui.Widget",(cocos2d::ui::Widget*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "seekActionWidgetByActionTag",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccui.Helper:seekActionWidgetByActionTag",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -15768,14 +16547,14 @@ int lua_cocos2dx_ui_Helper_seekWidgetByName(lua_State* tolua_S) cocos2d::ui::Widget* arg0; std::string arg1; ok &= luaval_to_object(tolua_S, 2, "ccui.Widget",&arg0); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "ccui.Helper:seekWidgetByName"); if(!ok) return 0; cocos2d::ui::Widget* ret = cocos2d::ui::Helper::seekWidgetByName(arg0, arg1); object_to_luaval(tolua_S, "ccui.Widget",(cocos2d::ui::Widget*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "seekWidgetByName",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccui.Helper:seekWidgetByName",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -15795,6 +16574,7 @@ int lua_register_cocos2dx_ui_Helper(lua_State* tolua_S) tolua_cclass(tolua_S,"Helper","ccui.Helper","",nullptr); tolua_beginmodule(tolua_S,"Helper"); + tolua_function(tolua_S,"getSubStringOfUTF8String", lua_cocos2dx_ui_Helper_getSubStringOfUTF8String); tolua_function(tolua_S,"seekWidgetByTag", lua_cocos2dx_ui_Helper_seekWidgetByTag); tolua_function(tolua_S,"seekActionWidgetByActionTag", lua_cocos2dx_ui_Helper_seekActionWidgetByActionTag); tolua_function(tolua_S,"seekWidgetByName", lua_cocos2dx_ui_Helper_seekWidgetByName); @@ -15837,18 +16617,18 @@ int lua_cocos2dx_ui_RichElement_init(lua_State* tolua_S) cocos2d::Color3B arg1; uint16_t arg2; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccui.RichElement:init"); - ok &= luaval_to_color3b(tolua_S, 3, &arg1); + ok &= luaval_to_color3b(tolua_S, 3, &arg1, "ccui.RichElement:init"); - ok &= luaval_to_uint16(tolua_S, 4,&arg2); + ok &= luaval_to_uint16(tolua_S, 4,&arg2, "ccui.RichElement:init"); if(!ok) return 0; bool ret = cobj->init(arg0, arg1, arg2); tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "init",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.RichElement:init",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 @@ -15882,7 +16662,7 @@ int lua_cocos2dx_ui_RichElement_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccui.RichElement"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "RichElement",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.RichElement:RichElement",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -15948,24 +16728,24 @@ int lua_cocos2dx_ui_RichElementText_init(lua_State* tolua_S) std::string arg4; double arg5; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccui.RichElementText:init"); - ok &= luaval_to_color3b(tolua_S, 3, &arg1); + ok &= luaval_to_color3b(tolua_S, 3, &arg1, "ccui.RichElementText:init"); - ok &= luaval_to_uint16(tolua_S, 4,&arg2); + ok &= luaval_to_uint16(tolua_S, 4,&arg2, "ccui.RichElementText:init"); - ok &= luaval_to_std_string(tolua_S, 5,&arg3); + ok &= luaval_to_std_string(tolua_S, 5,&arg3, "ccui.RichElementText:init"); - ok &= luaval_to_std_string(tolua_S, 6,&arg4); + ok &= luaval_to_std_string(tolua_S, 6,&arg4, "ccui.RichElementText:init"); - ok &= luaval_to_number(tolua_S, 7,&arg5); + ok &= luaval_to_number(tolua_S, 7,&arg5, "ccui.RichElementText:init"); if(!ok) return 0; bool ret = cobj->init(arg0, arg1, arg2, arg3, arg4, arg5); tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "init",argc, 6); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.RichElementText:init",argc, 6); return 0; #if COCOS2D_DEBUG >= 1 @@ -15998,19 +16778,19 @@ int lua_cocos2dx_ui_RichElementText_create(lua_State* tolua_S) std::string arg3; std::string arg4; double arg5; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); - ok &= luaval_to_color3b(tolua_S, 3, &arg1); - ok &= luaval_to_uint16(tolua_S, 4,&arg2); - ok &= luaval_to_std_string(tolua_S, 5,&arg3); - ok &= luaval_to_std_string(tolua_S, 6,&arg4); - ok &= luaval_to_number(tolua_S, 7,&arg5); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccui.RichElementText:create"); + ok &= luaval_to_color3b(tolua_S, 3, &arg1, "ccui.RichElementText:create"); + ok &= luaval_to_uint16(tolua_S, 4,&arg2, "ccui.RichElementText:create"); + ok &= luaval_to_std_string(tolua_S, 5,&arg3, "ccui.RichElementText:create"); + ok &= luaval_to_std_string(tolua_S, 6,&arg4, "ccui.RichElementText:create"); + ok &= luaval_to_number(tolua_S, 7,&arg5, "ccui.RichElementText:create"); if(!ok) return 0; cocos2d::ui::RichElementText* ret = cocos2d::ui::RichElementText::create(arg0, arg1, arg2, arg3, arg4, arg5); object_to_luaval(tolua_S, "ccui.RichElementText",(cocos2d::ui::RichElementText*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 6); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccui.RichElementText:create",argc, 6); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -16042,7 +16822,7 @@ int lua_cocos2dx_ui_RichElementText_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccui.RichElementText"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "RichElementText",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.RichElementText:RichElementText",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -16107,20 +16887,20 @@ int lua_cocos2dx_ui_RichElementImage_init(lua_State* tolua_S) uint16_t arg2; std::string arg3; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccui.RichElementImage:init"); - ok &= luaval_to_color3b(tolua_S, 3, &arg1); + ok &= luaval_to_color3b(tolua_S, 3, &arg1, "ccui.RichElementImage:init"); - ok &= luaval_to_uint16(tolua_S, 4,&arg2); + ok &= luaval_to_uint16(tolua_S, 4,&arg2, "ccui.RichElementImage:init"); - ok &= luaval_to_std_string(tolua_S, 5,&arg3); + ok &= luaval_to_std_string(tolua_S, 5,&arg3, "ccui.RichElementImage:init"); if(!ok) return 0; bool ret = cobj->init(arg0, arg1, arg2, arg3); tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "init",argc, 4); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.RichElementImage:init",argc, 4); return 0; #if COCOS2D_DEBUG >= 1 @@ -16151,17 +16931,17 @@ int lua_cocos2dx_ui_RichElementImage_create(lua_State* tolua_S) cocos2d::Color3B arg1; uint16_t arg2; std::string arg3; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); - ok &= luaval_to_color3b(tolua_S, 3, &arg1); - ok &= luaval_to_uint16(tolua_S, 4,&arg2); - ok &= luaval_to_std_string(tolua_S, 5,&arg3); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccui.RichElementImage:create"); + ok &= luaval_to_color3b(tolua_S, 3, &arg1, "ccui.RichElementImage:create"); + ok &= luaval_to_uint16(tolua_S, 4,&arg2, "ccui.RichElementImage:create"); + ok &= luaval_to_std_string(tolua_S, 5,&arg3, "ccui.RichElementImage:create"); if(!ok) return 0; cocos2d::ui::RichElementImage* ret = cocos2d::ui::RichElementImage::create(arg0, arg1, arg2, arg3); object_to_luaval(tolua_S, "ccui.RichElementImage",(cocos2d::ui::RichElementImage*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 4); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccui.RichElementImage:create",argc, 4); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -16193,7 +16973,7 @@ int lua_cocos2dx_ui_RichElementImage_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccui.RichElementImage"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "RichElementImage",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.RichElementImage:RichElementImage",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -16258,11 +17038,11 @@ int lua_cocos2dx_ui_RichElementCustomNode_init(lua_State* tolua_S) uint16_t arg2; cocos2d::Node* arg3; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccui.RichElementCustomNode:init"); - ok &= luaval_to_color3b(tolua_S, 3, &arg1); + ok &= luaval_to_color3b(tolua_S, 3, &arg1, "ccui.RichElementCustomNode:init"); - ok &= luaval_to_uint16(tolua_S, 4,&arg2); + ok &= luaval_to_uint16(tolua_S, 4,&arg2, "ccui.RichElementCustomNode:init"); ok &= luaval_to_object(tolua_S, 5, "cc.Node",&arg3); if(!ok) @@ -16271,7 +17051,7 @@ int lua_cocos2dx_ui_RichElementCustomNode_init(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "init",argc, 4); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.RichElementCustomNode:init",argc, 4); return 0; #if COCOS2D_DEBUG >= 1 @@ -16302,9 +17082,9 @@ int lua_cocos2dx_ui_RichElementCustomNode_create(lua_State* tolua_S) cocos2d::Color3B arg1; uint16_t arg2; cocos2d::Node* arg3; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); - ok &= luaval_to_color3b(tolua_S, 3, &arg1); - ok &= luaval_to_uint16(tolua_S, 4,&arg2); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccui.RichElementCustomNode:create"); + ok &= luaval_to_color3b(tolua_S, 3, &arg1, "ccui.RichElementCustomNode:create"); + ok &= luaval_to_uint16(tolua_S, 4,&arg2, "ccui.RichElementCustomNode:create"); ok &= luaval_to_object(tolua_S, 5, "cc.Node",&arg3); if(!ok) return 0; @@ -16312,7 +17092,7 @@ int lua_cocos2dx_ui_RichElementCustomNode_create(lua_State* tolua_S) object_to_luaval(tolua_S, "ccui.RichElementCustomNode",(cocos2d::ui::RichElementCustomNode*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 4); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccui.RichElementCustomNode:create",argc, 4); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -16344,7 +17124,7 @@ int lua_cocos2dx_ui_RichElementCustomNode_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccui.RichElementCustomNode"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "RichElementCustomNode",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.RichElementCustomNode:RichElementCustomNode",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -16409,13 +17189,13 @@ int lua_cocos2dx_ui_RichText_insertElement(lua_State* tolua_S) ok &= luaval_to_object(tolua_S, 2, "ccui.RichElement",&arg0); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "ccui.RichText:insertElement"); if(!ok) return 0; cobj->insertElement(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "insertElement",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.RichText:insertElement",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -16455,13 +17235,13 @@ int lua_cocos2dx_ui_RichText_setAnchorPoint(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "ccui.RichText:setAnchorPoint"); if(!ok) return 0; cobj->setAnchorPoint(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAnchorPoint",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.RichText:setAnchorPoint",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -16507,7 +17287,7 @@ int lua_cocos2dx_ui_RichText_pushBackElement(lua_State* tolua_S) cobj->pushBackElement(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "pushBackElement",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.RichText:pushBackElement",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -16547,13 +17327,13 @@ int lua_cocos2dx_ui_RichText_ignoreContentAdaptWithSize(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "ccui.RichText:ignoreContentAdaptWithSize"); if(!ok) return 0; cobj->ignoreContentAdaptWithSize(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ignoreContentAdaptWithSize",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.RichText:ignoreContentAdaptWithSize",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -16593,13 +17373,13 @@ int lua_cocos2dx_ui_RichText_setVerticalSpace(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "ccui.RichText:setVerticalSpace"); if(!ok) return 0; cobj->setVerticalSpace(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setVerticalSpace",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.RichText:setVerticalSpace",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -16642,7 +17422,7 @@ int lua_cocos2dx_ui_RichText_formatText(lua_State* tolua_S) cobj->formatText(); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "formatText",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.RichText:formatText",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -16687,7 +17467,7 @@ int lua_cocos2dx_ui_RichText_removeElement(lua_State* tolua_S) do{ if (argc == 1) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "ccui.RichText:removeElement"); if (!ok) { break; } cobj->removeElement(arg0); @@ -16695,7 +17475,7 @@ int lua_cocos2dx_ui_RichText_removeElement(lua_State* tolua_S) } }while(0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "removeElement",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.RichText:removeElement",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -16728,7 +17508,7 @@ int lua_cocos2dx_ui_RichText_create(lua_State* tolua_S) object_to_luaval(tolua_S, "ccui.RichText",(cocos2d::ui::RichText*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccui.RichText:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -16760,7 +17540,7 @@ int lua_cocos2dx_ui_RichText_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccui.RichText"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "RichText",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.RichText:RichText",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -16817,7 +17597,7 @@ int lua_cocos2dx_ui_HBox_create(lua_State* tolua_S) if (argc == 1) { cocos2d::Size arg0; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "ccui.HBox:create"); if (!ok) { break; } cocos2d::ui::HBox* ret = cocos2d::ui::HBox::create(arg0); object_to_luaval(tolua_S, "ccui.HBox",(cocos2d::ui::HBox*)ret); @@ -16835,7 +17615,7 @@ int lua_cocos2dx_ui_HBox_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "ccui.HBox:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -16867,7 +17647,7 @@ int lua_cocos2dx_ui_HBox_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccui.HBox"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "HBox",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.HBox:HBox",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -16917,7 +17697,7 @@ int lua_cocos2dx_ui_VBox_create(lua_State* tolua_S) if (argc == 1) { cocos2d::Size arg0; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "ccui.VBox:create"); if (!ok) { break; } cocos2d::ui::VBox* ret = cocos2d::ui::VBox::create(arg0); object_to_luaval(tolua_S, "ccui.VBox",(cocos2d::ui::VBox*)ret); @@ -16935,7 +17715,7 @@ int lua_cocos2dx_ui_VBox_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "ccui.VBox:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -16967,7 +17747,7 @@ int lua_cocos2dx_ui_VBox_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccui.VBox"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "VBox",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.VBox:VBox",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -17017,7 +17797,7 @@ int lua_cocos2dx_ui_RelativeBox_create(lua_State* tolua_S) if (argc == 1) { cocos2d::Size arg0; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "ccui.RelativeBox:create"); if (!ok) { break; } cocos2d::ui::RelativeBox* ret = cocos2d::ui::RelativeBox::create(arg0); object_to_luaval(tolua_S, "ccui.RelativeBox",(cocos2d::ui::RelativeBox*)ret); @@ -17035,7 +17815,7 @@ int lua_cocos2dx_ui_RelativeBox_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "ccui.RelativeBox:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -17067,7 +17847,7 @@ int lua_cocos2dx_ui_RelativeBox_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"ccui.RelativeBox"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "RelativeBox",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccui.RelativeBox:RelativeBox",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.hpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.hpp index a894093755..10bfa1f16b 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.hpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.hpp @@ -380,6 +380,23 @@ int register_all_cocos2dx_ui(lua_State* tolua_S); + + + + + + + + + + + + + + + + + diff --git a/cocos/scripting/lua-bindings/manual/3d/lua_cocos2dx_3d_manual.cpp b/cocos/scripting/lua-bindings/manual/3d/lua_cocos2dx_3d_manual.cpp new file mode 100644 index 0000000000..2064945f6f --- /dev/null +++ b/cocos/scripting/lua-bindings/manual/3d/lua_cocos2dx_3d_manual.cpp @@ -0,0 +1,38 @@ +/**************************************************************************** + 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 "lua_cocos2dx_3d_manual.h" +#include "lua_cocos2dx_3d_auto.hpp" +#include "CCLuaEngine.h" + +int register_cocos3d_module(lua_State* L) +{ + lua_getglobal(L, "_G"); + if (lua_istable(L,-1))//stack:...,_G, + { + register_all_cocos2dx_3d(L); + } + lua_pop(L, 1); + + return 1; +} diff --git a/cocos/scripting/lua-bindings/manual/3d/lua_cocos2dx_3d_manual.h b/cocos/scripting/lua-bindings/manual/3d/lua_cocos2dx_3d_manual.h new file mode 100644 index 0000000000..abebac4974 --- /dev/null +++ b/cocos/scripting/lua-bindings/manual/3d/lua_cocos2dx_3d_manual.h @@ -0,0 +1,38 @@ +/**************************************************************************** + 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 COCOS_SCRIPTING_LUA_BINDINGS_MANUAL_COCOS3D_LUA_COCOS2DX_3D_MANUAL_H__ +#define COCOS_SCRIPTING_LUA_BINDINGS_MANUAL_COCOS3D_LUA_COCOS2DX_3D_MANUAL_H__ + +#ifdef __cplusplus +extern "C" { +#endif +#include "tolua++.h" +#ifdef __cplusplus +} +#endif + +TOLUA_API int register_cocos3d_module(lua_State* L); + + +#endif // #ifndef COCOS_SCRIPTING_LUA_BINDINGS_MANUAL_3D_LUA_COCOS2DX_COCOSDENSHION_MANUAL_H__ diff --git a/cocos/scripting/lua-bindings/manual/CCLuaEngine.cpp b/cocos/scripting/lua-bindings/manual/CCLuaEngine.cpp index 4f68a472f4..fa83d089cd 100644 --- a/cocos/scripting/lua-bindings/manual/CCLuaEngine.cpp +++ b/cocos/scripting/lua-bindings/manual/CCLuaEngine.cpp @@ -57,9 +57,9 @@ bool LuaEngine::init(void) { _stack = LuaStack::create(); _stack->retain(); - executeScriptFile("DeprecatedEnum.lua"); - executeScriptFile("DeprecatedClass.lua"); - executeScriptFile("Deprecated.lua"); + executeScriptFile("DeprecatedCocos2dClass"); + executeScriptFile("DeprecatedCocos2dEnum"); + executeScriptFile("DeprecatedCocos2dFunc"); return true; } diff --git a/cocos/scripting/lua-bindings/manual/CCLuaEngine.h b/cocos/scripting/lua-bindings/manual/CCLuaEngine.h index f5ebb78dc7..10e4277960 100644 --- a/cocos/scripting/lua-bindings/manual/CCLuaEngine.h +++ b/cocos/scripting/lua-bindings/manual/CCLuaEngine.h @@ -34,7 +34,7 @@ extern "C" { #include "base/CCScriptSupport.h" #include "CCLuaStack.h" #include "CCLuaValue.h" -#include "LuaScriptHandlerMgr.h" +#include "cocos2d/LuaScriptHandlerMgr.h" NS_CC_BEGIN diff --git a/cocos/scripting/lua-bindings/manual/CCLuaStack.cpp b/cocos/scripting/lua-bindings/manual/CCLuaStack.cpp index 144850b298..c1f5def686 100644 --- a/cocos/scripting/lua-bindings/manual/CCLuaStack.cpp +++ b/cocos/scripting/lua-bindings/manual/CCLuaStack.cpp @@ -31,9 +31,6 @@ extern "C" { #include "tolua++.h" #include "lualib.h" #include "lauxlib.h" -#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_WIN32 || CC_TARGET_PLATFORM == CC_PLATFORM_MAC) -#include "lua_extensions.h" -#endif } #include "Cocos2dxLuaLoader.h" @@ -46,37 +43,17 @@ extern "C" { #include "platform/android/CCLuaJavaBridge.h" #endif -#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) -#include "platform/android/CCLuaJavaBridge.h" -#endif - -#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) -#include "Lua_web_socket.h" -#endif - #include "LuaOpengl.h" #include "LuaScriptHandlerMgr.h" #include "lua_cocos2dx_auto.hpp" -#include "lua_cocos2dx_extension_auto.hpp" #include "lua_cocos2dx_manual.hpp" #include "LuaBasicConversions.h" -#include "lua_cocos2dx_extension_manual.h" #include "lua_cocos2dx_deprecated.h" -#include "lua_xml_http_request.h" -#include "lua_cocos2dx_studio_auto.hpp" -#include "lua_cocos2dx_coco_studio_manual.hpp" -#include "lua_cocos2dx_spine_auto.hpp" -#include "lua_cocos2dx_spine_manual.hpp" #include "lua_cocos2dx_physics_auto.hpp" #include "lua_cocos2dx_physics_manual.hpp" -#include "lua_cocos2dx_ui_auto.hpp" -#include "lua_cocos2dx_ui_manual.hpp" #include "lua_cocos2dx_experimental_auto.hpp" #include "lua_cocos2dx_experimental_manual.hpp" -#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) -#include "lua_cocos2dx_experimental_video_auto.hpp" -#include "lua_cocos2dx_experimental_video_manual.hpp" -#endif + namespace { int lua_print(lua_State * luastate) @@ -120,7 +97,49 @@ int lua_print(lua_State * luastate) return 0; } -} // namespace { + +int lua_release_print(lua_State * L) +{ + int nargs = lua_gettop(L); + + std::string t; + for (int i=1; i <= nargs; i++) + { + if (lua_istable(L, i)) + t += "table"; + else if (lua_isnone(L, i)) + t += "none"; + else if (lua_isnil(L, i)) + t += "nil"; + else if (lua_isboolean(L, i)) + { + if (lua_toboolean(L, i) != 0) + t += "true"; + else + t += "false"; + } + else if (lua_isfunction(L, i)) + t += "function"; + else if (lua_islightuserdata(L, i)) + t += "lightuserdata"; + else if (lua_isthread(L, i)) + t += "thread"; + else + { + const char * str = lua_tostring(L, i); + if (str) + t += lua_tostring(L, i); + else + t += lua_typename(L, lua_type(L, i)); + } + if (i!=nargs) + t += "\t"; + } + log("[LUA-print] %s", t.c_str()); + + return 0; +} +} NS_CC_BEGIN @@ -157,26 +176,19 @@ bool LuaStack::init(void) // Register our version of the global "print" function const luaL_reg global_functions [] = { {"print", lua_print}, + {"release_print",lua_release_print}, {NULL, NULL} }; luaL_register(_state, "_G", global_functions); -#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_WIN32 || CC_TARGET_PLATFORM == CC_PLATFORM_MAC) - luaopen_lua_extensions(_state); -#endif + g_luaType.clear(); register_all_cocos2dx(_state); - register_all_cocos2dx_extension(_state); - register_cocos2dx_extension_CCBProxy(_state); tolua_opengl_open(_state); - register_all_cocos2dx_ui(_state); - register_all_cocos2dx_studio(_state); register_all_cocos2dx_manual(_state); register_all_cocos2dx_module_manual(_state); - register_all_cocos2dx_extension_manual(_state); - register_all_cocos2dx_coco_studio_manual(_state); - register_all_cocos2dx_ui_manual(_state); - register_all_cocos2dx_spine(_state); - register_all_cocos2dx_spine_manual(_state); + register_all_cocos2dx_experimental(_state); + register_all_cocos2dx_experimental_manual(_state); + register_glnode_manual(_state); #if CC_USE_PHYSICS register_all_cocos2dx_physics(_state); @@ -186,24 +198,10 @@ bool LuaStack::init(void) #if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_MAC) LuaObjcBridge::luaopen_luaoc(_state); #endif - register_all_cocos2dx_experimental(_state); - register_all_cocos2dx_experimental_manual(_state); - -#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) - register_all_cocos2dx_experimental_video(_state); - register_all_cocos2dx_experimental_video_manual(_state); -#endif #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) LuaJavaBridge::luaopen_luaj(_state); #endif - -#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) - tolua_web_socket_open(_state); - register_web_socket_manual(_state); -#endif - - register_xml_http_request(_state); register_all_cocos2dx_deprecated(_state); register_all_cocos2dx_manual_deprecated(_state); diff --git a/cocos/scripting/lua-bindings/manual/Cocos2dxLuaLoader.cpp b/cocos/scripting/lua-bindings/manual/Cocos2dxLuaLoader.cpp index e11d541626..e9d8d8a9fc 100644 --- a/cocos/scripting/lua-bindings/manual/Cocos2dxLuaLoader.cpp +++ b/cocos/scripting/lua-bindings/manual/Cocos2dxLuaLoader.cpp @@ -77,7 +77,6 @@ extern "C" pos = prefix.find("?.lua"); chunkName = prefix.substr(0, pos) + filename + BYTECODE_FILE_EXT; - chunkName = utils->fullPathForFilename(chunkName.c_str()); if (utils->isFileExist(chunkName)) { chunk = utils->getFileData(chunkName.c_str(), "rb", &chunkSize); @@ -86,7 +85,6 @@ extern "C" else { chunkName = prefix.substr(0, pos) + filename + NOT_BYTECODE_FILE_EXT; - chunkName = utils->fullPathForFilename(chunkName.c_str()); if (utils->isFileExist(chunkName)) { chunk = utils->getFileData(chunkName.c_str(), "rb", &chunkSize); diff --git a/cocos/scripting/lua-bindings/manual/LuaBasicConversions.cpp b/cocos/scripting/lua-bindings/manual/LuaBasicConversions.cpp index 8acf342552..da15b71819 100644 --- a/cocos/scripting/lua-bindings/manual/LuaBasicConversions.cpp +++ b/cocos/scripting/lua-bindings/manual/LuaBasicConversions.cpp @@ -31,7 +31,7 @@ std::unordered_map g_luaType; std::unordered_map g_typeCast; #if COCOS2D_DEBUG >=1 -void luaval_to_native_err(lua_State* L,const char* msg,tolua_Error* err) +void luaval_to_native_err(lua_State* L,const char* msg,tolua_Error* err, const char* funcName) { if (NULL == L || NULL == err || NULL == msg || 0 == strlen(msg)) return; @@ -44,16 +44,16 @@ void luaval_to_native_err(lua_State* L,const char* msg,tolua_Error* err) { int narg = err->index; if (err->array) - CCLOG("%s\n argument #%d is array of '%s'; array of '%s' expected.\n",msg+2,narg,provided,expected); + CCLOG("%s\n %s argument #%d is array of '%s'; array of '%s' expected.\n",msg+2,funcName,narg,provided,expected); else - CCLOG("%s\n argument #%d is '%s'; '%s' expected.\n",msg+2,narg,provided,expected); + CCLOG("%s\n %s argument #%d is '%s'; '%s' expected.\n",msg+2,funcName,narg,provided,expected); } else if (msg[1]=='v') { if (err->array) - CCLOG("%s\n value is array of '%s'; array of '%s' expected.\n",msg+2,provided,expected); + CCLOG("%s\n %s value is array of '%s'; array of '%s' expected.\n",funcName,msg+2,provided,expected); else - CCLOG("%s\n value is '%s'; '%s' expected.\n",msg+2,provided,expected); + CCLOG("%s\n %s value is '%s'; '%s' expected.\n",msg+2,funcName,provided,expected); } } } @@ -78,7 +78,7 @@ bool luaval_is_usertype(lua_State* L,int lo,const char* type, int def) return false; } -bool luaval_to_ushort(lua_State* L, int lo, unsigned short* outValue) +bool luaval_to_ushort(lua_State* L, int lo, unsigned short* outValue, const char* funcName) { if (nullptr == L || nullptr == outValue) return false; @@ -89,7 +89,7 @@ bool luaval_to_ushort(lua_State* L, int lo, unsigned short* outValue) if (!tolua_isnumber(L,lo,0,&tolua_err)) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -103,7 +103,7 @@ bool luaval_to_ushort(lua_State* L, int lo, unsigned short* outValue) } -bool luaval_to_int32(lua_State* L,int lo,int* outValue) +bool luaval_to_int32(lua_State* L,int lo,int* outValue, const char* funcName) { if (NULL == L || NULL == outValue) return false; @@ -114,7 +114,7 @@ bool luaval_to_int32(lua_State* L,int lo,int* outValue) if (!tolua_isnumber(L,lo,0,&tolua_err)) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -127,7 +127,7 @@ bool luaval_to_int32(lua_State* L,int lo,int* outValue) return ok; } -bool luaval_to_uint32(lua_State* L, int lo, unsigned int* outValue) +bool luaval_to_uint32(lua_State* L, int lo, unsigned int* outValue, const char* funcName) { if (NULL == L || NULL == outValue) return false; @@ -138,7 +138,7 @@ bool luaval_to_uint32(lua_State* L, int lo, unsigned int* outValue) if (!tolua_isnumber(L,lo,0,&tolua_err)) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -151,7 +151,7 @@ bool luaval_to_uint32(lua_State* L, int lo, unsigned int* outValue) return ok; } -bool luaval_to_uint16(lua_State* L,int lo,uint16_t* outValue) +bool luaval_to_uint16(lua_State* L,int lo,uint16_t* outValue, const char* funcName) { if (NULL == L || NULL == outValue) return false; @@ -162,7 +162,7 @@ bool luaval_to_uint16(lua_State* L,int lo,uint16_t* outValue) if (!tolua_isnumber(L,lo,0,&tolua_err)) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -175,7 +175,7 @@ bool luaval_to_uint16(lua_State* L,int lo,uint16_t* outValue) return ok; } -bool luaval_to_boolean(lua_State* L,int lo,bool* outValue) +bool luaval_to_boolean(lua_State* L,int lo,bool* outValue, const char* funcName) { if (NULL == L || NULL == outValue) return false; @@ -186,7 +186,7 @@ bool luaval_to_boolean(lua_State* L,int lo,bool* outValue) if (!tolua_isboolean(L,lo,0,&tolua_err)) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -199,7 +199,7 @@ bool luaval_to_boolean(lua_State* L,int lo,bool* outValue) return ok; } -bool luaval_to_number(lua_State* L,int lo,double* outValue) +bool luaval_to_number(lua_State* L,int lo,double* outValue, const char* funcName) { if (NULL == L || NULL == outValue) return false; @@ -210,7 +210,7 @@ bool luaval_to_number(lua_State* L,int lo,double* outValue) if (!tolua_isnumber(L,lo,0,&tolua_err)) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -223,7 +223,7 @@ bool luaval_to_number(lua_State* L,int lo,double* outValue) return ok; } -bool luaval_to_long_long(lua_State* L,int lo,long long* outValue) +bool luaval_to_long_long(lua_State* L,int lo,long long* outValue, const char* funcName) { if (NULL == L || NULL == outValue) return false; @@ -234,7 +234,7 @@ bool luaval_to_long_long(lua_State* L,int lo,long long* outValue) if (!tolua_isnumber(L,lo,0,&tolua_err)) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -247,7 +247,7 @@ bool luaval_to_long_long(lua_State* L,int lo,long long* outValue) return ok; } -bool luaval_to_std_string(lua_State* L, int lo, std::string* outValue) +bool luaval_to_std_string(lua_State* L, int lo, std::string* outValue, const char* funcName) { if (NULL == L || NULL == outValue) return false; @@ -258,7 +258,7 @@ bool luaval_to_std_string(lua_State* L, int lo, std::string* outValue) if (!tolua_iscppstring(L,lo,0,&tolua_err)) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -271,7 +271,7 @@ bool luaval_to_std_string(lua_State* L, int lo, std::string* outValue) return ok; } -bool luaval_to_vec2(lua_State* L,int lo,cocos2d::Vec2* outValue) +bool luaval_to_vec2(lua_State* L,int lo,cocos2d::Vec2* outValue, const char* funcName) { if (nullptr == L || nullptr == outValue) return false; @@ -282,7 +282,7 @@ bool luaval_to_vec2(lua_State* L,int lo,cocos2d::Vec2* outValue) if (!tolua_istable(L, lo, 0, &tolua_err) ) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -303,7 +303,7 @@ bool luaval_to_vec2(lua_State* L,int lo,cocos2d::Vec2* outValue) return ok; } -bool luaval_to_vec3(lua_State* L,int lo,cocos2d::Vec3* outValue) +bool luaval_to_vec3(lua_State* L,int lo,cocos2d::Vec3* outValue, const char* funcName) { if (nullptr == L || nullptr == outValue) return false; @@ -314,7 +314,7 @@ bool luaval_to_vec3(lua_State* L,int lo,cocos2d::Vec3* outValue) if (!tolua_istable(L, lo, 0, &tolua_err) ) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -340,7 +340,7 @@ bool luaval_to_vec3(lua_State* L,int lo,cocos2d::Vec3* outValue) return ok; } -bool luaval_to_vec4(lua_State* L,int lo,cocos2d::Vec4* outValue) +bool luaval_to_vec4(lua_State* L,int lo,cocos2d::Vec4* outValue, const char* funcName) { if (nullptr == L || nullptr == outValue) return false; @@ -351,7 +351,7 @@ bool luaval_to_vec4(lua_State* L,int lo,cocos2d::Vec4* outValue) if (!tolua_istable(L, lo, 0, &tolua_err) ) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -382,7 +382,7 @@ bool luaval_to_vec4(lua_State* L,int lo,cocos2d::Vec4* outValue) return ok; } -bool luaval_to_blendfunc(lua_State* L, int lo, cocos2d::BlendFunc* outValue) +bool luaval_to_blendfunc(lua_State* L, int lo, cocos2d::BlendFunc* outValue, const char* funcName) { if (nullptr == L || nullptr == outValue) return false; @@ -393,7 +393,7 @@ bool luaval_to_blendfunc(lua_State* L, int lo, cocos2d::BlendFunc* outValue) if (!tolua_istable(L, lo, 0, &tolua_err) ) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -414,7 +414,7 @@ bool luaval_to_blendfunc(lua_State* L, int lo, cocos2d::BlendFunc* outValue) return ok; } -bool luaval_to_physics_material(lua_State* L,int lo,PhysicsMaterial* outValue) +bool luaval_to_physics_material(lua_State* L,int lo,PhysicsMaterial* outValue, const char* funcName) { if (NULL == L || NULL == outValue) return false; @@ -425,7 +425,7 @@ bool luaval_to_physics_material(lua_State* L,int lo,PhysicsMaterial* outValue) if (!tolua_istable(L, lo, 0, &tolua_err) ) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -451,12 +451,12 @@ bool luaval_to_physics_material(lua_State* L,int lo,PhysicsMaterial* outValue) return ok; } -bool luaval_to_ssize(lua_State* L,int lo, ssize_t* outValue) +bool luaval_to_ssize(lua_State* L,int lo, ssize_t* outValue, const char* funcName) { return luaval_to_long(L, lo, reinterpret_cast(outValue)); } -bool luaval_to_long(lua_State* L,int lo, long* outValue) +bool luaval_to_long(lua_State* L,int lo, long* outValue, const char* funcName) { if (NULL == L || NULL == outValue) return false; @@ -467,7 +467,7 @@ bool luaval_to_long(lua_State* L,int lo, long* outValue) if (!tolua_isnumber(L,lo,0,&tolua_err)) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -480,7 +480,7 @@ bool luaval_to_long(lua_State* L,int lo, long* outValue) return ok; } -bool luaval_to_ulong(lua_State* L,int lo, unsigned long* outValue) +bool luaval_to_ulong(lua_State* L,int lo, unsigned long* outValue, const char* funcName) { if (NULL == L || NULL == outValue) return false; @@ -491,7 +491,7 @@ bool luaval_to_ulong(lua_State* L,int lo, unsigned long* outValue) if (!tolua_isnumber(L,lo,0,&tolua_err)) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -504,7 +504,7 @@ bool luaval_to_ulong(lua_State* L,int lo, unsigned long* outValue) return ok; } -bool luaval_to_size(lua_State* L,int lo,Size* outValue) +bool luaval_to_size(lua_State* L,int lo,Size* outValue, const char* funcName) { if (NULL == L || NULL == outValue) return false; @@ -515,7 +515,7 @@ bool luaval_to_size(lua_State* L,int lo,Size* outValue) if (!tolua_istable(L, lo, 0, &tolua_err) ) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -536,7 +536,7 @@ bool luaval_to_size(lua_State* L,int lo,Size* outValue) return ok; } -bool luaval_to_rect(lua_State* L,int lo,Rect* outValue) +bool luaval_to_rect(lua_State* L,int lo,Rect* outValue, const char* funcName) { if (NULL == L || NULL == outValue) return false; @@ -547,7 +547,7 @@ bool luaval_to_rect(lua_State* L,int lo,Rect* outValue) if (!tolua_istable(L, lo, 0, &tolua_err) ) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -578,7 +578,7 @@ bool luaval_to_rect(lua_State* L,int lo,Rect* outValue) return ok; } -bool luaval_to_color4b(lua_State* L,int lo,Color4B* outValue) +bool luaval_to_color4b(lua_State* L,int lo,Color4B* outValue, const char* funcName) { if (NULL == L || NULL == outValue) return false; @@ -589,7 +589,7 @@ bool luaval_to_color4b(lua_State* L,int lo,Color4B* outValue) if (!tolua_istable(L, lo, 0, &tolua_err) ) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -620,7 +620,7 @@ bool luaval_to_color4b(lua_State* L,int lo,Color4B* outValue) return ok; } -bool luaval_to_color4f(lua_State* L,int lo,Color4F* outValue) +bool luaval_to_color4f(lua_State* L,int lo,Color4F* outValue, const char* funcName) { if (NULL == L || NULL == outValue) return false; @@ -631,7 +631,7 @@ bool luaval_to_color4f(lua_State* L,int lo,Color4F* outValue) if (!tolua_istable(L, lo, 0, &tolua_err) ) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -662,7 +662,7 @@ bool luaval_to_color4f(lua_State* L,int lo,Color4F* outValue) return ok; } -bool luaval_to_color3b(lua_State* L,int lo,Color3B* outValue) +bool luaval_to_color3b(lua_State* L,int lo,Color3B* outValue, const char* funcName) { if (NULL == L || NULL == outValue) return false; @@ -673,7 +673,7 @@ bool luaval_to_color3b(lua_State* L,int lo,Color3B* outValue) if (!tolua_istable(L, lo, 0, &tolua_err) ) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -699,7 +699,7 @@ bool luaval_to_color3b(lua_State* L,int lo,Color3B* outValue) return ok; } -bool luaval_to_affinetransform(lua_State* L,int lo, AffineTransform* outValue) +bool luaval_to_affinetransform(lua_State* L,int lo, AffineTransform* outValue, const char* funcName) { if (NULL == L || NULL == outValue) return false; @@ -710,7 +710,7 @@ bool luaval_to_affinetransform(lua_State* L,int lo, AffineTransform* outValue) if (!tolua_istable(L, lo, 0, &tolua_err) ) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -750,7 +750,7 @@ bool luaval_to_affinetransform(lua_State* L,int lo, AffineTransform* outValue) return ok; } -bool luaval_to_fontdefinition(lua_State* L, int lo, FontDefinition* outValue ) +bool luaval_to_fontdefinition(lua_State* L, int lo, FontDefinition* outValue , const char* funcName) { if (NULL == L || NULL == outValue) return false; @@ -761,7 +761,7 @@ bool luaval_to_fontdefinition(lua_State* L, int lo, FontDefinition* outValue ) if (!tolua_istable(L, lo, 0, &tolua_err) ) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); ok = false; #endif } @@ -891,7 +891,7 @@ bool luaval_to_fontdefinition(lua_State* L, int lo, FontDefinition* outValue ) return ok; } -bool luaval_to_ttfconfig(lua_State* L,int lo, cocos2d::TTFConfig* outValue) +bool luaval_to_ttfconfig(lua_State* L,int lo, cocos2d::TTFConfig* outValue, const char* funcName) { if (nullptr == L || nullptr == outValue) return false; @@ -902,7 +902,7 @@ bool luaval_to_ttfconfig(lua_State* L,int lo, cocos2d::TTFConfig* outValue) if (!tolua_istable(L, lo, 0, &tolua_err) ) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -946,7 +946,7 @@ bool luaval_to_ttfconfig(lua_State* L,int lo, cocos2d::TTFConfig* outValue) } -bool luaval_to_uniform(lua_State* L, int lo, cocos2d::Uniform* outValue) +bool luaval_to_uniform(lua_State* L, int lo, cocos2d::Uniform* outValue, const char* funcName) { if (nullptr == L || nullptr == outValue) return false; @@ -957,7 +957,7 @@ bool luaval_to_uniform(lua_State* L, int lo, cocos2d::Uniform* outValue) if (!tolua_istable(L, lo, 0, &tolua_err) ) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -990,7 +990,7 @@ bool luaval_to_uniform(lua_State* L, int lo, cocos2d::Uniform* outValue) return false; } -bool luaval_to_vertexattrib(lua_State* L, int lo, cocos2d::VertexAttrib* outValue) +bool luaval_to_vertexattrib(lua_State* L, int lo, cocos2d::VertexAttrib* outValue, const char* funcName) { if (nullptr == L || nullptr == outValue) return false; @@ -1001,7 +1001,7 @@ bool luaval_to_vertexattrib(lua_State* L, int lo, cocos2d::VertexAttrib* outValu if (!tolua_istable(L, lo, 0, &tolua_err) ) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -1034,7 +1034,7 @@ bool luaval_to_vertexattrib(lua_State* L, int lo, cocos2d::VertexAttrib* outValu return false; } -bool luaval_to_mat4(lua_State* L, int lo, cocos2d::Mat4* outValue ) +bool luaval_to_mat4(lua_State* L, int lo, cocos2d::Mat4* outValue , const char* funcName) { if (nullptr == L || nullptr == outValue) return false; @@ -1045,7 +1045,7 @@ bool luaval_to_mat4(lua_State* L, int lo, cocos2d::Mat4* outValue ) if (!tolua_istable(L, lo, 0, &tolua_err) ) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); ok = false; #endif } @@ -1072,7 +1072,7 @@ bool luaval_to_mat4(lua_State* L, int lo, cocos2d::Mat4* outValue ) return ok; } -bool luaval_to_array(lua_State* L,int lo, __Array** outValue) +bool luaval_to_array(lua_State* L,int lo, __Array** outValue, const char* funcName) { if (NULL == L || NULL == outValue) return false; @@ -1083,7 +1083,7 @@ bool luaval_to_array(lua_State* L,int lo, __Array** outValue) if (!tolua_istable(L, lo, 0, &tolua_err) ) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -1172,7 +1172,7 @@ bool luaval_to_array(lua_State* L,int lo, __Array** outValue) return ok; } -bool luaval_to_dictionary(lua_State* L,int lo, __Dictionary** outValue) +bool luaval_to_dictionary(lua_State* L,int lo, __Dictionary** outValue, const char* funcName) { if (NULL == L || NULL == outValue) return false; @@ -1183,7 +1183,7 @@ bool luaval_to_dictionary(lua_State* L,int lo, __Dictionary** outValue) if (!tolua_istable(L, lo, 0, &tolua_err) ) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -1276,7 +1276,7 @@ bool luaval_to_dictionary(lua_State* L,int lo, __Dictionary** outValue) return ok; } -bool luaval_to_array_of_vec2(lua_State* L,int lo,cocos2d::Vec2 **points, int *numPoints) +bool luaval_to_array_of_vec2(lua_State* L,int lo,cocos2d::Vec2 **points, int *numPoints, const char* funcName) { if (NULL == L) return false; @@ -1288,7 +1288,7 @@ bool luaval_to_array_of_vec2(lua_State* L,int lo,cocos2d::Vec2 **points, int *nu if (!tolua_istable(L, lo, 0, &tolua_err) ) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -1308,7 +1308,7 @@ bool luaval_to_array_of_vec2(lua_State* L,int lo,cocos2d::Vec2 **points, int *nu if (!tolua_istable(L,-1, 0, &tolua_err)) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif lua_pop(L, 1); CC_SAFE_DELETE_ARRAY(array); @@ -1436,7 +1436,7 @@ bool luavals_variadic_to_ccvaluevector(lua_State* L, int argc, cocos2d::ValueVec return true; } -bool luaval_to_ccvalue(lua_State* L, int lo, cocos2d::Value* ret) +bool luaval_to_ccvalue(lua_State* L, int lo, cocos2d::Value* ret, const char* funcName) { if ( nullptr == L || nullptr == ret) return false; @@ -1492,7 +1492,7 @@ bool luaval_to_ccvalue(lua_State* L, int lo, cocos2d::Value* ret) return ok; } -bool luaval_to_ccvaluemap(lua_State* L, int lo, cocos2d::ValueMap* ret) +bool luaval_to_ccvaluemap(lua_State* L, int lo, cocos2d::ValueMap* ret, const char* funcName) { if ( nullptr == L || nullptr == ret) return false; @@ -1502,7 +1502,7 @@ bool luaval_to_ccvaluemap(lua_State* L, int lo, cocos2d::ValueMap* ret) if (!tolua_istable(L, lo, 0, &tolua_err)) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -1579,7 +1579,7 @@ bool luaval_to_ccvaluemap(lua_State* L, int lo, cocos2d::ValueMap* ret) return ok; } -bool luaval_to_ccvaluemapintkey(lua_State* L, int lo, cocos2d::ValueMapIntKey* ret) +bool luaval_to_ccvaluemapintkey(lua_State* L, int lo, cocos2d::ValueMapIntKey* ret, const char* funcName) { if (nullptr == L || nullptr == ret) return false; @@ -1589,7 +1589,7 @@ bool luaval_to_ccvaluemapintkey(lua_State* L, int lo, cocos2d::ValueMapIntKey* r if (!tolua_istable(L, lo, 0, &tolua_err)) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -1667,7 +1667,7 @@ bool luaval_to_ccvaluemapintkey(lua_State* L, int lo, cocos2d::ValueMapIntKey* r return ok; } -bool luaval_to_ccvaluevector(lua_State* L, int lo, cocos2d::ValueVector* ret) +bool luaval_to_ccvaluevector(lua_State* L, int lo, cocos2d::ValueVector* ret, const char* funcName) { if (nullptr == L || nullptr == ret) return false; @@ -1677,7 +1677,7 @@ bool luaval_to_ccvaluevector(lua_State* L, int lo, cocos2d::ValueVector* ret) if (!tolua_istable(L, lo, 0, &tolua_err)) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -1749,7 +1749,7 @@ bool luaval_to_ccvaluevector(lua_State* L, int lo, cocos2d::ValueVector* ret) return ok; } -bool luaval_to_std_vector_string(lua_State* L, int lo, std::vector* ret) +bool luaval_to_std_vector_string(lua_State* L, int lo, std::vector* ret, const char* funcName) { if (nullptr == L || nullptr == ret || lua_gettop(L) < lo) return false; @@ -1759,7 +1759,7 @@ bool luaval_to_std_vector_string(lua_State* L, int lo, std::vector* if (!tolua_istable(L, lo, 0, &tolua_err)) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -1790,7 +1790,7 @@ bool luaval_to_std_vector_string(lua_State* L, int lo, std::vector* return ok; } -bool luaval_to_std_vector_int(lua_State* L, int lo, std::vector* ret) +bool luaval_to_std_vector_int(lua_State* L, int lo, std::vector* ret, const char* funcName) { if (nullptr == L || nullptr == ret || lua_gettop(L) < lo) return false; @@ -1800,7 +1800,7 @@ bool luaval_to_std_vector_int(lua_State* L, int lo, std::vector* ret) if (!tolua_istable(L, lo, 0, &tolua_err)) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -1828,7 +1828,7 @@ bool luaval_to_std_vector_int(lua_State* L, int lo, std::vector* ret) return ok; } -bool luaval_to_mesh_vertex_attrib(lua_State* L, int lo, cocos2d::MeshVertexAttrib* ret) +bool luaval_to_mesh_vertex_attrib(lua_State* L, int lo, cocos2d::MeshVertexAttrib* ret, const char* funcName) { if (nullptr == L || nullptr == ret || lua_gettop(L) < lo) return false; @@ -1839,7 +1839,7 @@ bool luaval_to_mesh_vertex_attrib(lua_State* L, int lo, cocos2d::MeshVertexAttri if (!tolua_istable(L, lo, 0, &tolua_err)) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -1872,7 +1872,7 @@ bool luaval_to_mesh_vertex_attrib(lua_State* L, int lo, cocos2d::MeshVertexAttri } -bool luaval_to_std_vector_float(lua_State* L, int lo, std::vector* ret) +bool luaval_to_std_vector_float(lua_State* L, int lo, std::vector* ret, const char* funcName) { if (nullptr == L || nullptr == ret || lua_gettop(L) < lo) return false; @@ -1883,7 +1883,7 @@ bool luaval_to_std_vector_float(lua_State* L, int lo, std::vector* ret) if (!tolua_istable(L, lo, 0, &tolua_err)) { #if COCOS2D_DEBUG >=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } @@ -1912,7 +1912,7 @@ bool luaval_to_std_vector_float(lua_State* L, int lo, std::vector* ret) } -bool luaval_to_std_vector_ushort(lua_State* L, int lo, std::vector* ret) +bool luaval_to_std_vector_ushort(lua_State* L, int lo, std::vector* ret, const char* funcName) { if (nullptr == L || nullptr == ret || lua_gettop(L) < lo) return false; @@ -1923,7 +1923,7 @@ bool luaval_to_std_vector_ushort(lua_State* L, int lo, std::vector=1 - luaval_to_native_err(L,"#ferror:",&tolua_err); + luaval_to_native_err(L,"#ferror:",&tolua_err,funcName); #endif ok = false; } diff --git a/cocos/scripting/lua-bindings/manual/LuaBasicConversions.h b/cocos/scripting/lua-bindings/manual/LuaBasicConversions.h index f332afb076..2d07f4a2f2 100644 --- a/cocos/scripting/lua-bindings/manual/LuaBasicConversions.h +++ b/cocos/scripting/lua-bindings/manual/LuaBasicConversions.h @@ -30,6 +30,7 @@ extern "C" { } #include "tolua_fix.h" #include "cocos2d.h" +#include "3d/cocos3d.h" using namespace cocos2d; @@ -37,7 +38,7 @@ extern std::unordered_map g_luaType; extern std::unordered_map g_typeCast; #if COCOS2D_DEBUG >=1 -void luaval_to_native_err(lua_State* L,const char* msg,tolua_Error* err); +void luaval_to_native_err(lua_State* L,const char* msg,tolua_Error* err, const char* funcName = ""); #endif #define LUA_PRECONDITION( condition, ...) if( ! (condition) ) { \ @@ -47,48 +48,49 @@ cocos2d::log(__VA_ARGS__); \ extern bool luaval_is_usertype(lua_State* L,int lo,const char* type, int def); // to native -extern bool luaval_to_ushort(lua_State* L, int lo, unsigned short* outValue); -extern bool luaval_to_int32(lua_State* L,int lo,int* outValue); -extern bool luaval_to_uint32(lua_State* L, int lo, unsigned int* outValue); -extern bool luaval_to_uint16(lua_State* L,int lo,uint16_t* outValue); -extern bool luaval_to_boolean(lua_State* L,int lo,bool* outValue); -extern bool luaval_to_number(lua_State* L,int lo,double* outValue); -extern bool luaval_to_long_long(lua_State* L,int lo,long long* outValue); -extern bool luaval_to_std_string(lua_State* L, int lo, std::string* outValue); -extern bool luaval_to_long(lua_State* L,int lo, long* outValue); -extern bool luaval_to_ssize(lua_State* L,int lo, ssize_t* outValue); -extern bool luaval_to_size(lua_State* L,int lo,Size* outValue); -extern bool luaval_to_rect(lua_State* L,int lo,Rect* outValue); -extern bool luaval_to_color3b(lua_State* L,int lo,Color3B* outValue); -extern bool luaval_to_color4b(lua_State* L,int lo,Color4B* outValue); -extern bool luaval_to_color4f(lua_State* L,int lo,Color4F* outValue); -extern bool luaval_to_physics_material(lua_State* L,int lo, cocos2d::PhysicsMaterial* outValue); -extern bool luaval_to_affinetransform(lua_State* L,int lo, AffineTransform* outValue); -extern bool luaval_to_fontdefinition(lua_State* L, int lo, FontDefinition* outValue ); -extern bool luaval_to_mat4(lua_State* L, int lo, cocos2d::Mat4* outValue ); -extern bool luaval_to_array(lua_State* L,int lo, __Array** outValue); -extern bool luaval_to_dictionary(lua_State* L,int lo, __Dictionary** outValue); -extern bool luaval_to_array_of_vec2(lua_State* L,int lo,cocos2d::Vec2 **points, int *numPoints); +extern bool luaval_to_ulong(lua_State* L,int lo, unsigned long* outValue, const char* funcName=""); +extern bool luaval_to_ushort(lua_State* L, int lo, unsigned short* outValue, const char* funcName = ""); +extern bool luaval_to_int32(lua_State* L,int lo,int* outValue, const char* funcName = ""); +extern bool luaval_to_uint32(lua_State* L, int lo, unsigned int* outValue, const char* funcName = ""); +extern bool luaval_to_uint16(lua_State* L,int lo,uint16_t* outValue, const char* funcName = ""); +extern bool luaval_to_boolean(lua_State* L,int lo,bool* outValue, const char* funcName = ""); +extern bool luaval_to_number(lua_State* L,int lo,double* outValue, const char* funcName = ""); +extern bool luaval_to_long_long(lua_State* L,int lo,long long* outValue, const char* funcName = ""); +extern bool luaval_to_std_string(lua_State* L, int lo, std::string* outValue, const char* funcName = ""); +extern bool luaval_to_long(lua_State* L,int lo, long* outValue, const char* funcName = ""); +extern bool luaval_to_ssize(lua_State* L,int lo, ssize_t* outValue, const char* funcName = ""); +extern bool luaval_to_size(lua_State* L,int lo,Size* outValue, const char* funcName = ""); +extern bool luaval_to_rect(lua_State* L,int lo,Rect* outValue, const char* funcName = ""); +extern bool luaval_to_color3b(lua_State* L,int lo,Color3B* outValue, const char* funcName = ""); +extern bool luaval_to_color4b(lua_State* L,int lo,Color4B* outValue, const char* funcName = ""); +extern bool luaval_to_color4f(lua_State* L,int lo,Color4F* outValue, const char* funcName = ""); +extern bool luaval_to_physics_material(lua_State* L,int lo, cocos2d::PhysicsMaterial* outValue, const char* funcName = ""); +extern bool luaval_to_affinetransform(lua_State* L,int lo, AffineTransform* outValue, const char* funcName = ""); +extern bool luaval_to_fontdefinition(lua_State* L, int lo, FontDefinition* outValue , const char* funcName = ""); +extern bool luaval_to_mat4(lua_State* L, int lo, cocos2d::Mat4* outValue , const char* funcName = ""); +extern bool luaval_to_array(lua_State* L,int lo, __Array** outValue, const char* funcName = ""); +extern bool luaval_to_dictionary(lua_State* L,int lo, __Dictionary** outValue, const char* funcName = ""); +extern bool luaval_to_array_of_vec2(lua_State* L,int lo,cocos2d::Vec2 **points, int *numPoints, const char* funcName = ""); extern bool luavals_variadic_to_array(lua_State* L,int argc, __Array** ret); extern bool luavals_variadic_to_ccvaluevector(lua_State* L, int argc, cocos2d::ValueVector* ret); -extern bool luaval_to_vec2(lua_State* L,int lo,cocos2d::Vec2* outValue); -extern bool luaval_to_vec3(lua_State* L,int lo,cocos2d::Vec3* outValue); -extern bool luaval_to_vec4(lua_State* L,int lo,cocos2d::Vec4* outValue); -extern bool luaval_to_blendfunc(lua_State* L, int lo, cocos2d::BlendFunc* outValue); -extern bool luaval_to_ttfconfig(lua_State* L, int lo, cocos2d::TTFConfig* outValue); -extern bool luaval_to_uniform(lua_State* L, int lo, cocos2d::Uniform* outValue); -extern bool luaval_to_vertexattrib(lua_State* L, int lo, cocos2d::VertexAttrib* outValue); +extern bool luaval_to_vec2(lua_State* L,int lo,cocos2d::Vec2* outValue, const char* funcName = ""); +extern bool luaval_to_vec3(lua_State* L,int lo,cocos2d::Vec3* outValue, const char* funcName = ""); +extern bool luaval_to_vec4(lua_State* L,int lo,cocos2d::Vec4* outValue, const char* funcName = ""); +extern bool luaval_to_blendfunc(lua_State* L, int lo, cocos2d::BlendFunc* outValue, const char* funcName = ""); +extern bool luaval_to_ttfconfig(lua_State* L, int lo, cocos2d::TTFConfig* outValue, const char* funcName = ""); +extern bool luaval_to_uniform(lua_State* L, int lo, cocos2d::Uniform* outValue, const char* funcName = ""); +extern bool luaval_to_vertexattrib(lua_State* L, int lo, cocos2d::VertexAttrib* outValue, const char* funcName = ""); -static inline bool luaval_to_point(lua_State* L,int lo,cocos2d::Vec2* outValue) +static inline bool luaval_to_point(lua_State* L,int lo,cocos2d::Vec2* outValue, const char* funcName = "") { return luaval_to_vec2(L, lo, outValue); } -CC_DEPRECATED_ATTRIBUTE static inline bool luaval_to_kmMat4(lua_State* L, int lo, cocos2d::Mat4* outValue ) +CC_DEPRECATED_ATTRIBUTE static inline bool luaval_to_kmMat4(lua_State* L, int lo, cocos2d::Mat4* outValue , const char* funcName = "") { return luaval_to_mat4(L, lo, outValue); } -CC_DEPRECATED_ATTRIBUTE static inline bool luaval_to_array_of_Point(lua_State* L,int lo,cocos2d::Vec2 **points, int *numPoints) +CC_DEPRECATED_ATTRIBUTE static inline bool luaval_to_array_of_Point(lua_State* L,int lo,cocos2d::Vec2 **points, int *numPoints, const char* funcName = "") { return luaval_to_array_of_vec2(L, lo, points, numPoints); } @@ -122,7 +124,7 @@ bool luavals_variadic_to_ccvector( lua_State* L, int argc, cocos2d::Vector* r } template -bool luaval_to_ccvector(lua_State* L, int lo , cocos2d::Vector* ret) +bool luaval_to_ccvector(lua_State* L, int lo , cocos2d::Vector* ret, const char* funcName = "") { if (nullptr == L || nullptr == ret) return false; @@ -159,11 +161,11 @@ bool luaval_to_ccvector(lua_State* L, int lo , cocos2d::Vector* ret) return ok; } -bool luaval_to_std_vector_string(lua_State* L, int lo, std::vector* ret); -bool luaval_to_std_vector_int(lua_State* L, int lo, std::vector* ret); +bool luaval_to_std_vector_string(lua_State* L, int lo, std::vector* ret, const char* funcName = ""); +bool luaval_to_std_vector_int(lua_State* L, int lo, std::vector* ret, const char* funcName = ""); template -bool luaval_to_ccmap_string_key(lua_State* L, int lo, cocos2d::Map* ret) +bool luaval_to_ccmap_string_key(lua_State* L, int lo, cocos2d::Map* ret, const char* funcName = "") { if(nullptr == L || nullptr == ret || lua_gettop(L) < lo) return false; @@ -209,10 +211,10 @@ bool luaval_to_ccmap_string_key(lua_State* L, int lo, cocos2d::Map bool luaval_to_object(lua_State* L, int lo, const char* type, T** ret) @@ -231,9 +233,9 @@ bool luaval_to_object(lua_State* L, int lo, const char* type, T** ret) return true; } -extern bool luaval_to_mesh_vertex_attrib(lua_State* L, int lo, cocos2d::MeshVertexAttrib* ret); -extern bool luaval_to_std_vector_float(lua_State* L, int lo, std::vector* ret); -extern bool luaval_to_std_vector_ushort(lua_State* L, int lo, std::vector* ret); +extern bool luaval_to_mesh_vertex_attrib(lua_State* L, int lo, cocos2d::MeshVertexAttrib* ret, const char* funcName = ""); +extern bool luaval_to_std_vector_float(lua_State* L, int lo, std::vector* ret, const char* funcName = ""); +extern bool luaval_to_std_vector_ushort(lua_State* L, int lo, std::vector* ret, const char* funcName = ""); // from native extern void vec2_to_luaval(lua_State* L,const cocos2d::Vec2& vec2); @@ -318,7 +320,7 @@ void ccmap_string_key_to_luaval(lua_State* L, const cocos2d::Map auto typeIter = g_luaType.find(name); if (g_luaType.end() != typeIter) { - lua_pushstring(L, name.c_str()); + lua_pushstring(L, key.c_str()); int ID = (obj) ? (int)obj->_ID : -1; int* luaID = (obj) ? &obj->_luaID : NULL; toluafix_pushusertype_ccobject(L, ID, luaID, (void*)obj,typeIter->second.c_str()); @@ -361,11 +363,10 @@ void object_to_luaval(lua_State* L,const char* type, T* ret) { if(nullptr != ret) { - - cocos2d::Ref* dynObject = dynamic_cast(ret); - - if (nullptr != dynObject) + if (std::is_base_of::value) { + // use c style cast, T may not polymorphic + cocos2d::Ref* dynObject = (cocos2d::Ref*)(ret); int ID = (int)(dynObject->_ID) ; int* luaID = &(dynObject->_luaID); toluafix_pushusertype_ccobject(L,ID, luaID, (void*)ret,type); diff --git a/cocos/scripting/lua-bindings/manual/LuaOpengl.cpp b/cocos/scripting/lua-bindings/manual/cocos2d/LuaOpengl.cpp similarity index 98% rename from cocos/scripting/lua-bindings/manual/LuaOpengl.cpp rename to cocos/scripting/lua-bindings/manual/cocos2d/LuaOpengl.cpp index 8d7e5c100b..a1bf353acc 100644 --- a/cocos/scripting/lua-bindings/manual/LuaOpengl.cpp +++ b/cocos/scripting/lua-bindings/manual/cocos2d/LuaOpengl.cpp @@ -4429,7 +4429,7 @@ static int tolua_cocos2d_DrawPrimitives_drawPoint00(lua_State* tolua_S) #endif { cocos2d::Vec2 vec2; - if(luaval_to_vec2(tolua_S, 1, &vec2)) + if(luaval_to_vec2(tolua_S, 1, &vec2, "cc.DrawPrimitives.drawPoint")) { DrawPrimitives::drawPoint(vec2); } @@ -4476,7 +4476,7 @@ static int tolua_cocos2d_DrawPrimitives_drawPoints00(lua_State* tolua_S) goto tolua_lerror; } - if(!luaval_to_vec2(tolua_S, lua_gettop(tolua_S), &points[i])) + if(!luaval_to_vec2(tolua_S, lua_gettop(tolua_S), &points[i], "cc.DrawPrimitives.drawPoints")) { lua_pop(tolua_S, 1); CC_SAFE_DELETE_ARRAY(points); @@ -4512,11 +4512,11 @@ static int tolua_cocos2d_DrawPrimitives_drawLine00(lua_State* tolua_S) #endif { cocos2d::Vec2 origin; - if (!luaval_to_vec2(tolua_S, 1, &origin)) + if (!luaval_to_vec2(tolua_S, 1, &origin, "cc.DrawPrimitives.drawLine")) return 0; cocos2d::Vec2 destination; - if (!luaval_to_vec2(tolua_S, 2, &destination)) + if (!luaval_to_vec2(tolua_S, 2, &destination, "cc.DrawPrimitives.drawLine")) return 0; DrawPrimitives::drawLine(origin,destination); @@ -4545,11 +4545,11 @@ static int tolua_cocos2d_DrawPrimitives_drawRect00(lua_State* tolua_S) #endif { cocos2d::Vec2 origin; - if (!luaval_to_vec2(tolua_S, 1, &origin)) + if (!luaval_to_vec2(tolua_S, 1, &origin, "cc.DrawPrimitives.drawRect")) return 0; cocos2d::Vec2 destination; - if (!luaval_to_vec2(tolua_S, 2, &destination)) + if (!luaval_to_vec2(tolua_S, 2, &destination, "cc.DrawPrimitives.drawRect")) return 0; DrawPrimitives::drawRect(origin,destination); @@ -4580,15 +4580,15 @@ static int tolua_cocos2d_DrawPrimitives_drawSolidRect00(lua_State* tolua_S) #endif { cocos2d::Vec2 origin; - if (!luaval_to_vec2(tolua_S, 1, &origin)) + if (!luaval_to_vec2(tolua_S, 1, &origin, "cc.DrawPrimitives.drawSolidRect")) return 0; cocos2d::Vec2 destination; - if (!luaval_to_vec2(tolua_S, 2, &destination)) + if (!luaval_to_vec2(tolua_S, 2, &destination, "cc.DrawPrimitives.drawSolidRect")) return 0; Color4F color; - if (!luaval_to_color4f(tolua_S, 3, &color)) + if (!luaval_to_color4f(tolua_S, 3, &color, "cc.DrawPrimitives.drawSolidRect")) return 0; @@ -4638,7 +4638,7 @@ static int tolua_cocos2d_DrawPrimitives_drawPoly00(lua_State* tolua_S) goto tolua_lerror; } - if(!luaval_to_vec2(tolua_S, lua_gettop(tolua_S), &points[i])) + if(!luaval_to_vec2(tolua_S, lua_gettop(tolua_S), &points[i], "cc.DrawPrimitives.drawPoly")) { lua_pop(tolua_S, 1); CC_SAFE_DELETE_ARRAY(points); @@ -4692,7 +4692,7 @@ static int tolua_cocos2d_DrawPrimitives_drawSolidPoly00(lua_State* tolua_S) goto tolua_lerror; } - if(!luaval_to_vec2(tolua_S, lua_gettop(tolua_S), &points[i])) + if(!luaval_to_vec2(tolua_S, lua_gettop(tolua_S), &points[i], "cc.DrawPrimitives.drawSolidPoly")) { lua_pop(tolua_S, 1); CC_SAFE_DELETE_ARRAY(points); @@ -4702,7 +4702,7 @@ static int tolua_cocos2d_DrawPrimitives_drawSolidPoly00(lua_State* tolua_S) } Color4F color; - if (!luaval_to_color4f(tolua_S, 3, &color)) + if (!luaval_to_color4f(tolua_S, 3, &color, "cc.DrawPrimitives.drawSolidPoly")) { CC_SAFE_DELETE_ARRAY(points); return 0; @@ -4742,7 +4742,7 @@ static int tolua_cocos2d_DrawPrimitives_drawCircle00(lua_State* tolua_S) #endif { cocos2d::Vec2 center; - if (!luaval_to_vec2(tolua_S, 1, ¢er)) + if (!luaval_to_vec2(tolua_S, 1, ¢er, "cc.DrawPrimitives.drawCircle")) return 0; float radius = ((float) tolua_tonumber(tolua_S,2,0)); @@ -4783,7 +4783,7 @@ static int tolua_cocos2d_DrawPrimitives_drawSolidCircle00(lua_State* tolua_S) #endif { cocos2d::Vec2 center; - if (!luaval_to_vec2(tolua_S, 1, ¢er)) + if (!luaval_to_vec2(tolua_S, 1, ¢er, "cc.DrawPrimitives.drawSolidCircle")) return 0; float radius = ((float) tolua_tonumber(tolua_S,2,0)); float angle = ((float) tolua_tonumber(tolua_S,3,0)); @@ -4820,15 +4820,15 @@ static int tolua_cocos2d_DrawPrimitives_drawQuadBezier00(lua_State* tolua_S) #endif { cocos2d::Vec2 origin; - if (!luaval_to_vec2(tolua_S, 1, &origin)) + if (!luaval_to_vec2(tolua_S, 1, &origin, "cc.DrawPrimitives.drawQuadBezier")) return 0; cocos2d::Vec2 control; - if (!luaval_to_vec2(tolua_S, 2, &control)) + if (!luaval_to_vec2(tolua_S, 2, &control, "cc.DrawPrimitives.drawQuadBezier")) return 0; cocos2d::Vec2 destination; - if (!luaval_to_vec2(tolua_S, 3, &destination)) + if (!luaval_to_vec2(tolua_S, 3, &destination, "cc.DrawPrimitives.drawQuadBezier")) return 0; unsigned int segments = ((unsigned int) tolua_tonumber(tolua_S,4,0)); @@ -4863,19 +4863,19 @@ static int tolua_cocos2d_DrawPrimitives_drawCubicBezier00(lua_State* tolua_S) { cocos2d::Vec2 origin; - if (!luaval_to_vec2(tolua_S, 1, &origin)) + if (!luaval_to_vec2(tolua_S, 1, &origin, "cc.DrawPrimitives.drawCubicBezier")) return 0; cocos2d::Vec2 control1; - if (!luaval_to_vec2(tolua_S, 2, &control1)) + if (!luaval_to_vec2(tolua_S, 2, &control1, "cc.DrawPrimitives.drawCubicBezier")) return 0; cocos2d::Vec2 control2; - if (!luaval_to_vec2(tolua_S, 3, &control2)) + if (!luaval_to_vec2(tolua_S, 3, &control2, "cc.DrawPrimitives.drawCubicBezier")) return 0; cocos2d::Vec2 destination; - if (!luaval_to_vec2(tolua_S, 4, &destination)) + if (!luaval_to_vec2(tolua_S, 4, &destination, "cc.DrawPrimitives.drawCubicBezier")) return 0; unsigned int segments = ((unsigned int) tolua_tonumber(tolua_S,5,0)); @@ -4907,7 +4907,7 @@ int tolua_cocos2d_DrawPrimitives_drawCatmullRom00(lua_State* tolua_S) { int num = 0; cocos2d::Vec2 *arr = NULL; - if (!luaval_to_array_of_vec2(tolua_S, 1, &arr, &num)) + if (!luaval_to_array_of_vec2(tolua_S, 1, &arr, &num, "cc.DrawPrimitives.drawCatmullRom")) return 0; @@ -4954,7 +4954,7 @@ int tolua_cocos2d_DrawPrimitives_drawCardinalSpline00(lua_State* tolua_S) { int num = 0; cocos2d::Vec2 *arr = NULL; - if (!luaval_to_array_of_vec2(tolua_S, 1, &arr, &num)) + if (!luaval_to_array_of_vec2(tolua_S, 1, &arr, &num, "cc.DrawPrimitives.drawCatmullRom")) return 0; diff --git a/cocos/scripting/lua-bindings/manual/LuaOpengl.h b/cocos/scripting/lua-bindings/manual/cocos2d/LuaOpengl.h similarity index 100% rename from cocos/scripting/lua-bindings/manual/LuaOpengl.h rename to cocos/scripting/lua-bindings/manual/cocos2d/LuaOpengl.h diff --git a/cocos/scripting/lua-bindings/manual/LuaScriptHandlerMgr.cpp b/cocos/scripting/lua-bindings/manual/cocos2d/LuaScriptHandlerMgr.cpp similarity index 99% rename from cocos/scripting/lua-bindings/manual/LuaScriptHandlerMgr.cpp rename to cocos/scripting/lua-bindings/manual/cocos2d/LuaScriptHandlerMgr.cpp index 6f5fa121e4..79819fb1c2 100644 --- a/cocos/scripting/lua-bindings/manual/LuaScriptHandlerMgr.cpp +++ b/cocos/scripting/lua-bindings/manual/cocos2d/LuaScriptHandlerMgr.cpp @@ -30,7 +30,6 @@ #include "CCLuaStack.h" #include "CCLuaValue.h" #include "CCLuaEngine.h" -#include "Lua_web_socket.h" #include "LuaOpengl.h" using namespace cocos2d; diff --git a/cocos/scripting/lua-bindings/manual/LuaScriptHandlerMgr.h b/cocos/scripting/lua-bindings/manual/cocos2d/LuaScriptHandlerMgr.h similarity index 100% rename from cocos/scripting/lua-bindings/manual/LuaScriptHandlerMgr.h rename to cocos/scripting/lua-bindings/manual/cocos2d/LuaScriptHandlerMgr.h diff --git a/cocos/scripting/lua-bindings/manual/lua_cocos2dx_deprecated.cpp b/cocos/scripting/lua-bindings/manual/cocos2d/lua_cocos2dx_deprecated.cpp similarity index 92% rename from cocos/scripting/lua-bindings/manual/lua_cocos2dx_deprecated.cpp rename to cocos/scripting/lua-bindings/manual/cocos2d/lua_cocos2dx_deprecated.cpp index 8b6345ae4d..eb64b99bb1 100644 --- a/cocos/scripting/lua-bindings/manual/lua_cocos2dx_deprecated.cpp +++ b/cocos/scripting/lua-bindings/manual/cocos2d/lua_cocos2dx_deprecated.cpp @@ -1996,13 +1996,13 @@ static int lua_cocos2dx_LabelBMFont_setLineBreakWithoutSpace(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.LabelBMFont:setLineBreakWithoutSpace"); if(!ok) return 0; cobj->setLineBreakWithoutSpace(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setLineBreakWithoutSpace",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelBMFont:setLineBreakWithoutSpace",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2046,7 +2046,7 @@ static int lua_cocos2dx_LabelBMFont_getBlendFunc(lua_State* tolua_S) blendfunc_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getBlendFunc",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelBMFont:getBlendFunc",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2090,7 +2090,7 @@ static int lua_cocos2dx_LabelBMFont_isOpacityModifyRGB(lua_State* tolua_S) tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isOpacityModifyRGB",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelBMFont:isOpacityModifyRGB",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2130,14 +2130,14 @@ static int lua_cocos2dx_LabelBMFont_getLetter(lua_State* tolua_S) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.LabelBMFont:getLetter"); if(!ok) return 0; cocos2d::Sprite* ret = cobj->getLetter(arg0); object_to_luaval(tolua_S, "cc.Sprite",(cocos2d::Sprite*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getLetter",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelBMFont:getLetter",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2181,7 +2181,7 @@ static int lua_cocos2dx_LabelBMFont_getString(lua_State* tolua_S) tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getString",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelBMFont:getString",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2227,7 +2227,7 @@ static int lua_cocos2dx_LabelBMFont_setBlendFunc(lua_State* tolua_S) cobj->setBlendFunc(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setBlendFunc",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelBMFont:setBlendFunc",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2267,13 +2267,13 @@ static int lua_cocos2dx_LabelBMFont_setString(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.LabelBMFont:setString"); if(!ok) return 0; cobj->setString(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setString",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelBMFont:setString",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2314,9 +2314,9 @@ static int lua_cocos2dx_LabelBMFont_initWithString(lua_State* tolua_S) std::string arg0; std::string arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.LabelBMFont:initWithString"); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.LabelBMFont:initWithString"); if(!ok) return 0; bool ret = cobj->initWithString(arg0, arg1); @@ -2329,11 +2329,11 @@ static int lua_cocos2dx_LabelBMFont_initWithString(lua_State* tolua_S) std::string arg1; double arg2; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.LabelBMFont:initWithString"); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1,"cc.LabelBMFont:initWithString"); - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.LabelBMFont:initWithString"); if(!ok) return 0; bool ret = cobj->initWithString(arg0, arg1, arg2); @@ -2347,13 +2347,13 @@ static int lua_cocos2dx_LabelBMFont_initWithString(lua_State* tolua_S) double arg2; cocos2d::TextHAlignment arg3; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.LabelBMFont:initWithString"); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.LabelBMFont:initWithString"); - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.LabelBMFont:initWithString"); - ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3); + ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3, "cc.LabelBMFont:initWithString"); if(!ok) return 0; bool ret = cobj->initWithString(arg0, arg1, arg2, arg3); @@ -2368,22 +2368,22 @@ static int lua_cocos2dx_LabelBMFont_initWithString(lua_State* tolua_S) cocos2d::TextHAlignment arg3; cocos2d::Vec2 arg4; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.LabelBMFont:initWithString"); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.LabelBMFont:initWithString"); - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.LabelBMFont:initWithString"); - ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3); + ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3, "cc.LabelBMFont:initWithString"); - ok &= luaval_to_vec2(tolua_S, 6, &arg4); + ok &= luaval_to_vec2(tolua_S, 6, &arg4, "cc.LabelBMFont:initWithString"); if(!ok) return 0; bool ret = cobj->initWithString(arg0, arg1, arg2, arg3, arg4); tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "initWithString",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelBMFont:initWithString",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -2423,13 +2423,13 @@ static int lua_cocos2dx_LabelBMFont_setOpacityModifyRGB(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.LabelBMFont:setOpacityModifyRGB"); if(!ok) return 0; cobj->setOpacityModifyRGB(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setOpacityModifyRGB",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelBMFont:setOpacityModifyRGB",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2473,7 +2473,7 @@ static int lua_cocos2dx_LabelBMFont_getFntFile(lua_State* tolua_S) tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getFntFile",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelBMFont:getFntFile",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2513,7 +2513,7 @@ static int lua_cocos2dx_LabelBMFont_setFntFile(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.LabelBMFont:setFntFile"); if(!ok) return 0; cobj->setFntFile(arg0); @@ -2524,15 +2524,15 @@ static int lua_cocos2dx_LabelBMFont_setFntFile(lua_State* tolua_S) std::string arg0; cocos2d::Vec2 arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.LabelBMFont:setFntFile"); - ok &= luaval_to_vec2(tolua_S, 3, &arg1); + ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.LabelBMFont:setFntFile"); if(!ok) return 0; cobj->setFntFile(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setFntFile",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelBMFont:setFntFile",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2572,13 +2572,13 @@ static int lua_cocos2dx_LabelBMFont_setAlignment(lua_State* tolua_S) { cocos2d::TextHAlignment arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.LabelBMFont:setAlignment"); if(!ok) return 0; cobj->setAlignment(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAlignment",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelBMFont:setAlignment",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2618,13 +2618,13 @@ static int lua_cocos2dx_LabelBMFont_setWidth(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.LabelBMFont:setWidth"); if(!ok) return 0; cobj->setWidth(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setWidth",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelBMFont:setWidth",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2663,10 +2663,10 @@ static int lua_cocos2dx_LabelBMFont_create(lua_State* tolua_S) if (argc == 2) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.LabelBMFont:create"); if (!ok) { break; } std::string arg1; - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.LabelBMFont:create"); if (!ok) { break; } cocos2d::LabelBMFont* ret = cocos2d::LabelBMFont::create(arg0, arg1); object_to_luaval(tolua_S, "cc.LabelBMFont",(cocos2d::LabelBMFont*)ret); @@ -2679,13 +2679,13 @@ static int lua_cocos2dx_LabelBMFont_create(lua_State* tolua_S) if (argc == 3) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.LabelBMFont:create"); if (!ok) { break; } std::string arg1; - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.LabelBMFont:create"); if (!ok) { break; } double arg2; - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.LabelBMFont:create"); if (!ok) { break; } cocos2d::LabelBMFont* ret = cocos2d::LabelBMFont::create(arg0, arg1, arg2); object_to_luaval(tolua_S, "cc.LabelBMFont",(cocos2d::LabelBMFont*)ret); @@ -2698,16 +2698,16 @@ static int lua_cocos2dx_LabelBMFont_create(lua_State* tolua_S) if (argc == 4) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.LabelBMFont:create"); if (!ok) { break; } std::string arg1; - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.LabelBMFont:create"); if (!ok) { break; } double arg2; - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.LabelBMFont:create"); if (!ok) { break; } cocos2d::TextHAlignment arg3; - ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3); + ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3, "cc.LabelBMFont:create"); if (!ok) { break; } cocos2d::LabelBMFont* ret = cocos2d::LabelBMFont::create(arg0, arg1, arg2, arg3); object_to_luaval(tolua_S, "cc.LabelBMFont",(cocos2d::LabelBMFont*)ret); @@ -2720,19 +2720,19 @@ static int lua_cocos2dx_LabelBMFont_create(lua_State* tolua_S) if (argc == 5) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.LabelBMFont:create"); if (!ok) { break; } std::string arg1; - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.LabelBMFont:create"); if (!ok) { break; } double arg2; - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.LabelBMFont:create"); if (!ok) { break; } cocos2d::TextHAlignment arg3; - ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3); + ok &= luaval_to_int32(tolua_S, 5,(int *)&arg3, "cc.LabelBMFont:create"); if (!ok) { break; } cocos2d::Vec2 arg4; - ok &= luaval_to_vec2(tolua_S, 6, &arg4); + ok &= luaval_to_vec2(tolua_S, 6, &arg4, "cc.LabelBMFont:create"); if (!ok) { break; } cocos2d::LabelBMFont* ret = cocos2d::LabelBMFont::create(arg0, arg1, arg2, arg3, arg4); object_to_luaval(tolua_S, "cc.LabelBMFont",(cocos2d::LabelBMFont*)ret); @@ -2740,7 +2740,7 @@ static int lua_cocos2dx_LabelBMFont_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.LabelBMFont:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -2772,7 +2772,7 @@ static int lua_cocos2dx_LabelBMFont_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.LabelBMFont"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "LabelBMFont",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelBMFont:new",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -2851,11 +2851,11 @@ static int lua_cocos2dx_LabelTTF_enableShadow(lua_State* tolua_S) double arg1; double arg2; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.LabelTTF:enableShadow"); - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.LabelTTF:enableShadow"); - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.LabelTTF:enableShadow"); if(!ok) return 0; cobj->enableShadow(arg0, arg1, arg2); @@ -2868,19 +2868,19 @@ static int lua_cocos2dx_LabelTTF_enableShadow(lua_State* tolua_S) double arg2; bool arg3; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.LabelTTF:enableShadow"); - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.LabelTTF:enableShadow"); - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.LabelTTF:enableShadow"); - ok &= luaval_to_boolean(tolua_S, 5,&arg3); + ok &= luaval_to_boolean(tolua_S, 5,&arg3, "cc.LabelTTF:enableShadow"); if(!ok) return 0; cobj->enableShadow(arg0, arg1, arg2, arg3); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "enableShadow",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelTTF:enableShadow",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 @@ -2920,13 +2920,13 @@ static int lua_cocos2dx_LabelTTF_setDimensions(lua_State* tolua_S) { cocos2d::Size arg0; - ok &= luaval_to_size(tolua_S, 2, &arg0); + ok &= luaval_to_size(tolua_S, 2, &arg0, "cc.LabelTTF:setDimensions"); if(!ok) return 0; cobj->setDimensions(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setDimensions",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelTTF:setDimensions",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -2970,7 +2970,7 @@ static int lua_cocos2dx_LabelTTF_getFontSize(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getFontSize",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelTTF:getFontSize",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3014,7 +3014,7 @@ static int lua_cocos2dx_LabelTTF_getString(lua_State* tolua_S) tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getString",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelTTF:getString",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3054,13 +3054,13 @@ static int lua_cocos2dx_LabelTTF_setFlippedY(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.LabelTTF:setFlippedY"); if(!ok) return 0; cobj->setFlippedY(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setFlippedY",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelTTF:setFlippedY",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3100,13 +3100,13 @@ static int lua_cocos2dx_LabelTTF_setFlippedX(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.LabelTTF:setFlippedX"); if(!ok) return 0; cobj->setFlippedX(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setFlippedX",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelTTF:setFlippedX",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3146,13 +3146,13 @@ static int lua_cocos2dx_LabelTTF_setTextDefinition(lua_State* tolua_S) { cocos2d::FontDefinition arg0; - ok &= luaval_to_fontdefinition(tolua_S, 2, &arg0); + ok &= luaval_to_fontdefinition(tolua_S, 2, &arg0, "cc.LabelTTF:setTextDefinition"); if(!ok) return 0; cobj->setTextDefinition(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTextDefinition",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelTTF:setTextDefinition",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3192,13 +3192,13 @@ static int lua_cocos2dx_LabelTTF_setFontName(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.LabelTTF:setFontName"); if(!ok) return 0; cobj->setFontName(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setFontName",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelTTF:setFontName",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3242,7 +3242,7 @@ static int lua_cocos2dx_LabelTTF_getHorizontalAlignment(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getHorizontalAlignment",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelTTF:getHorizontalAlignment",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3283,16 +3283,16 @@ static int lua_cocos2dx_LabelTTF_initWithStringAndTextDefinition(lua_State* tolu std::string arg0; cocos2d::FontDefinition arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.LabelTTF:initWithStringAndTextDefinition"); - ok &= luaval_to_fontdefinition(tolua_S, 3, &arg1); + ok &= luaval_to_fontdefinition(tolua_S, 3, &arg1, "cc.LabelTTF:initWithStringAndTextDefinition"); if(!ok) return 0; bool ret = cobj->initWithStringAndTextDefinition(arg0, arg1); tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "initWithStringAndTextDefinition",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelTTF:initWithStringAndTextDefinition",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -3332,13 +3332,13 @@ static int lua_cocos2dx_LabelTTF_setString(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.LabelTTF:setString"); if(!ok) return 0; cobj->setString(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setString",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelTTF:setString",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3380,11 +3380,11 @@ static int lua_cocos2dx_LabelTTF_initWithString(lua_State* tolua_S) std::string arg1; double arg2; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.LabelTTF:initWithString"); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.LabelTTF:initWithString"); - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.LabelTTF:initWithString"); if(!ok) return 0; bool ret = cobj->initWithString(arg0, arg1, arg2); @@ -3398,13 +3398,13 @@ static int lua_cocos2dx_LabelTTF_initWithString(lua_State* tolua_S) double arg2; cocos2d::Size arg3; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.LabelTTF:initWithString"); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.LabelTTF:initWithString"); - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.LabelTTF:initWithString"); - ok &= luaval_to_size(tolua_S, 5, &arg3); + ok &= luaval_to_size(tolua_S, 5, &arg3, "cc.LabelTTF:initWithString"); if(!ok) return 0; bool ret = cobj->initWithString(arg0, arg1, arg2, arg3); @@ -3419,15 +3419,15 @@ static int lua_cocos2dx_LabelTTF_initWithString(lua_State* tolua_S) cocos2d::Size arg3; cocos2d::TextHAlignment arg4; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.LabelTTF:initWithString"); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.LabelTTF:initWithString"); - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.LabelTTF:initWithString"); - ok &= luaval_to_size(tolua_S, 5, &arg3); + ok &= luaval_to_size(tolua_S, 5, &arg3, "cc.LabelTTF:initWithString"); - ok &= luaval_to_int32(tolua_S, 6,(int *)&arg4); + ok &= luaval_to_int32(tolua_S, 6,(int *)&arg4, "cc.LabelTTF:initWithString"); if(!ok) return 0; bool ret = cobj->initWithString(arg0, arg1, arg2, arg3, arg4); @@ -3443,24 +3443,24 @@ static int lua_cocos2dx_LabelTTF_initWithString(lua_State* tolua_S) cocos2d::TextHAlignment arg4; cocos2d::TextVAlignment arg5; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.LabelTTF:initWithString"); - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.LabelTTF:initWithString"); - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.LabelTTF:initWithString"); - ok &= luaval_to_size(tolua_S, 5, &arg3); + ok &= luaval_to_size(tolua_S, 5, &arg3, "cc.LabelTTF:initWithString"); - ok &= luaval_to_int32(tolua_S, 6,(int *)&arg4); + ok &= luaval_to_int32(tolua_S, 6,(int *)&arg4, "cc.LabelTTF:initWithString"); - ok &= luaval_to_int32(tolua_S, 7,(int *)&arg5); + ok &= luaval_to_int32(tolua_S, 7,(int *)&arg5, "cc.LabelTTF:initWithString"); if(!ok) return 0; bool ret = cobj->initWithString(arg0, arg1, arg2, arg3, arg4, arg5); tolua_pushboolean(tolua_S,(bool)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "initWithString",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelTTF:initWithString",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 @@ -3500,7 +3500,7 @@ static int lua_cocos2dx_LabelTTF_setFontFillColor(lua_State* tolua_S) { cocos2d::Color3B arg0; - ok &= luaval_to_color3b(tolua_S, 2, &arg0); + ok &= luaval_to_color3b(tolua_S, 2, &arg0, "cc.LabelTTF:setFontFillColor"); if(!ok) return 0; cobj->setFontFillColor(arg0); @@ -3511,15 +3511,15 @@ static int lua_cocos2dx_LabelTTF_setFontFillColor(lua_State* tolua_S) cocos2d::Color3B arg0; bool arg1; - ok &= luaval_to_color3b(tolua_S, 2, &arg0); + ok &= luaval_to_color3b(tolua_S, 2, &arg0, "cc.LabelTTF:setFontFillColor"); - ok &= luaval_to_boolean(tolua_S, 3,&arg1); + ok &= luaval_to_boolean(tolua_S, 3,&arg1, "cc.LabelTTF:setFontFillColor"); if(!ok) return 0; cobj->setFontFillColor(arg0, arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setFontFillColor",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelTTF:setFontFillColor",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3563,7 +3563,7 @@ static int lua_cocos2dx_LabelTTF_getBlendFunc(lua_State* tolua_S) blendfunc_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getBlendFunc",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelTTF:getBlendFunc",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3604,9 +3604,9 @@ static int lua_cocos2dx_LabelTTF_enableStroke(lua_State* tolua_S) cocos2d::Color3B arg0; double arg1; - ok &= luaval_to_color3b(tolua_S, 2, &arg0); + ok &= luaval_to_color3b(tolua_S, 2, &arg0, "cc.LabelTTF:enableStroke"); - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.LabelTTF:enableStroke"); if(!ok) return 0; cobj->enableStroke(arg0, arg1); @@ -3618,17 +3618,17 @@ static int lua_cocos2dx_LabelTTF_enableStroke(lua_State* tolua_S) double arg1; bool arg2; - ok &= luaval_to_color3b(tolua_S, 2, &arg0); + ok &= luaval_to_color3b(tolua_S, 2, &arg0, "cc.LabelTTF:enableStroke"); - ok &= luaval_to_number(tolua_S, 3,&arg1); + ok &= luaval_to_number(tolua_S, 3,&arg1, "cc.LabelTTF:enableStroke"); - ok &= luaval_to_boolean(tolua_S, 4,&arg2); + ok &= luaval_to_boolean(tolua_S, 4,&arg2, "cc.LabelTTF:enableStroke"); if(!ok) return 0; cobj->enableStroke(arg0, arg1, arg2); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "enableStroke",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelTTF:enableStroke",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 @@ -3672,7 +3672,7 @@ static int lua_cocos2dx_LabelTTF_getDimensions(lua_State* tolua_S) size_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDimensions",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelTTF:getDimensions",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3712,13 +3712,13 @@ static int lua_cocos2dx_LabelTTF_setVerticalAlignment(lua_State* tolua_S) { cocos2d::TextVAlignment arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.LabelTTF:setVerticalAlignment"); if(!ok) return 0; cobj->setVerticalAlignment(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setVerticalAlignment",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelTTF:setVerticalAlignment",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3758,13 +3758,13 @@ static int lua_cocos2dx_LabelTTF_setFontSize(lua_State* tolua_S) { double arg0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.LabelTTF:setFontSize"); if(!ok) return 0; cobj->setFontSize(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setFontSize",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelTTF:setFontSize",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3808,7 +3808,7 @@ static int lua_cocos2dx_LabelTTF_getVerticalAlignment(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getVerticalAlignment",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelTTF:getVerticalAlignment",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3852,7 +3852,7 @@ static int lua_cocos2dx_LabelTTF_getTextDefinition(lua_State* tolua_S) fontdefinition_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTextDefinition",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelTTF:getTextDefinition",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3898,7 +3898,7 @@ static int lua_cocos2dx_LabelTTF_setBlendFunc(lua_State* tolua_S) cobj->setBlendFunc(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setBlendFunc",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelTTF:setBlendFunc",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3942,7 +3942,7 @@ static int lua_cocos2dx_LabelTTF_getFontName(lua_State* tolua_S) tolua_pushcppstring(tolua_S,ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getFontName",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelTTF:getFontName",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -3982,13 +3982,13 @@ static int lua_cocos2dx_LabelTTF_setHorizontalAlignment(lua_State* tolua_S) { cocos2d::TextHAlignment arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.LabelTTF:setHorizontalAlignment"); if(!ok) return 0; cobj->setHorizontalAlignment(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setHorizontalAlignment",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelTTF:setHorizontalAlignment",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -4035,13 +4035,13 @@ static int lua_cocos2dx_LabelTTF_disableShadow(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.LabelTTF:disableShadow"); if(!ok) return 0; cobj->disableShadow(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "disableShadow",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelTTF:disableShadow",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4088,13 +4088,13 @@ static int lua_cocos2dx_LabelTTF_disableStroke(lua_State* tolua_S) { bool arg0; - ok &= luaval_to_boolean(tolua_S, 2,&arg0); + ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.LabelTTF:disableStroke"); if(!ok) return 0; cobj->disableStroke(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "disableStroke",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelTTF:disableStroke",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4133,13 +4133,13 @@ static int lua_cocos2dx_LabelTTF_create(lua_State* tolua_S) if (argc == 3) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.LabelTTF:create"); if (!ok) { break; } std::string arg1; - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.LabelTTF:create"); if (!ok) { break; } double arg2; - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.LabelTTF:create"); if (!ok) { break; } cocos2d::LabelTTF* ret = cocos2d::LabelTTF::create(arg0, arg1, arg2); object_to_luaval(tolua_S, "cc.LabelTTF",(cocos2d::LabelTTF*)ret); @@ -4152,16 +4152,16 @@ static int lua_cocos2dx_LabelTTF_create(lua_State* tolua_S) if (argc == 4) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.LabelTTF:create"); if (!ok) { break; } std::string arg1; - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.LabelTTF:create"); if (!ok) { break; } double arg2; - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.LabelTTF:create"); if (!ok) { break; } cocos2d::Size arg3; - ok &= luaval_to_size(tolua_S, 5, &arg3); + ok &= luaval_to_size(tolua_S, 5, &arg3, "cc.LabelTTF:create"); if (!ok) { break; } cocos2d::LabelTTF* ret = cocos2d::LabelTTF::create(arg0, arg1, arg2, arg3); object_to_luaval(tolua_S, "cc.LabelTTF",(cocos2d::LabelTTF*)ret); @@ -4174,19 +4174,19 @@ static int lua_cocos2dx_LabelTTF_create(lua_State* tolua_S) if (argc == 5) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.LabelTTF:create"); if (!ok) { break; } std::string arg1; - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.LabelTTF:create"); if (!ok) { break; } double arg2; - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.LabelTTF:create"); if (!ok) { break; } cocos2d::Size arg3; - ok &= luaval_to_size(tolua_S, 5, &arg3); + ok &= luaval_to_size(tolua_S, 5, &arg3, "cc.LabelTTF:create"); if (!ok) { break; } cocos2d::TextHAlignment arg4; - ok &= luaval_to_int32(tolua_S, 6,(int *)&arg4); + ok &= luaval_to_int32(tolua_S, 6,(int *)&arg4, "cc.LabelTTF:create"); if (!ok) { break; } cocos2d::LabelTTF* ret = cocos2d::LabelTTF::create(arg0, arg1, arg2, arg3, arg4); object_to_luaval(tolua_S, "cc.LabelTTF",(cocos2d::LabelTTF*)ret); @@ -4199,22 +4199,22 @@ static int lua_cocos2dx_LabelTTF_create(lua_State* tolua_S) if (argc == 6) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.LabelTTF:create"); if (!ok) { break; } std::string arg1; - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.LabelTTF:create"); if (!ok) { break; } double arg2; - ok &= luaval_to_number(tolua_S, 4,&arg2); + ok &= luaval_to_number(tolua_S, 4,&arg2, "cc.LabelTTF:create"); if (!ok) { break; } cocos2d::Size arg3; - ok &= luaval_to_size(tolua_S, 5, &arg3); + ok &= luaval_to_size(tolua_S, 5, &arg3, "cc.LabelTTF:create"); if (!ok) { break; } cocos2d::TextHAlignment arg4; - ok &= luaval_to_int32(tolua_S, 6,(int *)&arg4); + ok &= luaval_to_int32(tolua_S, 6,(int *)&arg4, "cc.LabelTTF:create"); if (!ok) { break; } cocos2d::TextVAlignment arg5; - ok &= luaval_to_int32(tolua_S, 7,(int *)&arg5); + ok &= luaval_to_int32(tolua_S, 7,(int *)&arg5, "cc.LabelTTF:create"); if (!ok) { break; } cocos2d::LabelTTF* ret = cocos2d::LabelTTF::create(arg0, arg1, arg2, arg3, arg4, arg5); object_to_luaval(tolua_S, "cc.LabelTTF",(cocos2d::LabelTTF*)ret); @@ -4222,7 +4222,7 @@ static int lua_cocos2dx_LabelTTF_create(lua_State* tolua_S) } } while (0); ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "create",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.LabelTTF:create",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -4249,15 +4249,15 @@ static int lua_cocos2dx_LabelTTF_createWithFontDefinition(lua_State* tolua_S) { std::string arg0; cocos2d::FontDefinition arg1; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); - ok &= luaval_to_fontdefinition(tolua_S, 3, &arg1); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.LabelTTF:createWithFontDefinition"); + ok &= luaval_to_fontdefinition(tolua_S, 3, &arg1, "cc.LabelTTF:createWithFontDefinition"); if(!ok) return 0; cocos2d::LabelTTF* ret = cocos2d::LabelTTF::createWithFontDefinition(arg0, arg1); object_to_luaval(tolua_S, "cc.LabelTTF",(cocos2d::LabelTTF*)ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "createWithFontDefinition",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.LabelTTF:createWithFontDefinition",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -4289,7 +4289,7 @@ static int lua_cocos2dx_LabelTTF_constructor(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)cobj,"cc.LabelTTF"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "LabelTTF",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.LabelTTF:new",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -4803,7 +4803,7 @@ static int lua_cocos2dx_Label_create_deprecated(lua_State* tolua_S) cocos2d::Size dimensions = cocos2d::Size::ZERO; if (lua_istable(tolua_S, 5)) { - luaval_to_size(tolua_S, 5, &dimensions); + luaval_to_size(tolua_S, 5, &dimensions, "cc.Label:create"); } TextHAlignment hAlignment = static_cast((int)tolua_tonumber(tolua_S, 6, 0)); TextVAlignment vAlignment = static_cast((int)tolua_tonumber(tolua_S, 7, 0)); diff --git a/cocos/scripting/lua-bindings/manual/lua_cocos2dx_deprecated.h b/cocos/scripting/lua-bindings/manual/cocos2d/lua_cocos2dx_deprecated.h similarity index 100% rename from cocos/scripting/lua-bindings/manual/lua_cocos2dx_deprecated.h rename to cocos/scripting/lua-bindings/manual/cocos2d/lua_cocos2dx_deprecated.h diff --git a/cocos/scripting/lua-bindings/manual/lua_cocos2dx_experimental_manual.cpp b/cocos/scripting/lua-bindings/manual/cocos2d/lua_cocos2dx_experimental_manual.cpp similarity index 88% rename from cocos/scripting/lua-bindings/manual/lua_cocos2dx_experimental_manual.cpp rename to cocos/scripting/lua-bindings/manual/cocos2d/lua_cocos2dx_experimental_manual.cpp index 33cc751dd1..fb8fde5c83 100644 --- a/cocos/scripting/lua-bindings/manual/lua_cocos2dx_experimental_manual.cpp +++ b/cocos/scripting/lua-bindings/manual/cocos2d/lua_cocos2dx_experimental_manual.cpp @@ -1,5 +1,4 @@ #include "lua_cocos2dx_experimental_manual.hpp" -#include "UIVideoPlayer.h" #include "tolua_fix.h" #include "LuaBasicConversions.h" #include "CCLuaValue.h" @@ -35,7 +34,7 @@ static int lua_cocos2dx_experimental_TMXLayer_getTileGIDAt(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "ccexp.TMXLayer:getTileGIDAt"); if(!ok) return 0; int ret = cobj->getTileGIDAt(arg0); @@ -48,8 +47,8 @@ static int lua_cocos2dx_experimental_TMXLayer_getTileGIDAt(lua_State* tolua_S) cocos2d::Vec2 arg0; int arg1 = 0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); - ok &= luaval_to_int32(tolua_S, 3, &arg1); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "ccexp.TMXLayer:getTileGIDAt"); + ok &= luaval_to_int32(tolua_S, 3, &arg1, "ccexp.TMXLayer:getTileGIDAt"); if(!ok) return 0; @@ -59,7 +58,7 @@ static int lua_cocos2dx_experimental_TMXLayer_getTileGIDAt(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)arg1); return 2; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTileGIDAt",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "ccexp.TMXLayer:getTileGIDAt",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 diff --git a/cocos/scripting/lua-bindings/manual/lua_cocos2dx_experimental_manual.hpp b/cocos/scripting/lua-bindings/manual/cocos2d/lua_cocos2dx_experimental_manual.hpp similarity index 100% rename from cocos/scripting/lua-bindings/manual/lua_cocos2dx_experimental_manual.hpp rename to cocos/scripting/lua-bindings/manual/cocos2d/lua_cocos2dx_experimental_manual.hpp diff --git a/cocos/scripting/lua-bindings/manual/lua_cocos2dx_manual.cpp b/cocos/scripting/lua-bindings/manual/cocos2d/lua_cocos2dx_manual.cpp similarity index 89% rename from cocos/scripting/lua-bindings/manual/lua_cocos2dx_manual.cpp rename to cocos/scripting/lua-bindings/manual/cocos2d/lua_cocos2dx_manual.cpp index d8daf44b63..9b1c757bf4 100644 --- a/cocos/scripting/lua-bindings/manual/lua_cocos2dx_manual.cpp +++ b/cocos/scripting/lua-bindings/manual/cocos2d/lua_cocos2dx_manual.cpp @@ -106,7 +106,7 @@ static int tolua_cocos2d_MenuItemImage_create(lua_State* tolua_S) } } while (0); - CCLOG("'create' has wrong number of arguments: %d, was expecting %d\n", argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.MenuItemImage:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -147,12 +147,12 @@ static int tolua_cocos2d_MenuItemLabel_create(lua_State* tolua_S) return 1; } - CCLOG("'create' has wrong number of arguments: %d, was expecting %d\n", argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.MenuItemLabel:create", argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'create'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_MenuItemImage_create'.",&tolua_err); return 0; #endif } @@ -187,12 +187,12 @@ static int tolua_cocos2d_MenuItemFont_create(lua_State* tolua_S) return 1; } - CCLOG("'create' has wrong number of arguments: %d, was expecting %d\n", argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.MenuItemFont:create", argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'create'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_MenuItemImage_create'.",&tolua_err); return 0; #endif } @@ -241,12 +241,12 @@ static int tolua_cocos2d_MenuItemSprite_create(lua_State* tolua_S) return 1; } - CCLOG("create has wrong number of arguments: %d, was expecting %d\n", argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.MenuItemSprite:create",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'create'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_MenuItemImage_create'.",&tolua_err); return 0; #endif } @@ -391,7 +391,7 @@ static int tolua_cocos2dx_Menu_alignItemsInColumns(lua_State* tolua_S) #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'alignItemsInColumns'.\n",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2dx_Menu_alignItemsInColumns'.\n",&tolua_err); #endif return 0; } @@ -436,12 +436,12 @@ static int tolua_cocos2d_MenuItemToggle_create(lua_State* tolua_S) return 1; } - CCLOG("'create' has wrong number of arguments: %d, was expecting %d\n", argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.MenuItemToggle:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'create'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_MenuItemToggle_create'.",&tolua_err); return 0; #endif } @@ -477,12 +477,12 @@ static int tolua_cocos2d_MenuItem_registerScriptTapHandler(lua_State* tolua_S) return 0; } - CCLOG("'registerScriptTapHandler' has wrong number of arguments: %d, was expecting %d\n", argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.MenuItem:registerScriptTapHandler",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'registerScriptTapHandler'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_MenuItem_registerScriptTapHandler'.",&tolua_err); return 0; #endif } @@ -517,12 +517,12 @@ static int tolua_cocos2d_MenuItem_unregisterScriptTapHandler(lua_State* tolua_S) return 0; } - CCLOG("'unregisterScriptTapHandler' has wrong number of arguments: %d, was expecting %d\n", argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.MenuItem:unregisterScriptTapHandler", argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'unregisterScriptTapHandler'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_MenuItem_unregisterScriptTapHandler'.",&tolua_err); return 0; #endif } @@ -677,11 +677,11 @@ static int lua_cocos2dx_Layer_setTouchEnabled(lua_State* L) return 0; } - CCLOG("'setTouchEnabled' has wrong number of arguments: %d, was expecting %d\n", argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.Layer:setTouchEnabled", argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(L,"#ferror in function 'setTouchEnabled'.",&tolua_err); + tolua_error(L,"#ferror in function 'lua_cocos2dx_Layer_setTouchEnabled'.",&tolua_err); return 0; #endif @@ -724,11 +724,11 @@ static int lua_cocos2dx_Layer_isTouchEnabled(lua_State* L) return 0; } - CCLOG("'isTouchEnabled' has wrong number of arguments: %d, was expecting %d\n", argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.Layer:isTouchEnabled", argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(L,"#ferror in function 'isTouchEnabled'.",&tolua_err); + tolua_error(L,"#ferror in function 'lua_cocos2dx_Layer_isTouchEnabled'.",&tolua_err); return 0; #endif @@ -791,12 +791,12 @@ static int lua_cocos2dx_Layer_setTouchMode(lua_State* L) return 0; } - CCLOG("'setTouchMode' has wrong number of arguments: %d, was expecting %d\n", argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.Layer:setTouchMode", argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(L,"#ferror in function 'setTouchMode'.",&tolua_err); + tolua_error(L,"#ferror in function 'lua_cocos2dx_Layer_setTouchMode'.",&tolua_err); return 0; #endif } @@ -839,12 +839,12 @@ static int lua_cocos2dx_Layer_getTouchMode(lua_State* L) return 0; } - CCLOG("'getTouchMode' has wrong number of arguments: %d, was expecting %d\n", argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.Layer:getTouchMode", argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(L,"#ferror in function 'getTouchMode'.",&tolua_err); + tolua_error(L,"#ferror in function 'lua_cocos2dx_Layer_getTouchMode'.",&tolua_err); return 0; #endif } @@ -906,12 +906,12 @@ static int lua_cocos2dx_Layer_setSwallowsTouches(lua_State* L) return 0; } - CCLOG("'setSwallowsTouches' has wrong number of arguments: %d, was expecting %d\n", argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.Layer:setSwallowsTouches", argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(L,"#ferror in function 'setSwallowsTouches'.",&tolua_err); + tolua_error(L,"#ferror in function 'lua_cocos2dx_Layer_setSwallowsTouches'.",&tolua_err); return 0; #endif } @@ -952,12 +952,12 @@ static int lua_cocos2dx_Layer_isSwallowsTouches(lua_State* L) return 0; } - CCLOG("'isSwallowsTouches' has wrong number of arguments: %d, was expecting %d\n", argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.Layer:isSwallowsTouches", argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(L,"#ferror in function 'isSwallowsTouches'.",&tolua_err); + tolua_error(L,"#ferror in function 'lua_cocos2dx_Layer_isSwallowsTouches'.",&tolua_err); return 0; #endif } @@ -1024,12 +1024,12 @@ static int lua_cocos2dx_Layer_setKeyboardEnabled(lua_State* L) return 0; } - CCLOG("'setKeyboardEnabled' has wrong number of arguments: %d, was expecting %d\n", argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.Layer:setKeyboardEnabled", argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(L,"#ferror in function 'setKeyboardEnabled'.",&tolua_err); + tolua_error(L,"#ferror in function 'lua_cocos2dx_Layer_setKeyboardEnabled'.",&tolua_err); return 0; #endif } @@ -1071,12 +1071,12 @@ static int lua_cocos2dx_Layer_isKeyboardEnabled(lua_State* L) return 0; } - CCLOG("'isKeyboardEnabled' has wrong number of arguments: %d, was expecting %d\n", argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.Layer:isKeyboardEnabled", argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(L,"#ferror in function 'isKeyboardEnabled'.",&tolua_err); + tolua_error(L,"#ferror in function 'lua_cocos2dx_Layer_isKeyboardEnabled'.",&tolua_err); return 0; #endif } @@ -1144,12 +1144,12 @@ static int lua_cocos2dx_Layer_setAccelerometerEnabled(lua_State* L) return 0; } - CCLOG("'setAccelerometerEnabled' has wrong number of arguments: %d, was expecting %d\n", argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.Layer:setAccelerometerEnabled", argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(L,"#ferror in function 'setAccelerometerEnabled'.",&tolua_err); + tolua_error(L,"#ferror in function 'lua_cocos2dx_Layer_setAccelerometerEnabled'.",&tolua_err); return 0; #endif } @@ -1193,12 +1193,12 @@ static int lua_cocos2dx_Layer_isAccelerometerEnabled(lua_State* L) } - CCLOG("'isAccelerometerEnabled' has wrong number of arguments: %d, was expecting %d\n", argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.Layer:isAccelerometerEnabled", argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(L,"#ferror in function 'isAccelerometerEnabled'.",&tolua_err); + tolua_error(L,"#ferror in function 'lua_cocos2dx_Layer_isAccelerometerEnabled'.",&tolua_err); return 0; #endif } @@ -1238,12 +1238,12 @@ static int lua_cocos2dx_Layer_setAccelerometerInterval(lua_State* L) return 0; } - CCLOG("'setAccelerometerInterval' has wrong number of arguments: %d, was expecting %d\n", argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.Layer:setAccelerometerInterval",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(L,"#ferror in function 'setAccelerometerInterval'.",&tolua_err); + tolua_error(L,"#ferror in function 'lua_cocos2dx_Layer_setAccelerometerInterval'.",&tolua_err); return 0; #endif } @@ -1368,12 +1368,12 @@ static int tolua_cocos2d_Layer_registerScriptTouchHandler(lua_State* tolua_S) return 0; } - CCLOG("'registerScriptTouchHandler' has wrong number of arguments: %d, was expecting %d\n", argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.Layer:registerScriptTouchHandler", argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'registerScriptTouchHandler'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_Layer_registerScriptTouchHandler'.",&tolua_err); return 0; #endif } @@ -1421,12 +1421,12 @@ static int tolua_cocos2d_Layer_unregisterScriptTouchHandler(lua_State* tolua_S) return 0; } - CCLOG("'unregisterScriptTouchHandler' has wrong number of arguments: %d, was expecting %d\n", argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.Layer:unregisterScriptTouchHandler", argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'unregisterScriptTapHandler'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_Layer_unregisterScriptTouchHandler'.",&tolua_err); return 0; #endif } @@ -1468,12 +1468,12 @@ static int tolua_cocos2d_Layer_registerScriptKeypadHandler(lua_State* tolua_S) return 0; } - CCLOG("'registerScriptKeypadHandler' has wrong number of arguments: %d, was expecting %d\n", argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.Layer:registerScriptKeypadHandler", argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'registerScriptKeypadHandler'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_Layer_registerScriptKeypadHandler'.",&tolua_err); return 0; #endif } @@ -1521,12 +1521,12 @@ static int tolua_cocos2d_Layer_unregisterScriptKeypadHandler(lua_State* tolua_S) return 0; } - CCLOG("'unregisterScriptKeypadHandler' has wrong number of arguments: %d, was expecting %d\n", argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.Layer:unregisterScriptKeypadHandler", argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'unregisterScriptKeypadHandler'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_Layer_unregisterScriptKeypadHandler'.",&tolua_err); return 0; #endif } @@ -1567,11 +1567,11 @@ static int tolua_cocos2d_Layer_registerScriptAccelerateHandler(lua_State* tolua_ return 0; } - CCLOG("'registerScriptAccelerateHandler' has wrong number of arguments: %d, was expecting %d\n", argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.Layer:registerScriptAccelerateHandler", argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'registerScriptAccelerateHandler'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_Layer_registerScriptAccelerateHandler'.",&tolua_err); return 0; #endif } @@ -1618,12 +1618,12 @@ static int tolua_cocos2d_Layer_unregisterScriptAccelerateHandler(lua_State* tolu return 0; } - CCLOG("'unregisterScriptAccelerateHandler' has wrong number of arguments: %d, was expecting %d\n", argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.Layer:unregisterScriptAccelerateHandler", argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'unregisterScriptAccelerateHandler'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_Layer_unregisterScriptAccelerateHandler'.",&tolua_err); return 0; #endif } @@ -1668,12 +1668,12 @@ static int tolua_cocos2d_Scheduler_scheduleScriptFunc(lua_State* tolua_S) return 1; } - CCLOG("'scheduleScriptFunc' has wrong number of arguments: %d, was expecting %d\n", argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.Scheduler:scheduleScriptFunc", argc, 3); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'scheduleScriptFunc'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_Scheduler_scheduleScriptFunc'.",&tolua_err); return 0; #endif } @@ -1715,12 +1715,12 @@ static int tolua_cocos2d_Scheduler_unscheduleScriptEntry(lua_State* tolua_S) return 0; } - CCLOG("'unscheduleScriptEntry' has wrong number of arguments: %d, was expecting %d\n", argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.Scheduler:unscheduleScriptEntry",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'unscheduleScriptEntry'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_Scheduler_unscheduleScriptEntry'.",&tolua_err); return 0; #endif } @@ -1745,7 +1745,7 @@ int tolua_cocos2d_Sequence_create(lua_State* tolua_S) if (1 == argc && tolua_istable(tolua_S, 2, 0, &tolua_err)) { - luaval_to_ccvector(tolua_S, 2, &array); + luaval_to_ccvector(tolua_S, 2, &array, "cc.Sequence:create"); } else { @@ -1773,12 +1773,12 @@ int tolua_cocos2d_Sequence_create(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, nID, pLuaID, (void*)tolua_ret,"cc.Sequence"); return 1; } - CCLOG("'create' has wrong number of arguments: %d, was expecting %d\n", argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.Sequence:create", argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'create'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_Sequence_create'.",&tolua_err); return 0; #endif } @@ -1864,12 +1864,12 @@ static int tolua_cocos2d_CallFunc_create(lua_State* tolua_S) return 1; } - CCLOG("'create' has wrong number of arguments: %d, was expecting %d\n", argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.CallFunc:create", argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'create'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_CallFunc_create'.",&tolua_err); return 0; #endif @@ -1911,12 +1911,12 @@ static int tolua_cocos2d_Node_registerScriptHandler(lua_State* tolua_S) return 0; } - CCLOG("'registerScriptHandler' has wrong number of arguments: %d, was expecting %d\n", argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.Node:registerScriptHandler",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'registerScriptHandler'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_Node_registerScriptHandler'.",&tolua_err); return 0; #endif } @@ -1950,12 +1950,12 @@ static int tolua_cocos2d_Node_unregisterScriptHandler(lua_State* tolua_S) return 0; } - CCLOG("'unregisterScriptHandler' has wrong number of arguments: %d, was expecting %d\n", argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.Node:unregisterScriptHandler", argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'unregisterScriptHandler'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_Node_unregisterScriptHandler'.",&tolua_err); return 0; #endif } @@ -1993,19 +1993,19 @@ static int tolua_Cocos2d_Node_scheduleUpdateWithPriorityLua(lua_State* tolua_S) LUA_FUNCTION handler = toluafix_ref_function(tolua_S,2,0); int priority = 0; - if (luaval_to_int32(tolua_S, 3, &priority)) + if (luaval_to_int32(tolua_S, 3, &priority, "cc.Node:scheduleUpdateWithPriorityLua")) { self->scheduleUpdateWithPriorityLua(handler,priority); } return 0; } - CCLOG("'scheduleUpdateWithPriorityLua' has wrong number of arguments: %d, was expecting %d\n", argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n","cc.Node:scheduleUpdateWithPriorityLua", argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'scheduleUpdateWithPriorityLua'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_Cocos2d_Node_scheduleUpdateWithPriorityLua'.",&tolua_err); return 0; #endif } @@ -2039,12 +2039,12 @@ static int tolua_cocos2d_Node_unscheduleUpdate(lua_State* tolua_S) return 0; } - CCLOG("'unscheduleUpdate' has wrong number of arguments: %d, was expecting %d\n", argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.Node:unscheduleUpdate", argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'unscheduleUpdate'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_Node_unscheduleUpdate'.",&tolua_err); return 0; #endif } @@ -2073,7 +2073,7 @@ int tolua_cocos2d_Node_setContentSize(lua_State* tolua_S) if (1 == argc) { cocos2d::Size size; - ok &= luaval_to_size(tolua_S, 2, &size); + ok &= luaval_to_size(tolua_S, 2, &size, "cc.Node:setContentSize"); if (!ok) return 0; @@ -2083,13 +2083,13 @@ int tolua_cocos2d_Node_setContentSize(lua_State* tolua_S) else if(2 == argc) { double width; - ok &= luaval_to_number(tolua_S, 2,&width); + ok &= luaval_to_number(tolua_S, 2,&width, "cc.Node:setContentSize"); if (!ok) return 0; double height; - ok &= luaval_to_number(tolua_S, 3,&height); + ok &= luaval_to_number(tolua_S, 3,&height, "cc.Node:setContentSize"); if (!ok) return 0; @@ -2098,7 +2098,7 @@ int tolua_cocos2d_Node_setContentSize(lua_State* tolua_S) return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setContentSize",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:setContentSize",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -2131,7 +2131,7 @@ int tolua_cocos2d_Node_setAnchorPoint(lua_State* tolua_S) if (1 == argc) { cocos2d::Vec2 pt; - ok &= luaval_to_vec2(tolua_S, 2, &pt); + ok &= luaval_to_vec2(tolua_S, 2, &pt, "cc.Node:setAnchorPoint"); if (!ok) return 0; @@ -2141,13 +2141,13 @@ int tolua_cocos2d_Node_setAnchorPoint(lua_State* tolua_S) else if(2 == argc) { double x; - ok &= luaval_to_number(tolua_S, 2,&x); + ok &= luaval_to_number(tolua_S, 2,&x, "cc.Node:setAnchorPoint"); if (!ok) return 0; double y; - ok &= luaval_to_number(tolua_S, 3,&y); + ok &= luaval_to_number(tolua_S, 3,&y, "cc.Node:setAnchorPoint"); if (!ok) return 0; @@ -2156,7 +2156,7 @@ int tolua_cocos2d_Node_setAnchorPoint(lua_State* tolua_S) return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setAnchorPoint",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Node:setAnchorPoint",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -2205,12 +2205,12 @@ static int tolua_cocos2d_Node_getPosition(lua_State* tolua_S) return 2; } - CCLOG("'getPosition' function in Node has wrong number of arguments: %d, was expecting %d\n", argc, 0); + CCLOG("%s function in Node has wrong number of arguments: %d, was expecting %d\n", "cc.Node:getPosition",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'getPosition'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_Node_getPosition'.",&tolua_err); return 0; #endif } @@ -2296,7 +2296,7 @@ static int tolua_cocos2d_Spawn_create(lua_State* tolua_S) if (1 == argc && tolua_istable(tolua_S, 2, 0, &tolua_err)) { - luaval_to_ccvector(tolua_S, 2, &array); + luaval_to_ccvector(tolua_S, 2, &array, "cc.Spawn:create"); } else { @@ -2323,12 +2323,12 @@ static int tolua_cocos2d_Spawn_create(lua_State* tolua_S) return 1; } - CCLOG("'create' has wrong number of arguments: %d, was expecting %d\n", argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.Spawn:create", argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'create'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_Spawn_create'.",&tolua_err); return 0; #endif } @@ -2351,18 +2351,18 @@ int lua_cocos2d_CardinalSplineBy_create(lua_State* tolua_S) if (argc == 3) { double dur = 0.0; - ok &= luaval_to_number(tolua_S, 2, &dur); + ok &= luaval_to_number(tolua_S, 2, &dur, "cc.CardinalSplineBy:create"); if (!ok) return 0; int num = 0; cocos2d::Vec2 *arr = NULL; - ok &= luaval_to_array_of_vec2(tolua_S, 3, &arr, &num); + ok &= luaval_to_array_of_vec2(tolua_S, 3, &arr, &num, "cc.CardinalSplineBy:create"); if (!ok) return 0; double ten = 0.0; - ok &= luaval_to_number(tolua_S, 4, &ten); + ok &= luaval_to_number(tolua_S, 4, &ten, "cc.CardinalSplineBy:create"); if (!ok) { CC_SAFE_DELETE_ARRAY(arr); @@ -2395,12 +2395,12 @@ int lua_cocos2d_CardinalSplineBy_create(lua_State* tolua_S) } } - CCLOG("'create' has wrong number of arguments: %d, was expecting %d\n", argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.CardinalSplineBy:create", argc, 3); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'create'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'lua_cocos2d_CardinalSplineBy_create'.",&tolua_err); return 0; #endif } @@ -2423,13 +2423,13 @@ int tolua_cocos2d_CatmullRomBy_create(lua_State* tolua_S) if (argc == 2) { double dur = 0.0; - ok &= luaval_to_number(tolua_S, 2, &dur); + ok &= luaval_to_number(tolua_S, 2, &dur, "cc.CatmullRomBy:create"); if (!ok) return 0; int num = 0; cocos2d::Vec2 *arr = NULL; - ok &= luaval_to_array_of_vec2(tolua_S, 3, &arr, &num); + ok &= luaval_to_array_of_vec2(tolua_S, 3, &arr, &num, "cc.CatmullRomBy:create"); if (!ok) return 0; @@ -2459,12 +2459,12 @@ int tolua_cocos2d_CatmullRomBy_create(lua_State* tolua_S) } } - CCLOG("'create' has wrong number of arguments: %d, was expecting %d\n", argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.CatmullRomBy:create", argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'create'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_CatmullRomBy_create'.",&tolua_err); return 0; #endif } @@ -2487,13 +2487,13 @@ int tolua_cocos2d_CatmullRomTo_create(lua_State* tolua_S) if (argc == 2) { double dur = 0.0; - ok &= luaval_to_number(tolua_S, 2, &dur); + ok &= luaval_to_number(tolua_S, 2, &dur, "cc.CatmullRomTo:create"); if (!ok) return 0; int num = 0; cocos2d::Vec2 *arr = NULL; - ok &= luaval_to_array_of_vec2(tolua_S, 3, &arr, &num); + ok &= luaval_to_array_of_vec2(tolua_S, 3, &arr, &num, "cc.CatmullRomTo:create"); if (!ok) return 0; @@ -2523,12 +2523,12 @@ int tolua_cocos2d_CatmullRomTo_create(lua_State* tolua_S) } } - CCLOG("'create' has wrong number of arguments: %d, was expecting %d\n", argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.CatmullRomTo:create", argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'create'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_CatmullRomTo_create'.",&tolua_err); return 0; #endif } @@ -2551,13 +2551,13 @@ int tolua_cocos2d_BezierBy_create(lua_State* tolua_S) if (argc == 2) { double t = 0.0; - ok &= luaval_to_number(tolua_S, 2, &t); + ok &= luaval_to_number(tolua_S, 2, &t, "cc.BezierBy:create"); if (!ok) return 0; int num = 0; cocos2d::Vec2 *arr = NULL; - ok &= luaval_to_array_of_vec2(tolua_S, 3, &arr, &num); + ok &= luaval_to_array_of_vec2(tolua_S, 3, &arr, &num, "cc.BezierBy:create"); if (!ok) return 0; @@ -2583,12 +2583,12 @@ int tolua_cocos2d_BezierBy_create(lua_State* tolua_S) } } - CCLOG("'create' has wrong number of arguments: %d, was expecting %d\n", argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.BezierBy:create",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'create'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_BezierBy_create'.",&tolua_err); return 0; #endif } @@ -2611,13 +2611,13 @@ int tolua_cocos2d_BezierTo_create(lua_State* tolua_S) if (argc == 2) { double t = 0.0; - ok &= luaval_to_number(tolua_S, 2, &t); + ok &= luaval_to_number(tolua_S, 2, &t, "cc.BezierTo:create"); if (!ok) return 0; int num = 0; cocos2d::Vec2 *arr = NULL; - ok &= luaval_to_array_of_vec2(tolua_S, 3, &arr, &num); + ok &= luaval_to_array_of_vec2(tolua_S, 3, &arr, &num, "cc.BezierTo:create"); if (!ok) return 0; @@ -2643,12 +2643,12 @@ int tolua_cocos2d_BezierTo_create(lua_State* tolua_S) } } - CCLOG("'create' has wrong number of arguments: %d, was expecting %d\n", argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.BezierTo:create", argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'create'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_BezierTo_create'.",&tolua_err); return 0; #endif } @@ -2707,7 +2707,7 @@ static int tolua_cocos2d_DrawNode_drawPolygon(lua_State* tolua_S) #endif } - if(!luaval_to_vec2(tolua_S, lua_gettop(tolua_S), &points[i])) + if(!luaval_to_vec2(tolua_S, lua_gettop(tolua_S), &points[i], "cc.DrawNode:drawPolygon")) { lua_pop(tolua_S, 1); CC_SAFE_DELETE_ARRAY(points); @@ -2717,7 +2717,7 @@ static int tolua_cocos2d_DrawNode_drawPolygon(lua_State* tolua_S) } Color4F fillColor; - if (!luaval_to_color4f(tolua_S, 4, &fillColor)) + if (!luaval_to_color4f(tolua_S, 4, &fillColor, "cc.DrawNode:drawPolygon")) { CC_SAFE_DELETE_ARRAY(points); return 0; @@ -2726,7 +2726,7 @@ static int tolua_cocos2d_DrawNode_drawPolygon(lua_State* tolua_S) float borderWidth = (float)tolua_tonumber(tolua_S, 5, 0); Color4F borderColor; - if (!luaval_to_color4f(tolua_S, 6, &borderColor)) + if (!luaval_to_color4f(tolua_S, 6, &borderColor, "cc.DrawNode:drawPolygon")) { CC_SAFE_DELETE_ARRAY(points); return 0; @@ -2738,12 +2738,12 @@ static int tolua_cocos2d_DrawNode_drawPolygon(lua_State* tolua_S) } } - CCLOG("'drawPolygon' has wrong number of arguments: %d, was expecting %d\n", argc, 5); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.DrawNode:drawPolygon", argc, 5); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'drawPolygon'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_DrawNode_drawPolygon'.",&tolua_err); return 0; #endif } @@ -2769,10 +2769,10 @@ static int tolua_cocos2dx_setBlendFunc(lua_State* tolua_S,const char* className) if (2 == argc) { GLenum src, dst; - if (!luaval_to_int32(tolua_S, 2, (int32_t*)&src)) + if (!luaval_to_int32(tolua_S, 2, (int32_t*)&src, StringUtils::format("%s%s",className, ":setBlendFunc").c_str())) return 0; - if (!luaval_to_int32(tolua_S, 3, (int32_t*)&dst)) + if (!luaval_to_int32(tolua_S, 3, (int32_t*)&dst, StringUtils::format("%s%s",className, ":setBlendFunc").c_str())) return 0; BlendFunc blendFunc = {src, dst}; @@ -2786,7 +2786,7 @@ static int tolua_cocos2dx_setBlendFunc(lua_State* tolua_S,const char* className) #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'setBlendFunc'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2dx_setBlendFunc'.",&tolua_err); return 0; #endif } @@ -2863,12 +2863,12 @@ static int tolua_cocos2dx_LayerMultiplex_create(lua_State* tolua_S) } } - CCLOG("'create' has wrong number of arguments: %d, was expecting %d\n", argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.LayerMultiplex:create", argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'create'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2dx_LayerMultiplex_create'.",&tolua_err); return 0; #endif } @@ -2902,7 +2902,7 @@ static int tolua_cocos2dx_FileUtils_getStringFromFile(lua_State* tolua_S) if (1 == argc) { const char* arg0; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.FileUtils:getStringFromFile"); arg0 = arg0_tmp.c_str(); if (ok) { std::string fullPathName = FileUtils::getInstance()->fullPathForFilename(arg0); @@ -2916,12 +2916,12 @@ static int tolua_cocos2dx_FileUtils_getStringFromFile(lua_State* tolua_S) } } - CCLOG("'getStringFromFile' has wrong number of arguments: %d, was expecting %d\n", argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.FileUtils:getStringFromFile", argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'getStringFromFile'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2dx_FileUtils_getStringFromFile'.",&tolua_err); return 0; #endif } @@ -2947,12 +2947,12 @@ static int tolua_cocos2dx_UserDefault_getInstance(lua_State* tolua_S) return 1; } - CCLOG("'getInstance' has wrong number of arguments: %d, was expecting %d\n", argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.UserDefault:getInstance",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'getInstance'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2dx_UserDefault_getInstance'.",&tolua_err); return 0; #endif } @@ -2975,8 +2975,8 @@ static int tolua_cocos2dx_GLProgram_create(lua_State* tolua_S) if(2 == argc) { const char *arg0, *arg1; - std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp); arg0 = arg0_tmp.c_str(); - std::string arg1_tmp; ok &= luaval_to_std_string(tolua_S, 3, &arg1_tmp); arg1 = arg1_tmp.c_str(); + std::string arg0_tmp; ok &= luaval_to_std_string(tolua_S, 2, &arg0_tmp, "cc.GLProgram:create"); arg0 = arg0_tmp.c_str(); + std::string arg1_tmp; ok &= luaval_to_std_string(tolua_S, 3, &arg1_tmp, "cc.GLProgram:create"); arg1 = arg1_tmp.c_str(); GLProgram* tolua_ret = new GLProgram(); if (nullptr == tolua_ret) @@ -2991,12 +2991,12 @@ static int tolua_cocos2dx_GLProgram_create(lua_State* tolua_S) } - CCLOG("'create' function of GLProgram wrong number of arguments: %d, was expecting %d\n", argc, 2); + CCLOG("%s wrong number of arguments: %d, was expecting %d\n", "cc.GLProgram:create", argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'create'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2dx_GLProgram_create'.",&tolua_err); return 0; #endif } @@ -3032,12 +3032,12 @@ static int tolua_cocos2d_GLProgram_getProgram(lua_State* tolua_S) return 1; } - CCLOG("'getProgram' function of GLProgram wrong number of arguments: %d, was expecting %d\n", argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.GLProgram:getProgram",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'getProgram'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_GLProgram_getProgram'.",&tolua_err); return 0; #endif } @@ -3137,12 +3137,12 @@ static int tolua_cocos2dx_GLProgram_setUniformLocationF32(lua_State* tolua_S) } } - CCLOG("'setUniformLocationF32' function of GLProgram wrong number of arguments: %d, was expecting %d\n", argc, 2); + CCLOG(" %s has wrong number of arguments: %d, was expecting %d\n", "cc.GLProgram:setUniformLocationF32",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'setUniformLocationF32'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_GLProgram_getProgram'.",&tolua_err); return 0; #endif } @@ -3178,7 +3178,7 @@ static int lua_cocos2dx_GLProgram_getUniform(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.GLProgram:getUniform"); if(!ok) return 0; cocos2d::Uniform* ret = cobj->getUniform(arg0); @@ -3192,7 +3192,7 @@ static int lua_cocos2dx_GLProgram_getUniform(lua_State* tolua_S) } return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getUniform",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLProgram:getUniform:getUniform",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3235,9 +3235,9 @@ int lua_cocos2dx_GLProgram_setUniformLocationWithMatrix2fv(lua_State* tolua_S) GLfloat* arg1; unsigned int arg2; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.GLProgram:setUniformLocationWithMatrix2fv"); - ok &= luaval_to_uint32(tolua_S, 4,&arg2); + ok &= luaval_to_uint32(tolua_S, 4,&arg2, "cc.GLProgram:setUniformLocationWithMatrix2fv"); if(!ok) { @@ -3265,7 +3265,7 @@ int lua_cocos2dx_GLProgram_setUniformLocationWithMatrix2fv(lua_State* tolua_S) CC_SAFE_DELETE_ARRAY(arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setUniformLocationWithMatrix2fv",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLProgram:setUniformLocationWithMatrix2fv",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 @@ -3308,9 +3308,9 @@ int lua_cocos2dx_GLProgram_setUniformLocationWithMatrix3fv(lua_State* tolua_S) GLfloat* arg1; unsigned int arg2; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.GLProgram:setUniformLocationWithMatrix3fv"); - ok &= luaval_to_uint32(tolua_S, 4,&arg2); + ok &= luaval_to_uint32(tolua_S, 4,&arg2, "cc.GLProgram:setUniformLocationWithMatrix3fv"); if(!ok) { @@ -3339,7 +3339,7 @@ int lua_cocos2dx_GLProgram_setUniformLocationWithMatrix3fv(lua_State* tolua_S) return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setUniformLocationWithMatrix3fv",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLProgram:setUniformLocationWithMatrix3fv",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 @@ -3382,9 +3382,9 @@ int lua_cocos2dx_GLProgram_setUniformLocationWithMatrix4fv(lua_State* tolua_S) GLfloat* arg1; unsigned int arg2; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.GLProgram:setUniformLocationWithMatrix4fv"); - ok &= luaval_to_uint32(tolua_S, 4,&arg2); + ok &= luaval_to_uint32(tolua_S, 4,&arg2, "cc.GLProgram:setUniformLocationWithMatrix4fv"); if(!ok) { @@ -3413,7 +3413,7 @@ int lua_cocos2dx_GLProgram_setUniformLocationWithMatrix4fv(lua_State* tolua_S) CC_SAFE_DELETE_ARRAY(arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setUniformLocationWithMatrix4fv",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLProgram:setUniformLocationWithMatrix4fv",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 @@ -3455,9 +3455,9 @@ int lua_cocos2dx_GLProgram_setUniformLocationWith3iv(lua_State* tolua_S) GLint* arg1; unsigned int arg2; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.GLProgram:setUniformLocationWith3iv"); - ok &= luaval_to_uint32(tolua_S, 4,&arg2); + ok &= luaval_to_uint32(tolua_S, 4,&arg2, "cc.GLProgram:setUniformLocationWith3iv"); if(!ok) { CCLOG("Parse params error in the lua_cocos2dx_GLProgram_setUniformLocationWith3iv"); @@ -3485,7 +3485,7 @@ int lua_cocos2dx_GLProgram_setUniformLocationWith3iv(lua_State* tolua_S) CC_SAFE_DELETE_ARRAY(arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setUniformLocationWith3iv",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLProgram:setUniformLocationWith3iv",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 @@ -3528,9 +3528,9 @@ int lua_cocos2dx_GLProgram_setUniformLocationWith4iv(lua_State* tolua_S) GLint* arg1; unsigned int arg2; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.GLProgram:setUniformLocationWith4iv"); - ok &= luaval_to_uint32(tolua_S, 4,&arg2); + ok &= luaval_to_uint32(tolua_S, 4,&arg2, "cc.GLProgram:setUniformLocationWith4iv"); if(!ok) { @@ -3557,7 +3557,7 @@ int lua_cocos2dx_GLProgram_setUniformLocationWith4iv(lua_State* tolua_S) CC_SAFE_DELETE_ARRAY(arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setUniformLocationWith4iv",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLProgram:setUniformLocationWith4iv",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 @@ -3600,9 +3600,9 @@ int lua_cocos2dx_GLProgram_setUniformLocationWith2iv(lua_State* tolua_S) GLint* arg1; unsigned int arg2; - ok &= luaval_to_int32(tolua_S, 2,(GLint *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(GLint *)&arg0, "cc.GLProgram:setUniformLocationWith2iv"); - ok &= luaval_to_uint32(tolua_S, 4,&arg2); + ok &= luaval_to_uint32(tolua_S, 4,&arg2, "cc.GLProgram:setUniformLocationWith2iv"); if(!ok) { @@ -3626,7 +3626,7 @@ int lua_cocos2dx_GLProgram_setUniformLocationWith2iv(lua_State* tolua_S) CC_SAFE_DELETE_ARRAY(arg1); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setUniformLocationWith2iv",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLProgram:setUniformLocationWith2iv",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 @@ -3667,7 +3667,7 @@ int lua_cocos2dx_GLProgram_getVertexAttrib(lua_State* tolua_S) { std::string arg0; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.GLProgram:getVertexAttrib"); if(!ok) return 0; cocos2d::VertexAttrib* ret = cobj->getVertexAttrib(arg0); @@ -3681,7 +3681,7 @@ int lua_cocos2dx_GLProgram_getVertexAttrib(lua_State* tolua_S) } return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getVertexAttrib",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLProgram:getVertexAttrib",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -3831,7 +3831,7 @@ static int tolua_cocos2dx_SpriteBatchNode_getDescendants(lua_State* tolua_S) return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getDescendants",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.SpriteBatchNode:getDescendants",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -4371,12 +4371,12 @@ static int tolua_cocos2dx_LuaEventListenerAcceleration_create(lua_State* tolua_S return 1; } - CCLOG("'create' has wrong number of arguments: %d, was expecting %d\n", argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.EventListenerAcceleration:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'create'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2dx_LuaEventListenerAcceleration_create'.",&tolua_err); return 0; #endif } @@ -4415,12 +4415,12 @@ static int tolua_cocos2d_LuaEventListenerCustom_create(lua_State* tolua_S) return 1; } - CCLOG("'create' has wrong number of arguments: %d, was expecting %d\n", argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.EventListenerCustom:create", argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'create'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_LuaEventListenerCustom_create'.",&tolua_err); return 0; #endif } @@ -4473,12 +4473,12 @@ static int tolua_cocos2dx_EventListenerKeyboard_create(lua_State* tolua_S) return 1; } - CCLOG("'create' has wrong number of arguments: %d, was expecting %d\n", argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.EventListenerKeyboard:create", argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'create'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2dx_EventListenerKeyboard_create'.",&tolua_err); return 0; #endif } @@ -4558,12 +4558,12 @@ static int tolua_cocos2dx_EventListenerKeyboard_clone(lua_State* tolua_S) return 1; } - CCLOG("'clone' has wrong number of arguments: %d, was expecting %d\n", argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.EventListenerKeyboard:clone",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'clone'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2dx_EventListenerKeyboard_clone'.",&tolua_err); return 0; #endif } @@ -4630,12 +4630,12 @@ static int tolua_cocos2dx_EventListenerKeyboard_registerScriptHandler(lua_State* return 0; } - CCLOG("'registerScriptHandler' has wrong number of arguments: %d, was expecting %d\n", argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.EventListenerKeyboard:registerScriptHandler", argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'registerScriptHandler'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2dx_EventListenerKeyboard_registerScriptHandler'.",&tolua_err); return 0; #endif } @@ -4679,12 +4679,12 @@ static int tolua_cocos2dx_EventListenerTouchOneByOne_create(lua_State* tolua_S) return 1; } - CCLOG("'create' has wrong number of arguments: %d, was expecting %d\n", argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.EventListenerTouchOneByOne:create",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'create'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2dx_EventListenerTouchOneByOne_create'.",&tolua_err); return 0; #endif } @@ -4785,12 +4785,12 @@ static int tolua_cocos2dx_EventListenerTouchOneByOne_clone(lua_State* tolua_S) return 1; } - CCLOG("'clone' has wrong number of arguments: %d, was expecting %d\n", argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.EventListenerTouchOneByOne:create", argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'clone'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2dx_EventListenerTouchOneByOne_clone'.",&tolua_err); return 0; #endif } @@ -4879,12 +4879,12 @@ static int tolua_cocos2dx_EventListenerTouchOneByOne_registerScriptHandler(lua_S return 0; } - CCLOG("'registerScriptHandler' has wrong number of arguments: %d, was expecting %d\n", argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.EventListenerTouchOneByOne:registerScriptHandler", argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'registerScriptHandler'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2dx_EventListenerTouchOneByOne_registerScriptHandler'.",&tolua_err); return 0; #endif } @@ -4928,12 +4928,12 @@ static int tolua_cocos2dx_EventListenerTouchAllAtOnce_create(lua_State* tolua_S) return 1; } - CCLOG("'create' has wrong number of arguments: %d, was expecting %d\n", argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.EventListenerTouchAllAtOnce:registerScriptHandler",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'create'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2dx_EventListenerTouchAllAtOnce_create'.",&tolua_err); return 0; #endif } @@ -5033,12 +5033,12 @@ static int tolua_cocos2dx_EventListenerTouchAllAtOnce_clone(lua_State* tolua_S) return 1; } - CCLOG("'clone' has wrong number of arguments: %d, was expecting %d\n", argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.EventListenerTouchAllAtOnce:clone", argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'clone'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2dx_EventListenerTouchAllAtOnce_clone'.",&tolua_err); return 0; #endif } @@ -5127,12 +5127,12 @@ static int tolua_cocos2dx_EventListenerTouchAllAtOnce_registerScriptHandler(lua_ return 0; } - CCLOG("'registerScriptHandler' has wrong number of arguments: %d, was expecting %d\n", argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.EventListenerTouchAllAtOnce:registerScriptHandler",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'registerScriptHandler'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2dx_EventListenerTouchAllAtOnce_registerScriptHandler'.",&tolua_err); return 0; #endif } @@ -5176,12 +5176,12 @@ static int tolua_cocos2dx_EventListenerMouse_create(lua_State* tolua_S) return 1; } - CCLOG("'create' has wrong number of arguments: %d, was expecting %d\n", argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.EventListenerMouse:create",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'create'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2dx_EventListenerMouse_create'.",&tolua_err); return 0; #endif } @@ -5281,12 +5281,12 @@ static int tolua_cocos2dx_EventListenerMouse_clone(lua_State* tolua_S) return 1; } - CCLOG("'clone' has wrong number of arguments: %d, was expecting %d\n", argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.EventListenerMouse:clone", argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'clone'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2dx_EventListenerMouse_clone'.",&tolua_err); return 0; #endif } @@ -5377,12 +5377,12 @@ static int tolua_cocos2dx_EventListenerMouse_registerScriptHandler(lua_State* to return 0; } - CCLOG("'registerScriptHandler' has wrong number of arguments: %d, was expecting %d\n", argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.EventListenerMouse:registerScriptHandler",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'registerScriptHandler'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2dx_EventListenerMouse_registerScriptHandler'.",&tolua_err); return 0; #endif } @@ -5433,7 +5433,7 @@ static int tolua_cocos2dx_ActionCamera_reverse(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, reverse->_ID, &(reverse->_luaID), (void*)(reverse),"cc.ActionCamera"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "reverse",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.ActionCamera:reverse",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -5486,7 +5486,7 @@ static int tolua_cocos2dx_GridAction_reverse(lua_State* tolua_S) toluafix_pushusertype_ccobject(tolua_S, reverse->_ID, &(reverse->_luaID), (void*)(reverse),"cc.GridAction"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "reverse",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GridAction:reverse",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -5536,11 +5536,11 @@ static int lua_cocos2dx_Label_createWithTTF00(lua_State* L) TTFConfig ttfConfig(""); std::string text = ""; - ok &= luaval_to_ttfconfig(L, 2, &ttfConfig); + ok &= luaval_to_ttfconfig(L, 2, &ttfConfig, "cc.Label:createWithTTF"); if (!ok) return 0; - ok &= luaval_to_std_string(L, 3, &text); + ok &= luaval_to_std_string(L, 3, &text, "cc.Label:createWithTTF"); if (!ok) return 0; @@ -5553,7 +5553,7 @@ static int lua_cocos2dx_Label_createWithTTF00(lua_State* L) toluafix_pushusertype_ccobject(L,ID, luaID, (void*)ret,"cc.Label"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "create",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.Label:createWithTTF",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -5593,7 +5593,7 @@ static int lua_cocos2dx_Label_createWithTTF01(lua_State* L) cocos2d::Size dimensions = cocos2d::Size::ZERO; if (lua_istable(L, 5)) { - luaval_to_size(L, 5, &dimensions); + luaval_to_size(L, 5, &dimensions, "cc.Label:createWithTTF"); } TextHAlignment hAlignment = static_cast((int)tolua_tonumber(L, 6, 0)); TextVAlignment vAlignment = static_cast((int)tolua_tonumber(L, 7, 0)); @@ -5648,7 +5648,7 @@ static int lua_cocos2dx_TMXTiledMap_getPropertiesForGID(lua_State* tolua_S) if (argc == 1) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "cc.TMXTiledMap:getPropertiesForGID"); if (!ok) return 0; @@ -5656,7 +5656,7 @@ static int lua_cocos2dx_TMXTiledMap_getPropertiesForGID(lua_State* tolua_S) ccvalue_to_luaval(tolua_S, ret); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getPropertiesForGID",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXTiledMap:getPropertiesForGID",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -5704,9 +5704,9 @@ static int lua_cocos2dx_Console_send(lua_State* tolua_S) if (argc == 2) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,&arg0); + ok &= luaval_to_int32(tolua_S, 2,&arg0, "cc.Console:send"); std::string arg1; - ok &= luaval_to_std_string(tolua_S, 3,&arg1); + ok &= luaval_to_std_string(tolua_S, 3,&arg1, "cc.Console:send"); if(!ok) return 0; @@ -5714,7 +5714,7 @@ static int lua_cocos2dx_Console_send(lua_State* tolua_S) return 0; } ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "send",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.Console:send",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -5750,7 +5750,7 @@ static int lua_cocos2dx_Console_wait(lua_State* tolua_S) if (argc == 1) { int arg0; - ok &= luaval_to_int32(tolua_S, 2,&arg0); + ok &= luaval_to_int32(tolua_S, 2,&arg0, "cc.Console:wait"); if(!ok) return 0; @@ -5759,7 +5759,7 @@ static int lua_cocos2dx_Console_wait(lua_State* tolua_S) return 0; } ok = true; - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "wait",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.Console:wait",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -5796,7 +5796,7 @@ static int lua_cocos2dx_Console_addCommand(lua_State* tolua_S) if (ok && argc == 2) { ValueMap arg0; - ok &= luaval_to_ccvaluemap(tolua_S, 2, &arg0); + ok &= luaval_to_ccvaluemap(tolua_S, 2, &arg0, "cc.Console:addCommand"); // std::string name = std::string(arg0["name"].asString()); std::string help = std::string(arg0["help"].asString()); @@ -5828,7 +5828,7 @@ static int lua_cocos2dx_Console_addCommand(lua_State* tolua_S) } return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d", "addCommand",argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d", "cc.Console:addCommand",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -5886,17 +5886,17 @@ static int lua_cocos2dx_GLProgramState_setVertexAttribPointer(lua_State* tolua_S int arg4; int arg5; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.GLProgramState:setVertexAttribPointer"); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.GLProgramState:setVertexAttribPointer"); - ok &= luaval_to_uint32(tolua_S, 4,&arg2); + ok &= luaval_to_uint32(tolua_S, 4,&arg2, "cc.GLProgramState:setVertexAttribPointer"); - ok &= luaval_to_boolean(tolua_S, 5, &arg3); + ok &= luaval_to_boolean(tolua_S, 5, &arg3, "cc.GLProgramState:setVertexAttribPointer"); - ok &= luaval_to_int32(tolua_S, 6,(int *)&arg4); + ok &= luaval_to_int32(tolua_S, 6,(int *)&arg4, "cc.GLProgramState:setVertexAttribPointer"); - ok &= luaval_to_int32(tolua_S, 7, (int *)&arg5); + ok &= luaval_to_int32(tolua_S, 7, (int *)&arg5, "cc.GLProgramState:setVertexAttribPointer"); if(!ok) return 0; @@ -5914,17 +5914,17 @@ static int lua_cocos2dx_GLProgramState_setVertexAttribPointer(lua_State* tolua_S int arg6; - ok &= luaval_to_std_string(tolua_S, 2,&arg0); + ok &= luaval_to_std_string(tolua_S, 2,&arg0, "cc.GLProgramState:setVertexAttribPointer"); - ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1); + ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1, "cc.GLProgramState:setVertexAttribPointer"); - ok &= luaval_to_uint32(tolua_S, 4,&arg2); + ok &= luaval_to_uint32(tolua_S, 4,&arg2, "cc.GLProgramState:setVertexAttribPointer"); - ok &= luaval_to_boolean(tolua_S, 5, &arg3); + ok &= luaval_to_boolean(tolua_S, 5, &arg3, "cc.GLProgramState:setVertexAttribPointer"); - ok &= luaval_to_int32(tolua_S, 6,(int *)&arg4); + ok &= luaval_to_int32(tolua_S, 6,(int *)&arg4, "cc.GLProgramState:setVertexAttribPointer"); - ok &= luaval_to_int32(tolua_S, 8, (int *)&arg6); + ok &= luaval_to_int32(tolua_S, 8, (int *)&arg6, "cc.GLProgramState:setVertexAttribPointer"); size_t len = lua_objlen(tolua_S, 7); @@ -5963,7 +5963,7 @@ static int lua_cocos2dx_GLProgramState_setVertexAttribPointer(lua_State* tolua_S return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setVertexAttribPointer",argc, 6); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLProgramState:setVertexAttribPointer",argc, 6); return 0; #if COCOS2D_DEBUG >= 1 @@ -6033,7 +6033,7 @@ static int lua_cocos2dx_OrbitCamera_sphericalRadius(lua_State* tolua_S) return 3; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "sphericalRadius",argc, 3); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.OrbitCamera:sphericalRadius",argc, 3); return 0; #if COCOS2D_DEBUG >= 1 @@ -6085,7 +6085,7 @@ int lua_cocos2dx_TMXLayer_getTileGIDAt(lua_State* tolua_S) { cocos2d::Vec2 arg0; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.TMXLayer:getTileGIDAt"); if(!ok) return 0; unsigned int ret = cobj->getTileGIDAt(arg0); @@ -6098,8 +6098,8 @@ int lua_cocos2dx_TMXLayer_getTileGIDAt(lua_State* tolua_S) cocos2d::Vec2 arg0; int arg1; - ok &= luaval_to_vec2(tolua_S, 2, &arg0); - ok &= luaval_to_int32(tolua_S, 3, &arg1); + ok &= luaval_to_vec2(tolua_S, 2, &arg0, "cc.TMXLayer:getTileGIDAt"); + ok &= luaval_to_int32(tolua_S, 3, &arg1, "cc.TMXLayer:getTileGIDAt"); if(!ok) return 0; @@ -6109,7 +6109,7 @@ int lua_cocos2dx_TMXLayer_getTileGIDAt(lua_State* tolua_S) tolua_pushnumber(tolua_S,(lua_Number)arg1); return 2; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "getTileGIDAt",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXLayer:getTileGIDAt",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -6177,7 +6177,7 @@ int lua_cocos2dx_TMXLayer_setTiles(lua_State* tolua_S) CC_SAFE_DELETE_ARRAY(arg0); return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setTiles",argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.TMXLayer:setTiles",argc, 1); return 0; #if COCOS2D_DEBUG >= 1 @@ -6226,12 +6226,12 @@ static int tolua_cocos2dx_EventListenerFocus_create(lua_State* tolua_S) return 1; } - CCLOG("'create' has wrong number of arguments: %d, was expecting %d\n", argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.EventListenerFocus:create", argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'create'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2dx_EventListenerFocus_create'.",&tolua_err); return 0; #endif } @@ -6297,12 +6297,12 @@ static int tolua_cocos2dx_EventListenerFocus_clone(lua_State* tolua_S) return 1; } - CCLOG("'clone' has wrong number of arguments: %d, was expecting %d\n", argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.EventListenerFocus:clone", argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'clone'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2dx_EventListenerFocus_clone'.",&tolua_err); return 0; #endif } @@ -6353,12 +6353,12 @@ static int tolua_cocos2dx_EventListenerFocus_registerScriptHandler(lua_State* to return 0; } - CCLOG("'registerScriptHandler' has wrong number of arguments: %d, was expecting %d\n", argc, 1); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.EventListenerFocus:registerScriptHandler", argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'registerScriptHandler'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2dx_EventListenerFocus_registerScriptHandler'.",&tolua_err); return 0; #endif } @@ -6416,7 +6416,7 @@ int lua_cocos2dx_Application_isIOS64bit(lua_State* tolua_S) tolua_pushboolean(tolua_S, isIOS64bit); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "isIOS64bit",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Application:isIOS64bit",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 @@ -6485,11 +6485,11 @@ static int lua_cocos2dx_TextureCache_addImageAsync(lua_State* tolua_S) return 0; } - CCLOG("'addImageAsync' function of TextureCache has wrong number of arguments: %d, was expecting %d\n", argc, 1); + CCLOG("%s function of TextureCache has wrong number of arguments: %d, was expecting %d\n", "cc.TextureCache:addImageAsync", argc, 1); #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'addImageAsync'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_TextureCache_addImageAsync'.",&tolua_err); #endif return 0; } @@ -6589,7 +6589,7 @@ static int tolua_cocos2d_utils_captureScreen(lua_State* tolua_S) } #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'captureScreen'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_utils_captureScreen'.",&tolua_err); return 0; #endif } @@ -6627,7 +6627,7 @@ static int tolua_cocos2d_utils_findChildren(lua_State* tolua_S) } #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'findChildren'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_utils_findChildren'.",&tolua_err); return 0; #endif } diff --git a/cocos/scripting/lua-bindings/manual/lua_cocos2dx_manual.hpp b/cocos/scripting/lua-bindings/manual/cocos2d/lua_cocos2dx_manual.hpp similarity index 100% rename from cocos/scripting/lua-bindings/manual/lua_cocos2dx_manual.hpp rename to cocos/scripting/lua-bindings/manual/cocos2d/lua_cocos2dx_manual.hpp diff --git a/cocos/scripting/lua-bindings/manual/lua_cocos2dx_physics_manual.cpp b/cocos/scripting/lua-bindings/manual/cocos2d/lua_cocos2dx_physics_manual.cpp similarity index 93% rename from cocos/scripting/lua-bindings/manual/lua_cocos2dx_physics_manual.cpp rename to cocos/scripting/lua-bindings/manual/cocos2d/lua_cocos2dx_physics_manual.cpp index f63ae9ef0d..c7914a12e9 100644 --- a/cocos/scripting/lua-bindings/manual/lua_cocos2dx_physics_manual.cpp +++ b/cocos/scripting/lua-bindings/manual/cocos2d/lua_cocos2dx_physics_manual.cpp @@ -174,8 +174,8 @@ int lua_cocos2dx_physics_PhysicsWorld_rayCast(lua_State* tolua_S) }; } while(0); - ok &= luaval_to_vec2(tolua_S, 3, &arg1); - ok &= luaval_to_vec2(tolua_S, 4, &arg2); + ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.PhysicsWorld:rayCast"); + ok &= luaval_to_vec2(tolua_S, 4, &arg2, "cc.PhysicsWorld:rayCast"); if(!ok) return 0; cobj->rayCast(arg0, arg1, arg2, nullptr); @@ -231,7 +231,7 @@ int lua_cocos2dx_physics_PhysicsWorld_queryRect(lua_State* tolua_S) }; } while(0); - ok &= luaval_to_rect(tolua_S, 3, &arg1); + ok &= luaval_to_rect(tolua_S, 3, &arg1, "cc.PhysicsWorld:queryRect"); if(!ok) return 0; cobj->queryRect(arg0, arg1, nullptr); @@ -290,7 +290,7 @@ int lua_cocos2dx_physics_PhysicsWorld_queryPoint(lua_State* tolua_S) assert(false); } while(0) ; - ok &= luaval_to_vec2(tolua_S, 3, &arg1); + ok &= luaval_to_vec2(tolua_S, 3, &arg1, "cc.PhysicsWorld:queryPoint"); if(!ok) return 0; cobj->queryPoint(arg0, arg1, nullptr); @@ -328,7 +328,7 @@ int lua_cocos2dx_physics_PhysicsBody_createPolygon(lua_State* tolua_S) cocos2d::Vec2* arg0 = nullptr; int arg1 = 0; do { - ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1); + ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1, "cc.PhysicsBody:createPolygon"); if (nullptr == arg0){ LUA_PRECONDITION( arg0, "Invalid Native Object"); }} while (0); @@ -359,11 +359,11 @@ int lua_cocos2dx_physics_PhysicsBody_createPolygon(lua_State* tolua_S) int arg1 = 0; cocos2d::PhysicsMaterial arg2; do { - ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1); + ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1, "cc.PhysicsBody:createPolygon"); if (nullptr == arg0){ LUA_PRECONDITION( arg0, "Invalid Native Object"); }} while (0); - ok &= luaval_to_physics_material(tolua_S, 3, &arg2); + ok &= luaval_to_physics_material(tolua_S, 3, &arg2, "cc.PhysicsBody:createPolygon"); if(!ok) { CC_SAFE_DELETE_ARRAY(arg0); @@ -393,12 +393,12 @@ int lua_cocos2dx_physics_PhysicsBody_createPolygon(lua_State* tolua_S) cocos2d::PhysicsMaterial arg2; cocos2d::Vec2 arg3; do { - ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1); + ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1, "cc.PhysicsBody:createPolygon"); if (nullptr == arg0){ LUA_PRECONDITION( arg0, "Invalid Native Object"); }} while (0); - ok &= luaval_to_physics_material(tolua_S, 3, &arg2); - ok &= luaval_to_vec2(tolua_S, 4, &arg3); + ok &= luaval_to_physics_material(tolua_S, 3, &arg2, "cc.PhysicsBody:createPolygon"); + ok &= luaval_to_vec2(tolua_S, 4, &arg3, "cc.PhysicsBody:createPolygon"); if(!ok) { CC_SAFE_DELETE_ARRAY(arg0); @@ -449,7 +449,7 @@ int lua_cocos2dx_physics_PhysicsBody_createEdgePolygon(lua_State* tolua_S) cocos2d::Vec2* arg0; int arg1; do { - ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1); + ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1, "cc.PhysicsBody:createEdgePolygon"); if (nullptr == arg0){ LUA_PRECONDITION( arg0, "Invalid Native Object"); }} while (0); @@ -480,11 +480,11 @@ int lua_cocos2dx_physics_PhysicsBody_createEdgePolygon(lua_State* tolua_S) int arg1; cocos2d::PhysicsMaterial arg2; do { - ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1); + ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1, "cc.PhysicsBody:createEdgePolygon"); if (nullptr == arg0){ LUA_PRECONDITION( arg0, "Invalid Native Object"); }} while (0); - ok &= luaval_to_physics_material(tolua_S, 3, &arg2); + ok &= luaval_to_physics_material(tolua_S, 3, &arg2, "cc.PhysicsBody:createEdgePolygon"); if(!ok) { CC_SAFE_DELETE_ARRAY(arg0); @@ -513,12 +513,12 @@ int lua_cocos2dx_physics_PhysicsBody_createEdgePolygon(lua_State* tolua_S) cocos2d::PhysicsMaterial arg2; double arg3; do { - ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1); + ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1, "cc.PhysicsBody:createEdgePolygon"); if (nullptr == arg0){ LUA_PRECONDITION( arg0, "Invalid Native Object"); }} while (0); - ok &= luaval_to_physics_material(tolua_S, 3, &arg2); - ok &= luaval_to_number(tolua_S, 4,&arg3); + ok &= luaval_to_physics_material(tolua_S, 3, &arg2, "cc.PhysicsBody:createEdgePolygon"); + ok &= luaval_to_number(tolua_S, 4,&arg3, "cc.PhysicsBody:createEdgePolygon"); if(!ok) { CC_SAFE_DELETE_ARRAY(arg0); @@ -569,7 +569,7 @@ int lua_cocos2dx_physics_PhysicsBody_createEdgeChain(lua_State* tolua_S) cocos2d::Vec2* arg0; int arg1; do { - ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1); + ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1, "cc.PhysicsBody:createEdgeChain"); if (nullptr == arg0){ LUA_PRECONDITION( arg0, "Invalid Native Object"); }} while (0); @@ -600,11 +600,11 @@ int lua_cocos2dx_physics_PhysicsBody_createEdgeChain(lua_State* tolua_S) int arg1; cocos2d::PhysicsMaterial arg2; do { - ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1); + ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1, "cc.PhysicsBody:createEdgeChain"); if (nullptr == arg0){ LUA_PRECONDITION( arg0, "Invalid Native Object"); }} while (0); - ok &= luaval_to_physics_material(tolua_S, 3, &arg2); + ok &= luaval_to_physics_material(tolua_S, 3, &arg2, "cc.PhysicsBody:createEdgeChain"); if(!ok) { CC_SAFE_DELETE_ARRAY(arg0); @@ -633,12 +633,12 @@ int lua_cocos2dx_physics_PhysicsBody_createEdgeChain(lua_State* tolua_S) cocos2d::PhysicsMaterial arg2; double arg3; do { - ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1); + ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1, "cc.PhysicsBody:createEdgeChain"); if (nullptr == arg0){ LUA_PRECONDITION( arg0, "Invalid Native Object"); }} while (0); - ok &= luaval_to_physics_material(tolua_S, 3, &arg2); - ok &= luaval_to_number(tolua_S, 4,&arg3); + ok &= luaval_to_physics_material(tolua_S, 3, &arg2, "cc.PhysicsBody:createEdgeChain"); + ok &= luaval_to_number(tolua_S, 4,&arg3, "cc.PhysicsBody:createEdgeChain"); if(!ok) { CC_SAFE_DELETE_ARRAY(arg0); @@ -689,7 +689,7 @@ int lua_cocos2dx_physics_PhysicsShape_recenterPoints(lua_State* tolua_S) cocos2d::Vec2* arg0; int arg1 = 0; do { - ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1); + ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1, "cc.PhysicsShape:recenterPoints"); if (nullptr == arg0){ LUA_PRECONDITION( arg0, "Invalid Native Object"); }} while (0); @@ -710,11 +710,11 @@ int lua_cocos2dx_physics_PhysicsShape_recenterPoints(lua_State* tolua_S) int arg1 = 0; cocos2d::Vec2 arg2; do { - ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1); + ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1, "cc.PhysicsShape:recenterPoints"); if (nullptr == arg0){ LUA_PRECONDITION( arg0, "Invalid Native Object"); }} while (0); - ok &= luaval_to_vec2(tolua_S, 3, &arg2); + ok &= luaval_to_vec2(tolua_S, 3, &arg2, "cc.PhysicsShape:recenterPoints"); if(!ok) { CC_SAFE_DELETE_ARRAY(arg0); @@ -754,7 +754,7 @@ int lua_cocos2dx_physics_PhysicsShape_getPolyonCenter(lua_State* tolua_S) cocos2d::Vec2* arg0; int arg1 = 0; do { - ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1); + ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1, "cc.PhysicsShape:getPolyonCenter"); if (nullptr == arg0){ LUA_PRECONDITION( arg0, "Invalid Native Object"); }} while (0); @@ -883,7 +883,7 @@ int lua_cocos2dx_physics_PhysicsShapePolygon_create(lua_State* tolua_S) cocos2d::Vec2* arg0; int arg1 = 0; do { - ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1); + ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1, "cc.PhysicsShapePolygon:create"); if (nullptr == arg0){ LUA_PRECONDITION( arg0, "Invalid Native Object"); }} while (0); @@ -904,11 +904,11 @@ int lua_cocos2dx_physics_PhysicsShapePolygon_create(lua_State* tolua_S) int arg1 = 0; cocos2d::PhysicsMaterial arg2; do { - ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1); + ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1, "cc.PhysicsShapePolygon:create"); if (nullptr == arg0){ LUA_PRECONDITION( arg0, "Invalid Native Object"); }} while (0); - ok &= luaval_to_physics_material(tolua_S, 3, &arg2); + ok &= luaval_to_physics_material(tolua_S, 3, &arg2, "cc.PhysicsShapePolygon:create"); if(!ok) { CC_SAFE_DELETE_ARRAY(arg0); @@ -926,12 +926,12 @@ int lua_cocos2dx_physics_PhysicsShapePolygon_create(lua_State* tolua_S) cocos2d::PhysicsMaterial arg2; cocos2d::Vec2 arg3; do { - ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1); + ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1, "cc.PhysicsShapePolygon:create"); if (nullptr == arg0){ LUA_PRECONDITION( arg0, "Invalid Native Object"); }} while (0); - ok &= luaval_to_physics_material(tolua_S, 3, &arg2); - ok &= luaval_to_vec2(tolua_S, 4, &arg3); + ok &= luaval_to_physics_material(tolua_S, 3, &arg2, "cc.PhysicsShapePolygon:create"); + ok &= luaval_to_vec2(tolua_S, 4, &arg3, "cc.PhysicsShapePolygon:create"); if(!ok) { CC_SAFE_DELETE_ARRAY(arg0); @@ -970,7 +970,7 @@ int lua_cocos2dx_physics_PhysicsShapePolygon_calculateArea(lua_State* tolua_S) cocos2d::Vec2* arg0; int arg1 = 0; do { - ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1); + ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1, "cc.PhysicsShapePolygon:calculateArea"); if (nullptr == arg0){ LUA_PRECONDITION( arg0, "Invalid Native Object"); }} while (0); @@ -1012,9 +1012,9 @@ int lua_cocos2dx_physics_PhysicsShapePolygon_calculateMoment(lua_State* tolua_S) double arg0; cocos2d::Vec2* arg1; int arg2 = 0; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsShapePolygon:calculateMoment"); do { - ok = luaval_to_array_of_vec2(tolua_S, 3, &arg1, &arg2); + ok = luaval_to_array_of_vec2(tolua_S, 3, &arg1, &arg2, "cc.PhysicsShapePolygon:calculateMoment"); if (nullptr == arg1){ LUA_PRECONDITION( arg1, "Invalid Native Object"); }} while (0); @@ -1034,13 +1034,13 @@ int lua_cocos2dx_physics_PhysicsShapePolygon_calculateMoment(lua_State* tolua_S) cocos2d::Vec2* arg1; int arg2 = 0; cocos2d::Vec2 arg3; - ok &= luaval_to_number(tolua_S, 2,&arg0); + ok &= luaval_to_number(tolua_S, 2,&arg0, "cc.PhysicsShapePolygon:calculateMoment"); do { - ok = luaval_to_array_of_vec2(tolua_S, 3, &arg1, &arg2); + ok = luaval_to_array_of_vec2(tolua_S, 3, &arg1, &arg2, "cc.PhysicsShapePolygon:calculateMoment"); if (nullptr == arg1){ LUA_PRECONDITION( arg1, "Invalid Native Object"); }} while (0); - ok &= luaval_to_vec2(tolua_S, 4, &arg3); + ok &= luaval_to_vec2(tolua_S, 4, &arg3, "cc.PhysicsShapePolygon:calculateMoment"); if(!ok) { CC_SAFE_DELETE_ARRAY(arg1); @@ -1316,7 +1316,7 @@ int lua_cocos2dx_physics_PhysicsShapeEdgePolygon_create(lua_State* tolua_S) cocos2d::Vec2* arg0; int arg1 = 0; do { - ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1); + ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1, "cc.PhysicsShapeEdgePolygon:create"); if (nullptr == arg0){ LUA_PRECONDITION( arg0, "Invalid Native Object"); }} while (0); @@ -1336,11 +1336,11 @@ int lua_cocos2dx_physics_PhysicsShapeEdgePolygon_create(lua_State* tolua_S) int arg1 = 0; cocos2d::PhysicsMaterial arg2; do { - ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1); + ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1, "cc.PhysicsShapeEdgePolygon:create"); if (nullptr == arg0){ LUA_PRECONDITION( arg0, "Invalid Native Object"); }} while (0); - ok &= luaval_to_physics_material(tolua_S, 3, &arg2); + ok &= luaval_to_physics_material(tolua_S, 3, &arg2, "cc.PhysicsShapeEdgePolygon:create"); if(!ok) { CC_SAFE_DELETE_ARRAY(arg0); @@ -1358,12 +1358,12 @@ int lua_cocos2dx_physics_PhysicsShapeEdgePolygon_create(lua_State* tolua_S) cocos2d::PhysicsMaterial arg2; double arg3; do { - ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1); + ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1, "cc.PhysicsShapeEdgePolygon:create"); if (nullptr == arg0){ LUA_PRECONDITION( arg0, "Invalid Native Object"); }} while (0); - ok &= luaval_to_physics_material(tolua_S, 3, &arg2); - ok &= luaval_to_number(tolua_S, 4,&arg3); + ok &= luaval_to_physics_material(tolua_S, 3, &arg2, "cc.PhysicsShapeEdgePolygon:create"); + ok &= luaval_to_number(tolua_S, 4,&arg3, "cc.PhysicsShapeEdgePolygon:create"); if(!ok) { CC_SAFE_DELETE_ARRAY(arg0); @@ -1403,7 +1403,7 @@ int lua_cocos2dx_physics_PhysicsShapeEdgeChain_create(lua_State* tolua_S) cocos2d::Vec2* arg0; int arg1 = 0; do { - ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1); + ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1, "cc.PhysicsShapeEdgeChain:create"); if (nullptr == arg0){ LUA_PRECONDITION( arg0, "Invalid Native Object"); }} while (0); @@ -1423,11 +1423,11 @@ int lua_cocos2dx_physics_PhysicsShapeEdgeChain_create(lua_State* tolua_S) int arg1 = 0; cocos2d::PhysicsMaterial arg2; do { - ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1); + ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1, "cc.PhysicsShapeEdgeChain:create"); if (nullptr == arg0){ LUA_PRECONDITION( arg0, "Invalid Native Object"); }} while (0); - ok &= luaval_to_physics_material(tolua_S, 3, &arg2); + ok &= luaval_to_physics_material(tolua_S, 3, &arg2, "cc.PhysicsShapeEdgeChain:create"); if(!ok) { CC_SAFE_DELETE_ARRAY(arg0); @@ -1445,12 +1445,12 @@ int lua_cocos2dx_physics_PhysicsShapeEdgeChain_create(lua_State* tolua_S) cocos2d::PhysicsMaterial arg2; double arg3; do { - ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1); + ok = luaval_to_array_of_vec2(tolua_S, 2, &arg0, &arg1, "cc.PhysicsShapeEdgeChain:create"); if (nullptr == arg0){ LUA_PRECONDITION( arg0, "Invalid Native Object"); }} while (0); - ok &= luaval_to_physics_material(tolua_S, 3, &arg2); - ok &= luaval_to_number(tolua_S, 4,&arg3); + ok &= luaval_to_physics_material(tolua_S, 3, &arg2, "cc.PhysicsShapeEdgeChain:create"); + ok &= luaval_to_number(tolua_S, 4,&arg3, "cc.PhysicsShapeEdgeChain:create"); if(!ok) { CC_SAFE_DELETE_ARRAY(arg0); diff --git a/cocos/scripting/lua-bindings/manual/lua_cocos2dx_physics_manual.hpp b/cocos/scripting/lua-bindings/manual/cocos2d/lua_cocos2dx_physics_manual.hpp similarity index 100% rename from cocos/scripting/lua-bindings/manual/lua_cocos2dx_physics_manual.hpp rename to cocos/scripting/lua-bindings/manual/cocos2d/lua_cocos2dx_physics_manual.hpp diff --git a/cocos/scripting/lua-bindings/manual/CCBProxy.cpp b/cocos/scripting/lua-bindings/manual/cocosbuilder/CCBProxy.cpp similarity index 100% rename from cocos/scripting/lua-bindings/manual/CCBProxy.cpp rename to cocos/scripting/lua-bindings/manual/cocosbuilder/CCBProxy.cpp diff --git a/cocos/scripting/lua-bindings/manual/CCBProxy.h b/cocos/scripting/lua-bindings/manual/cocosbuilder/CCBProxy.h similarity index 100% rename from cocos/scripting/lua-bindings/manual/CCBProxy.h rename to cocos/scripting/lua-bindings/manual/cocosbuilder/CCBProxy.h diff --git a/cocos/scripting/lua-bindings/manual/cocosbuilder/lua_cocos2dx_cocosbuilder_manual.cpp b/cocos/scripting/lua-bindings/manual/cocosbuilder/lua_cocos2dx_cocosbuilder_manual.cpp new file mode 100644 index 0000000000..11693b86cb --- /dev/null +++ b/cocos/scripting/lua-bindings/manual/cocosbuilder/lua_cocos2dx_cocosbuilder_manual.cpp @@ -0,0 +1,471 @@ +/**************************************************************************** + 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 "lua_cocos2dx_cocosbuilder_manual.h" +#include "lua_cocos2dx_cocosbuilder_auto.hpp" +#include "cocos2d.h" +#include "tolua_fix.h" +#include "LuaBasicConversions.h" +#include "CCLuaEngine.h" +#include "CCLuaValue.h" +#include "CCBProxy.h" + +USING_NS_CC; +USING_NS_CC_EXT; + +static int tolua_cocos2d_CCBProxy_create(lua_State* tolua_S) +{ + if (NULL == tolua_S) + return 0; + + int argc = 0; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; + if (!tolua_isusertable(tolua_S,1,"cc.CCBProxy",0,&tolua_err)) goto tolua_lerror; +#endif + + argc = lua_gettop(tolua_S) - 1; + + if (0 == argc) + { + CCBProxy* tolua_ret = (CCBProxy*)CCBProxy::create(); + int nID = (tolua_ret) ? (int)tolua_ret->_ID : -1; + int *pLuaID = (tolua_ret) ? &tolua_ret->_luaID : NULL; + toluafix_pushusertype_ccobject(tolua_S, nID, pLuaID, (void*)tolua_ret,"cc.CCBProxy"); + return 1; + } + + CCLOG("%s function of CCBProxy has wrong number of arguments: %d, was expecting %d\n", "cc.CCBProxy:create", argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 +tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_CCBProxy_create'.",&tolua_err); + return 0; +#endif +} + + +static int tolua_cocos2d_CCBProxy_createCCBReader(lua_State* tolua_S) +{ + if (NULL == tolua_S) + return 0; + + int argc = 0; + CCBProxy* self = nullptr; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; + if (!tolua_isusertype(tolua_S,1,"cc.CCBProxy",0,&tolua_err)) goto tolua_lerror; +#endif + + self = static_cast(tolua_tousertype(tolua_S,1,0)); + +#if COCOS2D_DEBUG >= 1 + if (nullptr == self) { + tolua_error(tolua_S,"invalid 'self' in function 'tolua_cocos2d_CCBProxy_createCCBReader'\n", NULL); + return 0; + } +#endif + + argc = lua_gettop(tolua_S) - 1; + + if (0 == argc) + { + CCBReader* tolua_ret = (CCBReader*) self->createCCBReader(); + int nID = (tolua_ret) ? (int)tolua_ret->_ID : -1; + int* pLuaID = (tolua_ret) ? &tolua_ret->_luaID : NULL; + toluafix_pushusertype_ccobject(tolua_S, nID, pLuaID, (void*)tolua_ret,"cc.CCBReader"); + return 1; + } + + CCLOG("%s function of CCBProxy has wrong number of arguments: %d, was expecting %d\n", "cc.CCBProxy:createCCBReader", argc, 0); + return 0; + +#if COCOS2D_DEBUG >= 1 +tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_CCBProxy_createCCBReader'.",&tolua_err); + return 0; +#endif +} + +static int tolua_cocos2d_CCBProxy_readCCBFromFile(lua_State* tolua_S) +{ + if (NULL == tolua_S) + return 0; + + int argc = 0; + CCBProxy* self = nullptr; + const char* ccbFilePath = nullptr; + CCBReader* ccbReader = nullptr; + bool setOwner = false; + Node* tolua_ret = nullptr; + int ID = 0; + int* luaID = nullptr; + + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; + if (!tolua_isusertype(tolua_S,1,"cc.CCBProxy",0,&tolua_err)) goto tolua_lerror; +#endif + + self = static_cast(tolua_tousertype(tolua_S,1,0)); + +#if COCOS2D_DEBUG >= 1 + if (nullptr == self) { + tolua_error(tolua_S,"invalid 'self' in function 'tolua_cocos2d_CCBProxy_readCCBFromFile'\n", NULL); + return 0; + } +#endif + + argc = lua_gettop(tolua_S) - 1; + + if (2 == argc || 3 == argc) + { +#if COCOS2D_DEBUG >= 1 + if (!tolua_isstring(tolua_S, 2, 0, &tolua_err)|| + !tolua_isusertype(tolua_S,3,"cc.CCBReader",0,&tolua_err)|| + !tolua_isboolean(tolua_S,4,1,&tolua_err ) + ) + goto tolua_lerror; +#endif + ccbFilePath = ((const char*) tolua_tostring(tolua_S,2,0)); + ccbReader = ((CCBReader*) tolua_tousertype(tolua_S,3,0)); + setOwner = (bool) tolua_toboolean(tolua_S,4,-1); + tolua_ret = (Node*) self->readCCBFromFile(ccbFilePath, ccbReader, setOwner); + ID = (tolua_ret) ? (int)tolua_ret->_ID : -1; + luaID = (tolua_ret) ? &tolua_ret->_luaID : NULL; + toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)tolua_ret,"cc.Node"); + return 1; + } + + CCLOG("%s function of CCBProxy has wrong number of arguments: %d, was expecting %d\n", "cc.CCBReader:readCCBFromFile", argc, 2); + return 0; + +#if COCOS2D_DEBUG >= 1 +tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_CCBProxy_readCCBFromFile'.",&tolua_err); + return 0; +#endif +} + + +static int tolua_cocos2d_CCBProxy_getNodeTypeName(lua_State* tolua_S) +{ + if (nullptr == tolua_S) + return 0; + + int argc = 0; + CCBProxy* self = nullptr; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; + if (!tolua_isusertype(tolua_S,1,"cc.CCBProxy",0,&tolua_err)) goto tolua_lerror; +#endif + + self = static_cast(tolua_tousertype(tolua_S,1,0)); + +#if COCOS2D_DEBUG >= 1 + if (nullptr == self) { + tolua_error(tolua_S,"invalid 'self' in function 'tolua_cocos2d_CCBProxy_getNodeTypeName'\n", NULL); + return 0; + } +#endif + + argc = lua_gettop(tolua_S) - 1; + + if (1 == argc) + { +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,1,"cc.Node",0,&tolua_err)) goto tolua_lerror; +#endif + + Node* node = static_cast(tolua_tousertype(tolua_S,2,0)); + const char* tolua_ret = (const char*)self->getNodeTypeName(node); + tolua_pushstring(tolua_S,(const char*)tolua_ret); + return 1; + } + + CCLOG(" %s has wrong number of arguments: %d, was expecting %d\n", "cc.CCBProxy:getNodeTypeName", argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 +tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_CCBProxy_getNodeTypeName'.",&tolua_err); + return 0; +#endif +} + +static int tolua_cocos2d_CCBProxy_setCallback(lua_State* tolua_S) +{ + if (nullptr == tolua_S) + return 0; + + int argc = 0; + CCBProxy* self = nullptr; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; + if (!tolua_isusertype(tolua_S,1,"cc.CCBProxy",0,&tolua_err)) goto tolua_lerror; +#endif + + self = static_cast(tolua_tousertype(tolua_S,1,0)); +#if COCOS2D_DEBUG >= 1 + if (nullptr == self) { + tolua_error(tolua_S,"invalid 'self' in function 'tolua_cocos2d_CCBProxy_setCallback'\n", NULL); + return 0; + } +#endif + + argc = lua_gettop(tolua_S) - 1; + + if ( argc >= 2 && argc <= 3 ) + { +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,2,"cc.Node",0,&tolua_err) || + !toluafix_isfunction(tolua_S, 3, "LUA_FUNCTION", 0, &tolua_err) || + !tolua_isnumber(tolua_S, 4, 1, &tolua_err) + ) + goto tolua_lerror; +#endif + + Node* node = ((Node*)tolua_tousertype(tolua_S,2,0)); + LUA_FUNCTION funID = ( toluafix_ref_function(tolua_S,3,0)); + int controlEvents = (int)tolua_tonumber(tolua_S, 4, 1); + self->setCallback(node, funID, controlEvents); + return 0; + } + + CCLOG(" %s has wrong number of arguments: %d, was expecting %d\n", "cc.CCBProxy:setCallback", argc, 2); + return 0; + +#if COCOS2D_DEBUG >= 1 +tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_CCBProxy_setCallback'.",&tolua_err); + return 0; +#endif +} + +int register_cocos2dx_extension_CCBProxy(lua_State* tolua_S) +{ + tolua_module(tolua_S,"cc",0); + tolua_beginmodule(tolua_S,"cc"); + tolua_usertype(tolua_S,"cc.CCBProxy"); + tolua_cclass(tolua_S,"CCBProxy","cc.CCBProxy","cc.Layer",NULL); + tolua_beginmodule(tolua_S,"CCBProxy"); + tolua_function(tolua_S, "create", tolua_cocos2d_CCBProxy_create); + tolua_function(tolua_S, "createCCBReader", tolua_cocos2d_CCBProxy_createCCBReader); + tolua_function(tolua_S, "readCCBFromFile", tolua_cocos2d_CCBProxy_readCCBFromFile); + tolua_function(tolua_S, "getNodeTypeName", tolua_cocos2d_CCBProxy_getNodeTypeName); + tolua_function(tolua_S, "setCallback", tolua_cocos2d_CCBProxy_setCallback); + tolua_endmodule(tolua_S); + tolua_endmodule(tolua_S); + + std::string typeName = typeid(CCBProxy).name(); + g_luaType[typeName] = "cc.CCBProxy"; + return 1; +} + +static int tolua_cocos2d_CCBReader_load(lua_State* tolua_S) +{ + if (nullptr == tolua_S) + return 0; + + int argc = 0; + CCBReader* self = nullptr; + bool ok = true; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; + if (!tolua_isusertype(tolua_S,1,"cc.CCBReader",0,&tolua_err)) goto tolua_lerror; +#endif + + self = static_cast(tolua_tousertype(tolua_S,1,0)); +#if COCOS2D_DEBUG >= 1 + if (nullptr == self) { + tolua_error(tolua_S,"invalid 'self' in function 'tolua_cocos2d_CCBReader_load'\n", NULL); + return 0; + } +#endif + + argc = lua_gettop(tolua_S) - 1; + + if (argc >= 1 && argc <= 3) + { + const char* fileName = nullptr; + std::string fileName_tmp = ""; + ok &= luaval_to_std_string(tolua_S, 2, &fileName_tmp, "cc.CCBReader:load"); + fileName = fileName_tmp.c_str(); + if (!ok) + return 0; + + if (1 == argc) + { + Node* tolua_ret = (Node*) self->readNodeGraphFromFile(fileName); + int ID = (tolua_ret) ? (int)tolua_ret->_ID : -1; + int* luaID = (tolua_ret) ? &tolua_ret->_luaID : NULL; + toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)tolua_ret,"cc.Node"); + return 1; + } + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S, 3, "cc.Ref", 0, &tolua_err)) + goto tolua_lerror; +#endif + Ref* owner = static_cast(tolua_tousertype(tolua_S, 3, 0)); + //In lua owner always define in lua script by table, so owner is always nullptr + if (2 == argc) + { + Node* tolua_ret = (Node*) self->readNodeGraphFromFile(fileName,owner); + int ID = (tolua_ret) ? (int)tolua_ret->_ID : -1; + int* luaID = (tolua_ret) ? &tolua_ret->_luaID : NULL; + toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)tolua_ret,"cc.Node"); + return 1; + } + + Size size; + ok &= luaval_to_size(tolua_S, 4, &size, "cc.CCBReader:load"); + if (!ok) + return 0; + + Node* tolua_ret = (Node*) self->readNodeGraphFromFile(fileName,owner,size); + int ID = (tolua_ret) ? (int)tolua_ret->_ID : -1; + int* luaID = (tolua_ret) ? &tolua_ret->_luaID : NULL; + toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)tolua_ret,"cc.Node"); + return 1; + + } + + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.CCBReader:load",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 +tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_CCBReader_load'.",&tolua_err); + return 0; +#endif +} + +static void extendCCBReader(lua_State* tolua_S) +{ + lua_pushstring(tolua_S, "cc.CCBReader"); + lua_rawget(tolua_S, LUA_REGISTRYINDEX); + if (lua_istable(tolua_S,-1)) + { + lua_pushstring(tolua_S,"load"); + lua_pushcfunction(tolua_S,tolua_cocos2d_CCBReader_load ); + lua_rawset(tolua_S,-3); + } + lua_pop(tolua_S, 1); +} + + +static int tolua_cocos2d_CCBAnimationManager_setCallFuncForLuaCallbackNamed(lua_State* tolua_S) +{ + if (nullptr == tolua_S) + return 0; + + int argc = 0; + CCBAnimationManager* self = nullptr; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; + if (!tolua_isusertype(tolua_S,1,"cc.CCBAnimationManager",0,&tolua_err)) goto tolua_lerror; +#endif + + self = static_cast(tolua_tousertype(tolua_S,1,0)); +#if COCOS2D_DEBUG >= 1 + if (nullptr == self) { + tolua_error(tolua_S,"invalid 'self' in function 'tolua_cocos2d_CCBAnimationManager_setCallFuncForLuaCallbackNamed'\n", NULL); + return 0; + } +#endif + + argc = lua_gettop(tolua_S) - 1; + + if (2 == argc) + { + +#if COCOS2D_DEBUG >= 1 + if (!tolua_isusertype(tolua_S,2, "cc.CallFunc", 0, &tolua_err) || + !tolua_isstring(tolua_S, 3, 0, &tolua_err) ) + goto tolua_lerror; +#endif + + CallFunc* pCallFunc = static_cast(tolua_tousertype(tolua_S,2,0)); + const char* keyframeCallback = ((const char*) tolua_tostring(tolua_S,3,0)); + std::string strKey = ""; + if (NULL != keyframeCallback) { + strKey = keyframeCallback; + } + self->setCallFunc(pCallFunc, strKey); + + return 0; + } + + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.CCBAnimationManager:setCallFuncForLuaCallbackNamed",argc, 1); + return 0; + +#if COCOS2D_DEBUG >= 1 +tolua_lerror: + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_CCBAnimationManager_setCallFuncForLuaCallbackNamed'.",&tolua_err); + return 0; +#endif +} + +static void extendCCBAnimationManager(lua_State* tolua_S) +{ + lua_pushstring(tolua_S, "cc.CCBAnimationManager"); + lua_rawget(tolua_S, LUA_REGISTRYINDEX); + if (lua_istable(tolua_S,-1)) + { + lua_pushstring(tolua_S,"setCallFuncForLuaCallbackNamed"); + lua_pushcfunction(tolua_S,tolua_cocos2d_CCBAnimationManager_setCallFuncForLuaCallbackNamed ); + lua_rawset(tolua_S,-3); + } + lua_pop(tolua_S, 1); +} + +int register_all_cocos2dx_cocosbuilder_manual(lua_State* tolua_S) +{ + register_cocos2dx_extension_CCBProxy(tolua_S); + extendCCBReader(tolua_S); + extendCCBAnimationManager(tolua_S); + return 0; +} + + +int register_cocosbuilder_module(lua_State* tolua_S) +{ + lua_getglobal(tolua_S, "_G"); + if (lua_istable(tolua_S,-1))//stack:...,_G, + { + register_all_cocos2dx_cocosbuilder(tolua_S); + register_all_cocos2dx_cocosbuilder_manual(tolua_S); + } + lua_pop(tolua_S, 1); + + LuaEngine::getInstance()->executeScriptFile("DeprecatedCocosBuilderClass"); + return 1; +} diff --git a/cocos/scripting/lua-bindings/manual/cocosbuilder/lua_cocos2dx_cocosbuilder_manual.h b/cocos/scripting/lua-bindings/manual/cocosbuilder/lua_cocos2dx_cocosbuilder_manual.h new file mode 100644 index 0000000000..78554e784d --- /dev/null +++ b/cocos/scripting/lua-bindings/manual/cocosbuilder/lua_cocos2dx_cocosbuilder_manual.h @@ -0,0 +1,38 @@ +/**************************************************************************** + 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 COCOS_SCRIPTING_LUA_BINDINGS_MANUAL_LUA_COCOS2DX_COCOSBUILDER_H +#define COCOS_SCRIPTING_LUA_BINDINGS_MANUAL_LUA_COCOS2DX_COCOSBUILDER_H + +#ifdef __cplusplus +extern "C" { +#endif +#include "tolua++.h" +#ifdef __cplusplus +} +#endif + +TOLUA_API int register_all_cocos2dx_cocosbuilder_manual(lua_State* tolua_S); +TOLUA_API int register_cocosbuilder_module(lua_State* tolua_S); + +#endif // #ifndef COCOS_SCRIPTING_LUA_BINDINGS_MANUAL_LUA_COCOS2DX_COCOSBUILDER_H diff --git a/cocos/scripting/lua-bindings/manual/cocosdenshion/lua_cocos2dx_cocosdenshion_manual.cpp b/cocos/scripting/lua-bindings/manual/cocosdenshion/lua_cocos2dx_cocosdenshion_manual.cpp new file mode 100644 index 0000000000..9098fd949c --- /dev/null +++ b/cocos/scripting/lua-bindings/manual/cocosdenshion/lua_cocos2dx_cocosdenshion_manual.cpp @@ -0,0 +1,40 @@ +/**************************************************************************** + 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 "lua_cocos2dx_cocosdenshion_manual.h" +#include "lua_cocos2dx_cocosdenshion_auto.hpp" +#include "CCLuaEngine.h" + +int register_cocosdenshion_module(lua_State* L) +{ + lua_getglobal(L, "_G"); + if (lua_istable(L,-1))//stack:...,_G, + { + register_all_cocos2dx_cocosdenshion(L); + } + lua_pop(L, 1); + + cocos2d::LuaEngine::getInstance()->executeScriptFile("DeprecatedCocosDenshionClass"); + cocos2d::LuaEngine::getInstance()->executeScriptFile("DeprecatedCocosDenshionFunc"); + return 1; +} \ No newline at end of file diff --git a/cocos/scripting/lua-bindings/manual/cocosdenshion/lua_cocos2dx_cocosdenshion_manual.h b/cocos/scripting/lua-bindings/manual/cocosdenshion/lua_cocos2dx_cocosdenshion_manual.h new file mode 100644 index 0000000000..2df23521f4 --- /dev/null +++ b/cocos/scripting/lua-bindings/manual/cocosdenshion/lua_cocos2dx_cocosdenshion_manual.h @@ -0,0 +1,38 @@ +/**************************************************************************** + 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 COCOS_SCRIPTING_LUA_BINDINGS_MANUAL_COCOSDENSHION_LUA_COCOS2DX_COCOSDENSHION_MANUAL_H__ +#define COCOS_SCRIPTING_LUA_BINDINGS_MANUAL_COCOSDENSHION_LUA_COCOS2DX_COCOSDENSHION_MANUAL_H__ + +#ifdef __cplusplus +extern "C" { +#endif +#include "tolua++.h" +#ifdef __cplusplus +} +#endif + +TOLUA_API int register_cocosdenshion_module(lua_State* L); + + +#endif // #ifndef COCOS_SCRIPTING_LUA_BINDINGS_MANUAL_COCOSDENSHION_LUA_COCOS2DX_COCOSDENSHION_MANUAL_H__ diff --git a/cocos/scripting/lua-bindings/manual/lua_cocos2dx_coco_studio_manual.cpp b/cocos/scripting/lua-bindings/manual/cocostudio/lua_cocos2dx_coco_studio_manual.cpp similarity index 96% rename from cocos/scripting/lua-bindings/manual/lua_cocos2dx_coco_studio_manual.cpp rename to cocos/scripting/lua-bindings/manual/cocostudio/lua_cocos2dx_coco_studio_manual.cpp index a33e1adb2f..6546582eec 100644 --- a/cocos/scripting/lua-bindings/manual/lua_cocos2dx_coco_studio_manual.cpp +++ b/cocos/scripting/lua-bindings/manual/cocostudio/lua_cocos2dx_coco_studio_manual.cpp @@ -22,6 +22,7 @@ THE SOFTWARE. ****************************************************************************/ #include "lua_cocos2dx_coco_studio_manual.hpp" +#include "lua_cocos2dx_studio_auto.hpp" #include "cocos2d.h" #include "tolua_fix.h" #include "LuaBasicConversions.h" @@ -428,7 +429,7 @@ int lua_cocos2dx_studio_NodeReader_getInstance(lua_State* L) tolua_pushusertype(L,(void*)ret, "ccs.NodeReader"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "getInstance",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.NodeReader:getInstance",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -471,7 +472,7 @@ int lua_cocos2dx_studio_ActionTimelineCache_getInstance(lua_State* L) tolua_pushusertype(L,(void*)ret, "ccs.ActionTimelineCache"); return 1; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "getInstance",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccs.ActionTimelineCache:getInstance",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: @@ -567,3 +568,18 @@ int register_all_cocos2dx_coco_studio_manual(lua_State* L) return 0; } + +int register_cocostudio_module(lua_State* L) +{ + lua_getglobal(L, "_G"); + if (lua_istable(L,-1))//stack:...,_G, + { + register_all_cocos2dx_studio(L); + register_all_cocos2dx_coco_studio_manual(L); + } + lua_pop(L, 1); + + LuaEngine::getInstance()->executeScriptFile("DeprecatedCocoStudioClass"); + LuaEngine::getInstance()->executeScriptFile("DeprecatedCocoStudioFunc"); + return 1; +} diff --git a/cocos/scripting/lua-bindings/manual/lua_cocos2dx_coco_studio_manual.hpp b/cocos/scripting/lua-bindings/manual/cocostudio/lua_cocos2dx_coco_studio_manual.hpp similarity index 95% rename from cocos/scripting/lua-bindings/manual/lua_cocos2dx_coco_studio_manual.hpp rename to cocos/scripting/lua-bindings/manual/cocostudio/lua_cocos2dx_coco_studio_manual.hpp index 74cea4e691..905d71877e 100644 --- a/cocos/scripting/lua-bindings/manual/lua_cocos2dx_coco_studio_manual.hpp +++ b/cocos/scripting/lua-bindings/manual/cocostudio/lua_cocos2dx_coco_studio_manual.hpp @@ -35,7 +35,8 @@ extern "C" { #include "base/CCRef.h" #include -TOLUA_API int register_all_cocos2dx_coco_studio_manual(lua_State* L); +TOLUA_API int register_all_cocos2dx_coco_studio_manual(lua_State* L); +TOLUA_API int register_cocostudio_module(lua_State* L); struct LuaArmatureWrapperEventData { diff --git a/cocos/scripting/lua-bindings/manual/lua_cocos2dx_controller_manual.cpp b/cocos/scripting/lua-bindings/manual/controller/lua_cocos2dx_controller_manual.cpp similarity index 99% rename from cocos/scripting/lua-bindings/manual/lua_cocos2dx_controller_manual.cpp rename to cocos/scripting/lua-bindings/manual/controller/lua_cocos2dx_controller_manual.cpp index b5885874e9..f6b4895a67 100644 --- a/cocos/scripting/lua-bindings/manual/lua_cocos2dx_controller_manual.cpp +++ b/cocos/scripting/lua-bindings/manual/controller/lua_cocos2dx_controller_manual.cpp @@ -28,7 +28,7 @@ #include "cocos2d.h" #include "tolua_fix.h" #include "LuaBasicConversions.h" -#include "LuaScriptHandlerMgr.h" +#include "cocos2d/LuaScriptHandlerMgr.h" #include "CCLuaValue.h" #include "CCLuaEngine.h" #include "CCGameController.h" diff --git a/cocos/scripting/lua-bindings/manual/lua_cocos2dx_controller_manual.hpp b/cocos/scripting/lua-bindings/manual/controller/lua_cocos2dx_controller_manual.hpp similarity index 100% rename from cocos/scripting/lua-bindings/manual/lua_cocos2dx_controller_manual.hpp rename to cocos/scripting/lua-bindings/manual/controller/lua_cocos2dx_controller_manual.hpp diff --git a/cocos/scripting/lua-bindings/manual/lua_cocos2dx_extension_manual.cpp b/cocos/scripting/lua-bindings/manual/extension/lua_cocos2dx_extension_manual.cpp similarity index 67% rename from cocos/scripting/lua-bindings/manual/lua_cocos2dx_extension_manual.cpp rename to cocos/scripting/lua-bindings/manual/extension/lua_cocos2dx_extension_manual.cpp index f2ffb17b4d..ba262487bd 100644 --- a/cocos/scripting/lua-bindings/manual/lua_cocos2dx_extension_manual.cpp +++ b/cocos/scripting/lua-bindings/manual/extension/lua_cocos2dx_extension_manual.cpp @@ -22,17 +22,17 @@ THE SOFTWARE. ****************************************************************************/ #include "lua_cocos2dx_extension_manual.h" +#include "lua_cocos2dx_extension_auto.hpp" #include "cocos2d.h" #include "tolua_fix.h" #include "LuaBasicConversions.h" #include "CCLuaValue.h" #include "cocos-ext.h" -#include "CCBProxy.h" -#include "cocostudio/CocoStudio.h" +#include "CCLuaEngine.h" +#include "LuaScriptHandlerMgr.h" USING_NS_CC; USING_NS_CC_EXT; -using namespace cocostudio; class LuaScrollViewDelegate:public Ref, public ScrollViewDelegate { @@ -156,12 +156,12 @@ static int tolua_cocos2d_ScrollView_registerScriptHandler(lua_State* tolua_S) return 0; } - CCLOG("'registerScriptHandler' function of ScrollView has wrong number of arguments: %d, was expecting %d\n", argc, 2); + CCLOG("%s function of ScrollView has wrong number of arguments: %d, was expecting %d\n", "cc.ScrollView:registerScriptHandler",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'registerScriptHandler'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_ScrollView_registerScriptHandler'.",&tolua_err); return 0; #endif } @@ -201,12 +201,12 @@ static int tolua_cocos2d_ScrollView_unregisterScriptHandler(lua_State* tolua_S) return 0; } - CCLOG("'unregisterScriptHandler' function of ScrollView has wrong number of arguments: %d, was expecting %d\n", argc, 1); + CCLOG("%s function of ScrollView has wrong number of arguments: %d, was expecting %d\n", "cc.ScrollView:unregisterScriptHandler", argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'unregisterScriptHandler'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_ScrollView_unregisterScriptHandler'.",&tolua_err); return 0; #endif } @@ -277,12 +277,12 @@ static int tolua_cocos2d_Control_registerControlEventHandler(lua_State* tolua_S) return 0; } - CCLOG("'registerControlEventHandler' function of Control has wrong number of arguments: %d, was expecting %d\n", argc, 2); + CCLOG("%s function of Control has wrong number of arguments: %d, was expecting %d\n", "cc.Control:registerControlEventHandler", argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'registerControlEventHandler'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_Control_registerControlEventHandler'.",&tolua_err); return 0; #endif } @@ -330,12 +330,12 @@ static int tolua_cocos2d_control_unregisterControlEventHandler(lua_State* tolua_ return 0; } - CCLOG("'unregisterControlEventHandler' function of Control has wrong number of arguments: %d, was expecting %d\n", argc, 1); + CCLOG("%s function of Control has wrong number of arguments: %d, was expecting %d\n", "cc.Control:unregisterControlEventHandler", argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'unregisterControlEventHandler'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_control_unregisterControlEventHandler'.",&tolua_err); return 0; #endif } @@ -393,12 +393,12 @@ static int tolua_cocos2d_EditBox_registerScriptEditBoxHandler(lua_State* tolua_S return 0; } - CCLOG("'registerScriptEditBoxHandler' function of EditBox has wrong number of arguments: %d, was expecting %d\n", argc, 1); + CCLOG("%s function of EditBox has wrong number of arguments: %d, was expecting %d\n", "cc.EditBox:registerScriptEditBoxHandler", argc, 1); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'registerScriptEditBoxHandler'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_EditBox_registerScriptEditBoxHandler'.",&tolua_err); return 0; #endif @@ -435,12 +435,12 @@ static int tolua_cocos2d_EditBox_unregisterScriptEditBoxHandler(lua_State* tolua return 0; } - CCLOG("'unregisterScriptEditBoxHandler' function of EditBox has wrong number of arguments: %d, was expecting %d\n", argc, 0); + CCLOG("%s function of EditBox has wrong number of arguments: %d, was expecting %d\n", "cc.EditBox:unregisterScriptEditBoxHandler", argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'unregisterScriptEditBoxHandler'.",&tolua_err); + tolua_error(tolua_S,"#ferror in function 'tolua_cocos2d_EditBox_unregisterScriptEditBoxHandler'.",&tolua_err); return 0; #endif } @@ -461,420 +461,6 @@ static void extendEditBox(lua_State* tolua_S) lua_pop(tolua_S, 1); } -static int tolua_cocos2d_CCBProxy_create(lua_State* tolua_S) -{ - if (NULL == tolua_S) - return 0; - - int argc = 0; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; - if (!tolua_isusertable(tolua_S,1,"cc.CCBProxy",0,&tolua_err)) goto tolua_lerror; -#endif - - argc = lua_gettop(tolua_S) - 1; - - if (0 == argc) - { - CCBProxy* tolua_ret = (CCBProxy*)CCBProxy::create(); - int nID = (tolua_ret) ? (int)tolua_ret->_ID : -1; - int *pLuaID = (tolua_ret) ? &tolua_ret->_luaID : NULL; - toluafix_pushusertype_ccobject(tolua_S, nID, pLuaID, (void*)tolua_ret,"cc.CCBProxy"); - return 1; - } - - CCLOG("'create' function of CCBProxy has wrong number of arguments: %d, was expecting %d\n", argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 -tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'create'.",&tolua_err); - return 0; -#endif -} - - -static int tolua_cocos2d_CCBProxy_createCCBReader(lua_State* tolua_S) -{ - if (NULL == tolua_S) - return 0; - - int argc = 0; - CCBProxy* self = nullptr; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; - if (!tolua_isusertype(tolua_S,1,"cc.CCBProxy",0,&tolua_err)) goto tolua_lerror; -#endif - - self = static_cast(tolua_tousertype(tolua_S,1,0)); - -#if COCOS2D_DEBUG >= 1 - if (nullptr == self) { - tolua_error(tolua_S,"invalid 'self' in function 'tolua_cocos2d_CCBProxy_createCCBReader'\n", NULL); - return 0; - } -#endif - - argc = lua_gettop(tolua_S) - 1; - - if (0 == argc) - { - CCBReader* tolua_ret = (CCBReader*) self->createCCBReader(); - int nID = (tolua_ret) ? (int)tolua_ret->_ID : -1; - int* pLuaID = (tolua_ret) ? &tolua_ret->_luaID : NULL; - toluafix_pushusertype_ccobject(tolua_S, nID, pLuaID, (void*)tolua_ret,"cc.CCBReader"); - return 1; - } - - CCLOG("'createCCBReader' function of CCBProxy has wrong number of arguments: %d, was expecting %d\n", argc, 0); - return 0; - -#if COCOS2D_DEBUG >= 1 -tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'createCCBReader'.",&tolua_err); - return 0; -#endif -} - -static int tolua_cocos2d_CCBProxy_readCCBFromFile(lua_State* tolua_S) -{ - if (NULL == tolua_S) - return 0; - - int argc = 0; - CCBProxy* self = nullptr; - const char* ccbFilePath = nullptr; - CCBReader* ccbReader = nullptr; - bool setOwner = false; - Node* tolua_ret = nullptr; - int ID = 0; - int* luaID = nullptr; - - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; - if (!tolua_isusertype(tolua_S,1,"cc.CCBProxy",0,&tolua_err)) goto tolua_lerror; -#endif - - self = static_cast(tolua_tousertype(tolua_S,1,0)); - -#if COCOS2D_DEBUG >= 1 - if (nullptr == self) { - tolua_error(tolua_S,"invalid 'self' in function 'tolua_cocos2d_CCBProxy_readCCBFromFile'\n", NULL); - return 0; - } -#endif - - argc = lua_gettop(tolua_S) - 1; - - if (2 == argc || 3 == argc) - { -#if COCOS2D_DEBUG >= 1 - if (!tolua_isstring(tolua_S, 2, 0, &tolua_err)|| - !tolua_isusertype(tolua_S,3,"cc.CCBReader",0,&tolua_err)|| - !tolua_isboolean(tolua_S,4,1,&tolua_err ) - ) - goto tolua_lerror; -#endif - ccbFilePath = ((const char*) tolua_tostring(tolua_S,2,0)); - ccbReader = ((CCBReader*) tolua_tousertype(tolua_S,3,0)); - setOwner = (bool) tolua_toboolean(tolua_S,4,-1); - tolua_ret = (Node*) self->readCCBFromFile(ccbFilePath, ccbReader, setOwner); - ID = (tolua_ret) ? (int)tolua_ret->_ID : -1; - luaID = (tolua_ret) ? &tolua_ret->_luaID : NULL; - toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)tolua_ret,"cc.Node"); - return 1; - } - - CCLOG("'readCCBFromFile' function of CCBProxy has wrong number of arguments: %d, was expecting %d\n", argc, 2); - return 0; - -#if COCOS2D_DEBUG >= 1 -tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'readCCBFromFile'.",&tolua_err); - return 0; -#endif -} - - -static int tolua_cocos2d_CCBProxy_getNodeTypeName(lua_State* tolua_S) -{ - if (nullptr == tolua_S) - return 0; - - int argc = 0; - CCBProxy* self = nullptr; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; - if (!tolua_isusertype(tolua_S,1,"cc.CCBProxy",0,&tolua_err)) goto tolua_lerror; -#endif - - self = static_cast(tolua_tousertype(tolua_S,1,0)); - -#if COCOS2D_DEBUG >= 1 - if (nullptr == self) { - tolua_error(tolua_S,"invalid 'self' in function 'tolua_cocos2d_CCBProxy_getNodeTypeName'\n", NULL); - return 0; - } -#endif - - argc = lua_gettop(tolua_S) - 1; - - if (1 == argc) - { -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,1,"cc.Node",0,&tolua_err)) goto tolua_lerror; -#endif - - Node* node = static_cast(tolua_tousertype(tolua_S,2,0)); - const char* tolua_ret = (const char*)self->getNodeTypeName(node); - tolua_pushstring(tolua_S,(const char*)tolua_ret); - return 1; - } - - CCLOG("'getNodeTypeName' function of CCBProxy has wrong number of arguments: %d, was expecting %d\n", argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 -tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'getNodeTypeName'.",&tolua_err); - return 0; -#endif -} - -static int tolua_cocos2d_CCBProxy_setCallback(lua_State* tolua_S) -{ - if (nullptr == tolua_S) - return 0; - - int argc = 0; - CCBProxy* self = nullptr; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; - if (!tolua_isusertype(tolua_S,1,"cc.CCBProxy",0,&tolua_err)) goto tolua_lerror; -#endif - - self = static_cast(tolua_tousertype(tolua_S,1,0)); -#if COCOS2D_DEBUG >= 1 - if (nullptr == self) { - tolua_error(tolua_S,"invalid 'self' in function 'tolua_cocos2d_CCBProxy_setCallback'\n", NULL); - return 0; - } -#endif - - argc = lua_gettop(tolua_S) - 1; - - if ( argc >= 2 && argc <= 3 ) - { -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,2,"cc.Node",0,&tolua_err) || - !toluafix_isfunction(tolua_S, 3, "LUA_FUNCTION", 0, &tolua_err) || - !tolua_isnumber(tolua_S, 4, 1, &tolua_err) - ) - goto tolua_lerror; -#endif - - Node* node = ((Node*)tolua_tousertype(tolua_S,2,0)); - LUA_FUNCTION funID = ( toluafix_ref_function(tolua_S,3,0)); - int controlEvents = (int)tolua_tonumber(tolua_S, 4, 1); - self->setCallback(node, funID, controlEvents); - return 0; - } - - CCLOG("'setCallback' function of CCBProxy has wrong number of arguments: %d, was expecting %d\n", argc, 2); - return 0; - -#if COCOS2D_DEBUG >= 1 -tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'setCallback'.",&tolua_err); - return 0; -#endif -} - -int register_cocos2dx_extension_CCBProxy(lua_State* tolua_S) -{ - tolua_module(tolua_S,"cc",0); - tolua_beginmodule(tolua_S,"cc"); - tolua_usertype(tolua_S,"cc.CCBProxy"); - tolua_cclass(tolua_S,"CCBProxy","cc.CCBProxy","cc.Layer",NULL); - tolua_beginmodule(tolua_S,"CCBProxy"); - tolua_function(tolua_S, "create", tolua_cocos2d_CCBProxy_create); - tolua_function(tolua_S, "createCCBReader", tolua_cocos2d_CCBProxy_createCCBReader); - tolua_function(tolua_S, "readCCBFromFile", tolua_cocos2d_CCBProxy_readCCBFromFile); - tolua_function(tolua_S, "getNodeTypeName", tolua_cocos2d_CCBProxy_getNodeTypeName); - tolua_function(tolua_S, "setCallback", tolua_cocos2d_CCBProxy_setCallback); - tolua_endmodule(tolua_S); - tolua_endmodule(tolua_S); - - std::string typeName = typeid(CCBProxy).name(); - g_luaType[typeName] = "cc.CCBProxy"; - return 1; -} - -static int tolua_cocos2d_CCBReader_load(lua_State* tolua_S) -{ - if (nullptr == tolua_S) - return 0; - - int argc = 0; - CCBReader* self = nullptr; - bool ok = true; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; - if (!tolua_isusertype(tolua_S,1,"cc.CCBReader",0,&tolua_err)) goto tolua_lerror; -#endif - - self = static_cast(tolua_tousertype(tolua_S,1,0)); -#if COCOS2D_DEBUG >= 1 - if (nullptr == self) { - tolua_error(tolua_S,"invalid 'self' in function 'tolua_cocos2d_CCBReader_load'\n", NULL); - return 0; - } -#endif - - argc = lua_gettop(tolua_S) - 1; - - if (argc >= 1 && argc <= 3) - { - const char* fileName = nullptr; - std::string fileName_tmp = ""; - ok &= luaval_to_std_string(tolua_S, 2, &fileName_tmp); - fileName = fileName_tmp.c_str(); - if (!ok) - return 0; - - if (1 == argc) - { - Node* tolua_ret = (Node*) self->readNodeGraphFromFile(fileName); - int ID = (tolua_ret) ? (int)tolua_ret->_ID : -1; - int* luaID = (tolua_ret) ? &tolua_ret->_luaID : NULL; - toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)tolua_ret,"cc.Node"); - return 1; - } - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S, 3, "cc.Ref", 0, &tolua_err)) - goto tolua_lerror; -#endif - Ref* owner = static_cast(tolua_tousertype(tolua_S, 3, 0)); - //In lua owner always define in lua script by table, so owner is always nullptr - if (2 == argc) - { - Node* tolua_ret = (Node*) self->readNodeGraphFromFile(fileName,owner); - int ID = (tolua_ret) ? (int)tolua_ret->_ID : -1; - int* luaID = (tolua_ret) ? &tolua_ret->_luaID : NULL; - toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)tolua_ret,"cc.Node"); - return 1; - } - - Size size; - ok &= luaval_to_size(tolua_S, 4, &size); - if (!ok) - return 0; - - Node* tolua_ret = (Node*) self->readNodeGraphFromFile(fileName,owner,size); - int ID = (tolua_ret) ? (int)tolua_ret->_ID : -1; - int* luaID = (tolua_ret) ? &tolua_ret->_luaID : NULL; - toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)tolua_ret,"cc.Node"); - return 1; - - } - - CCLOG("'load' function of CCBReader has wrong number of arguments: %d, was expecting %d\n", argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 -tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'load'.",&tolua_err); - return 0; -#endif -} - -static void extendCCBReader(lua_State* tolua_S) -{ - lua_pushstring(tolua_S, "cc.CCBReader"); - lua_rawget(tolua_S, LUA_REGISTRYINDEX); - if (lua_istable(tolua_S,-1)) - { - lua_pushstring(tolua_S,"load"); - lua_pushcfunction(tolua_S,tolua_cocos2d_CCBReader_load ); - lua_rawset(tolua_S,-3); - } - lua_pop(tolua_S, 1); -} - - -static int tolua_cocos2d_CCBAnimationManager_setCallFuncForLuaCallbackNamed(lua_State* tolua_S) -{ - if (nullptr == tolua_S) - return 0; - - int argc = 0; - CCBAnimationManager* self = nullptr; - -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; - if (!tolua_isusertype(tolua_S,1,"cc.CCBAnimationManager",0,&tolua_err)) goto tolua_lerror; -#endif - - self = static_cast(tolua_tousertype(tolua_S,1,0)); -#if COCOS2D_DEBUG >= 1 - if (nullptr == self) { - tolua_error(tolua_S,"invalid 'self' in function 'tolua_cocos2d_CCBAnimationManager_setCallFuncForLuaCallbackNamed'\n", NULL); - return 0; - } -#endif - - argc = lua_gettop(tolua_S) - 1; - - if (2 == argc) - { - -#if COCOS2D_DEBUG >= 1 - if (!tolua_isusertype(tolua_S,2, "cc.CallFunc", 0, &tolua_err) || - !tolua_isstring(tolua_S, 3, 0, &tolua_err) ) - goto tolua_lerror; -#endif - - CallFunc* pCallFunc = static_cast(tolua_tousertype(tolua_S,2,0)); - const char* keyframeCallback = ((const char*) tolua_tostring(tolua_S,3,0)); - std::string strKey = ""; - if (NULL != keyframeCallback) { - strKey = keyframeCallback; - } - self->setCallFunc(pCallFunc, strKey); - - return 0; - } - - CCLOG("'setCallFuncForLuaCallbackNamed' function of CCBAnimationManager has wrong number of arguments: %d, was expecting %d\n", argc, 1); - return 0; - -#if COCOS2D_DEBUG >= 1 -tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'setCallFuncForLuaCallbackNamed'.",&tolua_err); - return 0; -#endif -} - -static void extendCCBAnimationManager(lua_State* tolua_S) -{ - lua_pushstring(tolua_S, "cc.CCBAnimationManager"); - lua_rawget(tolua_S, LUA_REGISTRYINDEX); - if (lua_istable(tolua_S,-1)) - { - lua_pushstring(tolua_S,"setCallFuncForLuaCallbackNamed"); - lua_pushcfunction(tolua_S,tolua_cocos2d_CCBAnimationManager_setCallFuncForLuaCallbackNamed ); - lua_rawset(tolua_S,-3); - } - lua_pop(tolua_S, 1); -} - class LuaAssetsManagerDelegateProtocol:public Ref, public AssetsManagerDelegateProtocol { public: @@ -968,12 +554,12 @@ static int lua_cocos2dx_AssetsManager_setDelegate(lua_State* L) return 0; } - CCLOG("'setDelegate' function of AssetsManager has wrong number of arguments: %d, was expecting %d\n", argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.AssetsManager:setDelegate", argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(L,"#ferror in function 'setDelegate'.",&tolua_err); + tolua_error(L,"#ferror in function 'lua_cocos2dx_AssetsManager_setDelegate'.",&tolua_err); return 0; #endif } @@ -1302,7 +888,7 @@ static int lua_cocos2dx_TableView_create(lua_State* L) { LUA_TableViewDataSource* dataSource = new LUA_TableViewDataSource(); Size size; - ok &= luaval_to_size(L, 2, &size); + ok &= luaval_to_size(L, 2, &size, "cc.TableView:create"); TableView* ret = nullptr; @@ -1358,7 +944,7 @@ static int lua_cocos2d_TableView_registerScriptHandler(lua_State* L) #if COCOS2D_DEBUG >= 1 tolua_Error tolua_err; - if (!tolua_isusertype(L,1,"cc.TableView",0,&tolua_err)) goto tolua_lerror; + if (!tolua_isusertype(L,1,"",0,&tolua_err)) goto tolua_lerror; #endif self = static_cast(tolua_tousertype(L,1,0)); @@ -1386,12 +972,12 @@ static int lua_cocos2d_TableView_registerScriptHandler(lua_State* L) return 0; } - CCLOG("'registerScriptHandler' function of TableView has wrong number of arguments: %d, was expecting %d\n", argc, 2); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.TableView:registerScriptHandler",argc, 2); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(L,"#ferror in function 'registerScriptHandler'.",&tolua_err); + tolua_error(L,"#ferror in function 'tolua_cocos2d_TableView_registerScriptHandler'.",&tolua_err); return 0; #endif } @@ -1431,12 +1017,12 @@ static int lua_cocos2d_TableView_unregisterScriptHandler(lua_State* L) return 0; } - CCLOG("'unregisterScriptHandler' function of TableView has wrong number of arguments: %d, was expecting %d\n", argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n", "cc.TableView:unregisterScriptHandler", argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: - tolua_error(L,"#ferror in function 'unregisterScriptHandler'.",&tolua_err); + tolua_error(L,"#ferror in function 'lua_cocos2d_TableView_unregisterScriptHandler'.",&tolua_err); return 0; #endif } @@ -1460,10 +1046,24 @@ int register_all_cocos2dx_extension_manual(lua_State* tolua_S) { extendControl(tolua_S); extendEditBox(tolua_S); - extendCCBReader(tolua_S); - extendCCBAnimationManager(tolua_S); extendAssetsManager(tolua_S); extendScrollView(tolua_S); extendTableView(tolua_S); return 0; } + +int register_extension_module(lua_State* tolua_S) +{ + lua_getglobal(tolua_S, "_G"); + if (lua_istable(tolua_S,-1))//stack:...,_G, + { + register_all_cocos2dx_extension(tolua_S); + register_all_cocos2dx_extension_manual(tolua_S); + } + lua_pop(tolua_S, 1); + + LuaEngine::getInstance()->executeScriptFile("DeprecatedExtensionClass"); + LuaEngine::getInstance()->executeScriptFile("DeprecatedExtensionEnum"); + LuaEngine::getInstance()->executeScriptFile("DeprecatedExtensionFunc"); + return 1; +} diff --git a/cocos/scripting/lua-bindings/manual/lua_cocos2dx_extension_manual.h b/cocos/scripting/lua-bindings/manual/extension/lua_cocos2dx_extension_manual.h similarity index 91% rename from cocos/scripting/lua-bindings/manual/lua_cocos2dx_extension_manual.h rename to cocos/scripting/lua-bindings/manual/extension/lua_cocos2dx_extension_manual.h index b150bf3cbd..44a9a86cd2 100644 --- a/cocos/scripting/lua-bindings/manual/lua_cocos2dx_extension_manual.h +++ b/cocos/scripting/lua-bindings/manual/extension/lua_cocos2dx_extension_manual.h @@ -32,10 +32,8 @@ extern "C" { } #endif -#include "LuaScriptHandlerMgr.h" - -TOLUA_API int register_all_cocos2dx_extension_manual(lua_State* tolua_S); -TOLUA_API int register_cocos2dx_extension_CCBProxy(lua_State* tolua_S); +TOLUA_API int register_all_cocos2dx_extension_manual(lua_State* tolua_S); +TOLUA_API int register_extension_module(lua_State* tolua_S); struct LuaAssetsManagerEventData { @@ -57,5 +55,4 @@ struct LuaTableViewEventData } }; - #endif // #ifndef COCOS2DX_SCRIPT_LUA_COCOS2DX_SUPPORT_LUA_COCOS2DX_EXTENSION_MANUAL_H diff --git a/cocos/scripting/lua-bindings/manual/Lua_web_socket.cpp b/cocos/scripting/lua-bindings/manual/network/Lua_web_socket.cpp similarity index 99% rename from cocos/scripting/lua-bindings/manual/Lua_web_socket.cpp rename to cocos/scripting/lua-bindings/manual/network/Lua_web_socket.cpp index 40c624623d..9b2b3ac2b1 100644 --- a/cocos/scripting/lua-bindings/manual/Lua_web_socket.cpp +++ b/cocos/scripting/lua-bindings/manual/network/Lua_web_socket.cpp @@ -35,7 +35,6 @@ using namespace cocos2d; - static int SendBinaryMessageToLua(int nHandler,const unsigned char* pTable,int nLength) { if (NULL == pTable || nHandler <= 0) { @@ -464,5 +463,4 @@ TOLUA_API int register_web_socket_manual(lua_State* tolua_S) return 1; } - #endif//(CC_TARGET_PLATFORM == CC_PLATFORM_IOS ... diff --git a/cocos/scripting/lua-bindings/manual/Lua_web_socket.h b/cocos/scripting/lua-bindings/manual/network/Lua_web_socket.h similarity index 100% rename from cocos/scripting/lua-bindings/manual/Lua_web_socket.h rename to cocos/scripting/lua-bindings/manual/network/Lua_web_socket.h diff --git a/cocos/scripting/lua-bindings/manual/network/lua_cocos2dx_network_manual.cpp b/cocos/scripting/lua-bindings/manual/network/lua_cocos2dx_network_manual.cpp new file mode 100644 index 0000000000..d563fdf546 --- /dev/null +++ b/cocos/scripting/lua-bindings/manual/network/lua_cocos2dx_network_manual.cpp @@ -0,0 +1,61 @@ +/**************************************************************************** + 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 "lua_cocos2dx_network_manual.h" +extern "C" { +#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_WIN32 || CC_TARGET_PLATFORM == CC_PLATFORM_MAC) +#include "lua_extensions.h" +#endif +} +#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) +#include "Lua_web_socket.h" +#endif + +#include "lua_xml_http_request.h" +#include "CCLuaEngine.h" + + +int register_network_module(lua_State* L) +{ + lua_getglobal(L, "_G"); + if (lua_istable(L,-1))//stack:...,_G, + { +#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_WIN32 || CC_TARGET_PLATFORM == CC_PLATFORM_MAC) + luaopen_lua_extensions(L); +#endif + +#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) + tolua_web_socket_open(L); + register_web_socket_manual(L); +#endif + + register_xml_http_request(L); + } + lua_pop(L, 1); + + cocos2d::LuaEngine::getInstance()->executeScriptFile("DeprecatedNetworkClass"); + cocos2d::LuaEngine::getInstance()->executeScriptFile("DeprecatedNetworkEnum"); + cocos2d::LuaEngine::getInstance()->executeScriptFile("DeprecatedNetworkFunc"); + + return 1; +} diff --git a/cocos/scripting/lua-bindings/manual/network/lua_cocos2dx_network_manual.h b/cocos/scripting/lua-bindings/manual/network/lua_cocos2dx_network_manual.h new file mode 100644 index 0000000000..1112a5b1b5 --- /dev/null +++ b/cocos/scripting/lua-bindings/manual/network/lua_cocos2dx_network_manual.h @@ -0,0 +1,37 @@ +/**************************************************************************** + 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 __COCOS_SCRIPTING_LUA_BINDINGS_MANUAL_NETWORK_LUA_COCOS2DX_NETWORK_MANUAL_H__ +#define __COCOS_SCRIPTING_LUA_BINDINGS_MANUAL_NETWORK_LUA_COCOS2DX_NETWORK_MANUAL_H__ + +#ifdef __cplusplus +extern "C" { +#endif +#include "tolua++.h" +#ifdef __cplusplus +} +#endif + +TOLUA_API int register_network_module(lua_State* L); + +#endif //#ifndef __COCOS_SCRIPTING_LUA_BINDINGS_MANUAL_NETWORK_LUA_COCOS2DX_NETWORK_MANUAL_H__ diff --git a/cocos/scripting/lua-bindings/manual/lua_extensions.c b/cocos/scripting/lua-bindings/manual/network/lua_extensions.c similarity index 100% rename from cocos/scripting/lua-bindings/manual/lua_extensions.c rename to cocos/scripting/lua-bindings/manual/network/lua_extensions.c diff --git a/cocos/scripting/lua-bindings/manual/lua_extensions.h b/cocos/scripting/lua-bindings/manual/network/lua_extensions.h similarity index 100% rename from cocos/scripting/lua-bindings/manual/lua_extensions.h rename to cocos/scripting/lua-bindings/manual/network/lua_extensions.h diff --git a/cocos/scripting/lua-bindings/manual/lua_xml_http_request.cpp b/cocos/scripting/lua-bindings/manual/network/lua_xml_http_request.cpp similarity index 100% rename from cocos/scripting/lua-bindings/manual/lua_xml_http_request.cpp rename to cocos/scripting/lua-bindings/manual/network/lua_xml_http_request.cpp diff --git a/cocos/scripting/lua-bindings/manual/lua_xml_http_request.h b/cocos/scripting/lua-bindings/manual/network/lua_xml_http_request.h similarity index 100% rename from cocos/scripting/lua-bindings/manual/lua_xml_http_request.h rename to cocos/scripting/lua-bindings/manual/network/lua_xml_http_request.h diff --git a/cocos/scripting/lua-bindings/manual/LuaSkeletonAnimation.cpp b/cocos/scripting/lua-bindings/manual/spine/LuaSkeletonAnimation.cpp similarity index 100% rename from cocos/scripting/lua-bindings/manual/LuaSkeletonAnimation.cpp rename to cocos/scripting/lua-bindings/manual/spine/LuaSkeletonAnimation.cpp diff --git a/cocos/scripting/lua-bindings/manual/LuaSkeletonAnimation.h b/cocos/scripting/lua-bindings/manual/spine/LuaSkeletonAnimation.h similarity index 100% rename from cocos/scripting/lua-bindings/manual/LuaSkeletonAnimation.h rename to cocos/scripting/lua-bindings/manual/spine/LuaSkeletonAnimation.h diff --git a/cocos/scripting/lua-bindings/manual/lua_cocos2dx_spine_manual.cpp b/cocos/scripting/lua-bindings/manual/spine/lua_cocos2dx_spine_manual.cpp similarity index 90% rename from cocos/scripting/lua-bindings/manual/lua_cocos2dx_spine_manual.cpp rename to cocos/scripting/lua-bindings/manual/spine/lua_cocos2dx_spine_manual.cpp index 003e5527a2..3c504fd3d6 100644 --- a/cocos/scripting/lua-bindings/manual/lua_cocos2dx_spine_manual.cpp +++ b/cocos/scripting/lua-bindings/manual/spine/lua_cocos2dx_spine_manual.cpp @@ -22,6 +22,7 @@ THE SOFTWARE. ****************************************************************************/ #include "lua_cocos2dx_spine_manual.hpp" +#include "lua_cocos2dx_spine_auto.hpp" #include "cocos2d.h" #include "tolua_fix.h" #include "LuaBasicConversions.h" @@ -30,6 +31,7 @@ #include "spine.h" #include "spine-cocos2dx.h" #include "LuaSkeletonAnimation.h" +#include "CCLuaEngine.h" using namespace spine; @@ -54,10 +56,10 @@ static int tolua_cocos2dx_setBlendFunc(lua_State* tolua_S,const char* className) if (2 == argc) { GLenum src, dst; - if (!luaval_to_int32(tolua_S, 2, (int32_t*)&src)) + if (!luaval_to_int32(tolua_S, 2, (int32_t*)&src, StringUtils::format("%s%s",className,":setBlendFunc").c_str())) return 0; - if (!luaval_to_int32(tolua_S, 3, (int32_t*)&dst)) + if (!luaval_to_int32(tolua_S, 3, (int32_t*)&dst,StringUtils::format("%s%s",className,":setBlendFunc").c_str())) return 0; BlendFunc blendFunc = {src, dst}; @@ -338,11 +340,11 @@ static int lua_cocos2dx_spine_SkeletonAnimation_addAnimation(lua_State* tolua_S) const char* arg1; bool arg2; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "sp.SkeletonAnimation:addAnimation"); - std::string arg1_tmp; ok &= luaval_to_std_string(tolua_S, 3, &arg1_tmp); arg1 = arg1_tmp.c_str(); + std::string arg1_tmp; ok &= luaval_to_std_string(tolua_S, 3, &arg1_tmp, "sp.SkeletonAnimation:addAnimation"); arg1 = arg1_tmp.c_str(); - ok &= luaval_to_boolean(tolua_S, 4,&arg2); + ok &= luaval_to_boolean(tolua_S, 4,&arg2, "sp.SkeletonAnimation:addAnimation"); if(!ok) return 0; cobj->addAnimation(arg0, arg1, arg2); @@ -356,13 +358,13 @@ static int lua_cocos2dx_spine_SkeletonAnimation_addAnimation(lua_State* tolua_S) bool arg2; double arg3; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "sp.SkeletonAnimation:addAnimation"); - std::string arg1_tmp; ok &= luaval_to_std_string(tolua_S, 3, &arg1_tmp); arg1 = arg1_tmp.c_str(); + std::string arg1_tmp; ok &= luaval_to_std_string(tolua_S, 3, &arg1_tmp, "sp.SkeletonAnimation:addAnimation"); arg1 = arg1_tmp.c_str(); - ok &= luaval_to_boolean(tolua_S, 4,&arg2); + ok &= luaval_to_boolean(tolua_S, 4,&arg2, "sp.SkeletonAnimation:addAnimation"); - ok &= luaval_to_number(tolua_S, 5,&arg3); + ok &= luaval_to_number(tolua_S, 5,&arg3, "sp.SkeletonAnimation:addAnimation"); if(!ok) return 0; @@ -413,11 +415,11 @@ static int lua_cocos2dx_spine_SkeletonAnimation_setAnimation(lua_State* tolua_S) const char* arg1; bool arg2; - ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0); + ok &= luaval_to_int32(tolua_S, 2,(int *)&arg0, "sp.SkeletonAnimation:setAnimation"); - std::string arg1_tmp; ok &= luaval_to_std_string(tolua_S, 3, &arg1_tmp); arg1 = arg1_tmp.c_str(); + std::string arg1_tmp; ok &= luaval_to_std_string(tolua_S, 3, &arg1_tmp, "sp.SkeletonAnimation:setAnimation"); arg1 = arg1_tmp.c_str(); - ok &= luaval_to_boolean(tolua_S, 4,&arg2); + ok &= luaval_to_boolean(tolua_S, 4,&arg2, "sp.SkeletonAnimation:setAnimation"); if(!ok) return 0; @@ -465,3 +467,16 @@ int register_all_cocos2dx_spine_manual(lua_State* L) return 0; } + +int register_spine_module(lua_State* L) +{ + lua_getglobal(L, "_G"); + if (lua_istable(L,-1))//stack:...,_G, + { + register_all_cocos2dx_spine(L); + register_all_cocos2dx_spine_manual(L); + } + lua_pop(L, 1); + + return 1; +} diff --git a/cocos/scripting/lua-bindings/manual/lua_cocos2dx_spine_manual.hpp b/cocos/scripting/lua-bindings/manual/spine/lua_cocos2dx_spine_manual.hpp similarity index 96% rename from cocos/scripting/lua-bindings/manual/lua_cocos2dx_spine_manual.hpp rename to cocos/scripting/lua-bindings/manual/spine/lua_cocos2dx_spine_manual.hpp index e54075519b..0c1d5d4853 100644 --- a/cocos/scripting/lua-bindings/manual/lua_cocos2dx_spine_manual.hpp +++ b/cocos/scripting/lua-bindings/manual/spine/lua_cocos2dx_spine_manual.hpp @@ -32,9 +32,7 @@ extern "C" { } #endif -#include "base/CCRef.h" - TOLUA_API int register_all_cocos2dx_spine_manual(lua_State* L); - +TOLUA_API int register_spine_module(lua_State* L); #endif // #ifndef COCOS_SCRIPTING_LUA_BINDINGS_LUA_COCOS2DX_SPINE_MANUAL_H diff --git a/cocos/scripting/lua-bindings/manual/lua_cocos2dx_experimental_video_manual.cpp b/cocos/scripting/lua-bindings/manual/ui/lua_cocos2dx_experimental_video_manual.cpp similarity index 97% rename from cocos/scripting/lua-bindings/manual/lua_cocos2dx_experimental_video_manual.cpp rename to cocos/scripting/lua-bindings/manual/ui/lua_cocos2dx_experimental_video_manual.cpp index 9b144fa828..a937cada2c 100644 --- a/cocos/scripting/lua-bindings/manual/lua_cocos2dx_experimental_video_manual.cpp +++ b/cocos/scripting/lua-bindings/manual/ui/lua_cocos2dx_experimental_video_manual.cpp @@ -54,7 +54,7 @@ static int lua_cocos2dx_experimental_video_VideoPlayer_addEventListener(lua_Stat return 0; } - CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "addEventListener",argc, 0); + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccexp.VideoPlayer:addEventListener",argc, 0); return 0; #if COCOS2D_DEBUG >= 1 tolua_lerror: diff --git a/cocos/scripting/lua-bindings/manual/lua_cocos2dx_experimental_video_manual.hpp b/cocos/scripting/lua-bindings/manual/ui/lua_cocos2dx_experimental_video_manual.hpp similarity index 100% rename from cocos/scripting/lua-bindings/manual/lua_cocos2dx_experimental_video_manual.hpp rename to cocos/scripting/lua-bindings/manual/ui/lua_cocos2dx_experimental_video_manual.hpp diff --git a/cocos/scripting/lua-bindings/manual/lua_cocos2dx_ui_manual.cpp b/cocos/scripting/lua-bindings/manual/ui/lua_cocos2dx_ui_manual.cpp similarity index 95% rename from cocos/scripting/lua-bindings/manual/lua_cocos2dx_ui_manual.cpp rename to cocos/scripting/lua-bindings/manual/ui/lua_cocos2dx_ui_manual.cpp index 8018cfaf81..c118218d58 100644 --- a/cocos/scripting/lua-bindings/manual/lua_cocos2dx_ui_manual.cpp +++ b/cocos/scripting/lua-bindings/manual/ui/lua_cocos2dx_ui_manual.cpp @@ -22,6 +22,11 @@ THE SOFTWARE. ****************************************************************************/ #include "lua_cocos2dx_ui_manual.hpp" +#include "lua_cocos2dx_ui_auto.hpp" +#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS) +#include "lua_cocos2dx_experimental_video_auto.hpp" +#include "lua_cocos2dx_experimental_video_manual.hpp" +#endif #include "cocos2d.h" #include "tolua_fix.h" #include "LuaBasicConversions.h" @@ -681,3 +686,22 @@ int register_all_cocos2dx_ui_manual(lua_State* L) return 0; } + +int register_ui_moudle(lua_State* L) +{ + lua_getglobal(L, "_G"); + if (lua_istable(L,-1))//stack:...,_G, + { + register_all_cocos2dx_ui(L); + register_all_cocos2dx_ui_manual(L); +#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS) + register_all_cocos2dx_experimental_video(L); + register_all_cocos2dx_experimental_video_manual(L); +#endif + } + lua_pop(L, 1); + + LuaEngine::getInstance()->executeScriptFile("DeprecatedUIEnum"); + LuaEngine::getInstance()->executeScriptFile("DeprecatedUIFunc"); + return 1; +} diff --git a/cocos/scripting/lua-bindings/manual/lua_cocos2dx_ui_manual.hpp b/cocos/scripting/lua-bindings/manual/ui/lua_cocos2dx_ui_manual.hpp similarity index 97% rename from cocos/scripting/lua-bindings/manual/lua_cocos2dx_ui_manual.hpp rename to cocos/scripting/lua-bindings/manual/ui/lua_cocos2dx_ui_manual.hpp index 8f102bf527..883e0005d4 100644 --- a/cocos/scripting/lua-bindings/manual/lua_cocos2dx_ui_manual.hpp +++ b/cocos/scripting/lua-bindings/manual/ui/lua_cocos2dx_ui_manual.hpp @@ -32,7 +32,7 @@ extern "C" { } #endif -#include "base/CCRef.h" - TOLUA_API int register_all_cocos2dx_ui_manual(lua_State* L); +TOLUA_API int register_ui_moudle(lua_State* L); + #endif // #ifndef COCOS_SCRIPTING_LUA_BINDINGS_LUA_COCOS2DX_GUI_MANUAL_H diff --git a/cocos/scripting/lua-bindings/manual/video/lua_cocos2dx_experimental_video_manual.cpp b/cocos/scripting/lua-bindings/manual/video/lua_cocos2dx_experimental_video_manual.cpp new file mode 100644 index 0000000000..a937cada2c --- /dev/null +++ b/cocos/scripting/lua-bindings/manual/video/lua_cocos2dx_experimental_video_manual.cpp @@ -0,0 +1,87 @@ +#include "lua_cocos2dx_experimental_video_manual.hpp" + +#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS) + +#include "UIVideoPlayer.h" +#include "tolua_fix.h" +#include "LuaBasicConversions.h" +#include "CCLuaValue.h" +#include "CCLuaEngine.h" + + + +static int lua_cocos2dx_experimental_video_VideoPlayer_addEventListener(lua_State* L) +{ + + int argc = 0; + cocos2d::experimental::ui::VideoPlayer* self = nullptr; + +#if COCOS2D_DEBUG >= 1 + tolua_Error tolua_err; + if (!tolua_isusertype(L,1,"ccexp.VideoPlayer",0,&tolua_err)) goto tolua_lerror; +#endif + + self = static_cast(tolua_tousertype(L,1,0)); + +#if COCOS2D_DEBUG >= 1 + if (nullptr == self) { + tolua_error(L,"invalid 'self' in function 'lua_cocos2dx_Widget_addTouchEventListener'\n", nullptr); + return 0; + } +#endif + + argc = lua_gettop(L) - 1; + + if (argc == 1) + { +#if COCOS2D_DEBUG >= 1 + if (!toluafix_isfunction(L,2,"LUA_FUNCTION",0,&tolua_err)) + { + goto tolua_lerror; + } +#endif + + LUA_FUNCTION handler = ( toluafix_ref_function(L,2,0)); + + self->addEventListener([=](cocos2d::Ref* ref, cocos2d::experimental::ui::VideoPlayer::EventType eventType){ + LuaStack* stack = LuaEngine::getInstance()->getLuaStack(); + + stack->pushObject(ref, "cc.Ref"); + stack->pushInt((int)eventType); + + stack->executeFunctionByHandler(handler, 2); + }); + + return 0; + } + CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "ccexp.VideoPlayer:addEventListener",argc, 0); + return 0; +#if COCOS2D_DEBUG >= 1 + tolua_lerror: + tolua_error(L, "#ferror in function 'lua_cocos2dx_experimental_VideoPlayer_addEventListener'.", &tolua_err); +#endif + return 0; +} + +static void extendVideoPlayer(lua_State* L) +{ + lua_pushstring(L, "ccexp.VideoPlayer"); + lua_rawget(L, LUA_REGISTRYINDEX); + if (lua_istable(L,-1)) + { + tolua_function(L, "addEventListener", lua_cocos2dx_experimental_video_VideoPlayer_addEventListener); + } + lua_pop(L, 1); +} + +int register_all_cocos2dx_experimental_video_manual(lua_State* L) +{ + if (nullptr == L) + return 0; + + extendVideoPlayer(L); + + return 0; +} + +#endif diff --git a/cocos/scripting/lua-bindings/manual/video/lua_cocos2dx_experimental_video_manual.hpp b/cocos/scripting/lua-bindings/manual/video/lua_cocos2dx_experimental_video_manual.hpp new file mode 100644 index 0000000000..6201540e59 --- /dev/null +++ b/cocos/scripting/lua-bindings/manual/video/lua_cocos2dx_experimental_video_manual.hpp @@ -0,0 +1,41 @@ +/**************************************************************************** + 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/ccConfig.h" +#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS) + +#ifndef COCOS_SCRIPTING_LUA_BINDINGS_LUA_COCOS2DX_EXPERIMENTAL_VIDEO_MANUAL_H +#define COCOS_SCRIPTING_LUA_BINDINGS_LUA_COCOS2DX_EXPERIMENTAL_VIDEO_MANUAL_H + +#ifdef __cplusplus +extern "C" { +#endif +#include "tolua++.h" +#ifdef __cplusplus +} +#endif + +TOLUA_API int register_all_cocos2dx_experimental_video_manual(lua_State* L); + +#endif //#ifndef COCOS_SCRIPTING_LUA_BINDINGS_LUA_COCOS2DX_EXPERIMENTAL_VIDEO_MANUAL_H +#endif //#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS) diff --git a/cocos/scripting/lua-bindings/proj.android/Android.mk b/cocos/scripting/lua-bindings/proj.android/Android.mk new file mode 100644 index 0000000000..84a8fafa63 --- /dev/null +++ b/cocos/scripting/lua-bindings/proj.android/Android.mk @@ -0,0 +1,265 @@ +LOCAL_PATH := $(call my-dir) +include $(CLEAR_VARS) + +LOCAL_MODULE := cocos2d_lua_static + +LOCAL_MODULE_FILENAME := libluacocos2d + +LOCAL_SRC_FILES := ../manual/CCLuaBridge.cpp \ + ../manual/CCLuaEngine.cpp \ + ../manual/CCLuaStack.cpp \ + ../manual/CCLuaValue.cpp \ + ../manual/Cocos2dxLuaLoader.cpp \ + ../manual/LuaBasicConversions.cpp \ + ../auto/lua_cocos2dx_auto.cpp \ + ../auto/lua_cocos2dx_physics_auto.cpp \ + ../auto/lua_cocos2dx_experimental_auto.cpp \ + ../manual/cocos2d/lua_cocos2dx_deprecated.cpp \ + ../manual/cocos2d/lua_cocos2dx_experimental_manual.cpp \ + ../manual/cocos2d/lua_cocos2dx_manual.cpp \ + ../manual/cocos2d/lua_cocos2dx_physics_manual.cpp \ + ../manual/cocos2d/LuaOpengl.cpp \ + ../manual/cocos2d/LuaScriptHandlerMgr.cpp \ + ../manual/platform/android/CCLuaJavaBridge.cpp \ + ../manual/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxLuaJavaBridge.cpp \ + ../manual/tolua_fix.cpp \ + ../../../../external/lua/tolua/tolua_event.c \ + ../../../../external/lua/tolua/tolua_is.c \ + ../../../../external/lua/tolua/tolua_map.c \ + ../../../../external/lua/tolua/tolua_push.c \ + ../../../../external/lua/tolua/tolua_to.c \ + ../../../../external/xxtea/xxtea.cpp + + +LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../../../external/lua/tolua \ + $(LOCAL_PATH)/../../../../external/lua/luajit/include \ + $(LOCAL_PATH)/../../../2d \ + $(LOCAL_PATH)/../../../3d \ + $(LOCAL_PATH)/../auto \ + $(LOCAL_PATH)/../manual \ + $(LOCAL_PATH)/../manual/extension \ + $(LOCAL_PATH)/../manual/cocostudio \ + $(LOCAL_PATH)/../manual/ui \ + $(LOCAL_PATH)/../manual/cocos2d \ + $(LOCAL_PATH)/../manual/platform/android \ + $(LOCAL_PATH)/../manual/platform/android/jni \ + $(LOCAL_PATH)/../../../../external/xxtea \ + $(LOCAL_PATH)/../../../.. \ + $(LOCAL_PATH)/../../../../extensions + + +LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../../external/lua/tolua \ + $(LOCAL_PATH)/../../../../external/lua/luajit/include \ + $(LOCAL_PATH)/../auto \ + $(LOCAL_PATH)/../manual \ + $(LOCAL_PATH)/../manual/cocos2d + + +LOCAL_STATIC_LIBRARIES := luajit_static +LOCAL_STATIC_LIBRARIES += cocos2dx_static + +include $(BUILD_STATIC_LIBRARY) + +#libluacocos3d +include $(CLEAR_VARS) + +LOCAL_MODULE := cocos3d_lua_static + +LOCAL_MODULE_FILENAME := libluacocos3d + +LOCAL_SRC_FILES := ../manual/3d/lua_cocos2dx_3d_manual.cpp \ + ../auto/lua_cocos2dx_3d_auto.cpp + +LOCAL_C_INCLUDES := $(LOCAL_PATH)/../auto \ + $(LOCAL_PATH)/../manual/3d \ + $(LOCAL_PATH)/../../../3d \ + +LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../manual/3d + +LOCAL_STATIC_LIBRARIES := cocos2d_lua_static +LOCAL_STATIC_LIBRARIES += cocos3d_static + +include $(BUILD_STATIC_LIBRARY) + +#libluacocosdenshion +include $(CLEAR_VARS) + +LOCAL_MODULE := cocosdenshion_lua_static + +LOCAL_MODULE_FILENAME := libluacocosdenshion + +LOCAL_SRC_FILES := ../manual/cocosdenshion/lua_cocos2dx_cocosdenshion_manual.cpp \ + ../auto/lua_cocos2dx_cocosdenshion_auto.cpp + +LOCAL_C_INCLUDES := $(LOCAL_PATH)/../auto \ + $(LOCAL_PATH)/../manual/cocosdenshion \ + $(LOCAL_PATH)/../../../audio/include \ + +LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../manual/cocosdenshion + +LOCAL_STATIC_LIBRARIES := cocosdenshion_static +LOCAL_STATIC_LIBRARIES += cocos2d_lua_static + +include $(BUILD_STATIC_LIBRARY) + +include $(CLEAR_VARS) + +LOCAL_MODULE := network_lua_static + +LOCAL_MODULE_FILENAME := libluanetwork + +LOCAL_SRC_FILES := ../manual/network/lua_cocos2dx_network_manual.cpp \ + ../manual/network/lua_extensions.c \ + ../manual/network/Lua_web_socket.cpp \ + ../manual/network/lua_xml_http_request.cpp \ + ../../../../external/lua/luasocket/auxiliar.c \ + ../../../../external/lua/luasocket/buffer.c \ + ../../../../external/lua/luasocket/except.c \ + ../../../../external/lua/luasocket/inet.c \ + ../../../../external/lua/luasocket/io.c \ + ../../../../external/lua/luasocket/luasocket.c \ + ../../../../external/lua/luasocket/mime.c \ + ../../../../external/lua/luasocket/options.c \ + ../../../../external/lua/luasocket/select.c \ + ../../../../external/lua/luasocket/serial.c \ + ../../../../external/lua/luasocket/tcp.c \ + ../../../../external/lua/luasocket/timeout.c \ + ../../../../external/lua/luasocket/udp.c \ + ../../../../external/lua/luasocket/unix.c \ + ../../../../external/lua/luasocket/usocket.c \ + +LOCAL_C_INCLUDES := $(LOCAL_PATH)/../manual/network \ + $(LOCAL_PATH)/../../../../external/lua \ + $(LOCAL_PATH)/../../../network + +LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../manual/network + +LOCAL_STATIC_LIBRARIES := cocos2d_lua_static +LOCAL_STATIC_LIBRARIES += cocos_network_static + +include $(BUILD_STATIC_LIBRARY) + +include $(CLEAR_VARS) + +LOCAL_MODULE := cocosbuilder_lua_static + +LOCAL_MODULE_FILENAME := libluacocosbuilder + +LOCAL_SRC_FILES := ../manual/cocosbuilder/lua_cocos2dx_cocosbuilder_manual.cpp \ + ../manual/cocosbuilder/CCBProxy.cpp \ + ../auto/lua_cocos2dx_cocosbuilder_auto.cpp \ + + +LOCAL_C_INCLUDES := $(LOCAL_PATH)/../manual/cocosbuilder \ + $(LOCAL_PATH)/../auto \ + $(LOCAL_PATH)/../../../editor-support/cocosbuilder + +LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../manual/cocosbuilder + +LOCAL_STATIC_LIBRARIES := cocos2d_lua_static +LOCAL_STATIC_LIBRARIES += cocosbuilder_static + +include $(BUILD_STATIC_LIBRARY) + + +# +include $(CLEAR_VARS) + +LOCAL_MODULE := cocostudio_lua_static + +LOCAL_MODULE_FILENAME := libluacocostudio + +LOCAL_SRC_FILES := ../manual/cocostudio/lua_cocos2dx_coco_studio_manual.cpp \ + ../auto/lua_cocos2dx_studio_auto.cpp \ + + +LOCAL_C_INCLUDES := $(LOCAL_PATH)/../manual/cocostudio \ + $(LOCAL_PATH)/../auto \ + $(LOCAL_PATH)/../../../editor-support/cocostudio + +LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../manual/cocostudio + +LOCAL_STATIC_LIBRARIES := cocos2d_lua_static +LOCAL_STATIC_LIBRARIES += cocostudio_static + +include $(BUILD_STATIC_LIBRARY) + +include $(CLEAR_VARS) + +LOCAL_MODULE := spine_lua_static + +LOCAL_MODULE_FILENAME := libluaspine + +LOCAL_SRC_FILES := ../manual/spine/lua_cocos2dx_spine_manual.cpp \ + ../manual/spine/LuaSkeletonAnimation.cpp \ + ../auto/lua_cocos2dx_spine_auto.cpp \ + + +LOCAL_C_INCLUDES := $(LOCAL_PATH)/../manual/spine \ + $(LOCAL_PATH)/../auto \ + $(LOCAL_PATH)/../../../editor-support/spine + +LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../manual/spine + +LOCAL_STATIC_LIBRARIES := cocos2d_lua_static +LOCAL_STATIC_LIBRARIES += spine_static + +include $(BUILD_STATIC_LIBRARY) + +include $(CLEAR_VARS) + +LOCAL_MODULE := extension_lua_static + +LOCAL_MODULE_FILENAME := libluaextension + +LOCAL_SRC_FILES := ../manual/extension/lua_cocos2dx_extension_manual.cpp \ + ../auto/lua_cocos2dx_extension_auto.cpp \ + + +LOCAL_C_INCLUDES := $(LOCAL_PATH)/../manual/extension \ + $(LOCAL_PATH)/../auto \ + $(LOCAL_PATH)/../../../../extensions + + +LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../manual/extension + +LOCAL_STATIC_LIBRARIES := cocos2d_lua_static +LOCAL_STATIC_LIBRARIES += cocos_extension_static + +include $(BUILD_STATIC_LIBRARY) + +include $(CLEAR_VARS) + +LOCAL_MODULE := ui_lua_static + +LOCAL_MODULE_FILENAME := libluaui + +LOCAL_SRC_FILES := ../manual/ui/lua_cocos2dx_experimental_video_manual.cpp \ + ../manual/ui/lua_cocos2dx_ui_manual.cpp \ + ../auto/lua_cocos2dx_experimental_video_auto.cpp \ + ../auto/lua_cocos2dx_ui_auto.cpp + +LOCAL_C_INCLUDES := $(LOCAL_PATH)/../manual/ui \ + $(LOCAL_PATH)/../auto \ + $(LOCAL_PATH)/../../../ui + + +LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../manual/ui + +LOCAL_STATIC_LIBRARIES := cocos2d_lua_static +LOCAL_STATIC_LIBRARIES += cocos_ui_static + +include $(BUILD_STATIC_LIBRARY) + +$(call import-module,lua/luajit/prebuilt/android) +$(call import-module,.) +$(call import-module,audio/android) +$(call import-module,network) +$(call import-module,editor-support/cocosbuilder) +$(call import-module,editor-support/cocostudio) +$(call import-module,editor-support/spine) +$(call import-module,ui) +$(call import-module,extensions) +$(call import-module,3d) + + 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 80163c3135..d5ce19e644 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 @@ -6,244 +6,484 @@ objectVersion = 46; objects = { +/* Begin PBXAggregateTarget section */ + 15D1F2AC1994B2AD00302043 /* build all lualibs Mac */ = { + isa = PBXAggregateTarget; + buildConfigurationList = 15D1F2AF1994B2AD00302043 /* Build configuration list for PBXAggregateTarget "build all lualibs Mac" */; + buildPhases = ( + ); + dependencies = ( + 15D1F2B11994B2C400302043 /* PBXTargetDependency */, + 15D1F2B31994B2C400302043 /* PBXTargetDependency */, + 15D1F2B51994B2C400302043 /* PBXTargetDependency */, + 15D1F2B71994B2C400302043 /* PBXTargetDependency */, + 15D1F2B91994B2C400302043 /* PBXTargetDependency */, + 15D1F2BB1994B2C400302043 /* PBXTargetDependency */, + 15D1F2BD1994B2C400302043 /* PBXTargetDependency */, + 15D1F2BF1994B2C400302043 /* PBXTargetDependency */, + ); + name = "build all lualibs Mac"; + productName = "build all lualibs Mac"; + }; + 15D1F2C01994B2DA00302043 /* build all lualibs iOS */ = { + isa = PBXAggregateTarget; + buildConfigurationList = 15D1F2C11994B2DA00302043 /* Build configuration list for PBXAggregateTarget "build all lualibs iOS" */; + buildPhases = ( + ); + dependencies = ( + 15D1F2C51994B2ED00302043 /* PBXTargetDependency */, + 15D1F2C71994B2ED00302043 /* PBXTargetDependency */, + 15D1F2C91994B2ED00302043 /* PBXTargetDependency */, + 15D1F2CB1994B2ED00302043 /* PBXTargetDependency */, + 15D1F2CD1994B2ED00302043 /* PBXTargetDependency */, + 15D1F2CF1994B2ED00302043 /* PBXTargetDependency */, + 15D1F2D11994B2ED00302043 /* PBXTargetDependency */, + 15D1F2D31994B2ED00302043 /* PBXTargetDependency */, + ); + name = "build all lualibs iOS"; + productName = "build all lualibs iOS"; + }; +/* End PBXAggregateTarget section */ + /* Begin PBXBuildFile section */ - 1503FAA118DA8A1C00F6518C /* buffer.c in Sources */ = {isa = PBXBuildFile; fileRef = 1503FA9D18DA8A1C00F6518C /* buffer.c */; }; - 1503FAA218DA8A1C00F6518C /* buffer.c in Sources */ = {isa = PBXBuildFile; fileRef = 1503FA9D18DA8A1C00F6518C /* buffer.c */; }; - 1503FAA318DA8A1C00F6518C /* buffer.h in Headers */ = {isa = PBXBuildFile; fileRef = 1503FA9E18DA8A1C00F6518C /* buffer.h */; }; - 1503FAA418DA8A1C00F6518C /* buffer.h in Headers */ = {isa = PBXBuildFile; fileRef = 1503FA9E18DA8A1C00F6518C /* buffer.h */; }; - 1503FAA518DA8A1C00F6518C /* io.c in Sources */ = {isa = PBXBuildFile; fileRef = 1503FA9F18DA8A1C00F6518C /* io.c */; }; - 1503FAA618DA8A1C00F6518C /* io.c in Sources */ = {isa = PBXBuildFile; fileRef = 1503FA9F18DA8A1C00F6518C /* io.c */; }; - 1503FAA718DA8A1C00F6518C /* io.h in Headers */ = {isa = PBXBuildFile; fileRef = 1503FAA018DA8A1C00F6518C /* io.h */; }; - 1503FAA818DA8A1C00F6518C /* io.h in Headers */ = {isa = PBXBuildFile; fileRef = 1503FAA018DA8A1C00F6518C /* io.h */; }; - 1540AF57193EC30500717D8E /* xxtea.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1540AF55193EC30500717D8E /* xxtea.cpp */; }; - 1540AF58193EC30500717D8E /* xxtea.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1540AF55193EC30500717D8E /* xxtea.cpp */; }; - 1540AF59193EC30500717D8E /* xxtea.h in Headers */ = {isa = PBXBuildFile; fileRef = 1540AF56193EC30500717D8E /* xxtea.h */; }; - 1540AF5A193EC30500717D8E /* xxtea.h in Headers */ = {isa = PBXBuildFile; fileRef = 1540AF56193EC30500717D8E /* xxtea.h */; }; - 15622969197780DE009C9067 /* lua_cocos2dx_experimental_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15622967197780DE009C9067 /* lua_cocos2dx_experimental_auto.cpp */; }; - 1562296A197780DE009C9067 /* lua_cocos2dx_experimental_auto.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 15622968197780DE009C9067 /* lua_cocos2dx_experimental_auto.hpp */; }; - 1562297519778209009C9067 /* lua_cocos2dx_experimental_manual.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1562297119778209009C9067 /* lua_cocos2dx_experimental_manual.cpp */; }; - 1562297619778209009C9067 /* lua_cocos2dx_experimental_manual.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1562297219778209009C9067 /* lua_cocos2dx_experimental_manual.hpp */; }; - 156EADF31977A2BA00F53709 /* lua_cocos2dx_experimental_video_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 156EADF11977A2BA00F53709 /* lua_cocos2dx_experimental_video_auto.cpp */; }; - 156EADF41977A2BA00F53709 /* lua_cocos2dx_experimental_video_auto.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 156EADF21977A2BA00F53709 /* lua_cocos2dx_experimental_video_auto.hpp */; }; - 156EADF51977A2BF00F53709 /* lua_cocos2dx_experimental_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15622967197780DE009C9067 /* lua_cocos2dx_experimental_auto.cpp */; }; - 156EADF61977A2C200F53709 /* lua_cocos2dx_experimental_auto.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 15622968197780DE009C9067 /* lua_cocos2dx_experimental_auto.hpp */; }; - 156EADF91977A39F00F53709 /* lua_cocos2dx_experimental_video_manual.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 156EADF71977A39F00F53709 /* lua_cocos2dx_experimental_video_manual.cpp */; }; - 156EADFA1977A39F00F53709 /* lua_cocos2dx_experimental_video_manual.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 156EADF81977A39F00F53709 /* lua_cocos2dx_experimental_video_manual.hpp */; }; - 156EADFB1977A3A300F53709 /* lua_cocos2dx_experimental_manual.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1562297119778209009C9067 /* lua_cocos2dx_experimental_manual.cpp */; }; - 156EADFC1977A3A500F53709 /* lua_cocos2dx_experimental_manual.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1562297219778209009C9067 /* lua_cocos2dx_experimental_manual.hpp */; }; - 1A262AB818BEEF5900D2DB92 /* tolua_fix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A262AB718BEEF5900D2DB92 /* tolua_fix.cpp */; }; - 1A262AB918BEEF5900D2DB92 /* tolua_fix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A262AB718BEEF5900D2DB92 /* tolua_fix.cpp */; }; - 1AACE7B518BC45C200215002 /* lua_cocos2dx_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE74918BC45C200215002 /* lua_cocos2dx_auto.cpp */; }; - 1AACE7B618BC45C200215002 /* lua_cocos2dx_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE74918BC45C200215002 /* lua_cocos2dx_auto.cpp */; }; - 1AACE7B718BC45C200215002 /* lua_cocos2dx_auto.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE74A18BC45C200215002 /* lua_cocos2dx_auto.hpp */; }; - 1AACE7B818BC45C200215002 /* lua_cocos2dx_auto.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE74A18BC45C200215002 /* lua_cocos2dx_auto.hpp */; }; - 1AACE7BB18BC45C200215002 /* lua_cocos2dx_extension_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE74C18BC45C200215002 /* lua_cocos2dx_extension_auto.cpp */; }; - 1AACE7BC18BC45C200215002 /* lua_cocos2dx_extension_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE74C18BC45C200215002 /* lua_cocos2dx_extension_auto.cpp */; }; - 1AACE7BD18BC45C200215002 /* lua_cocos2dx_extension_auto.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE74D18BC45C200215002 /* lua_cocos2dx_extension_auto.hpp */; }; - 1AACE7BE18BC45C200215002 /* lua_cocos2dx_extension_auto.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE74D18BC45C200215002 /* lua_cocos2dx_extension_auto.hpp */; }; - 1AACE7C718BC45C200215002 /* lua_cocos2dx_physics_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE75218BC45C200215002 /* lua_cocos2dx_physics_auto.cpp */; }; - 1AACE7C818BC45C200215002 /* lua_cocos2dx_physics_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE75218BC45C200215002 /* lua_cocos2dx_physics_auto.cpp */; }; - 1AACE7C918BC45C200215002 /* lua_cocos2dx_physics_auto.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE75318BC45C200215002 /* lua_cocos2dx_physics_auto.hpp */; }; - 1AACE7CA18BC45C200215002 /* lua_cocos2dx_physics_auto.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE75318BC45C200215002 /* lua_cocos2dx_physics_auto.hpp */; }; - 1AACE7CD18BC45C200215002 /* lua_cocos2dx_spine_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE75518BC45C200215002 /* lua_cocos2dx_spine_auto.cpp */; }; - 1AACE7CE18BC45C200215002 /* lua_cocos2dx_spine_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE75518BC45C200215002 /* lua_cocos2dx_spine_auto.cpp */; }; - 1AACE7CF18BC45C200215002 /* lua_cocos2dx_spine_auto.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE75618BC45C200215002 /* lua_cocos2dx_spine_auto.hpp */; }; - 1AACE7D018BC45C200215002 /* lua_cocos2dx_spine_auto.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE75618BC45C200215002 /* lua_cocos2dx_spine_auto.hpp */; }; - 1AACE7D318BC45C200215002 /* lua_cocos2dx_studio_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE75818BC45C200215002 /* lua_cocos2dx_studio_auto.cpp */; }; - 1AACE7D418BC45C200215002 /* lua_cocos2dx_studio_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE75818BC45C200215002 /* lua_cocos2dx_studio_auto.cpp */; }; - 1AACE7D518BC45C200215002 /* lua_cocos2dx_studio_auto.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE75918BC45C200215002 /* lua_cocos2dx_studio_auto.hpp */; }; - 1AACE7D618BC45C200215002 /* lua_cocos2dx_studio_auto.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE75918BC45C200215002 /* lua_cocos2dx_studio_auto.hpp */; }; - 1AACE7D918BC45C200215002 /* CCBProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE75E18BC45C200215002 /* CCBProxy.cpp */; }; - 1AACE7DA18BC45C200215002 /* CCBProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE75E18BC45C200215002 /* CCBProxy.cpp */; }; - 1AACE7DB18BC45C200215002 /* CCBProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE75F18BC45C200215002 /* CCBProxy.h */; }; - 1AACE7DC18BC45C200215002 /* CCBProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE75F18BC45C200215002 /* CCBProxy.h */; }; - 1AACE7DD18BC45C200215002 /* CCLuaBridge.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE76018BC45C200215002 /* CCLuaBridge.cpp */; }; - 1AACE7DE18BC45C200215002 /* CCLuaBridge.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE76018BC45C200215002 /* CCLuaBridge.cpp */; }; - 1AACE7DF18BC45C200215002 /* CCLuaBridge.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE76118BC45C200215002 /* CCLuaBridge.h */; }; - 1AACE7E018BC45C200215002 /* CCLuaBridge.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE76118BC45C200215002 /* CCLuaBridge.h */; }; - 1AACE7E118BC45C200215002 /* CCLuaEngine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE76218BC45C200215002 /* CCLuaEngine.cpp */; }; - 1AACE7E218BC45C200215002 /* CCLuaEngine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE76218BC45C200215002 /* CCLuaEngine.cpp */; }; - 1AACE7E318BC45C200215002 /* CCLuaEngine.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE76318BC45C200215002 /* CCLuaEngine.h */; }; - 1AACE7E418BC45C200215002 /* CCLuaEngine.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE76318BC45C200215002 /* CCLuaEngine.h */; }; - 1AACE7E518BC45C200215002 /* CCLuaStack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE76418BC45C200215002 /* CCLuaStack.cpp */; }; - 1AACE7E618BC45C200215002 /* CCLuaStack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE76418BC45C200215002 /* CCLuaStack.cpp */; }; - 1AACE7E718BC45C200215002 /* CCLuaStack.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE76518BC45C200215002 /* CCLuaStack.h */; }; - 1AACE7E818BC45C200215002 /* CCLuaStack.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE76518BC45C200215002 /* CCLuaStack.h */; }; - 1AACE7E918BC45C200215002 /* CCLuaValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE76618BC45C200215002 /* CCLuaValue.cpp */; }; - 1AACE7EA18BC45C200215002 /* CCLuaValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE76618BC45C200215002 /* CCLuaValue.cpp */; }; - 1AACE7EB18BC45C200215002 /* CCLuaValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE76718BC45C200215002 /* CCLuaValue.h */; }; - 1AACE7EC18BC45C200215002 /* CCLuaValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE76718BC45C200215002 /* CCLuaValue.h */; }; - 1AACE7ED18BC45C200215002 /* Cocos2dxLuaLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE76818BC45C200215002 /* Cocos2dxLuaLoader.cpp */; }; - 1AACE7EE18BC45C200215002 /* Cocos2dxLuaLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE76818BC45C200215002 /* Cocos2dxLuaLoader.cpp */; }; - 1AACE7EF18BC45C200215002 /* Cocos2dxLuaLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE76918BC45C200215002 /* Cocos2dxLuaLoader.h */; }; - 1AACE7F018BC45C200215002 /* Cocos2dxLuaLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE76918BC45C200215002 /* Cocos2dxLuaLoader.h */; }; - 1AACE7F118BC45C200215002 /* lua_cocos2dx_coco_studio_manual.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE76A18BC45C200215002 /* lua_cocos2dx_coco_studio_manual.cpp */; }; - 1AACE7F218BC45C200215002 /* lua_cocos2dx_coco_studio_manual.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE76A18BC45C200215002 /* lua_cocos2dx_coco_studio_manual.cpp */; }; - 1AACE7F318BC45C200215002 /* lua_cocos2dx_coco_studio_manual.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE76B18BC45C200215002 /* lua_cocos2dx_coco_studio_manual.hpp */; }; - 1AACE7F418BC45C200215002 /* lua_cocos2dx_coco_studio_manual.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE76B18BC45C200215002 /* lua_cocos2dx_coco_studio_manual.hpp */; }; - 1AACE7F518BC45C200215002 /* lua_cocos2dx_deprecated.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE76C18BC45C200215002 /* lua_cocos2dx_deprecated.cpp */; }; - 1AACE7F618BC45C200215002 /* lua_cocos2dx_deprecated.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE76C18BC45C200215002 /* lua_cocos2dx_deprecated.cpp */; }; - 1AACE7F718BC45C200215002 /* lua_cocos2dx_deprecated.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE76D18BC45C200215002 /* lua_cocos2dx_deprecated.h */; }; - 1AACE7F818BC45C200215002 /* lua_cocos2dx_deprecated.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE76D18BC45C200215002 /* lua_cocos2dx_deprecated.h */; }; - 1AACE7F918BC45C200215002 /* lua_cocos2dx_extension_manual.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE76E18BC45C200215002 /* lua_cocos2dx_extension_manual.cpp */; }; - 1AACE7FA18BC45C200215002 /* lua_cocos2dx_extension_manual.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE76E18BC45C200215002 /* lua_cocos2dx_extension_manual.cpp */; }; - 1AACE7FB18BC45C200215002 /* lua_cocos2dx_extension_manual.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE76F18BC45C200215002 /* lua_cocos2dx_extension_manual.h */; }; - 1AACE7FC18BC45C200215002 /* lua_cocos2dx_extension_manual.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE76F18BC45C200215002 /* lua_cocos2dx_extension_manual.h */; }; - 1AACE80118BC45C200215002 /* lua_cocos2dx_manual.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE77218BC45C200215002 /* lua_cocos2dx_manual.cpp */; }; - 1AACE80218BC45C200215002 /* lua_cocos2dx_manual.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE77218BC45C200215002 /* lua_cocos2dx_manual.cpp */; }; - 1AACE80318BC45C200215002 /* lua_cocos2dx_manual.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE77318BC45C200215002 /* lua_cocos2dx_manual.hpp */; }; - 1AACE80418BC45C200215002 /* lua_cocos2dx_manual.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE77318BC45C200215002 /* lua_cocos2dx_manual.hpp */; }; - 1AACE80518BC45C200215002 /* lua_cocos2dx_physics_manual.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE77418BC45C200215002 /* lua_cocos2dx_physics_manual.cpp */; }; - 1AACE80618BC45C200215002 /* lua_cocos2dx_physics_manual.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE77418BC45C200215002 /* lua_cocos2dx_physics_manual.cpp */; }; - 1AACE80718BC45C200215002 /* lua_cocos2dx_physics_manual.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE77518BC45C200215002 /* lua_cocos2dx_physics_manual.hpp */; }; - 1AACE80818BC45C200215002 /* lua_cocos2dx_physics_manual.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE77518BC45C200215002 /* lua_cocos2dx_physics_manual.hpp */; }; - 1AACE80918BC45C200215002 /* lua_cocos2dx_spine_manual.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE77618BC45C200215002 /* lua_cocos2dx_spine_manual.cpp */; }; - 1AACE80A18BC45C200215002 /* lua_cocos2dx_spine_manual.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE77618BC45C200215002 /* lua_cocos2dx_spine_manual.cpp */; }; - 1AACE80B18BC45C200215002 /* lua_cocos2dx_spine_manual.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE77718BC45C200215002 /* lua_cocos2dx_spine_manual.hpp */; }; - 1AACE80C18BC45C200215002 /* lua_cocos2dx_spine_manual.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE77718BC45C200215002 /* lua_cocos2dx_spine_manual.hpp */; }; - 1AACE80D18BC45C200215002 /* lua_extensions.c in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE77818BC45C200215002 /* lua_extensions.c */; }; - 1AACE80E18BC45C200215002 /* lua_extensions.c in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE77818BC45C200215002 /* lua_extensions.c */; }; - 1AACE80F18BC45C200215002 /* lua_extensions.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE77918BC45C200215002 /* lua_extensions.h */; }; - 1AACE81018BC45C200215002 /* lua_extensions.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE77918BC45C200215002 /* lua_extensions.h */; }; - 1AACE81118BC45C200215002 /* Lua_web_socket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE77A18BC45C200215002 /* Lua_web_socket.cpp */; }; - 1AACE81218BC45C200215002 /* Lua_web_socket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE77A18BC45C200215002 /* Lua_web_socket.cpp */; }; - 1AACE81318BC45C200215002 /* Lua_web_socket.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE77B18BC45C200215002 /* Lua_web_socket.h */; }; - 1AACE81418BC45C200215002 /* Lua_web_socket.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE77B18BC45C200215002 /* Lua_web_socket.h */; }; - 1AACE81518BC45C200215002 /* lua_xml_http_request.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE77C18BC45C200215002 /* lua_xml_http_request.cpp */; }; - 1AACE81618BC45C200215002 /* lua_xml_http_request.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE77C18BC45C200215002 /* lua_xml_http_request.cpp */; }; - 1AACE81718BC45C200215002 /* lua_xml_http_request.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE77D18BC45C200215002 /* lua_xml_http_request.h */; }; - 1AACE81818BC45C200215002 /* lua_xml_http_request.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE77D18BC45C200215002 /* lua_xml_http_request.h */; }; - 1AACE81918BC45C200215002 /* LuaBasicConversions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE77E18BC45C200215002 /* LuaBasicConversions.cpp */; }; - 1AACE81A18BC45C200215002 /* LuaBasicConversions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE77E18BC45C200215002 /* LuaBasicConversions.cpp */; }; - 1AACE81B18BC45C200215002 /* LuaBasicConversions.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE77F18BC45C200215002 /* LuaBasicConversions.h */; }; - 1AACE81C18BC45C200215002 /* LuaBasicConversions.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE77F18BC45C200215002 /* LuaBasicConversions.h */; }; - 1AACE81D18BC45C200215002 /* LuaOpengl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE78018BC45C200215002 /* LuaOpengl.cpp */; }; - 1AACE81E18BC45C200215002 /* LuaOpengl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE78018BC45C200215002 /* LuaOpengl.cpp */; }; - 1AACE81F18BC45C200215002 /* LuaOpengl.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE78118BC45C200215002 /* LuaOpengl.h */; }; - 1AACE82018BC45C200215002 /* LuaOpengl.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE78118BC45C200215002 /* LuaOpengl.h */; }; - 1AACE82118BC45C200215002 /* LuaScriptHandlerMgr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE78218BC45C200215002 /* LuaScriptHandlerMgr.cpp */; }; - 1AACE82218BC45C200215002 /* LuaScriptHandlerMgr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE78218BC45C200215002 /* LuaScriptHandlerMgr.cpp */; }; - 1AACE82318BC45C200215002 /* LuaScriptHandlerMgr.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE78318BC45C200215002 /* LuaScriptHandlerMgr.h */; }; - 1AACE82418BC45C200215002 /* LuaScriptHandlerMgr.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE78318BC45C200215002 /* LuaScriptHandlerMgr.h */; }; - 1AACE82518BC45C200215002 /* LuaSkeletonAnimation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE78418BC45C200215002 /* LuaSkeletonAnimation.cpp */; }; - 1AACE82618BC45C200215002 /* LuaSkeletonAnimation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE78418BC45C200215002 /* LuaSkeletonAnimation.cpp */; }; - 1AACE82718BC45C200215002 /* LuaSkeletonAnimation.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE78518BC45C200215002 /* LuaSkeletonAnimation.h */; }; - 1AACE82818BC45C200215002 /* LuaSkeletonAnimation.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE78518BC45C200215002 /* LuaSkeletonAnimation.h */; }; - 1AACE83118BC45C200215002 /* CCLuaObjcBridge.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE78E18BC45C200215002 /* CCLuaObjcBridge.h */; }; - 1AACE83218BC45C200215002 /* CCLuaObjcBridge.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE78E18BC45C200215002 /* CCLuaObjcBridge.h */; }; - 1AACE83318BC45C200215002 /* CCLuaObjcBridge.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE78F18BC45C200215002 /* CCLuaObjcBridge.mm */; }; - 1AACE83418BC45C200215002 /* CCLuaObjcBridge.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE78F18BC45C200215002 /* CCLuaObjcBridge.mm */; }; - 1AACE87B18BC45C200215002 /* tolua_fix.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE7B418BC45C200215002 /* tolua_fix.h */; }; - 1AACE87C18BC45C200215002 /* tolua_fix.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE7B418BC45C200215002 /* tolua_fix.h */; }; - 1ABCA1EA18CD8F470087CE3A /* lauxlib.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ABCA1E618CD8F470087CE3A /* lauxlib.h */; }; - 1ABCA1EB18CD8F470087CE3A /* lauxlib.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ABCA1E618CD8F470087CE3A /* lauxlib.h */; }; - 1ABCA1EC18CD8F470087CE3A /* lua.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ABCA1E718CD8F470087CE3A /* lua.h */; }; - 1ABCA1ED18CD8F470087CE3A /* lua.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ABCA1E718CD8F470087CE3A /* lua.h */; }; - 1ABCA1EE18CD8F470087CE3A /* luaconf.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ABCA1E818CD8F470087CE3A /* luaconf.h */; }; - 1ABCA1EF18CD8F470087CE3A /* luaconf.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ABCA1E818CD8F470087CE3A /* luaconf.h */; }; - 1ABCA1F018CD8F470087CE3A /* lualib.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ABCA1E918CD8F470087CE3A /* lualib.h */; }; - 1ABCA1F118CD8F470087CE3A /* lualib.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ABCA1E918CD8F470087CE3A /* lualib.h */; }; - 1ABCA1F418CD8F540087CE3A /* libluajit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA1F318CD8F540087CE3A /* libluajit.a */; }; - 1ABCA20018CD8F6E0087CE3A /* tolua_event.c in Sources */ = {isa = PBXBuildFile; fileRef = 1ABCA1F918CD8F6E0087CE3A /* tolua_event.c */; }; - 1ABCA20118CD8F6E0087CE3A /* tolua_event.c in Sources */ = {isa = PBXBuildFile; fileRef = 1ABCA1F918CD8F6E0087CE3A /* tolua_event.c */; }; - 1ABCA20218CD8F6E0087CE3A /* tolua_event.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ABCA1FA18CD8F6E0087CE3A /* tolua_event.h */; }; - 1ABCA20318CD8F6E0087CE3A /* tolua_event.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ABCA1FA18CD8F6E0087CE3A /* tolua_event.h */; }; - 1ABCA20418CD8F6E0087CE3A /* tolua_is.c in Sources */ = {isa = PBXBuildFile; fileRef = 1ABCA1FB18CD8F6E0087CE3A /* tolua_is.c */; }; - 1ABCA20518CD8F6E0087CE3A /* tolua_is.c in Sources */ = {isa = PBXBuildFile; fileRef = 1ABCA1FB18CD8F6E0087CE3A /* tolua_is.c */; }; - 1ABCA20618CD8F6E0087CE3A /* tolua_map.c in Sources */ = {isa = PBXBuildFile; fileRef = 1ABCA1FC18CD8F6E0087CE3A /* tolua_map.c */; }; - 1ABCA20718CD8F6E0087CE3A /* tolua_map.c in Sources */ = {isa = PBXBuildFile; fileRef = 1ABCA1FC18CD8F6E0087CE3A /* tolua_map.c */; }; - 1ABCA20818CD8F6E0087CE3A /* tolua_push.c in Sources */ = {isa = PBXBuildFile; fileRef = 1ABCA1FD18CD8F6E0087CE3A /* tolua_push.c */; }; - 1ABCA20918CD8F6E0087CE3A /* tolua_push.c in Sources */ = {isa = PBXBuildFile; fileRef = 1ABCA1FD18CD8F6E0087CE3A /* tolua_push.c */; }; - 1ABCA20A18CD8F6E0087CE3A /* tolua_to.c in Sources */ = {isa = PBXBuildFile; fileRef = 1ABCA1FE18CD8F6E0087CE3A /* tolua_to.c */; }; - 1ABCA20B18CD8F6E0087CE3A /* tolua_to.c in Sources */ = {isa = PBXBuildFile; fileRef = 1ABCA1FE18CD8F6E0087CE3A /* tolua_to.c */; }; - 1ABCA20C18CD8F6E0087CE3A /* tolua++.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ABCA1FF18CD8F6E0087CE3A /* tolua++.h */; }; - 1ABCA20D18CD8F6E0087CE3A /* tolua++.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ABCA1FF18CD8F6E0087CE3A /* tolua++.h */; }; - 1ABCA23118CD8F7D0087CE3A /* auxiliar.c in Sources */ = {isa = PBXBuildFile; fileRef = 1ABCA20F18CD8F7D0087CE3A /* auxiliar.c */; }; - 1ABCA23218CD8F7D0087CE3A /* auxiliar.c in Sources */ = {isa = PBXBuildFile; fileRef = 1ABCA20F18CD8F7D0087CE3A /* auxiliar.c */; }; - 1ABCA23318CD8F7D0087CE3A /* auxiliar.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ABCA21018CD8F7D0087CE3A /* auxiliar.h */; }; - 1ABCA23418CD8F7D0087CE3A /* auxiliar.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ABCA21018CD8F7D0087CE3A /* auxiliar.h */; }; - 1ABCA23518CD8F7D0087CE3A /* except.c in Sources */ = {isa = PBXBuildFile; fileRef = 1ABCA21118CD8F7D0087CE3A /* except.c */; }; - 1ABCA23618CD8F7D0087CE3A /* except.c in Sources */ = {isa = PBXBuildFile; fileRef = 1ABCA21118CD8F7D0087CE3A /* except.c */; }; - 1ABCA23718CD8F7D0087CE3A /* except.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ABCA21218CD8F7D0087CE3A /* except.h */; }; - 1ABCA23818CD8F7D0087CE3A /* except.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ABCA21218CD8F7D0087CE3A /* except.h */; }; - 1ABCA23918CD8F7D0087CE3A /* inet.c in Sources */ = {isa = PBXBuildFile; fileRef = 1ABCA21318CD8F7D0087CE3A /* inet.c */; }; - 1ABCA23A18CD8F7D0087CE3A /* inet.c in Sources */ = {isa = PBXBuildFile; fileRef = 1ABCA21318CD8F7D0087CE3A /* inet.c */; }; - 1ABCA23B18CD8F7D0087CE3A /* inet.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ABCA21418CD8F7D0087CE3A /* inet.h */; }; - 1ABCA23C18CD8F7D0087CE3A /* inet.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ABCA21418CD8F7D0087CE3A /* inet.h */; }; - 1ABCA23D18CD8F7D0087CE3A /* luasocket.c in Sources */ = {isa = PBXBuildFile; fileRef = 1ABCA21518CD8F7D0087CE3A /* luasocket.c */; }; - 1ABCA23E18CD8F7D0087CE3A /* luasocket.c in Sources */ = {isa = PBXBuildFile; fileRef = 1ABCA21518CD8F7D0087CE3A /* luasocket.c */; }; - 1ABCA23F18CD8F7D0087CE3A /* luasocket.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ABCA21618CD8F7D0087CE3A /* luasocket.h */; }; - 1ABCA24018CD8F7D0087CE3A /* luasocket.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ABCA21618CD8F7D0087CE3A /* luasocket.h */; }; - 1ABCA24918CD8F7D0087CE3A /* mime.c in Sources */ = {isa = PBXBuildFile; fileRef = 1ABCA21B18CD8F7D0087CE3A /* mime.c */; }; - 1ABCA24A18CD8F7D0087CE3A /* mime.c in Sources */ = {isa = PBXBuildFile; fileRef = 1ABCA21B18CD8F7D0087CE3A /* mime.c */; }; - 1ABCA24B18CD8F7D0087CE3A /* mime.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ABCA21C18CD8F7D0087CE3A /* mime.h */; }; - 1ABCA24C18CD8F7D0087CE3A /* mime.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ABCA21C18CD8F7D0087CE3A /* mime.h */; }; - 1ABCA24D18CD8F7D0087CE3A /* options.c in Sources */ = {isa = PBXBuildFile; fileRef = 1ABCA21D18CD8F7D0087CE3A /* options.c */; }; - 1ABCA24E18CD8F7D0087CE3A /* options.c in Sources */ = {isa = PBXBuildFile; fileRef = 1ABCA21D18CD8F7D0087CE3A /* options.c */; }; - 1ABCA24F18CD8F7D0087CE3A /* options.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ABCA21E18CD8F7D0087CE3A /* options.h */; }; - 1ABCA25018CD8F7D0087CE3A /* options.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ABCA21E18CD8F7D0087CE3A /* options.h */; }; - 1ABCA25118CD8F7D0087CE3A /* select.c in Sources */ = {isa = PBXBuildFile; fileRef = 1ABCA21F18CD8F7D0087CE3A /* select.c */; }; - 1ABCA25218CD8F7D0087CE3A /* select.c in Sources */ = {isa = PBXBuildFile; fileRef = 1ABCA21F18CD8F7D0087CE3A /* select.c */; }; - 1ABCA25318CD8F7D0087CE3A /* select.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ABCA22018CD8F7D0087CE3A /* select.h */; }; - 1ABCA25418CD8F7D0087CE3A /* select.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ABCA22018CD8F7D0087CE3A /* select.h */; }; - 1ABCA25518CD8F7D0087CE3A /* serial.c in Sources */ = {isa = PBXBuildFile; fileRef = 1ABCA22118CD8F7D0087CE3A /* serial.c */; }; - 1ABCA25618CD8F7D0087CE3A /* serial.c in Sources */ = {isa = PBXBuildFile; fileRef = 1ABCA22118CD8F7D0087CE3A /* serial.c */; }; - 1ABCA25718CD8F7D0087CE3A /* socket.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ABCA22218CD8F7D0087CE3A /* socket.h */; }; - 1ABCA25818CD8F7D0087CE3A /* socket.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ABCA22218CD8F7D0087CE3A /* socket.h */; }; - 1ABCA25D18CD8F7D0087CE3A /* tcp.c in Sources */ = {isa = PBXBuildFile; fileRef = 1ABCA22518CD8F7D0087CE3A /* tcp.c */; }; - 1ABCA25E18CD8F7D0087CE3A /* tcp.c in Sources */ = {isa = PBXBuildFile; fileRef = 1ABCA22518CD8F7D0087CE3A /* tcp.c */; }; - 1ABCA25F18CD8F7D0087CE3A /* tcp.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ABCA22618CD8F7D0087CE3A /* tcp.h */; }; - 1ABCA26018CD8F7D0087CE3A /* tcp.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ABCA22618CD8F7D0087CE3A /* tcp.h */; }; - 1ABCA26118CD8F7D0087CE3A /* timeout.c in Sources */ = {isa = PBXBuildFile; fileRef = 1ABCA22718CD8F7D0087CE3A /* timeout.c */; }; - 1ABCA26218CD8F7D0087CE3A /* timeout.c in Sources */ = {isa = PBXBuildFile; fileRef = 1ABCA22718CD8F7D0087CE3A /* timeout.c */; }; - 1ABCA26318CD8F7D0087CE3A /* timeout.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ABCA22818CD8F7D0087CE3A /* timeout.h */; }; - 1ABCA26418CD8F7D0087CE3A /* timeout.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ABCA22818CD8F7D0087CE3A /* timeout.h */; }; - 1ABCA26518CD8F7D0087CE3A /* udp.c in Sources */ = {isa = PBXBuildFile; fileRef = 1ABCA22918CD8F7D0087CE3A /* udp.c */; }; - 1ABCA26618CD8F7D0087CE3A /* udp.c in Sources */ = {isa = PBXBuildFile; fileRef = 1ABCA22918CD8F7D0087CE3A /* udp.c */; }; - 1ABCA26718CD8F7D0087CE3A /* udp.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ABCA22A18CD8F7D0087CE3A /* udp.h */; }; - 1ABCA26818CD8F7D0087CE3A /* udp.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ABCA22A18CD8F7D0087CE3A /* udp.h */; }; - 1ABCA26918CD8F7D0087CE3A /* unix.c in Sources */ = {isa = PBXBuildFile; fileRef = 1ABCA22B18CD8F7D0087CE3A /* unix.c */; }; - 1ABCA26A18CD8F7D0087CE3A /* unix.c in Sources */ = {isa = PBXBuildFile; fileRef = 1ABCA22B18CD8F7D0087CE3A /* unix.c */; }; - 1ABCA26B18CD8F7D0087CE3A /* unix.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ABCA22C18CD8F7D0087CE3A /* unix.h */; }; - 1ABCA26C18CD8F7D0087CE3A /* unix.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ABCA22C18CD8F7D0087CE3A /* unix.h */; }; - 1ABCA26D18CD8F7D0087CE3A /* usocket.c in Sources */ = {isa = PBXBuildFile; fileRef = 1ABCA22D18CD8F7D0087CE3A /* usocket.c */; }; - 1ABCA26E18CD8F7D0087CE3A /* usocket.c in Sources */ = {isa = PBXBuildFile; fileRef = 1ABCA22D18CD8F7D0087CE3A /* usocket.c */; }; - 1ABCA26F18CD8F7D0087CE3A /* usocket.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ABCA22E18CD8F7D0087CE3A /* usocket.h */; }; - 1ABCA27018CD8F7D0087CE3A /* usocket.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ABCA22E18CD8F7D0087CE3A /* usocket.h */; }; - 1ABCA36318CD9D7F0087CE3A /* libluajit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA1F618CD8F5F0087CE3A /* libluajit.a */; }; - 2905FAD018CF12E600240AA3 /* lua_cocos2dx_ui_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905FACE18CF12E600240AA3 /* lua_cocos2dx_ui_auto.cpp */; }; - 2905FAD118CF12E600240AA3 /* lua_cocos2dx_ui_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905FACE18CF12E600240AA3 /* lua_cocos2dx_ui_auto.cpp */; }; - 2905FAD218CF12E600240AA3 /* lua_cocos2dx_ui_auto.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 2905FACF18CF12E600240AA3 /* lua_cocos2dx_ui_auto.hpp */; }; - 2905FAD318CF12E600240AA3 /* lua_cocos2dx_ui_auto.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 2905FACF18CF12E600240AA3 /* lua_cocos2dx_ui_auto.hpp */; }; - 2905FAD618CF143800240AA3 /* lua_cocos2dx_ui_manual.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905FAD418CF143800240AA3 /* lua_cocos2dx_ui_manual.cpp */; }; - 2905FAD718CF143800240AA3 /* lua_cocos2dx_ui_manual.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905FAD418CF143800240AA3 /* lua_cocos2dx_ui_manual.cpp */; }; - 2905FAD818CF143800240AA3 /* lua_cocos2dx_ui_manual.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 2905FAD518CF143800240AA3 /* lua_cocos2dx_ui_manual.hpp */; }; - 2905FAD918CF143800240AA3 /* lua_cocos2dx_ui_manual.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 2905FAD518CF143800240AA3 /* lua_cocos2dx_ui_manual.hpp */; }; - C08D4F731974E00F00C87690 /* liblua.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C0D9BAFA1974D30000EC35BB /* liblua.a */; }; - C0FEF4D618BE0E70001F446C /* lua_debugger.c in Sources */ = {isa = PBXBuildFile; fileRef = C0FEF4D418BE0E70001F446C /* lua_debugger.c */; }; - C0FEF4D718BE0E70001F446C /* lua_debugger.c in Sources */ = {isa = PBXBuildFile; fileRef = C0FEF4D418BE0E70001F446C /* lua_debugger.c */; }; - C0FEF4D818BE0E70001F446C /* lua_debugger.h in Headers */ = {isa = PBXBuildFile; fileRef = C0FEF4D518BE0E70001F446C /* lua_debugger.h */; }; - C0FEF4D918BE0E70001F446C /* lua_debugger.h in Headers */ = {isa = PBXBuildFile; fileRef = C0FEF4D518BE0E70001F446C /* lua_debugger.h */; }; + 1516228119A0F3E3006099B8 /* lua_cocos2dx_3d_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1516227F19A0F3E3006099B8 /* lua_cocos2dx_3d_auto.cpp */; }; + 1516228219A0F3E3006099B8 /* lua_cocos2dx_3d_auto.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1516228019A0F3E3006099B8 /* lua_cocos2dx_3d_auto.hpp */; }; + 151622BC19A0F4E3006099B8 /* lua_cocos2dx_3d_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1516227F19A0F3E3006099B8 /* lua_cocos2dx_3d_auto.cpp */; }; + 151622BD19A0F4EC006099B8 /* lua_cocos2dx_3d_auto.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1516228019A0F3E3006099B8 /* lua_cocos2dx_3d_auto.hpp */; }; + 15427D44198F73F700DC375D /* lua_cocos2dx_cocosdenshion_manual.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15427D42198F73F700DC375D /* lua_cocos2dx_cocosdenshion_manual.cpp */; }; + 15427D45198F73F700DC375D /* lua_cocos2dx_cocosdenshion_manual.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15427D42198F73F700DC375D /* lua_cocos2dx_cocosdenshion_manual.cpp */; }; + 15427D46198F73F700DC375D /* lua_cocos2dx_cocosdenshion_manual.h in Headers */ = {isa = PBXBuildFile; fileRef = 15427D43198F73F700DC375D /* lua_cocos2dx_cocosdenshion_manual.h */; }; + 15427D47198F73F700DC375D /* lua_cocos2dx_cocosdenshion_manual.h in Headers */ = {isa = PBXBuildFile; fileRef = 15427D43198F73F700DC375D /* lua_cocos2dx_cocosdenshion_manual.h */; }; + 155CA35F1988E261006E0A08 /* usocket.c in Sources */ = {isa = PBXBuildFile; fileRef = 1ABCA22D18CD8F7D0087CE3A /* usocket.c */; }; + 155CA3601988E26D006E0A08 /* usocket.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ABCA22E18CD8F7D0087CE3A /* usocket.h */; }; + 158C128719A0FA1300781A76 /* lua_cocos2dx_3d_manual.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 158C128519A0FA1300781A76 /* lua_cocos2dx_3d_manual.cpp */; }; + 158C128819A0FA1300781A76 /* lua_cocos2dx_3d_manual.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 158C128519A0FA1300781A76 /* lua_cocos2dx_3d_manual.cpp */; }; + 158C128919A0FA1300781A76 /* lua_cocos2dx_3d_manual.h in Headers */ = {isa = PBXBuildFile; fileRef = 158C128619A0FA1300781A76 /* lua_cocos2dx_3d_manual.h */; }; + 158C128A19A0FA1300781A76 /* lua_cocos2dx_3d_manual.h in Headers */ = {isa = PBXBuildFile; fileRef = 158C128619A0FA1300781A76 /* lua_cocos2dx_3d_manual.h */; }; + 15AC69D519876E9300D17520 /* lua_cocos2dx_physics_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE75218BC45C200215002 /* lua_cocos2dx_physics_auto.cpp */; }; + 15AC69D619876EA200D17520 /* lua_cocos2dx_physics_auto.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE75318BC45C200215002 /* lua_cocos2dx_physics_auto.hpp */; }; + 15AC69D91987710400D17520 /* tolua_event.c in Sources */ = {isa = PBXBuildFile; fileRef = 1ABCA1F918CD8F6E0087CE3A /* tolua_event.c */; }; + 15AC69DA1987710400D17520 /* tolua_is.c in Sources */ = {isa = PBXBuildFile; fileRef = 1ABCA1FB18CD8F6E0087CE3A /* tolua_is.c */; }; + 15AC69DB1987710400D17520 /* tolua_map.c in Sources */ = {isa = PBXBuildFile; fileRef = 1ABCA1FC18CD8F6E0087CE3A /* tolua_map.c */; }; + 15AC69DC1987710400D17520 /* tolua_push.c in Sources */ = {isa = PBXBuildFile; fileRef = 1ABCA1FD18CD8F6E0087CE3A /* tolua_push.c */; }; + 15AC69DD1987710400D17520 /* tolua_to.c in Sources */ = {isa = PBXBuildFile; fileRef = 1ABCA1FE18CD8F6E0087CE3A /* tolua_to.c */; }; + 15AC69DE1987711400D17520 /* lauxlib.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ABCA1E618CD8F470087CE3A /* lauxlib.h */; }; + 15AC69DF1987711400D17520 /* lua.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ABCA1E718CD8F470087CE3A /* lua.h */; }; + 15AC69E01987711400D17520 /* luaconf.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ABCA1E818CD8F470087CE3A /* luaconf.h */; }; + 15AC69E11987711400D17520 /* lualib.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ABCA1E918CD8F470087CE3A /* lualib.h */; }; + 15AC69E21987712500D17520 /* tolua_event.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ABCA1FA18CD8F6E0087CE3A /* tolua_event.h */; }; + 15AC69E31987712500D17520 /* tolua++.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ABCA1FF18CD8F6E0087CE3A /* tolua++.h */; }; + 15AC69E4198771FF00D17520 /* libluajit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA1F618CD8F5F0087CE3A /* libluajit.a */; }; + 15AC69EB1987B42600D17520 /* lua_cocos2dx_experimental_video_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 156EADF11977A2BA00F53709 /* lua_cocos2dx_experimental_video_auto.cpp */; }; + 15AC69EC1987B43B00D17520 /* lua_cocos2dx_experimental_video_auto.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 156EADF21977A2BA00F53709 /* lua_cocos2dx_experimental_video_auto.hpp */; }; + 15C1BDDB1986541800A46ACC /* lua_cocos2dx_extension_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE74C18BC45C200215002 /* lua_cocos2dx_extension_auto.cpp */; }; + 15C1BDDC1986541800A46ACC /* lua_cocos2dx_extension_manual.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15C1BCFE1986526C00A46ACC /* lua_cocos2dx_extension_manual.cpp */; }; + 15C1BDDD1986542B00A46ACC /* lua_cocos2dx_experimental_auto.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 15622968197780DE009C9067 /* lua_cocos2dx_experimental_auto.hpp */; }; + 15C1BDDE1986542B00A46ACC /* lua_cocos2dx_extension_manual.h in Headers */ = {isa = PBXBuildFile; fileRef = 15C1BCFF1986526C00A46ACC /* lua_cocos2dx_extension_manual.h */; }; + 15C1BEE21986550500A46ACC /* lua_cocos2dx_cocosbuilder_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15C1BCC019864D8700A46ACC /* lua_cocos2dx_cocosbuilder_auto.cpp */; }; + 15C1BEE31986550500A46ACC /* CCBProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15C1BCF21986526C00A46ACC /* CCBProxy.cpp */; }; + 15C1BEE41986550500A46ACC /* lua_cocos2dx_cocosbuilder_manual.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15C1BCF41986526C00A46ACC /* lua_cocos2dx_cocosbuilder_manual.cpp */; }; + 15C1BEE51986555100A46ACC /* lua_cocos2dx_cocosbuilder_auto.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 15C1BCC119864D8700A46ACC /* lua_cocos2dx_cocosbuilder_auto.hpp */; }; + 15C1BEE61986555100A46ACC /* CCBProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 15C1BCF31986526C00A46ACC /* CCBProxy.h */; }; + 15C1BEE71986555100A46ACC /* lua_cocos2dx_cocosbuilder_manual.h in Headers */ = {isa = PBXBuildFile; fileRef = 15C1BCF51986526C00A46ACC /* lua_cocos2dx_cocosbuilder_manual.h */; }; + 15C1BF6A19865AAB00A46ACC /* lua_cocos2dx_cocosdenshion_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15C1BCC219864D8700A46ACC /* lua_cocos2dx_cocosdenshion_auto.cpp */; }; + 15C1BF6B19865AC200A46ACC /* lua_cocos2dx_cocosdenshion_auto.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 15C1BCC319864D8700A46ACC /* lua_cocos2dx_cocosdenshion_auto.hpp */; }; + 15C1BFEE19865CBE00A46ACC /* lua_cocos2dx_studio_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE75818BC45C200215002 /* lua_cocos2dx_studio_auto.cpp */; }; + 15C1BFF019865CD400A46ACC /* lua_cocos2dx_studio_auto.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE75918BC45C200215002 /* lua_cocos2dx_studio_auto.hpp */; }; + 15C1C074198731C000A46ACC /* lua_cocos2dx_spine_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE75518BC45C200215002 /* lua_cocos2dx_spine_auto.cpp */; }; + 15C1C075198731C000A46ACC /* lua_cocos2dx_spine_manual.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15C1BD151986526C00A46ACC /* lua_cocos2dx_spine_manual.cpp */; }; + 15C1C076198731C000A46ACC /* LuaSkeletonAnimation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15C1BD171986526C00A46ACC /* LuaSkeletonAnimation.cpp */; }; + 15C1C077198731D300A46ACC /* lua_cocos2dx_spine_auto.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE75618BC45C200215002 /* lua_cocos2dx_spine_auto.hpp */; }; + 15C1C078198731D300A46ACC /* lua_cocos2dx_spine_manual.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 15C1BD161986526C00A46ACC /* lua_cocos2dx_spine_manual.hpp */; }; + 15C1C079198731D300A46ACC /* LuaSkeletonAnimation.h in Headers */ = {isa = PBXBuildFile; fileRef = 15C1BD181986526C00A46ACC /* LuaSkeletonAnimation.h */; }; + 15C1C0FC1987330D00A46ACC /* lua_cocos2dx_ui_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905FACE18CF12E600240AA3 /* lua_cocos2dx_ui_auto.cpp */; }; + 15C1C0FD1987330D00A46ACC /* lua_cocos2dx_ui_manual.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15C1BD1A1986526C00A46ACC /* lua_cocos2dx_ui_manual.cpp */; }; + 15C1C0FE1987331B00A46ACC /* lua_cocos2dx_ui_auto.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 2905FACF18CF12E600240AA3 /* lua_cocos2dx_ui_auto.hpp */; }; + 15C1C0FF1987331B00A46ACC /* lua_cocos2dx_ui_manual.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 15C1BD1B1986526C00A46ACC /* lua_cocos2dx_ui_manual.hpp */; }; + 15C1C1A01987347200A46ACC /* lua_extensions.c in Sources */ = {isa = PBXBuildFile; fileRef = 15C1BD011986526C00A46ACC /* lua_extensions.c */; }; + 15C1C1A21987347200A46ACC /* Lua_web_socket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15C1BD031986526C00A46ACC /* Lua_web_socket.cpp */; }; + 15C1C1A41987347200A46ACC /* lua_xml_http_request.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15C1BD051986526C00A46ACC /* lua_xml_http_request.cpp */; }; + 15C1C1A6198734AC00A46ACC /* lua_extensions.h in Headers */ = {isa = PBXBuildFile; fileRef = 15C1BD021986526C00A46ACC /* lua_extensions.h */; }; + 15C1C1A7198734AC00A46ACC /* Lua_web_socket.h in Headers */ = {isa = PBXBuildFile; fileRef = 15C1BD041986526C00A46ACC /* Lua_web_socket.h */; }; + 15C1C1A8198734AC00A46ACC /* lua_xml_http_request.h in Headers */ = {isa = PBXBuildFile; fileRef = 15C1BD061986526C00A46ACC /* lua_xml_http_request.h */; }; + 15C1C1A91987370000A46ACC /* buffer.c in Sources */ = {isa = PBXBuildFile; fileRef = 1503FA9D18DA8A1C00F6518C /* buffer.c */; }; + 15C1C1AA1987370000A46ACC /* io.c in Sources */ = {isa = PBXBuildFile; fileRef = 1503FA9F18DA8A1C00F6518C /* io.c */; }; + 15C1C1AB1987370000A46ACC /* auxiliar.c in Sources */ = {isa = PBXBuildFile; fileRef = 1ABCA20F18CD8F7D0087CE3A /* auxiliar.c */; }; + 15C1C1AC1987370000A46ACC /* except.c in Sources */ = {isa = PBXBuildFile; fileRef = 1ABCA21118CD8F7D0087CE3A /* except.c */; }; + 15C1C1AD1987370000A46ACC /* inet.c in Sources */ = {isa = PBXBuildFile; fileRef = 1ABCA21318CD8F7D0087CE3A /* inet.c */; }; + 15C1C1AE1987370000A46ACC /* luasocket.c in Sources */ = {isa = PBXBuildFile; fileRef = 1ABCA21518CD8F7D0087CE3A /* luasocket.c */; }; + 15C1C1AF1987370000A46ACC /* mime.c in Sources */ = {isa = PBXBuildFile; fileRef = 1ABCA21B18CD8F7D0087CE3A /* mime.c */; }; + 15C1C1B01987370000A46ACC /* options.c in Sources */ = {isa = PBXBuildFile; fileRef = 1ABCA21D18CD8F7D0087CE3A /* options.c */; }; + 15C1C1B11987370000A46ACC /* select.c in Sources */ = {isa = PBXBuildFile; fileRef = 1ABCA21F18CD8F7D0087CE3A /* select.c */; }; + 15C1C1B21987370000A46ACC /* serial.c in Sources */ = {isa = PBXBuildFile; fileRef = 1ABCA22118CD8F7D0087CE3A /* serial.c */; }; + 15C1C1B31987370000A46ACC /* tcp.c in Sources */ = {isa = PBXBuildFile; fileRef = 1ABCA22518CD8F7D0087CE3A /* tcp.c */; }; + 15C1C1B41987370000A46ACC /* timeout.c in Sources */ = {isa = PBXBuildFile; fileRef = 1ABCA22718CD8F7D0087CE3A /* timeout.c */; }; + 15C1C1B51987370000A46ACC /* udp.c in Sources */ = {isa = PBXBuildFile; fileRef = 1ABCA22918CD8F7D0087CE3A /* udp.c */; }; + 15C1C1B61987370000A46ACC /* unix.c in Sources */ = {isa = PBXBuildFile; fileRef = 1ABCA22B18CD8F7D0087CE3A /* unix.c */; }; + 15C1C1B71987374000A46ACC /* buffer.h in Headers */ = {isa = PBXBuildFile; fileRef = 1503FA9E18DA8A1C00F6518C /* buffer.h */; }; + 15C1C1B81987374000A46ACC /* io.h in Headers */ = {isa = PBXBuildFile; fileRef = 1503FAA018DA8A1C00F6518C /* io.h */; }; + 15C1C1B91987374000A46ACC /* auxiliar.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ABCA21018CD8F7D0087CE3A /* auxiliar.h */; }; + 15C1C1BA1987374000A46ACC /* except.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ABCA21218CD8F7D0087CE3A /* except.h */; }; + 15C1C1BB1987374000A46ACC /* inet.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ABCA21418CD8F7D0087CE3A /* inet.h */; }; + 15C1C1BC1987374000A46ACC /* luasocket.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ABCA21618CD8F7D0087CE3A /* luasocket.h */; }; + 15C1C1BD1987374000A46ACC /* mime.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ABCA21C18CD8F7D0087CE3A /* mime.h */; }; + 15C1C1BE1987374000A46ACC /* options.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ABCA21E18CD8F7D0087CE3A /* options.h */; }; + 15C1C1BF1987374000A46ACC /* select.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ABCA22018CD8F7D0087CE3A /* select.h */; }; + 15C1C1C01987374000A46ACC /* socket.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ABCA22218CD8F7D0087CE3A /* socket.h */; }; + 15C1C1C11987374000A46ACC /* tcp.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ABCA22618CD8F7D0087CE3A /* tcp.h */; }; + 15C1C1C21987374000A46ACC /* timeout.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ABCA22818CD8F7D0087CE3A /* timeout.h */; }; + 15C1C1C31987374000A46ACC /* udp.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ABCA22A18CD8F7D0087CE3A /* udp.h */; }; + 15C1C1C41987374000A46ACC /* unix.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ABCA22C18CD8F7D0087CE3A /* unix.h */; }; + 15C1C24D1987473200A46ACC /* lua_cocos2dx_experimental_video_manual.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15C1C24B1987473200A46ACC /* lua_cocos2dx_experimental_video_manual.cpp */; }; + 15C1C24E1987473200A46ACC /* lua_cocos2dx_experimental_video_manual.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 15C1C24C1987473200A46ACC /* lua_cocos2dx_experimental_video_manual.hpp */; }; + 15C1C2CD1987495500A46ACC /* lua_cocos2dx_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE74918BC45C200215002 /* lua_cocos2dx_auto.cpp */; }; + 15C1C2CE1987498B00A46ACC /* LuaOpengl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15C1C24F198747E400A46ACC /* LuaOpengl.cpp */; }; + 15C1C2CF1987498B00A46ACC /* lua_cocos2dx_deprecated.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15C1BCD31986525900A46ACC /* lua_cocos2dx_deprecated.cpp */; }; + 15C1C2D01987498B00A46ACC /* lua_cocos2dx_experimental_manual.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15C1BCD51986525900A46ACC /* lua_cocos2dx_experimental_manual.cpp */; }; + 15C1C2D11987498B00A46ACC /* lua_cocos2dx_manual.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15C1BCD71986525900A46ACC /* lua_cocos2dx_manual.cpp */; }; + 15C1C2D21987498B00A46ACC /* lua_cocos2dx_physics_manual.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15C1BCD91986525900A46ACC /* lua_cocos2dx_physics_manual.cpp */; }; + 15C1C2D31987498B00A46ACC /* LuaScriptHandlerMgr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15C1BCDB1986525900A46ACC /* LuaScriptHandlerMgr.cpp */; }; + 15C1C2D41987499F00A46ACC /* lua_cocos2dx_auto.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE74A18BC45C200215002 /* lua_cocos2dx_auto.hpp */; }; + 15C1C2D5198749BC00A46ACC /* LuaOpengl.h in Headers */ = {isa = PBXBuildFile; fileRef = 15C1C250198747E400A46ACC /* LuaOpengl.h */; }; + 15C1C2D6198749BC00A46ACC /* lua_cocos2dx_deprecated.h in Headers */ = {isa = PBXBuildFile; fileRef = 15C1BCD41986525900A46ACC /* lua_cocos2dx_deprecated.h */; }; + 15C1C2D7198749BC00A46ACC /* lua_cocos2dx_experimental_manual.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 15C1BCD61986525900A46ACC /* lua_cocos2dx_experimental_manual.hpp */; }; + 15C1C2D8198749BC00A46ACC /* lua_cocos2dx_manual.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 15C1BCD81986525900A46ACC /* lua_cocos2dx_manual.hpp */; }; + 15C1C2D9198749BC00A46ACC /* lua_cocos2dx_physics_manual.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 15C1BCDA1986525900A46ACC /* lua_cocos2dx_physics_manual.hpp */; }; + 15C1C2DA198749BC00A46ACC /* LuaScriptHandlerMgr.h in Headers */ = {isa = PBXBuildFile; fileRef = 15C1BCDC1986525900A46ACC /* LuaScriptHandlerMgr.h */; }; + 15C1C2DB19874B3D00A46ACC /* xxtea.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1540AF55193EC30500717D8E /* xxtea.cpp */; }; + 15C1C2DC19874B4400A46ACC /* xxtea.h in Headers */ = {isa = PBXBuildFile; fileRef = 1540AF56193EC30500717D8E /* xxtea.h */; }; + 15C1C2DD19874B8800A46ACC /* CCLuaBridge.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE76018BC45C200215002 /* CCLuaBridge.cpp */; }; + 15C1C2DE19874B8800A46ACC /* CCLuaEngine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE76218BC45C200215002 /* CCLuaEngine.cpp */; }; + 15C1C2DF19874B8800A46ACC /* CCLuaStack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE76418BC45C200215002 /* CCLuaStack.cpp */; }; + 15C1C2E019874B8800A46ACC /* CCLuaValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE76618BC45C200215002 /* CCLuaValue.cpp */; }; + 15C1C2E119874B8800A46ACC /* Cocos2dxLuaLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE76818BC45C200215002 /* Cocos2dxLuaLoader.cpp */; }; + 15C1C2E219874BA100A46ACC /* LuaBasicConversions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE77E18BC45C200215002 /* LuaBasicConversions.cpp */; }; + 15C1C2E419874C7C00A46ACC /* tolua_fix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A262AB718BEEF5900D2DB92 /* tolua_fix.cpp */; }; + 15C1C2E519874C9200A46ACC /* CCLuaObjcBridge.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE78F18BC45C200215002 /* CCLuaObjcBridge.mm */; }; + 15C1C2E719874CBE00A46ACC /* CCLuaBridge.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE76118BC45C200215002 /* CCLuaBridge.h */; }; + 15C1C2E819874CBE00A46ACC /* CCLuaEngine.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE76318BC45C200215002 /* CCLuaEngine.h */; }; + 15C1C2E919874CBE00A46ACC /* CCLuaStack.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE76518BC45C200215002 /* CCLuaStack.h */; }; + 15C1C2EA19874CBE00A46ACC /* CCLuaValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE76718BC45C200215002 /* CCLuaValue.h */; }; + 15C1C2EB19874CBE00A46ACC /* Cocos2dxLuaLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE76918BC45C200215002 /* Cocos2dxLuaLoader.h */; }; + 15C1C2EC19874CBE00A46ACC /* LuaBasicConversions.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE77F18BC45C200215002 /* LuaBasicConversions.h */; }; + 15C1C2ED19874CBE00A46ACC /* CCLuaObjcBridge.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE78E18BC45C200215002 /* CCLuaObjcBridge.h */; }; + 15C1C2EE19874CBE00A46ACC /* tolua_fix.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE7B418BC45C200215002 /* tolua_fix.h */; }; + 15EFA1F61989E528000C57D3 /* lua_cocos2dx_experimental_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15622967197780DE009C9067 /* lua_cocos2dx_experimental_auto.cpp */; }; + 15EFA1F71989E582000C57D3 /* lua_cocos2dx_experimental_auto.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 15622968197780DE009C9067 /* lua_cocos2dx_experimental_auto.hpp */; }; + 15EFA27B198B274B000C57D3 /* lua_cocos2dx_extension_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE74C18BC45C200215002 /* lua_cocos2dx_extension_auto.cpp */; }; + 15EFA27C198B275D000C57D3 /* lua_cocos2dx_extension_manual.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15C1BCFE1986526C00A46ACC /* lua_cocos2dx_extension_manual.cpp */; }; + 15EFA27D198B2777000C57D3 /* lua_cocos2dx_extension_auto.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE74D18BC45C200215002 /* lua_cocos2dx_extension_auto.hpp */; }; + 15EFA27E198B2777000C57D3 /* lua_cocos2dx_extension_manual.h in Headers */ = {isa = PBXBuildFile; fileRef = 15C1BCFF1986526C00A46ACC /* lua_cocos2dx_extension_manual.h */; }; + 15EFA2FA198B2860000C57D3 /* CCBProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15C1BCF21986526C00A46ACC /* CCBProxy.cpp */; }; + 15EFA2FB198B2860000C57D3 /* lua_cocos2dx_cocosbuilder_manual.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15C1BCF41986526C00A46ACC /* lua_cocos2dx_cocosbuilder_manual.cpp */; }; + 15EFA2FC198B2869000C57D3 /* lua_cocos2dx_cocosbuilder_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15C1BCC019864D8700A46ACC /* lua_cocos2dx_cocosbuilder_auto.cpp */; }; + 15EFA2FD198B2875000C57D3 /* lua_cocos2dx_cocosbuilder_auto.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 15C1BCC119864D8700A46ACC /* lua_cocos2dx_cocosbuilder_auto.hpp */; }; + 15EFA2FE198B2875000C57D3 /* CCBProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 15C1BCF31986526C00A46ACC /* CCBProxy.h */; }; + 15EFA2FF198B2875000C57D3 /* lua_cocos2dx_cocosbuilder_manual.h in Headers */ = {isa = PBXBuildFile; fileRef = 15C1BCF51986526C00A46ACC /* lua_cocos2dx_cocosbuilder_manual.h */; }; + 15EFA37B198B28FF000C57D3 /* lua_cocos2dx_ui_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905FACE18CF12E600240AA3 /* lua_cocos2dx_ui_auto.cpp */; }; + 15EFA37C198B28FF000C57D3 /* lua_cocos2dx_experimental_video_manual.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15C1C24B1987473200A46ACC /* lua_cocos2dx_experimental_video_manual.cpp */; }; + 15EFA37D198B28FF000C57D3 /* lua_cocos2dx_ui_manual.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15C1BD1A1986526C00A46ACC /* lua_cocos2dx_ui_manual.cpp */; }; + 15EFA37E198B2911000C57D3 /* lua_cocos2dx_ui_auto.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 2905FACF18CF12E600240AA3 /* lua_cocos2dx_ui_auto.hpp */; }; + 15EFA37F198B2911000C57D3 /* lua_cocos2dx_experimental_video_manual.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 15C1C24C1987473200A46ACC /* lua_cocos2dx_experimental_video_manual.hpp */; }; + 15EFA380198B2912000C57D3 /* lua_cocos2dx_ui_manual.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 15C1BD1B1986526C00A46ACC /* lua_cocos2dx_ui_manual.hpp */; }; + 15EFA3FC198B29F9000C57D3 /* lua_cocos2dx_studio_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE75818BC45C200215002 /* lua_cocos2dx_studio_auto.cpp */; }; + 15EFA3FE198B2A11000C57D3 /* lua_cocos2dx_studio_auto.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE75918BC45C200215002 /* lua_cocos2dx_studio_auto.hpp */; }; + 15EFA403198B2AB2000C57D3 /* lua_cocos2dx_coco_studio_manual.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15EFA401198B2AB2000C57D3 /* lua_cocos2dx_coco_studio_manual.cpp */; }; + 15EFA404198B2AB2000C57D3 /* lua_cocos2dx_coco_studio_manual.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15EFA401198B2AB2000C57D3 /* lua_cocos2dx_coco_studio_manual.cpp */; }; + 15EFA405198B2AB2000C57D3 /* lua_cocos2dx_coco_studio_manual.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 15EFA402198B2AB2000C57D3 /* lua_cocos2dx_coco_studio_manual.hpp */; }; + 15EFA406198B2AB2000C57D3 /* lua_cocos2dx_coco_studio_manual.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 15EFA402198B2AB2000C57D3 /* lua_cocos2dx_coco_studio_manual.hpp */; }; + 15EFA480198B2B57000C57D3 /* lua_cocos2dx_spine_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE75518BC45C200215002 /* lua_cocos2dx_spine_auto.cpp */; }; + 15EFA481198B2B57000C57D3 /* lua_cocos2dx_spine_manual.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15C1BD151986526C00A46ACC /* lua_cocos2dx_spine_manual.cpp */; }; + 15EFA482198B2B57000C57D3 /* LuaSkeletonAnimation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15C1BD171986526C00A46ACC /* LuaSkeletonAnimation.cpp */; }; + 15EFA483198B2B68000C57D3 /* lua_cocos2dx_spine_auto.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE75618BC45C200215002 /* lua_cocos2dx_spine_auto.hpp */; }; + 15EFA484198B2B68000C57D3 /* lua_cocos2dx_spine_manual.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 15C1BD161986526C00A46ACC /* lua_cocos2dx_spine_manual.hpp */; }; + 15EFA485198B2B68000C57D3 /* LuaSkeletonAnimation.h in Headers */ = {isa = PBXBuildFile; fileRef = 15C1BD181986526C00A46ACC /* LuaSkeletonAnimation.h */; }; + 15EFA4FF198B2C0B000C57D3 /* buffer.c in Sources */ = {isa = PBXBuildFile; fileRef = 1503FA9D18DA8A1C00F6518C /* buffer.c */; }; + 15EFA500198B2C0B000C57D3 /* io.c in Sources */ = {isa = PBXBuildFile; fileRef = 1503FA9F18DA8A1C00F6518C /* io.c */; }; + 15EFA501198B2C0B000C57D3 /* auxiliar.c in Sources */ = {isa = PBXBuildFile; fileRef = 1ABCA20F18CD8F7D0087CE3A /* auxiliar.c */; }; + 15EFA502198B2C0B000C57D3 /* except.c in Sources */ = {isa = PBXBuildFile; fileRef = 1ABCA21118CD8F7D0087CE3A /* except.c */; }; + 15EFA503198B2C0B000C57D3 /* inet.c in Sources */ = {isa = PBXBuildFile; fileRef = 1ABCA21318CD8F7D0087CE3A /* inet.c */; }; + 15EFA504198B2C0C000C57D3 /* luasocket.c in Sources */ = {isa = PBXBuildFile; fileRef = 1ABCA21518CD8F7D0087CE3A /* luasocket.c */; }; + 15EFA505198B2C0C000C57D3 /* mime.c in Sources */ = {isa = PBXBuildFile; fileRef = 1ABCA21B18CD8F7D0087CE3A /* mime.c */; }; + 15EFA506198B2C0C000C57D3 /* options.c in Sources */ = {isa = PBXBuildFile; fileRef = 1ABCA21D18CD8F7D0087CE3A /* options.c */; }; + 15EFA507198B2C0C000C57D3 /* select.c in Sources */ = {isa = PBXBuildFile; fileRef = 1ABCA21F18CD8F7D0087CE3A /* select.c */; }; + 15EFA508198B2C0C000C57D3 /* serial.c in Sources */ = {isa = PBXBuildFile; fileRef = 1ABCA22118CD8F7D0087CE3A /* serial.c */; }; + 15EFA509198B2C0C000C57D3 /* tcp.c in Sources */ = {isa = PBXBuildFile; fileRef = 1ABCA22518CD8F7D0087CE3A /* tcp.c */; }; + 15EFA50A198B2C0C000C57D3 /* timeout.c in Sources */ = {isa = PBXBuildFile; fileRef = 1ABCA22718CD8F7D0087CE3A /* timeout.c */; }; + 15EFA50B198B2C0C000C57D3 /* udp.c in Sources */ = {isa = PBXBuildFile; fileRef = 1ABCA22918CD8F7D0087CE3A /* udp.c */; }; + 15EFA50C198B2C0C000C57D3 /* unix.c in Sources */ = {isa = PBXBuildFile; fileRef = 1ABCA22B18CD8F7D0087CE3A /* unix.c */; }; + 15EFA50D198B2C0C000C57D3 /* usocket.c in Sources */ = {isa = PBXBuildFile; fileRef = 1ABCA22D18CD8F7D0087CE3A /* usocket.c */; }; + 15EFA50E198B2CD0000C57D3 /* buffer.h in Headers */ = {isa = PBXBuildFile; fileRef = 1503FA9E18DA8A1C00F6518C /* buffer.h */; }; + 15EFA50F198B2CD0000C57D3 /* io.h in Headers */ = {isa = PBXBuildFile; fileRef = 1503FAA018DA8A1C00F6518C /* io.h */; }; + 15EFA510198B2CD0000C57D3 /* auxiliar.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ABCA21018CD8F7D0087CE3A /* auxiliar.h */; }; + 15EFA511198B2CD0000C57D3 /* except.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ABCA21218CD8F7D0087CE3A /* except.h */; }; + 15EFA512198B2CD0000C57D3 /* inet.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ABCA21418CD8F7D0087CE3A /* inet.h */; }; + 15EFA513198B2CD1000C57D3 /* luasocket.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ABCA21618CD8F7D0087CE3A /* luasocket.h */; }; + 15EFA514198B2CD1000C57D3 /* mime.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ABCA21C18CD8F7D0087CE3A /* mime.h */; }; + 15EFA515198B2CD1000C57D3 /* options.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ABCA21E18CD8F7D0087CE3A /* options.h */; }; + 15EFA516198B2CD1000C57D3 /* select.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ABCA22018CD8F7D0087CE3A /* select.h */; }; + 15EFA517198B2CD1000C57D3 /* socket.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ABCA22218CD8F7D0087CE3A /* socket.h */; }; + 15EFA518198B2CD1000C57D3 /* tcp.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ABCA22618CD8F7D0087CE3A /* tcp.h */; }; + 15EFA519198B2CD1000C57D3 /* timeout.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ABCA22818CD8F7D0087CE3A /* timeout.h */; }; + 15EFA51A198B2CD1000C57D3 /* udp.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ABCA22A18CD8F7D0087CE3A /* udp.h */; }; + 15EFA51B198B2CD1000C57D3 /* unix.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ABCA22C18CD8F7D0087CE3A /* unix.h */; }; + 15EFA51C198B2CD1000C57D3 /* usocket.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ABCA22E18CD8F7D0087CE3A /* usocket.h */; }; + 15EFA51D198B2CE5000C57D3 /* lua_extensions.c in Sources */ = {isa = PBXBuildFile; fileRef = 15C1BD011986526C00A46ACC /* lua_extensions.c */; }; + 15EFA51E198B2CE5000C57D3 /* Lua_web_socket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15C1BD031986526C00A46ACC /* Lua_web_socket.cpp */; }; + 15EFA51F198B2CE5000C57D3 /* lua_xml_http_request.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15C1BD051986526C00A46ACC /* lua_xml_http_request.cpp */; }; + 15EFA520198B2CF3000C57D3 /* lua_extensions.h in Headers */ = {isa = PBXBuildFile; fileRef = 15C1BD021986526C00A46ACC /* lua_extensions.h */; }; + 15EFA521198B2CF4000C57D3 /* Lua_web_socket.h in Headers */ = {isa = PBXBuildFile; fileRef = 15C1BD041986526C00A46ACC /* Lua_web_socket.h */; }; + 15EFA522198B2CF4000C57D3 /* lua_xml_http_request.h in Headers */ = {isa = PBXBuildFile; fileRef = 15C1BD061986526C00A46ACC /* lua_xml_http_request.h */; }; + 15EFA59C198B2D5F000C57D3 /* lua_cocos2dx_cocosdenshion_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15C1BCC219864D8700A46ACC /* lua_cocos2dx_cocosdenshion_auto.cpp */; }; + 15EFA59D198B2D69000C57D3 /* lua_cocos2dx_cocosdenshion_auto.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 15C1BCC319864D8700A46ACC /* lua_cocos2dx_cocosdenshion_auto.hpp */; }; + 15EFA5D8198B2DAA000C57D3 /* liblua.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C0D9BAFA1974D30000EC35BB /* liblua.a */; }; + 15EFA5D9198B2DAA000C57D3 /* libluajit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ABCA1F318CD8F540087CE3A /* libluajit.a */; }; + 15EFA617198B2E2B000C57D3 /* lua_cocos2dx_experimental_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15622967197780DE009C9067 /* lua_cocos2dx_experimental_auto.cpp */; }; + 15EFA618198B2E2B000C57D3 /* lua_cocos2dx_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE74918BC45C200215002 /* lua_cocos2dx_auto.cpp */; }; + 15EFA619198B2E2B000C57D3 /* lua_cocos2dx_physics_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE75218BC45C200215002 /* lua_cocos2dx_physics_auto.cpp */; }; + 15EFA622198B2E74000C57D3 /* lua_cocos2dx_experimental_auto.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 15622968197780DE009C9067 /* lua_cocos2dx_experimental_auto.hpp */; }; + 15EFA623198B2E74000C57D3 /* lua_cocos2dx_auto.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE74A18BC45C200215002 /* lua_cocos2dx_auto.hpp */; }; + 15EFA624198B2E74000C57D3 /* lua_cocos2dx_physics_auto.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE75318BC45C200215002 /* lua_cocos2dx_physics_auto.hpp */; }; + 15EFA625198B31FB000C57D3 /* LuaOpengl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15C1C24F198747E400A46ACC /* LuaOpengl.cpp */; }; + 15EFA626198B31FB000C57D3 /* lua_cocos2dx_deprecated.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15C1BCD31986525900A46ACC /* lua_cocos2dx_deprecated.cpp */; }; + 15EFA627198B31FB000C57D3 /* lua_cocos2dx_experimental_manual.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15C1BCD51986525900A46ACC /* lua_cocos2dx_experimental_manual.cpp */; }; + 15EFA628198B31FB000C57D3 /* lua_cocos2dx_manual.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15C1BCD71986525900A46ACC /* lua_cocos2dx_manual.cpp */; }; + 15EFA629198B31FB000C57D3 /* lua_cocos2dx_physics_manual.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15C1BCD91986525900A46ACC /* lua_cocos2dx_physics_manual.cpp */; }; + 15EFA62A198B31FB000C57D3 /* LuaScriptHandlerMgr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15C1BCDB1986525900A46ACC /* LuaScriptHandlerMgr.cpp */; }; + 15EFA62B198B3220000C57D3 /* LuaOpengl.h in Headers */ = {isa = PBXBuildFile; fileRef = 15C1C250198747E400A46ACC /* LuaOpengl.h */; }; + 15EFA62C198B3220000C57D3 /* lua_cocos2dx_deprecated.h in Headers */ = {isa = PBXBuildFile; fileRef = 15C1BCD41986525900A46ACC /* lua_cocos2dx_deprecated.h */; }; + 15EFA62D198B3220000C57D3 /* lua_cocos2dx_experimental_manual.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 15C1BCD61986525900A46ACC /* lua_cocos2dx_experimental_manual.hpp */; }; + 15EFA62E198B3220000C57D3 /* lua_cocos2dx_manual.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 15C1BCD81986525900A46ACC /* lua_cocos2dx_manual.hpp */; }; + 15EFA62F198B3220000C57D3 /* lua_cocos2dx_physics_manual.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 15C1BCDA1986525900A46ACC /* lua_cocos2dx_physics_manual.hpp */; }; + 15EFA630198B3220000C57D3 /* LuaScriptHandlerMgr.h in Headers */ = {isa = PBXBuildFile; fileRef = 15C1BCDC1986525900A46ACC /* LuaScriptHandlerMgr.h */; }; + 15EFA632198B328B000C57D3 /* CCLuaBridge.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE76018BC45C200215002 /* CCLuaBridge.cpp */; }; + 15EFA633198B328B000C57D3 /* CCLuaEngine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE76218BC45C200215002 /* CCLuaEngine.cpp */; }; + 15EFA634198B328B000C57D3 /* CCLuaStack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE76418BC45C200215002 /* CCLuaStack.cpp */; }; + 15EFA635198B328B000C57D3 /* CCLuaValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE76618BC45C200215002 /* CCLuaValue.cpp */; }; + 15EFA636198B328B000C57D3 /* Cocos2dxLuaLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE76818BC45C200215002 /* Cocos2dxLuaLoader.cpp */; }; + 15EFA637198B328B000C57D3 /* LuaBasicConversions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE77E18BC45C200215002 /* LuaBasicConversions.cpp */; }; + 15EFA638198B328B000C57D3 /* CCLuaObjcBridge.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AACE78F18BC45C200215002 /* CCLuaObjcBridge.mm */; }; + 15EFA639198B328B000C57D3 /* tolua_fix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A262AB718BEEF5900D2DB92 /* tolua_fix.cpp */; }; + 15EFA63B198B32BB000C57D3 /* CCLuaBridge.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE76118BC45C200215002 /* CCLuaBridge.h */; }; + 15EFA63C198B32BB000C57D3 /* CCLuaEngine.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE76318BC45C200215002 /* CCLuaEngine.h */; }; + 15EFA63D198B32BB000C57D3 /* CCLuaStack.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE76518BC45C200215002 /* CCLuaStack.h */; }; + 15EFA63E198B32BB000C57D3 /* CCLuaValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE76718BC45C200215002 /* CCLuaValue.h */; }; + 15EFA63F198B32BB000C57D3 /* Cocos2dxLuaLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE76918BC45C200215002 /* Cocos2dxLuaLoader.h */; }; + 15EFA640198B32BB000C57D3 /* LuaBasicConversions.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE77F18BC45C200215002 /* LuaBasicConversions.h */; }; + 15EFA641198B32BB000C57D3 /* CCLuaObjcBridge.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE78E18BC45C200215002 /* CCLuaObjcBridge.h */; }; + 15EFA642198B32BB000C57D3 /* tolua_fix.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AACE7B418BC45C200215002 /* tolua_fix.h */; }; + 15EFA644198B32D5000C57D3 /* xxtea.h in Headers */ = {isa = PBXBuildFile; fileRef = 1540AF56193EC30500717D8E /* xxtea.h */; }; + 15EFA645198B32DB000C57D3 /* xxtea.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1540AF55193EC30500717D8E /* xxtea.cpp */; }; + 15EFA646198B3311000C57D3 /* tolua_event.c in Sources */ = {isa = PBXBuildFile; fileRef = 1ABCA1F918CD8F6E0087CE3A /* tolua_event.c */; }; + 15EFA647198B3311000C57D3 /* tolua_is.c in Sources */ = {isa = PBXBuildFile; fileRef = 1ABCA1FB18CD8F6E0087CE3A /* tolua_is.c */; }; + 15EFA648198B3311000C57D3 /* tolua_map.c in Sources */ = {isa = PBXBuildFile; fileRef = 1ABCA1FC18CD8F6E0087CE3A /* tolua_map.c */; }; + 15EFA649198B3311000C57D3 /* tolua_push.c in Sources */ = {isa = PBXBuildFile; fileRef = 1ABCA1FD18CD8F6E0087CE3A /* tolua_push.c */; }; + 15EFA64A198B3311000C57D3 /* tolua_to.c in Sources */ = {isa = PBXBuildFile; fileRef = 1ABCA1FE18CD8F6E0087CE3A /* tolua_to.c */; }; + 15EFA64B198B3320000C57D3 /* tolua_event.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ABCA1FA18CD8F6E0087CE3A /* tolua_event.h */; }; + 15EFA64C198B3320000C57D3 /* tolua++.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ABCA1FF18CD8F6E0087CE3A /* tolua++.h */; }; + 15EFA64D198B3342000C57D3 /* lauxlib.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ABCA1E618CD8F470087CE3A /* lauxlib.h */; }; + 15EFA64E198B3342000C57D3 /* lua.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ABCA1E718CD8F470087CE3A /* lua.h */; }; + 15EFA64F198B3342000C57D3 /* luaconf.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ABCA1E818CD8F470087CE3A /* luaconf.h */; }; + 15EFA650198B3342000C57D3 /* lualib.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ABCA1E918CD8F470087CE3A /* lualib.h */; }; + 15EFA696198B668C000C57D3 /* lua_cocos2dx_network_manual.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15EFA694198B668C000C57D3 /* lua_cocos2dx_network_manual.cpp */; }; + 15EFA697198B668C000C57D3 /* lua_cocos2dx_network_manual.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15EFA694198B668C000C57D3 /* lua_cocos2dx_network_manual.cpp */; }; + 15EFA698198B668C000C57D3 /* lua_cocos2dx_network_manual.h in Headers */ = {isa = PBXBuildFile; fileRef = 15EFA695198B668C000C57D3 /* lua_cocos2dx_network_manual.h */; }; + 15EFA699198B668C000C57D3 /* lua_cocos2dx_network_manual.h in Headers */ = {isa = PBXBuildFile; fileRef = 15EFA695198B668C000C57D3 /* lua_cocos2dx_network_manual.h */; }; + 15EFA69A198B6B67000C57D3 /* lua_cocos2dx_experimental_video_auto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 156EADF11977A2BA00F53709 /* lua_cocos2dx_experimental_video_auto.cpp */; }; + 15EFA69B198B6B84000C57D3 /* lua_cocos2dx_experimental_video_auto.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 156EADF21977A2BA00F53709 /* lua_cocos2dx_experimental_video_auto.hpp */; }; /* End PBXBuildFile section */ +/* Begin PBXContainerItemProxy section */ + 15D1F2B01994B2C400302043 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1551A336158F2AB200E66CFE /* Project object */; + proxyType = 1; + remoteGlobalIDString = 15C1BD5F1986538000A46ACC; + remoteInfo = "libluaextension Mac"; + }; + 15D1F2B21994B2C400302043 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1551A336158F2AB200E66CFE /* Project object */; + proxyType = 1; + remoteGlobalIDString = 15C1C0801987328E00A46ACC; + remoteInfo = "libluaui Mac"; + }; + 15D1F2B41994B2C400302043 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1551A336158F2AB200E66CFE /* Project object */; + proxyType = 1; + remoteGlobalIDString = 15C1BF7219865C2000A46ACC; + remoteInfo = "libluacocostudio Mac"; + }; + 15D1F2B61994B2C400302043 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1551A336158F2AB200E66CFE /* Project object */; + proxyType = 1; + remoteGlobalIDString = 15C1BE66198654BE00A46ACC; + remoteInfo = "libluacocosbuilder Mac"; + }; + 15D1F2B81994B2C400302043 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1551A336158F2AB200E66CFE /* Project object */; + proxyType = 1; + remoteGlobalIDString = 15C1BFF819865E5F00A46ACC; + remoteInfo = "libluaspine Mac"; + }; + 15D1F2BA1994B2C400302043 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1551A336158F2AB200E66CFE /* Project object */; + proxyType = 1; + remoteGlobalIDString = 15C1C1061987340C00A46ACC; + remoteInfo = "libluanetwork Mac"; + }; + 15D1F2BC1994B2C400302043 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1551A336158F2AB200E66CFE /* Project object */; + proxyType = 1; + remoteGlobalIDString = 15C1BEEE19865A0600A46ACC; + remoteInfo = "libluacocosdenshion Mac"; + }; + 15D1F2BE1994B2C400302043 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1551A336158F2AB200E66CFE /* Project object */; + proxyType = 1; + remoteGlobalIDString = 15C1C255198748D200A46ACC; + remoteInfo = "libluacocos2d Mac"; + }; + 15D1F2C41994B2ED00302043 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1551A336158F2AB200E66CFE /* Project object */; + proxyType = 1; + remoteGlobalIDString = 155CA2C71988C494006E0A08; + remoteInfo = "libluaextension iOS"; + }; + 15D1F2C61994B2ED00302043 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1551A336158F2AB200E66CFE /* Project object */; + proxyType = 1; + remoteGlobalIDString = 15EFA300198B28A8000C57D3; + remoteInfo = "libluaui iOS"; + }; + 15D1F2C81994B2ED00302043 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1551A336158F2AB200E66CFE /* Project object */; + proxyType = 1; + remoteGlobalIDString = 15EFA381198B2934000C57D3; + remoteInfo = "libluacocostudio iOS"; + }; + 15D1F2CA1994B2ED00302043 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1551A336158F2AB200E66CFE /* Project object */; + proxyType = 1; + remoteGlobalIDString = 15EFA27F198B2791000C57D3; + remoteInfo = "libluacocosbuilder iOS"; + }; + 15D1F2CC1994B2ED00302043 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1551A336158F2AB200E66CFE /* Project object */; + proxyType = 1; + remoteGlobalIDString = 15EFA407198B2AFD000C57D3; + remoteInfo = "libluaspine iOS"; + }; + 15D1F2CE1994B2ED00302043 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1551A336158F2AB200E66CFE /* Project object */; + proxyType = 1; + remoteGlobalIDString = 15EFA486198B2B9B000C57D3; + remoteInfo = "libluanetwork iOS"; + }; + 15D1F2D01994B2ED00302043 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1551A336158F2AB200E66CFE /* Project object */; + proxyType = 1; + remoteGlobalIDString = 15EFA523198B2D13000C57D3; + remoteInfo = "libluacocosdenshion iOS"; + }; + 15D1F2D21994B2ED00302043 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1551A336158F2AB200E66CFE /* Project object */; + proxyType = 1; + remoteGlobalIDString = 15EFA59E198B2DAA000C57D3; + remoteInfo = "libluacocos2d iOS"; + }; +/* End PBXContainerItemProxy section */ + /* Begin PBXFileReference section */ 1503FA9D18DA8A1C00F6518C /* buffer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = buffer.c; sourceTree = ""; }; 1503FA9E18DA8A1C00F6518C /* buffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = buffer.h; sourceTree = ""; }; 1503FA9F18DA8A1C00F6518C /* io.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = io.c; sourceTree = ""; }; 1503FAA018DA8A1C00F6518C /* io.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = io.h; sourceTree = ""; }; + 1516227C19A0F32D006099B8 /* libluacocos3d Mac.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libluacocos3d Mac.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 1516227F19A0F3E3006099B8 /* lua_cocos2dx_3d_auto.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lua_cocos2dx_3d_auto.cpp; sourceTree = ""; }; + 1516228019A0F3E3006099B8 /* lua_cocos2dx_3d_auto.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = lua_cocos2dx_3d_auto.hpp; sourceTree = ""; }; + 151622BB19A0F45E006099B8 /* libluacocos3d iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libluacocos3d iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 1540AF55193EC30500717D8E /* xxtea.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = xxtea.cpp; sourceTree = ""; }; 1540AF56193EC30500717D8E /* xxtea.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = xxtea.h; sourceTree = ""; }; + 15427D42198F73F700DC375D /* lua_cocos2dx_cocosdenshion_manual.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lua_cocos2dx_cocosdenshion_manual.cpp; sourceTree = ""; }; + 15427D43198F73F700DC375D /* lua_cocos2dx_cocosdenshion_manual.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lua_cocos2dx_cocosdenshion_manual.h; sourceTree = ""; }; + 155CA3431988C494006E0A08 /* libluaextension iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libluaextension iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 15622967197780DE009C9067 /* lua_cocos2dx_experimental_auto.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lua_cocos2dx_experimental_auto.cpp; sourceTree = ""; }; 15622968197780DE009C9067 /* lua_cocos2dx_experimental_auto.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = lua_cocos2dx_experimental_auto.hpp; sourceTree = ""; }; - 1562297119778209009C9067 /* lua_cocos2dx_experimental_manual.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lua_cocos2dx_experimental_manual.cpp; sourceTree = ""; }; - 1562297219778209009C9067 /* lua_cocos2dx_experimental_manual.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = lua_cocos2dx_experimental_manual.hpp; sourceTree = ""; }; 156EADF11977A2BA00F53709 /* lua_cocos2dx_experimental_video_auto.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lua_cocos2dx_experimental_video_auto.cpp; sourceTree = ""; }; 156EADF21977A2BA00F53709 /* lua_cocos2dx_experimental_video_auto.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = lua_cocos2dx_experimental_video_auto.hpp; sourceTree = ""; }; - 156EADF71977A39F00F53709 /* lua_cocos2dx_experimental_video_manual.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lua_cocos2dx_experimental_video_manual.cpp; sourceTree = ""; }; - 156EADF81977A39F00F53709 /* lua_cocos2dx_experimental_video_manual.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = lua_cocos2dx_experimental_video_manual.hpp; sourceTree = ""; }; + 158C128519A0FA1300781A76 /* lua_cocos2dx_3d_manual.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lua_cocos2dx_3d_manual.cpp; sourceTree = ""; }; + 158C128619A0FA1300781A76 /* lua_cocos2dx_3d_manual.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lua_cocos2dx_3d_manual.h; sourceTree = ""; }; + 15C1BCC019864D8700A46ACC /* lua_cocos2dx_cocosbuilder_auto.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lua_cocos2dx_cocosbuilder_auto.cpp; sourceTree = ""; }; + 15C1BCC119864D8700A46ACC /* lua_cocos2dx_cocosbuilder_auto.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = lua_cocos2dx_cocosbuilder_auto.hpp; sourceTree = ""; }; + 15C1BCC219864D8700A46ACC /* lua_cocos2dx_cocosdenshion_auto.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lua_cocos2dx_cocosdenshion_auto.cpp; sourceTree = ""; }; + 15C1BCC319864D8700A46ACC /* lua_cocos2dx_cocosdenshion_auto.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = lua_cocos2dx_cocosdenshion_auto.hpp; sourceTree = ""; }; + 15C1BCD31986525900A46ACC /* lua_cocos2dx_deprecated.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lua_cocos2dx_deprecated.cpp; sourceTree = ""; }; + 15C1BCD41986525900A46ACC /* lua_cocos2dx_deprecated.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lua_cocos2dx_deprecated.h; sourceTree = ""; }; + 15C1BCD51986525900A46ACC /* lua_cocos2dx_experimental_manual.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lua_cocos2dx_experimental_manual.cpp; sourceTree = ""; }; + 15C1BCD61986525900A46ACC /* lua_cocos2dx_experimental_manual.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = lua_cocos2dx_experimental_manual.hpp; sourceTree = ""; }; + 15C1BCD71986525900A46ACC /* lua_cocos2dx_manual.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lua_cocos2dx_manual.cpp; sourceTree = ""; }; + 15C1BCD81986525900A46ACC /* lua_cocos2dx_manual.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = lua_cocos2dx_manual.hpp; sourceTree = ""; }; + 15C1BCD91986525900A46ACC /* lua_cocos2dx_physics_manual.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lua_cocos2dx_physics_manual.cpp; sourceTree = ""; }; + 15C1BCDA1986525900A46ACC /* lua_cocos2dx_physics_manual.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = lua_cocos2dx_physics_manual.hpp; sourceTree = ""; }; + 15C1BCDB1986525900A46ACC /* LuaScriptHandlerMgr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LuaScriptHandlerMgr.cpp; sourceTree = ""; }; + 15C1BCDC1986525900A46ACC /* LuaScriptHandlerMgr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LuaScriptHandlerMgr.h; sourceTree = ""; }; + 15C1BCF21986526C00A46ACC /* CCBProxy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCBProxy.cpp; sourceTree = ""; }; + 15C1BCF31986526C00A46ACC /* CCBProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCBProxy.h; sourceTree = ""; }; + 15C1BCF41986526C00A46ACC /* lua_cocos2dx_cocosbuilder_manual.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lua_cocos2dx_cocosbuilder_manual.cpp; sourceTree = ""; }; + 15C1BCF51986526C00A46ACC /* lua_cocos2dx_cocosbuilder_manual.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lua_cocos2dx_cocosbuilder_manual.h; sourceTree = ""; }; + 15C1BCFE1986526C00A46ACC /* lua_cocos2dx_extension_manual.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lua_cocos2dx_extension_manual.cpp; sourceTree = ""; }; + 15C1BCFF1986526C00A46ACC /* lua_cocos2dx_extension_manual.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lua_cocos2dx_extension_manual.h; sourceTree = ""; }; + 15C1BD011986526C00A46ACC /* lua_extensions.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = lua_extensions.c; sourceTree = ""; }; + 15C1BD021986526C00A46ACC /* lua_extensions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lua_extensions.h; sourceTree = ""; }; + 15C1BD031986526C00A46ACC /* Lua_web_socket.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Lua_web_socket.cpp; sourceTree = ""; }; + 15C1BD041986526C00A46ACC /* Lua_web_socket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Lua_web_socket.h; sourceTree = ""; }; + 15C1BD051986526C00A46ACC /* lua_xml_http_request.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lua_xml_http_request.cpp; sourceTree = ""; }; + 15C1BD061986526C00A46ACC /* lua_xml_http_request.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lua_xml_http_request.h; sourceTree = ""; }; + 15C1BD151986526C00A46ACC /* lua_cocos2dx_spine_manual.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lua_cocos2dx_spine_manual.cpp; sourceTree = ""; }; + 15C1BD161986526C00A46ACC /* lua_cocos2dx_spine_manual.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = lua_cocos2dx_spine_manual.hpp; sourceTree = ""; }; + 15C1BD171986526C00A46ACC /* LuaSkeletonAnimation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LuaSkeletonAnimation.cpp; sourceTree = ""; }; + 15C1BD181986526C00A46ACC /* LuaSkeletonAnimation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LuaSkeletonAnimation.h; sourceTree = ""; }; + 15C1BD1A1986526C00A46ACC /* lua_cocos2dx_ui_manual.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lua_cocos2dx_ui_manual.cpp; sourceTree = ""; }; + 15C1BD1B1986526C00A46ACC /* lua_cocos2dx_ui_manual.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = lua_cocos2dx_ui_manual.hpp; sourceTree = ""; }; + 15C1BDDA1986538000A46ACC /* libluaextension Mac.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libluaextension Mac.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 15C1BEE1198654BE00A46ACC /* libluacocosbuilder Mac.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libluacocosbuilder Mac.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 15C1BF6919865A0600A46ACC /* libluacocosdenshion Mac.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libluacocosdenshion Mac.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 15C1BFED19865C2000A46ACC /* libluacocostudio Mac.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libluacocostudio Mac.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 15C1C07319865E5F00A46ACC /* libluaspine Mac.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libluaspine Mac.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 15C1C0FB1987328E00A46ACC /* libluaui Mac.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libluaui Mac.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 15C1C1811987340C00A46ACC /* libluanetwork Mac.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libluanetwork Mac.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 15C1C24B1987473200A46ACC /* lua_cocos2dx_experimental_video_manual.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lua_cocos2dx_experimental_video_manual.cpp; sourceTree = ""; }; + 15C1C24C1987473200A46ACC /* lua_cocos2dx_experimental_video_manual.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = lua_cocos2dx_experimental_video_manual.hpp; sourceTree = ""; }; + 15C1C24F198747E400A46ACC /* LuaOpengl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LuaOpengl.cpp; sourceTree = ""; }; + 15C1C250198747E400A46ACC /* LuaOpengl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LuaOpengl.h; sourceTree = ""; }; + 15C1C2CC198748D200A46ACC /* libluacocos2d Mac.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libluacocos2d Mac.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 15EFA2F9198B2791000C57D3 /* libluacocosbuilder iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libluacocosbuilder iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 15EFA37A198B28A8000C57D3 /* libluaui iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libluaui iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 15EFA3FB198B2934000C57D3 /* libluacocostudio iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libluacocostudio iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 15EFA401198B2AB2000C57D3 /* lua_cocos2dx_coco_studio_manual.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lua_cocos2dx_coco_studio_manual.cpp; sourceTree = ""; }; + 15EFA402198B2AB2000C57D3 /* lua_cocos2dx_coco_studio_manual.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = lua_cocos2dx_coco_studio_manual.hpp; sourceTree = ""; }; + 15EFA47F198B2AFD000C57D3 /* libluaspine iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libluaspine iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 15EFA4FE198B2B9B000C57D3 /* libluanetwork iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libluanetwork iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 15EFA59B198B2D13000C57D3 /* libluacocosdenshion iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libluacocosdenshion iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 15EFA616198B2DAA000C57D3 /* libluacocos2d iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libluacocos2d iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 15EFA694198B668C000C57D3 /* lua_cocos2dx_network_manual.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lua_cocos2dx_network_manual.cpp; sourceTree = ""; }; + 15EFA695198B668C000C57D3 /* lua_cocos2dx_network_manual.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lua_cocos2dx_network_manual.h; sourceTree = ""; }; 1A262AB718BEEF5900D2DB92 /* tolua_fix.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tolua_fix.cpp; sourceTree = ""; }; - 1AACE74618BC45A000215002 /* libluabindings Mac.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libluabindings Mac.a"; sourceTree = BUILT_PRODUCTS_DIR; }; - 1AACE74718BC45A000215002 /* libluabindings iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libluabindings iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 1AACE74918BC45C200215002 /* lua_cocos2dx_auto.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = lua_cocos2dx_auto.cpp; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.cpp; }; 1AACE74A18BC45C200215002 /* lua_cocos2dx_auto.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = lua_cocos2dx_auto.hpp; sourceTree = ""; }; 1AACE74C18BC45C200215002 /* lua_cocos2dx_extension_auto.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lua_cocos2dx_extension_auto.cpp; sourceTree = ""; }; @@ -254,8 +494,6 @@ 1AACE75618BC45C200215002 /* lua_cocos2dx_spine_auto.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = lua_cocos2dx_spine_auto.hpp; sourceTree = ""; }; 1AACE75818BC45C200215002 /* lua_cocos2dx_studio_auto.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lua_cocos2dx_studio_auto.cpp; sourceTree = ""; }; 1AACE75918BC45C200215002 /* lua_cocos2dx_studio_auto.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = lua_cocos2dx_studio_auto.hpp; sourceTree = ""; }; - 1AACE75E18BC45C200215002 /* CCBProxy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCBProxy.cpp; sourceTree = ""; }; - 1AACE75F18BC45C200215002 /* CCBProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCBProxy.h; sourceTree = ""; }; 1AACE76018BC45C200215002 /* CCLuaBridge.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCLuaBridge.cpp; sourceTree = ""; }; 1AACE76118BC45C200215002 /* CCLuaBridge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCLuaBridge.h; sourceTree = ""; }; 1AACE76218BC45C200215002 /* CCLuaEngine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCLuaEngine.cpp; sourceTree = ""; }; @@ -266,32 +504,8 @@ 1AACE76718BC45C200215002 /* CCLuaValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCLuaValue.h; sourceTree = ""; }; 1AACE76818BC45C200215002 /* Cocos2dxLuaLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Cocos2dxLuaLoader.cpp; sourceTree = ""; }; 1AACE76918BC45C200215002 /* Cocos2dxLuaLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Cocos2dxLuaLoader.h; sourceTree = ""; }; - 1AACE76A18BC45C200215002 /* lua_cocos2dx_coco_studio_manual.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lua_cocos2dx_coco_studio_manual.cpp; sourceTree = ""; }; - 1AACE76B18BC45C200215002 /* lua_cocos2dx_coco_studio_manual.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = lua_cocos2dx_coco_studio_manual.hpp; sourceTree = ""; }; - 1AACE76C18BC45C200215002 /* lua_cocos2dx_deprecated.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lua_cocos2dx_deprecated.cpp; sourceTree = ""; }; - 1AACE76D18BC45C200215002 /* lua_cocos2dx_deprecated.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lua_cocos2dx_deprecated.h; sourceTree = ""; }; - 1AACE76E18BC45C200215002 /* lua_cocos2dx_extension_manual.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lua_cocos2dx_extension_manual.cpp; sourceTree = ""; }; - 1AACE76F18BC45C200215002 /* lua_cocos2dx_extension_manual.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lua_cocos2dx_extension_manual.h; sourceTree = ""; }; - 1AACE77218BC45C200215002 /* lua_cocos2dx_manual.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lua_cocos2dx_manual.cpp; sourceTree = ""; }; - 1AACE77318BC45C200215002 /* lua_cocos2dx_manual.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = lua_cocos2dx_manual.hpp; sourceTree = ""; }; - 1AACE77418BC45C200215002 /* lua_cocos2dx_physics_manual.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lua_cocos2dx_physics_manual.cpp; sourceTree = ""; }; - 1AACE77518BC45C200215002 /* lua_cocos2dx_physics_manual.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = lua_cocos2dx_physics_manual.hpp; sourceTree = ""; }; - 1AACE77618BC45C200215002 /* lua_cocos2dx_spine_manual.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lua_cocos2dx_spine_manual.cpp; sourceTree = ""; }; - 1AACE77718BC45C200215002 /* lua_cocos2dx_spine_manual.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = lua_cocos2dx_spine_manual.hpp; sourceTree = ""; }; - 1AACE77818BC45C200215002 /* lua_extensions.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = lua_extensions.c; sourceTree = ""; }; - 1AACE77918BC45C200215002 /* lua_extensions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lua_extensions.h; sourceTree = ""; }; - 1AACE77A18BC45C200215002 /* Lua_web_socket.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Lua_web_socket.cpp; sourceTree = ""; }; - 1AACE77B18BC45C200215002 /* Lua_web_socket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Lua_web_socket.h; sourceTree = ""; }; - 1AACE77C18BC45C200215002 /* lua_xml_http_request.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lua_xml_http_request.cpp; sourceTree = ""; }; - 1AACE77D18BC45C200215002 /* lua_xml_http_request.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lua_xml_http_request.h; sourceTree = ""; }; 1AACE77E18BC45C200215002 /* LuaBasicConversions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LuaBasicConversions.cpp; sourceTree = ""; }; 1AACE77F18BC45C200215002 /* LuaBasicConversions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LuaBasicConversions.h; sourceTree = ""; }; - 1AACE78018BC45C200215002 /* LuaOpengl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = LuaOpengl.cpp; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.cpp; }; - 1AACE78118BC45C200215002 /* LuaOpengl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LuaOpengl.h; sourceTree = ""; }; - 1AACE78218BC45C200215002 /* LuaScriptHandlerMgr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LuaScriptHandlerMgr.cpp; sourceTree = ""; }; - 1AACE78318BC45C200215002 /* LuaScriptHandlerMgr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LuaScriptHandlerMgr.h; sourceTree = ""; }; - 1AACE78418BC45C200215002 /* LuaSkeletonAnimation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LuaSkeletonAnimation.cpp; sourceTree = ""; }; - 1AACE78518BC45C200215002 /* LuaSkeletonAnimation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LuaSkeletonAnimation.h; sourceTree = ""; }; 1AACE78E18BC45C200215002 /* CCLuaObjcBridge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCLuaObjcBridge.h; sourceTree = ""; }; 1AACE78F18BC45C200215002 /* CCLuaObjcBridge.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CCLuaObjcBridge.mm; sourceTree = ""; }; 1AACE7B418BC45C200215002 /* tolua_fix.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tolua_fix.h; sourceTree = ""; }; @@ -336,28 +550,136 @@ 1ABCA22E18CD8F7D0087CE3A /* usocket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = usocket.h; sourceTree = ""; }; 2905FACE18CF12E600240AA3 /* lua_cocos2dx_ui_auto.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lua_cocos2dx_ui_auto.cpp; sourceTree = ""; }; 2905FACF18CF12E600240AA3 /* lua_cocos2dx_ui_auto.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = lua_cocos2dx_ui_auto.hpp; sourceTree = ""; }; - 2905FAD418CF143800240AA3 /* lua_cocos2dx_ui_manual.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lua_cocos2dx_ui_manual.cpp; sourceTree = ""; }; - 2905FAD518CF143800240AA3 /* lua_cocos2dx_ui_manual.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = lua_cocos2dx_ui_manual.hpp; sourceTree = ""; }; C0D9BAFA1974D30000EC35BB /* liblua.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblua.a; path = ../../../../external/lua/lua/prebuilt/ios/liblua.a; sourceTree = ""; }; - C0FEF4D418BE0E70001F446C /* lua_debugger.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = lua_debugger.c; sourceTree = ""; }; - C0FEF4D518BE0E70001F446C /* lua_debugger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lua_debugger.h; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ - 1A11972D178526AA00D62A44 /* Frameworks */ = { + 1516225E19A0F32D006099B8 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - C08D4F731974E00F00C87690 /* liblua.a in Frameworks */, - 1ABCA1F418CD8F540087CE3A /* libluajit.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; - 1A6FB51817854BC200CDF010 /* Frameworks */ = { + 1516229C19A0F45E006099B8 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 1ABCA36318CD9D7F0087CE3A /* libluajit.a in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 155CA3021988C494006E0A08 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 15C1BD9A1986538000A46ACC /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 15C1BEA1198654BE00A46ACC /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 15C1BF2919865A0600A46ACC /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 15C1BFAD19865C2000A46ACC /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 15C1C03319865E5F00A46ACC /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 15C1C0BB1987328E00A46ACC /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 15C1C1411987340C00A46ACC /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 15C1C28E198748D200A46ACC /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 15AC69E4198771FF00D17520 /* libluajit.a in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 15EFA2B9198B2791000C57D3 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 15EFA33A198B28A8000C57D3 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 15EFA3BB198B2934000C57D3 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 15EFA440198B2AFD000C57D3 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 15EFA4BF198B2B9B000C57D3 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 15EFA55C198B2D13000C57D3 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 15EFA5D7198B2DAA000C57D3 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 15EFA5D8198B2DAA000C57D3 /* liblua.a in Frameworks */, + 15EFA5D9198B2DAA000C57D3 /* libluajit.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -374,6 +696,15 @@ path = ../../../../external/xxtea; sourceTree = ""; }; + 15427D41198F73F700DC375D /* cocosdenshion */ = { + isa = PBXGroup; + children = ( + 15427D42198F73F700DC375D /* lua_cocos2dx_cocosdenshion_manual.cpp */, + 15427D43198F73F700DC375D /* lua_cocos2dx_cocosdenshion_manual.h */, + ); + path = cocosdenshion; + sourceTree = ""; + }; 1551A334158F2AB200E66CFE = { isa = PBXGroup; children = ( @@ -381,14 +712,130 @@ 1ABCA1E218CD8F230087CE3A /* external */, 1AACE74818BC45C200215002 /* auto */, 1AACE75B18BC45C200215002 /* manual */, - 1AACE74618BC45A000215002 /* libluabindings Mac.a */, - 1AACE74718BC45A000215002 /* libluabindings iOS.a */, + 15C1BDDA1986538000A46ACC /* libluaextension Mac.a */, + 15C1BEE1198654BE00A46ACC /* libluacocosbuilder Mac.a */, + 15C1BF6919865A0600A46ACC /* libluacocosdenshion Mac.a */, + 15C1BFED19865C2000A46ACC /* libluacocostudio Mac.a */, + 15C1C07319865E5F00A46ACC /* libluaspine Mac.a */, + 15C1C0FB1987328E00A46ACC /* libluaui Mac.a */, + 15C1C1811987340C00A46ACC /* libluanetwork Mac.a */, + 15C1C2CC198748D200A46ACC /* libluacocos2d Mac.a */, + 155CA3431988C494006E0A08 /* libluaextension iOS.a */, + 15EFA2F9198B2791000C57D3 /* libluacocosbuilder iOS.a */, + 15EFA37A198B28A8000C57D3 /* libluaui iOS.a */, + 15EFA3FB198B2934000C57D3 /* libluacocostudio iOS.a */, + 15EFA47F198B2AFD000C57D3 /* libluaspine iOS.a */, + 15EFA4FE198B2B9B000C57D3 /* libluanetwork iOS.a */, + 15EFA59B198B2D13000C57D3 /* libluacocosdenshion iOS.a */, + 15EFA616198B2DAA000C57D3 /* libluacocos2d iOS.a */, + 1516227C19A0F32D006099B8 /* libluacocos3d Mac.a */, + 151622BB19A0F45E006099B8 /* libluacocos3d iOS.a */, ); sourceTree = ""; }; + 158C128419A0FA1300781A76 /* 3d */ = { + isa = PBXGroup; + children = ( + 158C128519A0FA1300781A76 /* lua_cocos2dx_3d_manual.cpp */, + 158C128619A0FA1300781A76 /* lua_cocos2dx_3d_manual.h */, + ); + path = 3d; + sourceTree = ""; + }; + 15C1BCD21986525900A46ACC /* cocos2d */ = { + isa = PBXGroup; + children = ( + 15C1C24F198747E400A46ACC /* LuaOpengl.cpp */, + 15C1C250198747E400A46ACC /* LuaOpengl.h */, + 15C1BCD31986525900A46ACC /* lua_cocos2dx_deprecated.cpp */, + 15C1BCD41986525900A46ACC /* lua_cocos2dx_deprecated.h */, + 15C1BCD51986525900A46ACC /* lua_cocos2dx_experimental_manual.cpp */, + 15C1BCD61986525900A46ACC /* lua_cocos2dx_experimental_manual.hpp */, + 15C1BCD71986525900A46ACC /* lua_cocos2dx_manual.cpp */, + 15C1BCD81986525900A46ACC /* lua_cocos2dx_manual.hpp */, + 15C1BCD91986525900A46ACC /* lua_cocos2dx_physics_manual.cpp */, + 15C1BCDA1986525900A46ACC /* lua_cocos2dx_physics_manual.hpp */, + 15C1BCDB1986525900A46ACC /* LuaScriptHandlerMgr.cpp */, + 15C1BCDC1986525900A46ACC /* LuaScriptHandlerMgr.h */, + ); + path = cocos2d; + sourceTree = ""; + }; + 15C1BCF11986526C00A46ACC /* cocosbuilder */ = { + isa = PBXGroup; + children = ( + 15C1BCF21986526C00A46ACC /* CCBProxy.cpp */, + 15C1BCF31986526C00A46ACC /* CCBProxy.h */, + 15C1BCF41986526C00A46ACC /* lua_cocos2dx_cocosbuilder_manual.cpp */, + 15C1BCF51986526C00A46ACC /* lua_cocos2dx_cocosbuilder_manual.h */, + ); + path = cocosbuilder; + sourceTree = ""; + }; + 15C1BCFD1986526C00A46ACC /* extension */ = { + isa = PBXGroup; + children = ( + 15C1BCFE1986526C00A46ACC /* lua_cocos2dx_extension_manual.cpp */, + 15C1BCFF1986526C00A46ACC /* lua_cocos2dx_extension_manual.h */, + ); + path = extension; + sourceTree = ""; + }; + 15C1BD001986526C00A46ACC /* network */ = { + isa = PBXGroup; + children = ( + 15EFA694198B668C000C57D3 /* lua_cocos2dx_network_manual.cpp */, + 15EFA695198B668C000C57D3 /* lua_cocos2dx_network_manual.h */, + 15C1BD011986526C00A46ACC /* lua_extensions.c */, + 15C1BD021986526C00A46ACC /* lua_extensions.h */, + 15C1BD031986526C00A46ACC /* Lua_web_socket.cpp */, + 15C1BD041986526C00A46ACC /* Lua_web_socket.h */, + 15C1BD051986526C00A46ACC /* lua_xml_http_request.cpp */, + 15C1BD061986526C00A46ACC /* lua_xml_http_request.h */, + ); + path = network; + sourceTree = ""; + }; + 15C1BD141986526C00A46ACC /* spine */ = { + isa = PBXGroup; + children = ( + 15C1BD151986526C00A46ACC /* lua_cocos2dx_spine_manual.cpp */, + 15C1BD161986526C00A46ACC /* lua_cocos2dx_spine_manual.hpp */, + 15C1BD171986526C00A46ACC /* LuaSkeletonAnimation.cpp */, + 15C1BD181986526C00A46ACC /* LuaSkeletonAnimation.h */, + ); + path = spine; + sourceTree = ""; + }; + 15C1BD191986526C00A46ACC /* ui */ = { + isa = PBXGroup; + children = ( + 15C1C24B1987473200A46ACC /* lua_cocos2dx_experimental_video_manual.cpp */, + 15C1C24C1987473200A46ACC /* lua_cocos2dx_experimental_video_manual.hpp */, + 15C1BD1A1986526C00A46ACC /* lua_cocos2dx_ui_manual.cpp */, + 15C1BD1B1986526C00A46ACC /* lua_cocos2dx_ui_manual.hpp */, + ); + path = ui; + sourceTree = ""; + }; + 15EFA400198B2AB2000C57D3 /* cocostudio */ = { + isa = PBXGroup; + children = ( + 15EFA401198B2AB2000C57D3 /* lua_cocos2dx_coco_studio_manual.cpp */, + 15EFA402198B2AB2000C57D3 /* lua_cocos2dx_coco_studio_manual.hpp */, + ); + path = cocostudio; + sourceTree = ""; + }; 1AACE74818BC45C200215002 /* auto */ = { isa = PBXGroup; children = ( + 1516227F19A0F3E3006099B8 /* lua_cocos2dx_3d_auto.cpp */, + 1516228019A0F3E3006099B8 /* lua_cocos2dx_3d_auto.hpp */, + 15C1BCC019864D8700A46ACC /* lua_cocos2dx_cocosbuilder_auto.cpp */, + 15C1BCC119864D8700A46ACC /* lua_cocos2dx_cocosbuilder_auto.hpp */, + 15C1BCC219864D8700A46ACC /* lua_cocos2dx_cocosdenshion_auto.cpp */, + 15C1BCC319864D8700A46ACC /* lua_cocos2dx_cocosdenshion_auto.hpp */, 156EADF11977A2BA00F53709 /* lua_cocos2dx_experimental_video_auto.cpp */, 156EADF21977A2BA00F53709 /* lua_cocos2dx_experimental_video_auto.hpp */, 15622967197780DE009C9067 /* lua_cocos2dx_experimental_auto.cpp */, @@ -413,16 +860,15 @@ 1AACE75B18BC45C200215002 /* manual */ = { isa = PBXGroup; children = ( - 156EADF71977A39F00F53709 /* lua_cocos2dx_experimental_video_manual.cpp */, - 156EADF81977A39F00F53709 /* lua_cocos2dx_experimental_video_manual.hpp */, - 1562297119778209009C9067 /* lua_cocos2dx_experimental_manual.cpp */, - 1562297219778209009C9067 /* lua_cocos2dx_experimental_manual.hpp */, - 2905FAD418CF143800240AA3 /* lua_cocos2dx_ui_manual.cpp */, - 2905FAD518CF143800240AA3 /* lua_cocos2dx_ui_manual.hpp */, - 1AACE75E18BC45C200215002 /* CCBProxy.cpp */, - C0FEF4D418BE0E70001F446C /* lua_debugger.c */, - C0FEF4D518BE0E70001F446C /* lua_debugger.h */, - 1AACE75F18BC45C200215002 /* CCBProxy.h */, + 158C128419A0FA1300781A76 /* 3d */, + 15427D41198F73F700DC375D /* cocosdenshion */, + 15EFA400198B2AB2000C57D3 /* cocostudio */, + 15C1BCF11986526C00A46ACC /* cocosbuilder */, + 15C1BCFD1986526C00A46ACC /* extension */, + 15C1BD001986526C00A46ACC /* network */, + 15C1BD141986526C00A46ACC /* spine */, + 15C1BD191986526C00A46ACC /* ui */, + 15C1BCD21986525900A46ACC /* cocos2d */, 1AACE76018BC45C200215002 /* CCLuaBridge.cpp */, 1AACE76118BC45C200215002 /* CCLuaBridge.h */, 1AACE76218BC45C200215002 /* CCLuaEngine.cpp */, @@ -433,32 +879,8 @@ 1AACE76718BC45C200215002 /* CCLuaValue.h */, 1AACE76818BC45C200215002 /* Cocos2dxLuaLoader.cpp */, 1AACE76918BC45C200215002 /* Cocos2dxLuaLoader.h */, - 1AACE76A18BC45C200215002 /* lua_cocos2dx_coco_studio_manual.cpp */, - 1AACE76B18BC45C200215002 /* lua_cocos2dx_coco_studio_manual.hpp */, - 1AACE76C18BC45C200215002 /* lua_cocos2dx_deprecated.cpp */, - 1AACE76D18BC45C200215002 /* lua_cocos2dx_deprecated.h */, - 1AACE76E18BC45C200215002 /* lua_cocos2dx_extension_manual.cpp */, - 1AACE76F18BC45C200215002 /* lua_cocos2dx_extension_manual.h */, - 1AACE77218BC45C200215002 /* lua_cocos2dx_manual.cpp */, - 1AACE77318BC45C200215002 /* lua_cocos2dx_manual.hpp */, - 1AACE77418BC45C200215002 /* lua_cocos2dx_physics_manual.cpp */, - 1AACE77518BC45C200215002 /* lua_cocos2dx_physics_manual.hpp */, - 1AACE77618BC45C200215002 /* lua_cocos2dx_spine_manual.cpp */, - 1AACE77718BC45C200215002 /* lua_cocos2dx_spine_manual.hpp */, - 1AACE77818BC45C200215002 /* lua_extensions.c */, - 1AACE77918BC45C200215002 /* lua_extensions.h */, - 1AACE77A18BC45C200215002 /* Lua_web_socket.cpp */, - 1AACE77B18BC45C200215002 /* Lua_web_socket.h */, - 1AACE77C18BC45C200215002 /* lua_xml_http_request.cpp */, - 1AACE77D18BC45C200215002 /* lua_xml_http_request.h */, 1AACE77E18BC45C200215002 /* LuaBasicConversions.cpp */, 1AACE77F18BC45C200215002 /* LuaBasicConversions.h */, - 1AACE78018BC45C200215002 /* LuaOpengl.cpp */, - 1AACE78118BC45C200215002 /* LuaOpengl.h */, - 1AACE78218BC45C200215002 /* LuaScriptHandlerMgr.cpp */, - 1AACE78318BC45C200215002 /* LuaScriptHandlerMgr.h */, - 1AACE78418BC45C200215002 /* LuaSkeletonAnimation.cpp */, - 1AACE78518BC45C200215002 /* LuaSkeletonAnimation.h */, 1AACE78618BC45C200215002 /* platform */, 1A262AB718BEEF5900D2DB92 /* tolua_fix.cpp */, 1AACE7B418BC45C200215002 /* tolua_fix.h */, @@ -590,163 +1012,561 @@ /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ - 1A11972F178526AA00D62A44 /* Headers */ = { + 1516226019A0F32D006099B8 /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 1503FAA818DA8A1C00F6518C /* io.h in Headers */, - 1ABCA26C18CD8F7D0087CE3A /* unix.h in Headers */, - 1AACE7E018BC45C200215002 /* CCLuaBridge.h in Headers */, - 1540AF5A193EC30500717D8E /* xxtea.h in Headers */, - C0FEF4D918BE0E70001F446C /* lua_debugger.h in Headers */, - 1AACE7B818BC45C200215002 /* lua_cocos2dx_auto.hpp in Headers */, - 1AACE7E418BC45C200215002 /* CCLuaEngine.h in Headers */, - 1AACE7F018BC45C200215002 /* Cocos2dxLuaLoader.h in Headers */, - 1AACE7DC18BC45C200215002 /* CCBProxy.h in Headers */, - 1ABCA20D18CD8F6E0087CE3A /* tolua++.h in Headers */, - 1ABCA24018CD8F7D0087CE3A /* luasocket.h in Headers */, - 1ABCA25818CD8F7D0087CE3A /* socket.h in Headers */, - 1ABCA23418CD8F7D0087CE3A /* auxiliar.h in Headers */, - 1AACE7E818BC45C200215002 /* CCLuaStack.h in Headers */, - 1ABCA1EF18CD8F470087CE3A /* luaconf.h in Headers */, - 1ABCA23C18CD8F7D0087CE3A /* inet.h in Headers */, - 1562296A197780DE009C9067 /* lua_cocos2dx_experimental_auto.hpp in Headers */, - 1AACE7D018BC45C200215002 /* lua_cocos2dx_spine_auto.hpp in Headers */, - 1ABCA1EB18CD8F470087CE3A /* lauxlib.h in Headers */, - 1AACE81018BC45C200215002 /* lua_extensions.h in Headers */, - 1AACE82018BC45C200215002 /* LuaOpengl.h in Headers */, - 1503FAA418DA8A1C00F6518C /* buffer.h in Headers */, - 1ABCA26018CD8F7D0087CE3A /* tcp.h in Headers */, - 1AACE80418BC45C200215002 /* lua_cocos2dx_manual.hpp in Headers */, - 1AACE81818BC45C200215002 /* lua_xml_http_request.h in Headers */, - 1AACE87C18BC45C200215002 /* tolua_fix.h in Headers */, - 1AACE83218BC45C200215002 /* CCLuaObjcBridge.h in Headers */, - 1562297619778209009C9067 /* lua_cocos2dx_experimental_manual.hpp in Headers */, - 1AACE82418BC45C200215002 /* LuaScriptHandlerMgr.h in Headers */, - 1AACE7FC18BC45C200215002 /* lua_cocos2dx_extension_manual.h in Headers */, - 2905FAD318CF12E600240AA3 /* lua_cocos2dx_ui_auto.hpp in Headers */, - 156EADF41977A2BA00F53709 /* lua_cocos2dx_experimental_video_auto.hpp in Headers */, - 1AACE7EC18BC45C200215002 /* CCLuaValue.h in Headers */, - 2905FAD918CF143800240AA3 /* lua_cocos2dx_ui_manual.hpp in Headers */, - 1AACE80C18BC45C200215002 /* lua_cocos2dx_spine_manual.hpp in Headers */, - 1ABCA25018CD8F7D0087CE3A /* options.h in Headers */, - 1ABCA1F118CD8F470087CE3A /* lualib.h in Headers */, - 1ABCA20318CD8F6E0087CE3A /* tolua_event.h in Headers */, - 1AACE82818BC45C200215002 /* LuaSkeletonAnimation.h in Headers */, - 1ABCA27018CD8F7D0087CE3A /* usocket.h in Headers */, - 1AACE80818BC45C200215002 /* lua_cocos2dx_physics_manual.hpp in Headers */, - 1AACE7BE18BC45C200215002 /* lua_cocos2dx_extension_auto.hpp in Headers */, - 1ABCA23818CD8F7D0087CE3A /* except.h in Headers */, - 1ABCA26418CD8F7D0087CE3A /* timeout.h in Headers */, - 1AACE81418BC45C200215002 /* Lua_web_socket.h in Headers */, - 1AACE81C18BC45C200215002 /* LuaBasicConversions.h in Headers */, - 1AACE7CA18BC45C200215002 /* lua_cocos2dx_physics_auto.hpp in Headers */, - 1AACE7F818BC45C200215002 /* lua_cocos2dx_deprecated.h in Headers */, - 1ABCA24C18CD8F7D0087CE3A /* mime.h in Headers */, - 1ABCA1ED18CD8F470087CE3A /* lua.h in Headers */, - 1AACE7F418BC45C200215002 /* lua_cocos2dx_coco_studio_manual.hpp in Headers */, - 1ABCA26818CD8F7D0087CE3A /* udp.h in Headers */, - 156EADFA1977A39F00F53709 /* lua_cocos2dx_experimental_video_manual.hpp in Headers */, - 1ABCA25418CD8F7D0087CE3A /* select.h in Headers */, - 1AACE7D618BC45C200215002 /* lua_cocos2dx_studio_auto.hpp in Headers */, + 1516228219A0F3E3006099B8 /* lua_cocos2dx_3d_auto.hpp in Headers */, + 158C128919A0FA1300781A76 /* lua_cocos2dx_3d_manual.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; - 1A6FB51B17854BC200CDF010 /* Headers */ = { + 1516229F19A0F45E006099B8 /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 1503FAA718DA8A1C00F6518C /* io.h in Headers */, - 1ABCA26B18CD8F7D0087CE3A /* unix.h in Headers */, - 1AACE7DF18BC45C200215002 /* CCLuaBridge.h in Headers */, - 1540AF59193EC30500717D8E /* xxtea.h in Headers */, - C0FEF4D818BE0E70001F446C /* lua_debugger.h in Headers */, - 1AACE7B718BC45C200215002 /* lua_cocos2dx_auto.hpp in Headers */, - 1AACE7E318BC45C200215002 /* CCLuaEngine.h in Headers */, - 1AACE7EF18BC45C200215002 /* Cocos2dxLuaLoader.h in Headers */, - 1AACE7DB18BC45C200215002 /* CCBProxy.h in Headers */, - 1ABCA20C18CD8F6E0087CE3A /* tolua++.h in Headers */, - 1ABCA23F18CD8F7D0087CE3A /* luasocket.h in Headers */, - 1ABCA25718CD8F7D0087CE3A /* socket.h in Headers */, - 1ABCA23318CD8F7D0087CE3A /* auxiliar.h in Headers */, - 1AACE7E718BC45C200215002 /* CCLuaStack.h in Headers */, - 1ABCA1EE18CD8F470087CE3A /* luaconf.h in Headers */, - 1ABCA23B18CD8F7D0087CE3A /* inet.h in Headers */, - 1AACE7CF18BC45C200215002 /* lua_cocos2dx_spine_auto.hpp in Headers */, - 1ABCA1EA18CD8F470087CE3A /* lauxlib.h in Headers */, - 1AACE80F18BC45C200215002 /* lua_extensions.h in Headers */, - 156EADF61977A2C200F53709 /* lua_cocos2dx_experimental_auto.hpp in Headers */, - 156EADFC1977A3A500F53709 /* lua_cocos2dx_experimental_manual.hpp in Headers */, - 1AACE81F18BC45C200215002 /* LuaOpengl.h in Headers */, - 1503FAA318DA8A1C00F6518C /* buffer.h in Headers */, - 1ABCA25F18CD8F7D0087CE3A /* tcp.h in Headers */, - 1AACE80318BC45C200215002 /* lua_cocos2dx_manual.hpp in Headers */, - 1AACE81718BC45C200215002 /* lua_xml_http_request.h in Headers */, - 1AACE87B18BC45C200215002 /* tolua_fix.h in Headers */, - 1AACE83118BC45C200215002 /* CCLuaObjcBridge.h in Headers */, - 1AACE82318BC45C200215002 /* LuaScriptHandlerMgr.h in Headers */, - 1AACE7FB18BC45C200215002 /* lua_cocos2dx_extension_manual.h in Headers */, - 2905FAD218CF12E600240AA3 /* lua_cocos2dx_ui_auto.hpp in Headers */, - 1AACE7EB18BC45C200215002 /* CCLuaValue.h in Headers */, - 2905FAD818CF143800240AA3 /* lua_cocos2dx_ui_manual.hpp in Headers */, - 1AACE80B18BC45C200215002 /* lua_cocos2dx_spine_manual.hpp in Headers */, - 1ABCA24F18CD8F7D0087CE3A /* options.h in Headers */, - 1ABCA1F018CD8F470087CE3A /* lualib.h in Headers */, - 1ABCA20218CD8F6E0087CE3A /* tolua_event.h in Headers */, - 1AACE82718BC45C200215002 /* LuaSkeletonAnimation.h in Headers */, - 1ABCA26F18CD8F7D0087CE3A /* usocket.h in Headers */, - 1AACE80718BC45C200215002 /* lua_cocos2dx_physics_manual.hpp in Headers */, - 1AACE7BD18BC45C200215002 /* lua_cocos2dx_extension_auto.hpp in Headers */, - 1ABCA23718CD8F7D0087CE3A /* except.h in Headers */, - 1ABCA26318CD8F7D0087CE3A /* timeout.h in Headers */, - 1AACE81318BC45C200215002 /* Lua_web_socket.h in Headers */, - 1AACE81B18BC45C200215002 /* LuaBasicConversions.h in Headers */, - 1AACE7C918BC45C200215002 /* lua_cocos2dx_physics_auto.hpp in Headers */, - 1AACE7F718BC45C200215002 /* lua_cocos2dx_deprecated.h in Headers */, - 1ABCA24B18CD8F7D0087CE3A /* mime.h in Headers */, - 1ABCA1EC18CD8F470087CE3A /* lua.h in Headers */, - 1AACE7F318BC45C200215002 /* lua_cocos2dx_coco_studio_manual.hpp in Headers */, - 1ABCA26718CD8F7D0087CE3A /* udp.h in Headers */, - 1ABCA25318CD8F7D0087CE3A /* select.h in Headers */, - 1AACE7D518BC45C200215002 /* lua_cocos2dx_studio_auto.hpp in Headers */, + 151622BD19A0F4EC006099B8 /* lua_cocos2dx_3d_auto.hpp in Headers */, + 158C128A19A0FA1300781A76 /* lua_cocos2dx_3d_manual.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 155CA3051988C494006E0A08 /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 15EFA27D198B2777000C57D3 /* lua_cocos2dx_extension_auto.hpp in Headers */, + 15EFA27E198B2777000C57D3 /* lua_cocos2dx_extension_manual.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 15C1BD9C1986538000A46ACC /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 15C1BDDD1986542B00A46ACC /* lua_cocos2dx_experimental_auto.hpp in Headers */, + 15C1BDDE1986542B00A46ACC /* lua_cocos2dx_extension_manual.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 15C1BEA3198654BE00A46ACC /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 15C1BEE51986555100A46ACC /* lua_cocos2dx_cocosbuilder_auto.hpp in Headers */, + 15C1BEE61986555100A46ACC /* CCBProxy.h in Headers */, + 15C1BEE71986555100A46ACC /* lua_cocos2dx_cocosbuilder_manual.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 15C1BF2B19865A0600A46ACC /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 15427D46198F73F700DC375D /* lua_cocos2dx_cocosdenshion_manual.h in Headers */, + 15C1BF6B19865AC200A46ACC /* lua_cocos2dx_cocosdenshion_auto.hpp in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 15C1BFAF19865C2000A46ACC /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 15EFA405198B2AB2000C57D3 /* lua_cocos2dx_coco_studio_manual.hpp in Headers */, + 15C1BFF019865CD400A46ACC /* lua_cocos2dx_studio_auto.hpp in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 15C1C03519865E5F00A46ACC /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 15C1C077198731D300A46ACC /* lua_cocos2dx_spine_auto.hpp in Headers */, + 15C1C078198731D300A46ACC /* lua_cocos2dx_spine_manual.hpp in Headers */, + 15C1C079198731D300A46ACC /* LuaSkeletonAnimation.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 15C1C0BD1987328E00A46ACC /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 15AC69EC1987B43B00D17520 /* lua_cocos2dx_experimental_video_auto.hpp in Headers */, + 15C1C24E1987473200A46ACC /* lua_cocos2dx_experimental_video_manual.hpp in Headers */, + 15C1C0FE1987331B00A46ACC /* lua_cocos2dx_ui_auto.hpp in Headers */, + 15C1C0FF1987331B00A46ACC /* lua_cocos2dx_ui_manual.hpp in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 15C1C1431987340C00A46ACC /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 15EFA698198B668C000C57D3 /* lua_cocos2dx_network_manual.h in Headers */, + 155CA3601988E26D006E0A08 /* usocket.h in Headers */, + 15C1C1B71987374000A46ACC /* buffer.h in Headers */, + 15C1C1B81987374000A46ACC /* io.h in Headers */, + 15C1C1B91987374000A46ACC /* auxiliar.h in Headers */, + 15C1C1BA1987374000A46ACC /* except.h in Headers */, + 15C1C1BB1987374000A46ACC /* inet.h in Headers */, + 15C1C1BC1987374000A46ACC /* luasocket.h in Headers */, + 15C1C1BD1987374000A46ACC /* mime.h in Headers */, + 15C1C1BE1987374000A46ACC /* options.h in Headers */, + 15C1C1BF1987374000A46ACC /* select.h in Headers */, + 15C1C1C01987374000A46ACC /* socket.h in Headers */, + 15C1C1C11987374000A46ACC /* tcp.h in Headers */, + 15C1C1C21987374000A46ACC /* timeout.h in Headers */, + 15C1C1C31987374000A46ACC /* udp.h in Headers */, + 15C1C1C41987374000A46ACC /* unix.h in Headers */, + 15C1C1A6198734AC00A46ACC /* lua_extensions.h in Headers */, + 15C1C1A7198734AC00A46ACC /* Lua_web_socket.h in Headers */, + 15C1C1A8198734AC00A46ACC /* lua_xml_http_request.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 15C1C290198748D200A46ACC /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 15EFA1F71989E582000C57D3 /* lua_cocos2dx_experimental_auto.hpp in Headers */, + 15AC69E21987712500D17520 /* tolua_event.h in Headers */, + 15AC69E31987712500D17520 /* tolua++.h in Headers */, + 15AC69DE1987711400D17520 /* lauxlib.h in Headers */, + 15AC69DF1987711400D17520 /* lua.h in Headers */, + 15AC69E01987711400D17520 /* luaconf.h in Headers */, + 15AC69E11987711400D17520 /* lualib.h in Headers */, + 15C1C2E719874CBE00A46ACC /* CCLuaBridge.h in Headers */, + 15C1C2E819874CBE00A46ACC /* CCLuaEngine.h in Headers */, + 15C1C2E919874CBE00A46ACC /* CCLuaStack.h in Headers */, + 15C1C2EA19874CBE00A46ACC /* CCLuaValue.h in Headers */, + 15C1C2EB19874CBE00A46ACC /* Cocos2dxLuaLoader.h in Headers */, + 15C1C2EC19874CBE00A46ACC /* LuaBasicConversions.h in Headers */, + 15C1C2ED19874CBE00A46ACC /* CCLuaObjcBridge.h in Headers */, + 15C1C2EE19874CBE00A46ACC /* tolua_fix.h in Headers */, + 15C1C2DC19874B4400A46ACC /* xxtea.h in Headers */, + 15C1C2D5198749BC00A46ACC /* LuaOpengl.h in Headers */, + 15C1C2D6198749BC00A46ACC /* lua_cocos2dx_deprecated.h in Headers */, + 15C1C2D7198749BC00A46ACC /* lua_cocos2dx_experimental_manual.hpp in Headers */, + 15C1C2D8198749BC00A46ACC /* lua_cocos2dx_manual.hpp in Headers */, + 15C1C2D9198749BC00A46ACC /* lua_cocos2dx_physics_manual.hpp in Headers */, + 15C1C2DA198749BC00A46ACC /* LuaScriptHandlerMgr.h in Headers */, + 15AC69D619876EA200D17520 /* lua_cocos2dx_physics_auto.hpp in Headers */, + 15C1C2D41987499F00A46ACC /* lua_cocos2dx_auto.hpp in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 15EFA2BC198B2791000C57D3 /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 15EFA2FD198B2875000C57D3 /* lua_cocos2dx_cocosbuilder_auto.hpp in Headers */, + 15EFA2FE198B2875000C57D3 /* CCBProxy.h in Headers */, + 15EFA2FF198B2875000C57D3 /* lua_cocos2dx_cocosbuilder_manual.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 15EFA33D198B28A8000C57D3 /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 15EFA37E198B2911000C57D3 /* lua_cocos2dx_ui_auto.hpp in Headers */, + 15EFA69B198B6B84000C57D3 /* lua_cocos2dx_experimental_video_auto.hpp in Headers */, + 15EFA380198B2912000C57D3 /* lua_cocos2dx_ui_manual.hpp in Headers */, + 15EFA37F198B2911000C57D3 /* lua_cocos2dx_experimental_video_manual.hpp in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 15EFA3BE198B2934000C57D3 /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 15EFA406198B2AB2000C57D3 /* lua_cocos2dx_coco_studio_manual.hpp in Headers */, + 15EFA3FE198B2A11000C57D3 /* lua_cocos2dx_studio_auto.hpp in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 15EFA443198B2AFD000C57D3 /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 15EFA483198B2B68000C57D3 /* lua_cocos2dx_spine_auto.hpp in Headers */, + 15EFA484198B2B68000C57D3 /* lua_cocos2dx_spine_manual.hpp in Headers */, + 15EFA485198B2B68000C57D3 /* LuaSkeletonAnimation.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 15EFA4C2198B2B9B000C57D3 /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 15EFA699198B668C000C57D3 /* lua_cocos2dx_network_manual.h in Headers */, + 15EFA520198B2CF3000C57D3 /* lua_extensions.h in Headers */, + 15EFA521198B2CF4000C57D3 /* Lua_web_socket.h in Headers */, + 15EFA522198B2CF4000C57D3 /* lua_xml_http_request.h in Headers */, + 15EFA50E198B2CD0000C57D3 /* buffer.h in Headers */, + 15EFA50F198B2CD0000C57D3 /* io.h in Headers */, + 15EFA510198B2CD0000C57D3 /* auxiliar.h in Headers */, + 15EFA511198B2CD0000C57D3 /* except.h in Headers */, + 15EFA512198B2CD0000C57D3 /* inet.h in Headers */, + 15EFA513198B2CD1000C57D3 /* luasocket.h in Headers */, + 15EFA514198B2CD1000C57D3 /* mime.h in Headers */, + 15EFA515198B2CD1000C57D3 /* options.h in Headers */, + 15EFA516198B2CD1000C57D3 /* select.h in Headers */, + 15EFA517198B2CD1000C57D3 /* socket.h in Headers */, + 15EFA518198B2CD1000C57D3 /* tcp.h in Headers */, + 15EFA519198B2CD1000C57D3 /* timeout.h in Headers */, + 15EFA51A198B2CD1000C57D3 /* udp.h in Headers */, + 15EFA51B198B2CD1000C57D3 /* unix.h in Headers */, + 15EFA51C198B2CD1000C57D3 /* usocket.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 15EFA55F198B2D13000C57D3 /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 15427D47198F73F700DC375D /* lua_cocos2dx_cocosdenshion_manual.h in Headers */, + 15EFA59D198B2D69000C57D3 /* lua_cocos2dx_cocosdenshion_auto.hpp in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 15EFA5DA198B2DAA000C57D3 /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 15EFA64D198B3342000C57D3 /* lauxlib.h in Headers */, + 15EFA64E198B3342000C57D3 /* lua.h in Headers */, + 15EFA64F198B3342000C57D3 /* luaconf.h in Headers */, + 15EFA650198B3342000C57D3 /* lualib.h in Headers */, + 15EFA64B198B3320000C57D3 /* tolua_event.h in Headers */, + 15EFA64C198B3320000C57D3 /* tolua++.h in Headers */, + 15EFA644198B32D5000C57D3 /* xxtea.h in Headers */, + 15EFA63B198B32BB000C57D3 /* CCLuaBridge.h in Headers */, + 15EFA63C198B32BB000C57D3 /* CCLuaEngine.h in Headers */, + 15EFA63D198B32BB000C57D3 /* CCLuaStack.h in Headers */, + 15EFA63E198B32BB000C57D3 /* CCLuaValue.h in Headers */, + 15EFA63F198B32BB000C57D3 /* Cocos2dxLuaLoader.h in Headers */, + 15EFA640198B32BB000C57D3 /* LuaBasicConversions.h in Headers */, + 15EFA641198B32BB000C57D3 /* CCLuaObjcBridge.h in Headers */, + 15EFA642198B32BB000C57D3 /* tolua_fix.h in Headers */, + 15EFA62B198B3220000C57D3 /* LuaOpengl.h in Headers */, + 15EFA62C198B3220000C57D3 /* lua_cocos2dx_deprecated.h in Headers */, + 15EFA62D198B3220000C57D3 /* lua_cocos2dx_experimental_manual.hpp in Headers */, + 15EFA62E198B3220000C57D3 /* lua_cocos2dx_manual.hpp in Headers */, + 15EFA62F198B3220000C57D3 /* lua_cocos2dx_physics_manual.hpp in Headers */, + 15EFA630198B3220000C57D3 /* LuaScriptHandlerMgr.h in Headers */, + 15EFA622198B2E74000C57D3 /* lua_cocos2dx_experimental_auto.hpp in Headers */, + 15EFA623198B2E74000C57D3 /* lua_cocos2dx_auto.hpp in Headers */, + 15EFA624198B2E74000C57D3 /* lua_cocos2dx_physics_auto.hpp in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ - 1A119716178526AA00D62A44 /* luabindings iOS */ = { + 1516224519A0F32D006099B8 /* libluacocos3d Mac */ = { isa = PBXNativeTarget; - buildConfigurationList = 1A11978E178526AA00D62A44 /* Build configuration list for PBXNativeTarget "luabindings iOS" */; + buildConfigurationList = 1516227919A0F32D006099B8 /* Build configuration list for PBXNativeTarget "libluacocos3d Mac" */; buildPhases = ( - 1A119717178526AA00D62A44 /* Sources */, - 1A11972D178526AA00D62A44 /* Frameworks */, - 1A11972F178526AA00D62A44 /* Headers */, + 1516224619A0F32D006099B8 /* Sources */, + 1516225E19A0F32D006099B8 /* Frameworks */, + 1516226019A0F32D006099B8 /* Headers */, ); buildRules = ( ); dependencies = ( ); - name = "luabindings iOS"; + name = "libluacocos3d Mac"; productName = cocos2dx; - productReference = 1AACE74718BC45A000215002 /* libluabindings iOS.a */; + productReference = 1516227C19A0F32D006099B8 /* libluacocos3d Mac.a */; productType = "com.apple.product-type.library.static"; }; - 1A6FB50417854BC200CDF010 /* luabindings Mac */ = { + 1516228319A0F45E006099B8 /* libluacocos3d iOS */ = { isa = PBXNativeTarget; - buildConfigurationList = 1A6FB52D17854BC200CDF010 /* Build configuration list for PBXNativeTarget "luabindings Mac" */; + buildConfigurationList = 151622B819A0F45E006099B8 /* Build configuration list for PBXNativeTarget "libluacocos3d iOS" */; buildPhases = ( - 1A6FB50517854BC200CDF010 /* Sources */, - 1A6FB51817854BC200CDF010 /* Frameworks */, - 1A6FB51B17854BC200CDF010 /* Headers */, + 1516228419A0F45E006099B8 /* Sources */, + 1516229C19A0F45E006099B8 /* Frameworks */, + 1516229F19A0F45E006099B8 /* Headers */, ); buildRules = ( ); dependencies = ( ); - name = "luabindings Mac"; + name = "libluacocos3d iOS"; productName = cocos2dx; - productReference = 1AACE74618BC45A000215002 /* libluabindings Mac.a */; + productReference = 151622BB19A0F45E006099B8 /* libluacocos3d iOS.a */; + productType = "com.apple.product-type.library.static"; + }; + 155CA2C71988C494006E0A08 /* libluaextension iOS */ = { + isa = PBXNativeTarget; + buildConfigurationList = 155CA3401988C494006E0A08 /* Build configuration list for PBXNativeTarget "libluaextension iOS" */; + buildPhases = ( + 155CA2C81988C494006E0A08 /* Sources */, + 155CA3021988C494006E0A08 /* Frameworks */, + 155CA3051988C494006E0A08 /* Headers */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = "libluaextension iOS"; + productName = cocos2dx; + productReference = 155CA3431988C494006E0A08 /* libluaextension iOS.a */; + productType = "com.apple.product-type.library.static"; + }; + 15C1BD5F1986538000A46ACC /* libluaextension Mac */ = { + isa = PBXNativeTarget; + buildConfigurationList = 15C1BDD71986538000A46ACC /* Build configuration list for PBXNativeTarget "libluaextension Mac" */; + buildPhases = ( + 15C1BD601986538000A46ACC /* Sources */, + 15C1BD9A1986538000A46ACC /* Frameworks */, + 15C1BD9C1986538000A46ACC /* Headers */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = "libluaextension Mac"; + productName = cocos2dx; + productReference = 15C1BDDA1986538000A46ACC /* libluaextension Mac.a */; + productType = "com.apple.product-type.library.static"; + }; + 15C1BE66198654BE00A46ACC /* libluacocosbuilder Mac */ = { + isa = PBXNativeTarget; + buildConfigurationList = 15C1BEDE198654BE00A46ACC /* Build configuration list for PBXNativeTarget "libluacocosbuilder Mac" */; + buildPhases = ( + 15C1BE67198654BE00A46ACC /* Sources */, + 15C1BEA1198654BE00A46ACC /* Frameworks */, + 15C1BEA3198654BE00A46ACC /* Headers */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = "libluacocosbuilder Mac"; + productName = cocos2dx; + productReference = 15C1BEE1198654BE00A46ACC /* libluacocosbuilder Mac.a */; + productType = "com.apple.product-type.library.static"; + }; + 15C1BEEE19865A0600A46ACC /* libluacocosdenshion Mac */ = { + isa = PBXNativeTarget; + buildConfigurationList = 15C1BF6619865A0600A46ACC /* Build configuration list for PBXNativeTarget "libluacocosdenshion Mac" */; + buildPhases = ( + 15C1BEEF19865A0600A46ACC /* Sources */, + 15C1BF2919865A0600A46ACC /* Frameworks */, + 15C1BF2B19865A0600A46ACC /* Headers */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = "libluacocosdenshion Mac"; + productName = cocos2dx; + productReference = 15C1BF6919865A0600A46ACC /* libluacocosdenshion Mac.a */; + productType = "com.apple.product-type.library.static"; + }; + 15C1BF7219865C2000A46ACC /* libluacocostudio Mac */ = { + isa = PBXNativeTarget; + buildConfigurationList = 15C1BFEA19865C2000A46ACC /* Build configuration list for PBXNativeTarget "libluacocostudio Mac" */; + buildPhases = ( + 15C1BF7319865C2000A46ACC /* Sources */, + 15C1BFAD19865C2000A46ACC /* Frameworks */, + 15C1BFAF19865C2000A46ACC /* Headers */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = "libluacocostudio Mac"; + productName = cocos2dx; + productReference = 15C1BFED19865C2000A46ACC /* libluacocostudio Mac.a */; + productType = "com.apple.product-type.library.static"; + }; + 15C1BFF819865E5F00A46ACC /* libluaspine Mac */ = { + isa = PBXNativeTarget; + buildConfigurationList = 15C1C07019865E5F00A46ACC /* Build configuration list for PBXNativeTarget "libluaspine Mac" */; + buildPhases = ( + 15C1BFF919865E5F00A46ACC /* Sources */, + 15C1C03319865E5F00A46ACC /* Frameworks */, + 15C1C03519865E5F00A46ACC /* Headers */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = "libluaspine Mac"; + productName = cocos2dx; + productReference = 15C1C07319865E5F00A46ACC /* libluaspine Mac.a */; + productType = "com.apple.product-type.library.static"; + }; + 15C1C0801987328E00A46ACC /* libluaui Mac */ = { + isa = PBXNativeTarget; + buildConfigurationList = 15C1C0F81987328E00A46ACC /* Build configuration list for PBXNativeTarget "libluaui Mac" */; + buildPhases = ( + 15C1C0811987328E00A46ACC /* Sources */, + 15C1C0BB1987328E00A46ACC /* Frameworks */, + 15C1C0BD1987328E00A46ACC /* Headers */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = "libluaui Mac"; + productName = cocos2dx; + productReference = 15C1C0FB1987328E00A46ACC /* libluaui Mac.a */; + productType = "com.apple.product-type.library.static"; + }; + 15C1C1061987340C00A46ACC /* libluanetwork Mac */ = { + isa = PBXNativeTarget; + buildConfigurationList = 15C1C17E1987340C00A46ACC /* Build configuration list for PBXNativeTarget "libluanetwork Mac" */; + buildPhases = ( + 15C1C1071987340C00A46ACC /* Sources */, + 15C1C1411987340C00A46ACC /* Frameworks */, + 15C1C1431987340C00A46ACC /* Headers */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = "libluanetwork Mac"; + productName = cocos2dx; + productReference = 15C1C1811987340C00A46ACC /* libluanetwork Mac.a */; + productType = "com.apple.product-type.library.static"; + }; + 15C1C255198748D200A46ACC /* libluacocos2d Mac */ = { + isa = PBXNativeTarget; + buildConfigurationList = 15C1C2C9198748D200A46ACC /* Build configuration list for PBXNativeTarget "libluacocos2d Mac" */; + buildPhases = ( + 15C1C256198748D200A46ACC /* Sources */, + 15C1C28E198748D200A46ACC /* Frameworks */, + 15C1C290198748D200A46ACC /* Headers */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = "libluacocos2d Mac"; + productName = cocos2dx; + productReference = 15C1C2CC198748D200A46ACC /* libluacocos2d Mac.a */; + productType = "com.apple.product-type.library.static"; + }; + 15EFA27F198B2791000C57D3 /* libluacocosbuilder iOS */ = { + isa = PBXNativeTarget; + buildConfigurationList = 15EFA2F6198B2791000C57D3 /* Build configuration list for PBXNativeTarget "libluacocosbuilder iOS" */; + buildPhases = ( + 15EFA280198B2791000C57D3 /* Sources */, + 15EFA2B9198B2791000C57D3 /* Frameworks */, + 15EFA2BC198B2791000C57D3 /* Headers */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = "libluacocosbuilder iOS"; + productName = cocos2dx; + productReference = 15EFA2F9198B2791000C57D3 /* libluacocosbuilder iOS.a */; + productType = "com.apple.product-type.library.static"; + }; + 15EFA300198B28A8000C57D3 /* libluaui iOS */ = { + isa = PBXNativeTarget; + buildConfigurationList = 15EFA377198B28A8000C57D3 /* Build configuration list for PBXNativeTarget "libluaui iOS" */; + buildPhases = ( + 15EFA301198B28A8000C57D3 /* Sources */, + 15EFA33A198B28A8000C57D3 /* Frameworks */, + 15EFA33D198B28A8000C57D3 /* Headers */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = "libluaui iOS"; + productName = cocos2dx; + productReference = 15EFA37A198B28A8000C57D3 /* libluaui iOS.a */; + productType = "com.apple.product-type.library.static"; + }; + 15EFA381198B2934000C57D3 /* libluacocostudio iOS */ = { + isa = PBXNativeTarget; + buildConfigurationList = 15EFA3F8198B2934000C57D3 /* Build configuration list for PBXNativeTarget "libluacocostudio iOS" */; + buildPhases = ( + 15EFA382198B2934000C57D3 /* Sources */, + 15EFA3BB198B2934000C57D3 /* Frameworks */, + 15EFA3BE198B2934000C57D3 /* Headers */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = "libluacocostudio iOS"; + productName = cocos2dx; + productReference = 15EFA3FB198B2934000C57D3 /* libluacocostudio iOS.a */; + productType = "com.apple.product-type.library.static"; + }; + 15EFA407198B2AFD000C57D3 /* libluaspine iOS */ = { + isa = PBXNativeTarget; + buildConfigurationList = 15EFA47C198B2AFD000C57D3 /* Build configuration list for PBXNativeTarget "libluaspine iOS" */; + buildPhases = ( + 15EFA408198B2AFD000C57D3 /* Sources */, + 15EFA440198B2AFD000C57D3 /* Frameworks */, + 15EFA443198B2AFD000C57D3 /* Headers */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = "libluaspine iOS"; + productName = cocos2dx; + productReference = 15EFA47F198B2AFD000C57D3 /* libluaspine iOS.a */; + productType = "com.apple.product-type.library.static"; + }; + 15EFA486198B2B9B000C57D3 /* libluanetwork iOS */ = { + isa = PBXNativeTarget; + buildConfigurationList = 15EFA4FB198B2B9B000C57D3 /* Build configuration list for PBXNativeTarget "libluanetwork iOS" */; + buildPhases = ( + 15EFA487198B2B9B000C57D3 /* Sources */, + 15EFA4BF198B2B9B000C57D3 /* Frameworks */, + 15EFA4C2198B2B9B000C57D3 /* Headers */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = "libluanetwork iOS"; + productName = cocos2dx; + productReference = 15EFA4FE198B2B9B000C57D3 /* libluanetwork iOS.a */; + productType = "com.apple.product-type.library.static"; + }; + 15EFA523198B2D13000C57D3 /* libluacocosdenshion iOS */ = { + isa = PBXNativeTarget; + buildConfigurationList = 15EFA598198B2D13000C57D3 /* Build configuration list for PBXNativeTarget "libluacocosdenshion iOS" */; + buildPhases = ( + 15EFA524198B2D13000C57D3 /* Sources */, + 15EFA55C198B2D13000C57D3 /* Frameworks */, + 15EFA55F198B2D13000C57D3 /* Headers */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = "libluacocosdenshion iOS"; + productName = cocos2dx; + productReference = 15EFA59B198B2D13000C57D3 /* libluacocosdenshion iOS.a */; + productType = "com.apple.product-type.library.static"; + }; + 15EFA59E198B2DAA000C57D3 /* libluacocos2d iOS */ = { + isa = PBXNativeTarget; + buildConfigurationList = 15EFA613198B2DAA000C57D3 /* Build configuration list for PBXNativeTarget "libluacocos2d iOS" */; + buildPhases = ( + 15EFA59F198B2DAA000C57D3 /* Sources */, + 15EFA5D7198B2DAA000C57D3 /* Frameworks */, + 15EFA5DA198B2DAA000C57D3 /* Headers */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = "libluacocos2d iOS"; + productName = cocos2dx; + productReference = 15EFA616198B2DAA000C57D3 /* libluacocos2d iOS.a */; productType = "com.apple.product-type.library.static"; }; /* End PBXNativeTarget section */ @@ -770,136 +1590,451 @@ projectDirPath = ""; projectRoot = ""; targets = ( - 1A6FB50417854BC200CDF010 /* luabindings Mac */, - 1A119716178526AA00D62A44 /* luabindings iOS */, + 15D1F2AC1994B2AD00302043 /* build all lualibs Mac */, + 15C1BD5F1986538000A46ACC /* libluaextension Mac */, + 15C1C0801987328E00A46ACC /* libluaui Mac */, + 15C1BF7219865C2000A46ACC /* libluacocostudio Mac */, + 15C1BE66198654BE00A46ACC /* libluacocosbuilder Mac */, + 15C1BFF819865E5F00A46ACC /* libluaspine Mac */, + 15C1C1061987340C00A46ACC /* libluanetwork Mac */, + 15C1BEEE19865A0600A46ACC /* libluacocosdenshion Mac */, + 1516224519A0F32D006099B8 /* libluacocos3d Mac */, + 15C1C255198748D200A46ACC /* libluacocos2d Mac */, + 15D1F2C01994B2DA00302043 /* build all lualibs iOS */, + 155CA2C71988C494006E0A08 /* libluaextension iOS */, + 15EFA300198B28A8000C57D3 /* libluaui iOS */, + 15EFA381198B2934000C57D3 /* libluacocostudio iOS */, + 15EFA27F198B2791000C57D3 /* libluacocosbuilder iOS */, + 15EFA407198B2AFD000C57D3 /* libluaspine iOS */, + 15EFA486198B2B9B000C57D3 /* libluanetwork iOS */, + 15EFA523198B2D13000C57D3 /* libluacocosdenshion iOS */, + 1516228319A0F45E006099B8 /* libluacocos3d iOS */, + 15EFA59E198B2DAA000C57D3 /* libluacocos2d iOS */, ); }; /* End PBXProject section */ /* Begin PBXSourcesBuildPhase section */ - 1A119717178526AA00D62A44 /* Sources */ = { + 1516224619A0F32D006099B8 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 1AACE7C818BC45C200215002 /* lua_cocos2dx_physics_auto.cpp in Sources */, - 1AACE83418BC45C200215002 /* CCLuaObjcBridge.mm in Sources */, - 15622969197780DE009C9067 /* lua_cocos2dx_experimental_auto.cpp in Sources */, - 1ABCA20518CD8F6E0087CE3A /* tolua_is.c in Sources */, - 1AACE7F618BC45C200215002 /* lua_cocos2dx_deprecated.cpp in Sources */, - 1ABCA24E18CD8F7D0087CE3A /* options.c in Sources */, - 1A262AB918BEEF5900D2DB92 /* tolua_fix.cpp in Sources */, - 1AACE81E18BC45C200215002 /* LuaOpengl.cpp in Sources */, - 1AACE7CE18BC45C200215002 /* lua_cocos2dx_spine_auto.cpp in Sources */, - 1AACE80218BC45C200215002 /* lua_cocos2dx_manual.cpp in Sources */, - 1ABCA23E18CD8F7D0087CE3A /* luasocket.c in Sources */, - 1ABCA25218CD8F7D0087CE3A /* select.c in Sources */, - 1ABCA24A18CD8F7D0087CE3A /* mime.c in Sources */, - 1540AF58193EC30500717D8E /* xxtea.cpp in Sources */, - 1ABCA26218CD8F7D0087CE3A /* timeout.c in Sources */, - 1503FAA618DA8A1C00F6518C /* io.c in Sources */, - 1ABCA26618CD8F7D0087CE3A /* udp.c in Sources */, - 1AACE82218BC45C200215002 /* LuaScriptHandlerMgr.cpp in Sources */, - 1ABCA23618CD8F7D0087CE3A /* except.c in Sources */, - 2905FAD718CF143800240AA3 /* lua_cocos2dx_ui_manual.cpp in Sources */, - 1ABCA26A18CD8F7D0087CE3A /* unix.c in Sources */, - 1AACE7F218BC45C200215002 /* lua_cocos2dx_coco_studio_manual.cpp in Sources */, - 1503FAA218DA8A1C00F6518C /* buffer.c in Sources */, - 1AACE80E18BC45C200215002 /* lua_extensions.c in Sources */, - 1562297519778209009C9067 /* lua_cocos2dx_experimental_manual.cpp in Sources */, - 1AACE7EA18BC45C200215002 /* CCLuaValue.cpp in Sources */, - 1AACE7D418BC45C200215002 /* lua_cocos2dx_studio_auto.cpp in Sources */, - 1AACE7BC18BC45C200215002 /* lua_cocos2dx_extension_auto.cpp in Sources */, - 1ABCA20918CD8F6E0087CE3A /* tolua_push.c in Sources */, - 1AACE82618BC45C200215002 /* LuaSkeletonAnimation.cpp in Sources */, - 1ABCA25E18CD8F7D0087CE3A /* tcp.c in Sources */, - 1AACE80A18BC45C200215002 /* lua_cocos2dx_spine_manual.cpp in Sources */, - 1AACE81A18BC45C200215002 /* LuaBasicConversions.cpp in Sources */, - 1AACE7EE18BC45C200215002 /* Cocos2dxLuaLoader.cpp in Sources */, - 1AACE7DA18BC45C200215002 /* CCBProxy.cpp in Sources */, - 156EADF91977A39F00F53709 /* lua_cocos2dx_experimental_video_manual.cpp in Sources */, - 1AACE81618BC45C200215002 /* lua_xml_http_request.cpp in Sources */, - 1ABCA23A18CD8F7D0087CE3A /* inet.c in Sources */, - 2905FAD118CF12E600240AA3 /* lua_cocos2dx_ui_auto.cpp in Sources */, - 1AACE7E218BC45C200215002 /* CCLuaEngine.cpp in Sources */, - 1ABCA26E18CD8F7D0087CE3A /* usocket.c in Sources */, - 1AACE81218BC45C200215002 /* Lua_web_socket.cpp in Sources */, - 1AACE7FA18BC45C200215002 /* lua_cocos2dx_extension_manual.cpp in Sources */, - 1AACE7DE18BC45C200215002 /* CCLuaBridge.cpp in Sources */, - 1ABCA23218CD8F7D0087CE3A /* auxiliar.c in Sources */, - 1ABCA20118CD8F6E0087CE3A /* tolua_event.c in Sources */, - 156EADF31977A2BA00F53709 /* lua_cocos2dx_experimental_video_auto.cpp in Sources */, - C0FEF4D718BE0E70001F446C /* lua_debugger.c in Sources */, - 1AACE7E618BC45C200215002 /* CCLuaStack.cpp in Sources */, - 1AACE80618BC45C200215002 /* lua_cocos2dx_physics_manual.cpp in Sources */, - 1AACE7B618BC45C200215002 /* lua_cocos2dx_auto.cpp in Sources */, - 1ABCA20718CD8F6E0087CE3A /* tolua_map.c in Sources */, - 1ABCA25618CD8F7D0087CE3A /* serial.c in Sources */, - 1ABCA20B18CD8F6E0087CE3A /* tolua_to.c in Sources */, + 158C128719A0FA1300781A76 /* lua_cocos2dx_3d_manual.cpp in Sources */, + 1516228119A0F3E3006099B8 /* lua_cocos2dx_3d_auto.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; - 1A6FB50517854BC200CDF010 /* Sources */ = { + 1516228419A0F45E006099B8 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 1AACE7C718BC45C200215002 /* lua_cocos2dx_physics_auto.cpp in Sources */, - 1AACE83318BC45C200215002 /* CCLuaObjcBridge.mm in Sources */, - 1ABCA20418CD8F6E0087CE3A /* tolua_is.c in Sources */, - 1AACE7F518BC45C200215002 /* lua_cocos2dx_deprecated.cpp in Sources */, - 1ABCA24D18CD8F7D0087CE3A /* options.c in Sources */, - 1A262AB818BEEF5900D2DB92 /* tolua_fix.cpp in Sources */, - 1AACE81D18BC45C200215002 /* LuaOpengl.cpp in Sources */, - 1AACE7CD18BC45C200215002 /* lua_cocos2dx_spine_auto.cpp in Sources */, - 1AACE80118BC45C200215002 /* lua_cocos2dx_manual.cpp in Sources */, - 1ABCA23D18CD8F7D0087CE3A /* luasocket.c in Sources */, - 1ABCA25118CD8F7D0087CE3A /* select.c in Sources */, - 1ABCA24918CD8F7D0087CE3A /* mime.c in Sources */, - 1540AF57193EC30500717D8E /* xxtea.cpp in Sources */, - 1ABCA26118CD8F7D0087CE3A /* timeout.c in Sources */, - 1503FAA518DA8A1C00F6518C /* io.c in Sources */, - 1ABCA26518CD8F7D0087CE3A /* udp.c in Sources */, - 1AACE82118BC45C200215002 /* LuaScriptHandlerMgr.cpp in Sources */, - 1ABCA23518CD8F7D0087CE3A /* except.c in Sources */, - 2905FAD618CF143800240AA3 /* lua_cocos2dx_ui_manual.cpp in Sources */, - 1ABCA26918CD8F7D0087CE3A /* unix.c in Sources */, - 1AACE7F118BC45C200215002 /* lua_cocos2dx_coco_studio_manual.cpp in Sources */, - 1503FAA118DA8A1C00F6518C /* buffer.c in Sources */, - 1AACE80D18BC45C200215002 /* lua_extensions.c in Sources */, - 1AACE7E918BC45C200215002 /* CCLuaValue.cpp in Sources */, - 156EADF51977A2BF00F53709 /* lua_cocos2dx_experimental_auto.cpp in Sources */, - 1AACE7D318BC45C200215002 /* lua_cocos2dx_studio_auto.cpp in Sources */, - 1AACE7BB18BC45C200215002 /* lua_cocos2dx_extension_auto.cpp in Sources */, - 1ABCA20818CD8F6E0087CE3A /* tolua_push.c in Sources */, - 1AACE82518BC45C200215002 /* LuaSkeletonAnimation.cpp in Sources */, - 1ABCA25D18CD8F7D0087CE3A /* tcp.c in Sources */, - 1AACE80918BC45C200215002 /* lua_cocos2dx_spine_manual.cpp in Sources */, - 1AACE81918BC45C200215002 /* LuaBasicConversions.cpp in Sources */, - 1AACE7ED18BC45C200215002 /* Cocos2dxLuaLoader.cpp in Sources */, - 1AACE7D918BC45C200215002 /* CCBProxy.cpp in Sources */, - 1AACE81518BC45C200215002 /* lua_xml_http_request.cpp in Sources */, - 1ABCA23918CD8F7D0087CE3A /* inet.c in Sources */, - 2905FAD018CF12E600240AA3 /* lua_cocos2dx_ui_auto.cpp in Sources */, - 1AACE7E118BC45C200215002 /* CCLuaEngine.cpp in Sources */, - 1ABCA26D18CD8F7D0087CE3A /* usocket.c in Sources */, - 1AACE81118BC45C200215002 /* Lua_web_socket.cpp in Sources */, - 1AACE7F918BC45C200215002 /* lua_cocos2dx_extension_manual.cpp in Sources */, - 156EADFB1977A3A300F53709 /* lua_cocos2dx_experimental_manual.cpp in Sources */, - 1AACE7DD18BC45C200215002 /* CCLuaBridge.cpp in Sources */, - 1ABCA23118CD8F7D0087CE3A /* auxiliar.c in Sources */, - 1ABCA20018CD8F6E0087CE3A /* tolua_event.c in Sources */, - C0FEF4D618BE0E70001F446C /* lua_debugger.c in Sources */, - 1AACE7E518BC45C200215002 /* CCLuaStack.cpp in Sources */, - 1AACE80518BC45C200215002 /* lua_cocos2dx_physics_manual.cpp in Sources */, - 1AACE7B518BC45C200215002 /* lua_cocos2dx_auto.cpp in Sources */, - 1ABCA20618CD8F6E0087CE3A /* tolua_map.c in Sources */, - 1ABCA25518CD8F7D0087CE3A /* serial.c in Sources */, - 1ABCA20A18CD8F6E0087CE3A /* tolua_to.c in Sources */, + 158C128819A0FA1300781A76 /* lua_cocos2dx_3d_manual.cpp in Sources */, + 151622BC19A0F4E3006099B8 /* lua_cocos2dx_3d_auto.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 155CA2C81988C494006E0A08 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 15EFA27C198B275D000C57D3 /* lua_cocos2dx_extension_manual.cpp in Sources */, + 15EFA27B198B274B000C57D3 /* lua_cocos2dx_extension_auto.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 15C1BD601986538000A46ACC /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 15C1BDDB1986541800A46ACC /* lua_cocos2dx_extension_auto.cpp in Sources */, + 15C1BDDC1986541800A46ACC /* lua_cocos2dx_extension_manual.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 15C1BE67198654BE00A46ACC /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 15C1BEE21986550500A46ACC /* lua_cocos2dx_cocosbuilder_auto.cpp in Sources */, + 15C1BEE31986550500A46ACC /* CCBProxy.cpp in Sources */, + 15C1BEE41986550500A46ACC /* lua_cocos2dx_cocosbuilder_manual.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 15C1BEEF19865A0600A46ACC /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 15C1BF6A19865AAB00A46ACC /* lua_cocos2dx_cocosdenshion_auto.cpp in Sources */, + 15427D44198F73F700DC375D /* lua_cocos2dx_cocosdenshion_manual.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 15C1BF7319865C2000A46ACC /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 15C1BFEE19865CBE00A46ACC /* lua_cocos2dx_studio_auto.cpp in Sources */, + 15EFA403198B2AB2000C57D3 /* lua_cocos2dx_coco_studio_manual.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 15C1BFF919865E5F00A46ACC /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 15C1C074198731C000A46ACC /* lua_cocos2dx_spine_auto.cpp in Sources */, + 15C1C075198731C000A46ACC /* lua_cocos2dx_spine_manual.cpp in Sources */, + 15C1C076198731C000A46ACC /* LuaSkeletonAnimation.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 15C1C0811987328E00A46ACC /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 15AC69EB1987B42600D17520 /* lua_cocos2dx_experimental_video_auto.cpp in Sources */, + 15C1C0FC1987330D00A46ACC /* lua_cocos2dx_ui_auto.cpp in Sources */, + 15C1C0FD1987330D00A46ACC /* lua_cocos2dx_ui_manual.cpp in Sources */, + 15C1C24D1987473200A46ACC /* lua_cocos2dx_experimental_video_manual.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 15C1C1071987340C00A46ACC /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 155CA35F1988E261006E0A08 /* usocket.c in Sources */, + 15C1C1A91987370000A46ACC /* buffer.c in Sources */, + 15C1C1AA1987370000A46ACC /* io.c in Sources */, + 15C1C1AB1987370000A46ACC /* auxiliar.c in Sources */, + 15C1C1AC1987370000A46ACC /* except.c in Sources */, + 15C1C1AD1987370000A46ACC /* inet.c in Sources */, + 15C1C1AE1987370000A46ACC /* luasocket.c in Sources */, + 15C1C1AF1987370000A46ACC /* mime.c in Sources */, + 15EFA696198B668C000C57D3 /* lua_cocos2dx_network_manual.cpp in Sources */, + 15C1C1B01987370000A46ACC /* options.c in Sources */, + 15C1C1B11987370000A46ACC /* select.c in Sources */, + 15C1C1B21987370000A46ACC /* serial.c in Sources */, + 15C1C1B31987370000A46ACC /* tcp.c in Sources */, + 15C1C1B41987370000A46ACC /* timeout.c in Sources */, + 15C1C1B51987370000A46ACC /* udp.c in Sources */, + 15C1C1B61987370000A46ACC /* unix.c in Sources */, + 15C1C1A01987347200A46ACC /* lua_extensions.c in Sources */, + 15C1C1A21987347200A46ACC /* Lua_web_socket.cpp in Sources */, + 15C1C1A41987347200A46ACC /* lua_xml_http_request.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 15C1C256198748D200A46ACC /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 15AC69D91987710400D17520 /* tolua_event.c in Sources */, + 15AC69DA1987710400D17520 /* tolua_is.c in Sources */, + 15AC69DB1987710400D17520 /* tolua_map.c in Sources */, + 15AC69DC1987710400D17520 /* tolua_push.c in Sources */, + 15AC69DD1987710400D17520 /* tolua_to.c in Sources */, + 15C1C2E519874C9200A46ACC /* CCLuaObjcBridge.mm in Sources */, + 15C1C2E419874C7C00A46ACC /* tolua_fix.cpp in Sources */, + 15C1C2E219874BA100A46ACC /* LuaBasicConversions.cpp in Sources */, + 15C1C2DD19874B8800A46ACC /* CCLuaBridge.cpp in Sources */, + 15C1C2DE19874B8800A46ACC /* CCLuaEngine.cpp in Sources */, + 15C1C2DF19874B8800A46ACC /* CCLuaStack.cpp in Sources */, + 15C1C2E019874B8800A46ACC /* CCLuaValue.cpp in Sources */, + 15C1C2E119874B8800A46ACC /* Cocos2dxLuaLoader.cpp in Sources */, + 15C1C2DB19874B3D00A46ACC /* xxtea.cpp in Sources */, + 15EFA1F61989E528000C57D3 /* lua_cocos2dx_experimental_auto.cpp in Sources */, + 15AC69D519876E9300D17520 /* lua_cocos2dx_physics_auto.cpp in Sources */, + 15C1C2CE1987498B00A46ACC /* LuaOpengl.cpp in Sources */, + 15C1C2CF1987498B00A46ACC /* lua_cocos2dx_deprecated.cpp in Sources */, + 15C1C2D01987498B00A46ACC /* lua_cocos2dx_experimental_manual.cpp in Sources */, + 15C1C2D11987498B00A46ACC /* lua_cocos2dx_manual.cpp in Sources */, + 15C1C2D21987498B00A46ACC /* lua_cocos2dx_physics_manual.cpp in Sources */, + 15C1C2D31987498B00A46ACC /* LuaScriptHandlerMgr.cpp in Sources */, + 15C1C2CD1987495500A46ACC /* lua_cocos2dx_auto.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 15EFA280198B2791000C57D3 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 15EFA2FC198B2869000C57D3 /* lua_cocos2dx_cocosbuilder_auto.cpp in Sources */, + 15EFA2FA198B2860000C57D3 /* CCBProxy.cpp in Sources */, + 15EFA2FB198B2860000C57D3 /* lua_cocos2dx_cocosbuilder_manual.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 15EFA301198B28A8000C57D3 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 15EFA37B198B28FF000C57D3 /* lua_cocos2dx_ui_auto.cpp in Sources */, + 15EFA69A198B6B67000C57D3 /* lua_cocos2dx_experimental_video_auto.cpp in Sources */, + 15EFA37D198B28FF000C57D3 /* lua_cocos2dx_ui_manual.cpp in Sources */, + 15EFA37C198B28FF000C57D3 /* lua_cocos2dx_experimental_video_manual.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 15EFA382198B2934000C57D3 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 15EFA3FC198B29F9000C57D3 /* lua_cocos2dx_studio_auto.cpp in Sources */, + 15EFA404198B2AB2000C57D3 /* lua_cocos2dx_coco_studio_manual.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 15EFA408198B2AFD000C57D3 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 15EFA480198B2B57000C57D3 /* lua_cocos2dx_spine_auto.cpp in Sources */, + 15EFA481198B2B57000C57D3 /* lua_cocos2dx_spine_manual.cpp in Sources */, + 15EFA482198B2B57000C57D3 /* LuaSkeletonAnimation.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 15EFA487198B2B9B000C57D3 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 15EFA51D198B2CE5000C57D3 /* lua_extensions.c in Sources */, + 15EFA51E198B2CE5000C57D3 /* Lua_web_socket.cpp in Sources */, + 15EFA51F198B2CE5000C57D3 /* lua_xml_http_request.cpp in Sources */, + 15EFA4FF198B2C0B000C57D3 /* buffer.c in Sources */, + 15EFA500198B2C0B000C57D3 /* io.c in Sources */, + 15EFA501198B2C0B000C57D3 /* auxiliar.c in Sources */, + 15EFA502198B2C0B000C57D3 /* except.c in Sources */, + 15EFA503198B2C0B000C57D3 /* inet.c in Sources */, + 15EFA697198B668C000C57D3 /* lua_cocos2dx_network_manual.cpp in Sources */, + 15EFA504198B2C0C000C57D3 /* luasocket.c in Sources */, + 15EFA505198B2C0C000C57D3 /* mime.c in Sources */, + 15EFA506198B2C0C000C57D3 /* options.c in Sources */, + 15EFA507198B2C0C000C57D3 /* select.c in Sources */, + 15EFA508198B2C0C000C57D3 /* serial.c in Sources */, + 15EFA509198B2C0C000C57D3 /* tcp.c in Sources */, + 15EFA50A198B2C0C000C57D3 /* timeout.c in Sources */, + 15EFA50B198B2C0C000C57D3 /* udp.c in Sources */, + 15EFA50C198B2C0C000C57D3 /* unix.c in Sources */, + 15EFA50D198B2C0C000C57D3 /* usocket.c in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 15EFA524198B2D13000C57D3 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 15EFA59C198B2D5F000C57D3 /* lua_cocos2dx_cocosdenshion_auto.cpp in Sources */, + 15427D45198F73F700DC375D /* lua_cocos2dx_cocosdenshion_manual.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 15EFA59F198B2DAA000C57D3 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 15EFA646198B3311000C57D3 /* tolua_event.c in Sources */, + 15EFA647198B3311000C57D3 /* tolua_is.c in Sources */, + 15EFA648198B3311000C57D3 /* tolua_map.c in Sources */, + 15EFA649198B3311000C57D3 /* tolua_push.c in Sources */, + 15EFA64A198B3311000C57D3 /* tolua_to.c in Sources */, + 15EFA645198B32DB000C57D3 /* xxtea.cpp in Sources */, + 15EFA632198B328B000C57D3 /* CCLuaBridge.cpp in Sources */, + 15EFA633198B328B000C57D3 /* CCLuaEngine.cpp in Sources */, + 15EFA634198B328B000C57D3 /* CCLuaStack.cpp in Sources */, + 15EFA635198B328B000C57D3 /* CCLuaValue.cpp in Sources */, + 15EFA636198B328B000C57D3 /* Cocos2dxLuaLoader.cpp in Sources */, + 15EFA637198B328B000C57D3 /* LuaBasicConversions.cpp in Sources */, + 15EFA638198B328B000C57D3 /* CCLuaObjcBridge.mm in Sources */, + 15EFA639198B328B000C57D3 /* tolua_fix.cpp in Sources */, + 15EFA625198B31FB000C57D3 /* LuaOpengl.cpp in Sources */, + 15EFA626198B31FB000C57D3 /* lua_cocos2dx_deprecated.cpp in Sources */, + 15EFA627198B31FB000C57D3 /* lua_cocos2dx_experimental_manual.cpp in Sources */, + 15EFA628198B31FB000C57D3 /* lua_cocos2dx_manual.cpp in Sources */, + 15EFA629198B31FB000C57D3 /* lua_cocos2dx_physics_manual.cpp in Sources */, + 15EFA62A198B31FB000C57D3 /* LuaScriptHandlerMgr.cpp in Sources */, + 15EFA617198B2E2B000C57D3 /* lua_cocos2dx_experimental_auto.cpp in Sources */, + 15EFA618198B2E2B000C57D3 /* lua_cocos2dx_auto.cpp in Sources */, + 15EFA619198B2E2B000C57D3 /* lua_cocos2dx_physics_auto.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXSourcesBuildPhase section */ +/* Begin PBXTargetDependency section */ + 15D1F2B11994B2C400302043 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 15C1BD5F1986538000A46ACC /* libluaextension Mac */; + targetProxy = 15D1F2B01994B2C400302043 /* PBXContainerItemProxy */; + }; + 15D1F2B31994B2C400302043 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 15C1C0801987328E00A46ACC /* libluaui Mac */; + targetProxy = 15D1F2B21994B2C400302043 /* PBXContainerItemProxy */; + }; + 15D1F2B51994B2C400302043 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 15C1BF7219865C2000A46ACC /* libluacocostudio Mac */; + targetProxy = 15D1F2B41994B2C400302043 /* PBXContainerItemProxy */; + }; + 15D1F2B71994B2C400302043 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 15C1BE66198654BE00A46ACC /* libluacocosbuilder Mac */; + targetProxy = 15D1F2B61994B2C400302043 /* PBXContainerItemProxy */; + }; + 15D1F2B91994B2C400302043 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 15C1BFF819865E5F00A46ACC /* libluaspine Mac */; + targetProxy = 15D1F2B81994B2C400302043 /* PBXContainerItemProxy */; + }; + 15D1F2BB1994B2C400302043 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 15C1C1061987340C00A46ACC /* libluanetwork Mac */; + targetProxy = 15D1F2BA1994B2C400302043 /* PBXContainerItemProxy */; + }; + 15D1F2BD1994B2C400302043 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 15C1BEEE19865A0600A46ACC /* libluacocosdenshion Mac */; + targetProxy = 15D1F2BC1994B2C400302043 /* PBXContainerItemProxy */; + }; + 15D1F2BF1994B2C400302043 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 15C1C255198748D200A46ACC /* libluacocos2d Mac */; + targetProxy = 15D1F2BE1994B2C400302043 /* PBXContainerItemProxy */; + }; + 15D1F2C51994B2ED00302043 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 155CA2C71988C494006E0A08 /* libluaextension iOS */; + targetProxy = 15D1F2C41994B2ED00302043 /* PBXContainerItemProxy */; + }; + 15D1F2C71994B2ED00302043 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 15EFA300198B28A8000C57D3 /* libluaui iOS */; + targetProxy = 15D1F2C61994B2ED00302043 /* PBXContainerItemProxy */; + }; + 15D1F2C91994B2ED00302043 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 15EFA381198B2934000C57D3 /* libluacocostudio iOS */; + targetProxy = 15D1F2C81994B2ED00302043 /* PBXContainerItemProxy */; + }; + 15D1F2CB1994B2ED00302043 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 15EFA27F198B2791000C57D3 /* libluacocosbuilder iOS */; + targetProxy = 15D1F2CA1994B2ED00302043 /* PBXContainerItemProxy */; + }; + 15D1F2CD1994B2ED00302043 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 15EFA407198B2AFD000C57D3 /* libluaspine iOS */; + targetProxy = 15D1F2CC1994B2ED00302043 /* PBXContainerItemProxy */; + }; + 15D1F2CF1994B2ED00302043 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 15EFA486198B2B9B000C57D3 /* libluanetwork iOS */; + targetProxy = 15D1F2CE1994B2ED00302043 /* PBXContainerItemProxy */; + }; + 15D1F2D11994B2ED00302043 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 15EFA523198B2D13000C57D3 /* libluacocosdenshion iOS */; + targetProxy = 15D1F2D01994B2ED00302043 /* PBXContainerItemProxy */; + }; + 15D1F2D31994B2ED00302043 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 15EFA59E198B2DAA000C57D3 /* libluacocos2d iOS */; + targetProxy = 15D1F2D21994B2ED00302043 /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + /* Begin XCBuildConfiguration section */ + 1516227A19A0F32D006099B8 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = YES; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + EXECUTABLE_PREFIX = ""; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = ""; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + CC_TARGET_OS_MAC, + CC_KEYBOARD_SUPPORT, + ); + HEADER_SEARCH_PATHS = ""; + IPHONEOS_DEPLOYMENT_TARGET = 5.0; + LIBRARY_SEARCH_PATHS = ""; + PRODUCT_NAME = "libluacocos3d Mac"; + TARGETED_DEVICE_FAMILY = "1,2"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../../platform/mac $(SRCROOT)/../../../../external/glfw3/include/mac"; + }; + name = Debug; + }; + 1516227B19A0F32D006099B8 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = YES; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + EXECUTABLE_PREFIX = ""; + GCC_GENERATE_DEBUGGING_SYMBOLS = NO; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = ""; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + CC_TARGET_OS_MAC, + CC_KEYBOARD_SUPPORT, + ); + HEADER_SEARCH_PATHS = ""; + IPHONEOS_DEPLOYMENT_TARGET = 5.0; + LIBRARY_SEARCH_PATHS = ""; + PRODUCT_NAME = "libluacocos3d Mac"; + TARGETED_DEVICE_FAMILY = "1,2"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../../platform/mac $(SRCROOT)/../../../../external/glfw3/include/mac"; + }; + name = Release; + }; + 151622B919A0F45E006099B8 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = YES; + EXECUTABLE_PREFIX = ""; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = ""; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + CC_TARGET_OS_IPHONE, + ); + HEADER_SEARCH_PATHS = ""; + IPHONEOS_DEPLOYMENT_TARGET = 5.1; + LIBRARY_SEARCH_PATHS = ""; + PRODUCT_NAME = "libluacocos3d iOS"; + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../../platform/ios"; + }; + name = Debug; + }; + 151622BA19A0F45E006099B8 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = YES; + EXECUTABLE_PREFIX = ""; + GCC_GENERATE_DEBUGGING_SYMBOLS = NO; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = ""; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + CC_TARGET_OS_IPHONE, + ); + HEADER_SEARCH_PATHS = ""; + IPHONEOS_DEPLOYMENT_TARGET = 5.1; + LIBRARY_SEARCH_PATHS = ""; + PRODUCT_NAME = "libluacocos3d iOS"; + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../../platform/ios"; + }; + name = Release; + }; 1551A34A158F2AB200E66CFE /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -971,10 +2106,11 @@ }; name = Release; }; - 1A11978F178526AA00D62A44 /* Debug */ = { + 155CA3411988C494006E0A08 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = YES; + EXECUTABLE_PREFIX = ""; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = ""; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -983,22 +2119,20 @@ ); HEADER_SEARCH_PATHS = ""; IPHONEOS_DEPLOYMENT_TARGET = 5.1; - LIBRARY_SEARCH_PATHS = ( - "$(SRCROOT)/../../../../external/lua/luajit/prebuilt/ios", - "$(SRCROOT)/../../../../external/lua/lua/prebuilt/ios", - ); - "OTHER_LDFLAGS[sdk=iphonesimulator7.1]" = "-llua"; - "OTHER_LDFLAGS[sdk=iphonesimulator8.0]" = "-llua"; + LIBRARY_SEARCH_PATHS = ""; + OTHER_LDFLAGS = ""; + PRODUCT_NAME = "libluaextension iOS"; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../../platform/ios"; }; name = Debug; }; - 1A119790178526AA00D62A44 /* Release */ = { + 155CA3421988C494006E0A08 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = YES; + EXECUTABLE_PREFIX = ""; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = ""; @@ -1008,23 +2142,348 @@ ); HEADER_SEARCH_PATHS = ""; IPHONEOS_DEPLOYMENT_TARGET = 5.1; - LIBRARY_SEARCH_PATHS = ( - "$(SRCROOT)/../../../../external/lua/luajit/prebuilt/ios", - "$(SRCROOT)/../../../../external/lua/lua/prebuilt/ios", - ); - "OTHER_LDFLAGS[sdk=iphonesimulator7.1]" = "-llua"; - "OTHER_LDFLAGS[sdk=iphonesimulator8.0]" = "-llua"; + LIBRARY_SEARCH_PATHS = ""; + OTHER_LDFLAGS = ""; + PRODUCT_NAME = "libluaextension iOS"; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../../platform/ios"; }; name = Release; }; - 1A6FB52E17854BC200CDF010 /* Debug */ = { + 15C1BDD81986538000A46ACC /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = YES; ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + EXECUTABLE_PREFIX = ""; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = ""; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + CC_TARGET_OS_MAC, + CC_KEYBOARD_SUPPORT, + ); + HEADER_SEARCH_PATHS = ""; + IPHONEOS_DEPLOYMENT_TARGET = 5.0; + LIBRARY_SEARCH_PATHS = ""; + OTHER_LDFLAGS = ""; + PRODUCT_NAME = "libluaextension Mac"; + TARGETED_DEVICE_FAMILY = "1,2"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../../platform/mac $(SRCROOT)/../../../../external/glfw3/include/mac"; + }; + name = Debug; + }; + 15C1BDD91986538000A46ACC /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = YES; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + EXECUTABLE_PREFIX = ""; + GCC_GENERATE_DEBUGGING_SYMBOLS = NO; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = ""; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + CC_TARGET_OS_MAC, + CC_KEYBOARD_SUPPORT, + ); + HEADER_SEARCH_PATHS = ""; + IPHONEOS_DEPLOYMENT_TARGET = 5.0; + LIBRARY_SEARCH_PATHS = ""; + OTHER_LDFLAGS = ""; + PRODUCT_NAME = "libluaextension Mac"; + TARGETED_DEVICE_FAMILY = "1,2"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../../platform/mac $(SRCROOT)/../../../../external/glfw3/include/mac"; + }; + name = Release; + }; + 15C1BEDF198654BE00A46ACC /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = YES; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + EXECUTABLE_PREFIX = ""; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = ""; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + CC_TARGET_OS_MAC, + CC_KEYBOARD_SUPPORT, + ); + HEADER_SEARCH_PATHS = ""; + IPHONEOS_DEPLOYMENT_TARGET = 5.0; + LIBRARY_SEARCH_PATHS = ""; + PRODUCT_NAME = "libluacocosbuilder Mac"; + TARGETED_DEVICE_FAMILY = "1,2"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../../platform/mac $(SRCROOT)/../../../../external/glfw3/include/mac"; + }; + name = Debug; + }; + 15C1BEE0198654BE00A46ACC /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = YES; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + EXECUTABLE_PREFIX = ""; + GCC_GENERATE_DEBUGGING_SYMBOLS = NO; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = ""; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + CC_TARGET_OS_MAC, + CC_KEYBOARD_SUPPORT, + ); + HEADER_SEARCH_PATHS = ""; + IPHONEOS_DEPLOYMENT_TARGET = 5.0; + LIBRARY_SEARCH_PATHS = ""; + PRODUCT_NAME = "libluacocosbuilder Mac"; + TARGETED_DEVICE_FAMILY = "1,2"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../../platform/mac $(SRCROOT)/../../../../external/glfw3/include/mac"; + }; + name = Release; + }; + 15C1BF6719865A0600A46ACC /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = YES; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + EXECUTABLE_PREFIX = ""; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = ""; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + CC_TARGET_OS_MAC, + CC_KEYBOARD_SUPPORT, + ); + HEADER_SEARCH_PATHS = ""; + IPHONEOS_DEPLOYMENT_TARGET = 5.0; + LIBRARY_SEARCH_PATHS = ""; + PRODUCT_NAME = "libluacocosdenshion Mac"; + TARGETED_DEVICE_FAMILY = "1,2"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../../platform/mac $(SRCROOT)/../../../../external/glfw3/include/mac"; + }; + name = Debug; + }; + 15C1BF6819865A0600A46ACC /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = YES; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + EXECUTABLE_PREFIX = ""; + GCC_GENERATE_DEBUGGING_SYMBOLS = NO; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = ""; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + CC_TARGET_OS_MAC, + CC_KEYBOARD_SUPPORT, + ); + HEADER_SEARCH_PATHS = ""; + IPHONEOS_DEPLOYMENT_TARGET = 5.0; + LIBRARY_SEARCH_PATHS = ""; + PRODUCT_NAME = "libluacocosdenshion Mac"; + TARGETED_DEVICE_FAMILY = "1,2"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../../platform/mac $(SRCROOT)/../../../../external/glfw3/include/mac"; + }; + name = Release; + }; + 15C1BFEB19865C2000A46ACC /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = YES; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + EXECUTABLE_PREFIX = ""; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = ""; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + CC_TARGET_OS_MAC, + CC_KEYBOARD_SUPPORT, + ); + HEADER_SEARCH_PATHS = ""; + IPHONEOS_DEPLOYMENT_TARGET = 5.0; + LIBRARY_SEARCH_PATHS = ( + "$(SRCROOT)/../../../../external/lua/luajit/prebuilt/mac", + "$(USER_LIBRARY_DIR)/Developer/Xcode/DerivedData/cocos2d_tests-hfwnhsdtjxbycbgwztnpjtkcaupu/Build/Products/Debug", + "/Users/cocos2d/MyWork/cocos2d-x-develop/build/build/Debug", + ); + PRODUCT_NAME = "libluacocostudio Mac"; + TARGETED_DEVICE_FAMILY = "1,2"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../../platform/mac $(SRCROOT)/../../../../external/glfw3/include/mac"; + }; + name = Debug; + }; + 15C1BFEC19865C2000A46ACC /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = YES; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + EXECUTABLE_PREFIX = ""; + GCC_GENERATE_DEBUGGING_SYMBOLS = NO; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = ""; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + CC_TARGET_OS_MAC, + CC_KEYBOARD_SUPPORT, + ); + HEADER_SEARCH_PATHS = ""; + IPHONEOS_DEPLOYMENT_TARGET = 5.0; + LIBRARY_SEARCH_PATHS = ( + "$(SRCROOT)/../../../../external/lua/luajit/prebuilt/mac", + "$(USER_LIBRARY_DIR)/Developer/Xcode/DerivedData/cocos2d_tests-hfwnhsdtjxbycbgwztnpjtkcaupu/Build/Products/Debug", + "/Users/cocos2d/MyWork/cocos2d-x-develop/build/build/Debug", + ); + PRODUCT_NAME = "libluacocostudio Mac"; + TARGETED_DEVICE_FAMILY = "1,2"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../../platform/mac $(SRCROOT)/../../../../external/glfw3/include/mac"; + }; + name = Release; + }; + 15C1C07119865E5F00A46ACC /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = YES; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + EXECUTABLE_PREFIX = ""; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = ""; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + CC_TARGET_OS_MAC, + CC_KEYBOARD_SUPPORT, + ); + HEADER_SEARCH_PATHS = ""; + IPHONEOS_DEPLOYMENT_TARGET = 5.0; + LIBRARY_SEARCH_PATHS = ""; + PRODUCT_NAME = "libluaspine Mac"; + TARGETED_DEVICE_FAMILY = "1,2"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../../platform/mac $(SRCROOT)/../../../../external/glfw3/include/mac"; + }; + name = Debug; + }; + 15C1C07219865E5F00A46ACC /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = YES; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + EXECUTABLE_PREFIX = ""; + GCC_GENERATE_DEBUGGING_SYMBOLS = NO; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = ""; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + CC_TARGET_OS_MAC, + CC_KEYBOARD_SUPPORT, + ); + HEADER_SEARCH_PATHS = ""; + IPHONEOS_DEPLOYMENT_TARGET = 5.0; + LIBRARY_SEARCH_PATHS = ""; + PRODUCT_NAME = "libluaspine Mac"; + TARGETED_DEVICE_FAMILY = "1,2"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../../platform/mac $(SRCROOT)/../../../../external/glfw3/include/mac"; + }; + name = Release; + }; + 15C1C0F91987328E00A46ACC /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = YES; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + EXECUTABLE_PREFIX = ""; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = ""; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + CC_TARGET_OS_MAC, + CC_KEYBOARD_SUPPORT, + ); + HEADER_SEARCH_PATHS = ""; + IPHONEOS_DEPLOYMENT_TARGET = 5.0; + LIBRARY_SEARCH_PATHS = ""; + PRODUCT_NAME = "libluaui Mac"; + TARGETED_DEVICE_FAMILY = "1,2"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../../platform/mac $(SRCROOT)/../../../../external/glfw3/include/mac"; + }; + name = Debug; + }; + 15C1C0FA1987328E00A46ACC /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = YES; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + EXECUTABLE_PREFIX = ""; + GCC_GENERATE_DEBUGGING_SYMBOLS = NO; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = ""; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + CC_TARGET_OS_MAC, + CC_KEYBOARD_SUPPORT, + ); + HEADER_SEARCH_PATHS = ""; + IPHONEOS_DEPLOYMENT_TARGET = 5.0; + LIBRARY_SEARCH_PATHS = ""; + PRODUCT_NAME = "libluaui Mac"; + TARGETED_DEVICE_FAMILY = "1,2"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../../platform/mac $(SRCROOT)/../../../../external/glfw3/include/mac"; + }; + name = Release; + }; + 15C1C17F1987340C00A46ACC /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = YES; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + EXECUTABLE_PREFIX = ""; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = ""; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + CC_TARGET_OS_MAC, + CC_KEYBOARD_SUPPORT, + ); + HEADER_SEARCH_PATHS = ""; + IPHONEOS_DEPLOYMENT_TARGET = 5.0; + LIBRARY_SEARCH_PATHS = ""; + OTHER_LDFLAGS = ""; + PRODUCT_NAME = "libluanetwork Mac"; + TARGETED_DEVICE_FAMILY = "1,2"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../../platform/mac $(SRCROOT)/../../../../external/glfw3/include/mac"; + }; + name = Debug; + }; + 15C1C1801987340C00A46ACC /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = YES; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + EXECUTABLE_PREFIX = ""; + GCC_GENERATE_DEBUGGING_SYMBOLS = NO; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = ""; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + CC_TARGET_OS_MAC, + CC_KEYBOARD_SUPPORT, + ); + HEADER_SEARCH_PATHS = ""; + IPHONEOS_DEPLOYMENT_TARGET = 5.0; + LIBRARY_SEARCH_PATHS = ""; + OTHER_LDFLAGS = ""; + PRODUCT_NAME = "libluanetwork Mac"; + TARGETED_DEVICE_FAMILY = "1,2"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../../platform/mac $(SRCROOT)/../../../../external/glfw3/include/mac"; + }; + name = Release; + }; + 15C1C2CA198748D200A46ACC /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = YES; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + EXECUTABLE_PREFIX = ""; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = ""; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -1035,16 +2494,18 @@ HEADER_SEARCH_PATHS = ""; IPHONEOS_DEPLOYMENT_TARGET = 5.0; LIBRARY_SEARCH_PATHS = "$(SRCROOT)/../../../../external/lua/luajit/prebuilt/mac"; + PRODUCT_NAME = "libluacocos2d Mac"; TARGETED_DEVICE_FAMILY = "1,2"; USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../../platform/mac $(SRCROOT)/../../../../external/glfw3/include/mac"; }; name = Debug; }; - 1A6FB52F17854BC200CDF010 /* Release */ = { + 15C1C2CB198748D200A46ACC /* Release */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = YES; ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + EXECUTABLE_PREFIX = ""; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = ""; @@ -1056,14 +2517,380 @@ HEADER_SEARCH_PATHS = ""; IPHONEOS_DEPLOYMENT_TARGET = 5.0; LIBRARY_SEARCH_PATHS = "$(SRCROOT)/../../../../external/lua/luajit/prebuilt/mac"; + PRODUCT_NAME = "libluacocos2d Mac"; TARGETED_DEVICE_FAMILY = "1,2"; USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../../platform/mac $(SRCROOT)/../../../../external/glfw3/include/mac"; }; name = Release; }; + 15D1F2AD1994B2AD00302043 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Debug; + }; + 15D1F2AE1994B2AD00302043 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Release; + }; + 15D1F2C21994B2DA00302043 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = iphoneos; + SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; + VALID_ARCHS = "arm64 armv7 armv7s"; + }; + name = Debug; + }; + 15D1F2C31994B2DA00302043 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = iphoneos; + SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; + VALID_ARCHS = "arm64 armv7 armv7s"; + }; + name = Release; + }; + 15EFA2F7198B2791000C57D3 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = YES; + EXECUTABLE_PREFIX = ""; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = ""; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + CC_TARGET_OS_IPHONE, + ); + HEADER_SEARCH_PATHS = ""; + IPHONEOS_DEPLOYMENT_TARGET = 5.1; + LIBRARY_SEARCH_PATHS = ""; + PRODUCT_NAME = "libluacocosbuilder iOS"; + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../../platform/ios"; + }; + name = Debug; + }; + 15EFA2F8198B2791000C57D3 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = YES; + EXECUTABLE_PREFIX = ""; + GCC_GENERATE_DEBUGGING_SYMBOLS = NO; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = ""; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + CC_TARGET_OS_IPHONE, + ); + HEADER_SEARCH_PATHS = ""; + IPHONEOS_DEPLOYMENT_TARGET = 5.1; + LIBRARY_SEARCH_PATHS = ""; + PRODUCT_NAME = "libluacocosbuilder iOS"; + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../../platform/ios"; + }; + name = Release; + }; + 15EFA378198B28A8000C57D3 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = YES; + EXECUTABLE_PREFIX = ""; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = ""; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + CC_TARGET_OS_IPHONE, + ); + HEADER_SEARCH_PATHS = ""; + IPHONEOS_DEPLOYMENT_TARGET = 5.1; + LIBRARY_SEARCH_PATHS = ""; + PRODUCT_NAME = "libluaui iOS"; + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../../platform/ios"; + }; + name = Debug; + }; + 15EFA379198B28A8000C57D3 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = YES; + EXECUTABLE_PREFIX = ""; + GCC_GENERATE_DEBUGGING_SYMBOLS = NO; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = ""; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + CC_TARGET_OS_IPHONE, + ); + HEADER_SEARCH_PATHS = ""; + IPHONEOS_DEPLOYMENT_TARGET = 5.1; + LIBRARY_SEARCH_PATHS = ""; + PRODUCT_NAME = "libluaui iOS"; + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../../platform/ios"; + }; + name = Release; + }; + 15EFA3F9198B2934000C57D3 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = YES; + EXECUTABLE_PREFIX = ""; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = ""; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + CC_TARGET_OS_IPHONE, + ); + HEADER_SEARCH_PATHS = ""; + IPHONEOS_DEPLOYMENT_TARGET = 5.1; + LIBRARY_SEARCH_PATHS = ""; + PRODUCT_NAME = "libluacocostudio iOS"; + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../../platform/ios"; + }; + name = Debug; + }; + 15EFA3FA198B2934000C57D3 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = YES; + EXECUTABLE_PREFIX = ""; + GCC_GENERATE_DEBUGGING_SYMBOLS = NO; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = ""; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + CC_TARGET_OS_IPHONE, + ); + HEADER_SEARCH_PATHS = ""; + IPHONEOS_DEPLOYMENT_TARGET = 5.1; + LIBRARY_SEARCH_PATHS = ""; + PRODUCT_NAME = "libluacocostudio iOS"; + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../../platform/ios"; + }; + name = Release; + }; + 15EFA47D198B2AFD000C57D3 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = YES; + EXECUTABLE_PREFIX = ""; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = ""; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + CC_TARGET_OS_IPHONE, + ); + HEADER_SEARCH_PATHS = ""; + IPHONEOS_DEPLOYMENT_TARGET = 5.1; + LIBRARY_SEARCH_PATHS = ""; + PRODUCT_NAME = "libluaspine iOS"; + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../../platform/ios"; + }; + name = Debug; + }; + 15EFA47E198B2AFD000C57D3 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = YES; + EXECUTABLE_PREFIX = ""; + GCC_GENERATE_DEBUGGING_SYMBOLS = NO; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = ""; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + CC_TARGET_OS_IPHONE, + ); + HEADER_SEARCH_PATHS = ""; + IPHONEOS_DEPLOYMENT_TARGET = 5.1; + LIBRARY_SEARCH_PATHS = ""; + PRODUCT_NAME = "libluaspine iOS"; + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../../platform/ios"; + }; + name = Release; + }; + 15EFA4FC198B2B9B000C57D3 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = YES; + EXECUTABLE_PREFIX = ""; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = ""; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + CC_TARGET_OS_IPHONE, + ); + HEADER_SEARCH_PATHS = ""; + IPHONEOS_DEPLOYMENT_TARGET = 5.1; + LIBRARY_SEARCH_PATHS = ""; + PRODUCT_NAME = "libluanetwork iOS"; + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../../platform/ios"; + }; + name = Debug; + }; + 15EFA4FD198B2B9B000C57D3 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = YES; + EXECUTABLE_PREFIX = ""; + GCC_GENERATE_DEBUGGING_SYMBOLS = NO; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = ""; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + CC_TARGET_OS_IPHONE, + ); + HEADER_SEARCH_PATHS = ""; + IPHONEOS_DEPLOYMENT_TARGET = 5.1; + LIBRARY_SEARCH_PATHS = ""; + PRODUCT_NAME = "libluanetwork iOS"; + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../../platform/ios"; + }; + name = Release; + }; + 15EFA599198B2D13000C57D3 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = YES; + EXECUTABLE_PREFIX = ""; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = ""; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + CC_TARGET_OS_IPHONE, + ); + HEADER_SEARCH_PATHS = ""; + IPHONEOS_DEPLOYMENT_TARGET = 5.1; + LIBRARY_SEARCH_PATHS = ""; + PRODUCT_NAME = "libluacocosdenshion iOS"; + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../../platform/ios"; + }; + name = Debug; + }; + 15EFA59A198B2D13000C57D3 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = YES; + EXECUTABLE_PREFIX = ""; + GCC_GENERATE_DEBUGGING_SYMBOLS = NO; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = ""; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + CC_TARGET_OS_IPHONE, + ); + HEADER_SEARCH_PATHS = ""; + IPHONEOS_DEPLOYMENT_TARGET = 5.1; + LIBRARY_SEARCH_PATHS = ""; + PRODUCT_NAME = "libluacocosdenshion iOS"; + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../../platform/ios"; + }; + name = Release; + }; + 15EFA614198B2DAA000C57D3 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = YES; + EXECUTABLE_PREFIX = ""; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = ""; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + CC_TARGET_OS_IPHONE, + ); + HEADER_SEARCH_PATHS = ""; + IPHONEOS_DEPLOYMENT_TARGET = 5.1; + LIBRARY_SEARCH_PATHS = ( + "$(SRCROOT)/../../../../external/lua/luajit/prebuilt/ios", + "$(SRCROOT)/../../../../external/lua/lua/prebuilt/ios", + ); + "OTHER_LDFLAGS[sdk=iphonesimulator7.1]" = "-llua"; + "OTHER_LDFLAGS[sdk=iphonesimulator8.0]" = "-llua"; + PRODUCT_NAME = "libluacocos2d iOS"; + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../../platform/ios"; + }; + name = Debug; + }; + 15EFA615198B2DAA000C57D3 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = YES; + EXECUTABLE_PREFIX = ""; + GCC_GENERATE_DEBUGGING_SYMBOLS = NO; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = ""; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + CC_TARGET_OS_IPHONE, + ); + HEADER_SEARCH_PATHS = ""; + IPHONEOS_DEPLOYMENT_TARGET = 5.1; + LIBRARY_SEARCH_PATHS = ( + "$(SRCROOT)/../../../../external/lua/luajit/prebuilt/ios", + "$(SRCROOT)/../../../../external/lua/lua/prebuilt/ios", + ); + "OTHER_LDFLAGS[sdk=iphonesimulator7.1]" = "-llua"; + "OTHER_LDFLAGS[sdk=iphonesimulator8.0]" = "-llua"; + PRODUCT_NAME = "libluacocos2d iOS"; + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../../platform/ios"; + }; + name = Release; + }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ + 1516227919A0F32D006099B8 /* Build configuration list for PBXNativeTarget "libluacocos3d Mac" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 1516227A19A0F32D006099B8 /* Debug */, + 1516227B19A0F32D006099B8 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 151622B819A0F45E006099B8 /* Build configuration list for PBXNativeTarget "libluacocos3d iOS" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 151622B919A0F45E006099B8 /* Debug */, + 151622BA19A0F45E006099B8 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; 1551A339158F2AB200E66CFE /* Build configuration list for PBXProject "cocos2d_lua_bindings" */ = { isa = XCConfigurationList; buildConfigurations = ( @@ -1073,20 +2900,164 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 1A11978E178526AA00D62A44 /* Build configuration list for PBXNativeTarget "luabindings iOS" */ = { + 155CA3401988C494006E0A08 /* Build configuration list for PBXNativeTarget "libluaextension iOS" */ = { isa = XCConfigurationList; buildConfigurations = ( - 1A11978F178526AA00D62A44 /* Debug */, - 1A119790178526AA00D62A44 /* Release */, + 155CA3411988C494006E0A08 /* Debug */, + 155CA3421988C494006E0A08 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 1A6FB52D17854BC200CDF010 /* Build configuration list for PBXNativeTarget "luabindings Mac" */ = { + 15C1BDD71986538000A46ACC /* Build configuration list for PBXNativeTarget "libluaextension Mac" */ = { isa = XCConfigurationList; buildConfigurations = ( - 1A6FB52E17854BC200CDF010 /* Debug */, - 1A6FB52F17854BC200CDF010 /* Release */, + 15C1BDD81986538000A46ACC /* Debug */, + 15C1BDD91986538000A46ACC /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 15C1BEDE198654BE00A46ACC /* Build configuration list for PBXNativeTarget "libluacocosbuilder Mac" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 15C1BEDF198654BE00A46ACC /* Debug */, + 15C1BEE0198654BE00A46ACC /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 15C1BF6619865A0600A46ACC /* Build configuration list for PBXNativeTarget "libluacocosdenshion Mac" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 15C1BF6719865A0600A46ACC /* Debug */, + 15C1BF6819865A0600A46ACC /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 15C1BFEA19865C2000A46ACC /* Build configuration list for PBXNativeTarget "libluacocostudio Mac" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 15C1BFEB19865C2000A46ACC /* Debug */, + 15C1BFEC19865C2000A46ACC /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 15C1C07019865E5F00A46ACC /* Build configuration list for PBXNativeTarget "libluaspine Mac" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 15C1C07119865E5F00A46ACC /* Debug */, + 15C1C07219865E5F00A46ACC /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 15C1C0F81987328E00A46ACC /* Build configuration list for PBXNativeTarget "libluaui Mac" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 15C1C0F91987328E00A46ACC /* Debug */, + 15C1C0FA1987328E00A46ACC /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 15C1C17E1987340C00A46ACC /* Build configuration list for PBXNativeTarget "libluanetwork Mac" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 15C1C17F1987340C00A46ACC /* Debug */, + 15C1C1801987340C00A46ACC /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 15C1C2C9198748D200A46ACC /* Build configuration list for PBXNativeTarget "libluacocos2d Mac" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 15C1C2CA198748D200A46ACC /* Debug */, + 15C1C2CB198748D200A46ACC /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 15D1F2AF1994B2AD00302043 /* Build configuration list for PBXAggregateTarget "build all lualibs Mac" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 15D1F2AD1994B2AD00302043 /* Debug */, + 15D1F2AE1994B2AD00302043 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 15D1F2C11994B2DA00302043 /* Build configuration list for PBXAggregateTarget "build all lualibs iOS" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 15D1F2C21994B2DA00302043 /* Debug */, + 15D1F2C31994B2DA00302043 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 15EFA2F6198B2791000C57D3 /* Build configuration list for PBXNativeTarget "libluacocosbuilder iOS" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 15EFA2F7198B2791000C57D3 /* Debug */, + 15EFA2F8198B2791000C57D3 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 15EFA377198B28A8000C57D3 /* Build configuration list for PBXNativeTarget "libluaui iOS" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 15EFA378198B28A8000C57D3 /* Debug */, + 15EFA379198B28A8000C57D3 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 15EFA3F8198B2934000C57D3 /* Build configuration list for PBXNativeTarget "libluacocostudio iOS" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 15EFA3F9198B2934000C57D3 /* Debug */, + 15EFA3FA198B2934000C57D3 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 15EFA47C198B2AFD000C57D3 /* Build configuration list for PBXNativeTarget "libluaspine iOS" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 15EFA47D198B2AFD000C57D3 /* Debug */, + 15EFA47E198B2AFD000C57D3 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 15EFA4FB198B2B9B000C57D3 /* Build configuration list for PBXNativeTarget "libluanetwork iOS" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 15EFA4FC198B2B9B000C57D3 /* Debug */, + 15EFA4FD198B2B9B000C57D3 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 15EFA598198B2D13000C57D3 /* Build configuration list for PBXNativeTarget "libluacocosdenshion iOS" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 15EFA599198B2D13000C57D3 /* Debug */, + 15EFA59A198B2D13000C57D3 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 15EFA613198B2DAA000C57D3 /* Build configuration list for PBXNativeTarget "libluacocos2d iOS" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 15EFA614198B2DAA000C57D3 /* Debug */, + 15EFA615198B2DAA000C57D3 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/xcshareddata/xcschemes/luabindings Mac.xcscheme b/cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/xcshareddata/xcschemes/luabindings Mac.xcscheme deleted file mode 100644 index 59ef8fc5d8..0000000000 --- a/cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/xcshareddata/xcschemes/luabindings Mac.xcscheme +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/xcshareddata/xcschemes/luabindings iOS.xcscheme b/cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/xcshareddata/xcschemes/luabindings iOS.xcscheme deleted file mode 100644 index ca661aa036..0000000000 --- a/cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/xcshareddata/xcschemes/luabindings iOS.xcscheme +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cocos/scripting/lua-bindings/proj.win32/liblua.vcxproj.filters b/cocos/scripting/lua-bindings/proj.win32/liblua.vcxproj.filters deleted file mode 100644 index 17e309c94c..0000000000 --- a/cocos/scripting/lua-bindings/proj.win32/liblua.vcxproj.filters +++ /dev/null @@ -1,386 +0,0 @@ - - - - - {8d269c90-26ad-4ce8-b355-d8df01d59914} - - - {25c7b94b-a9a1-4b93-b285-93c9b620e2ad} - - - {af4b7d5f-f563-4069-ade8-c1a954e6fe5e} - - - {c36f2204-a252-47c0-b36c-b84cda218746} - - - {24fae6d6-ebb5-4da1-b0da-3f3845a9e9a9} - - - {cc863463-a948-487a-aacd-dc233c3e5200} - - - {1fa7ff75-c142-4928-8aef-e6a2eb2b465f} - - - - - auto - - - auto - - - auto - - - auto - - - auto - - - auto - - - manual - - - manual - - - manual - - - manual - - - manual - - - manual - - - manual - - - manual - - - manual - - - manual - - - manual - - - manual - - - manual - - - manual - - - manual - - - manual - - - manual - - - manual - - - manual - - - manual - - - manual - - - manual - - - luasocket - - - luasocket - - - luasocket - - - luasocket - - - luasocket - - - luasocket - - - luasocket - - - luasocket - - - luasocket - - - luasocket - - - luasocket - - - luasocket - - - luasocket - - - tolua - - - tolua - - - tolua - - - tolua - - - tolua - - - xxtea - - - manual - - - auto - - - - - auto - - - auto - - - auto - - - auto - - - auto - - - auto - - - manual - - - manual - - - manual - - - manual - - - manual - - - manual - - - manual - - - manual - - - manual - - - manual - - - manual - - - manual - - - manual - - - manual - - - manual - - - manual - - - manual - - - manual - - - manual - - - manual - - - manual - - - manual - - - luasocket - - - luasocket - - - luasocket - - - luasocket - - - luasocket - - - luasocket - - - luasocket - - - luasocket - - - luasocket - - - luasocket - - - luasocket - - - luasocket - - - luasocket - - - luasocket - - - tolua - - - tolua - - - luajit - - - luajit - - - luajit - - - luajit - - - xxtea - - - manual - - - auto - - - - - script - - - script - - - script - - - script - - - script - - - script - - - script - - - script - - - script - - - script - - - script - - - script - - - script - - - script - - - script - - - script - - - script - - - script - - - \ No newline at end of file diff --git a/cocos/scripting/lua-bindings/proj.win32/liblua.vcxproj b/cocos/scripting/lua-bindings/proj.win32/libluacocos2d.vcxproj similarity index 61% rename from cocos/scripting/lua-bindings/proj.win32/liblua.vcxproj rename to cocos/scripting/lua-bindings/proj.win32/libluacocos2d.vcxproj index 8afd7fae0a..cfccfeb76e 100644 --- a/cocos/scripting/lua-bindings/proj.win32/liblua.vcxproj +++ b/cocos/scripting/lua-bindings/proj.win32/libluacocos2d.vcxproj @@ -11,19 +11,6 @@ - - - - - - - - - - - - - @@ -32,33 +19,19 @@ - - - - - + + + + + + - - - - - - - - - - - - - - - @@ -66,77 +39,49 @@ - - - - - - - - - - - - - - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + - - + + + + {98a51ba8-fc3a-415b-ac8f-8c7bd464e93e} + - {DDC3E27F-004D-4DD4-9DD3-931A013D2159} - liblua + {9F2D6CE6-C893-4400-B50C-6DB70CC2562F} + libluacocos2d Win32Proj @@ -173,9 +118,9 @@ <_ProjectFileVersion>10.0.40219.1 $(SolutionDir)$(Configuration).win32\ - $(Configuration).win32\ + $(Configuration).win32\$(ProjectName)\ $(SolutionDir)$(Configuration).win32\ - $(Configuration).win32\ + $(Configuration).win32\$(ProjectName)\ AllRules.ruleset @@ -192,7 +137,7 @@ Disabled - $(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)cocos\ui;$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\editor-support\cocostudio;$(EngineRoot)cocos\editor-support\cocosbuilder;$(EngineRoot)cocos\editor-support\spine;$(EngineRoot)cocos\audio\include;$(EngineRoot)extensions;$(EngineRoot)extensions\network;$(EngineRoot)external;$(EngineRoot)external\libwebsockets\win32\include;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\lua\luajit\include;$(EngineRoot)external\lua;$(EngineRoot)cocos\scripting\lua-bindings\auto;$(EngineRoot)cocos\scripting\lua-bindings\manual;$(EngineRoot)cocos\2d;$(EngineRoot)cocos\3d;%(AdditionalIncludeDirectories) + $(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\lua\luajit\include;$(EngineRoot)external\lua;$(EngineRoot)cocos\scripting\lua-bindings\auto;$(EngineRoot)cocos\scripting\lua-bindings\manual;$(EngineRoot)cocos\2d;$(EngineRoot)cocos\3d;$(EngineRoot)cocos\scripting\lua-bindings\manual\extension;$(EngineRoot)cocos\scripting\lua-bindings\manual\cocostudio;$(EngineRoot)cocos\scripting\lua-bindings\manual\ui;$(EngineRoot)cocos\scripting\lua-bindings\manual\cocos2d;$(EngineRoot)extensions;%(AdditionalIncludeDirectories) WIN32;_WINDOWS;_DEBUG;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) false EnableFastChecks @@ -224,7 +169,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\lua\luajit\prebuilt\win32\*.*" "$ MinSpace true - $(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)cocos\ui;$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\editor-support\cocostudio;$(EngineRoot)cocos\editor-support\cocosbuilder;$(EngineRoot)cocos\editor-support\spine;$(EngineRoot)cocos\audio\include;$(EngineRoot)extensions;$(EngineRoot)extensions\network;$(EngineRoot)external;$(EngineRoot)external\libwebsockets\win32\include;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\lua\luajit\include;$(EngineRoot)external\lua;$(EngineRoot)cocos\scripting\lua-bindings\auto;$(EngineRoot)cocos\scripting\lua-bindings\manual;$(EngineRoot)cocos\2d;$(EngineRoot)cocos\3d;%(AdditionalIncludeDirectories) + $(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\lua\luajit\include;$(EngineRoot)external\lua;$(EngineRoot)cocos\scripting\lua-bindings\auto;$(EngineRoot)cocos\scripting\lua-bindings\manual;$(EngineRoot)cocos\2d;$(EngineRoot)cocos\3d;$(EngineRoot)cocos\scripting\lua-bindings\manual\extension;$(EngineRoot)cocos\scripting\lua-bindings\manual\cocostudio;$(EngineRoot)cocos\scripting\lua-bindings\manual\ui;$(EngineRoot)cocos\scripting\lua-bindings\manual\cocos2d;$(EngineRoot)extensions;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;LIBLUA_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreadedDLL true diff --git a/cocos/scripting/lua-bindings/proj.win32/libluacocos2d.vcxproj.filters b/cocos/scripting/lua-bindings/proj.win32/libluacocos2d.vcxproj.filters new file mode 100644 index 0000000000..6d63a2b301 --- /dev/null +++ b/cocos/scripting/lua-bindings/proj.win32/libluacocos2d.vcxproj.filters @@ -0,0 +1,206 @@ + + + + + {8d269c90-26ad-4ce8-b355-d8df01d59914} + + + {25c7b94b-a9a1-4b93-b285-93c9b620e2ad} + + + {af4b7d5f-f563-4069-ade8-c1a954e6fe5e} + + + {24fae6d6-ebb5-4da1-b0da-3f3845a9e9a9} + + + {cc863463-a948-487a-aacd-dc233c3e5200} + + + {1fa7ff75-c142-4928-8aef-e6a2eb2b465f} + + + {d326dcc4-b1e3-4326-95c2-c14144076fd9} + + + + + auto + + + tolua + + + tolua + + + tolua + + + tolua + + + tolua + + + xxtea + + + auto + + + manual + + + manual + + + manual + + + manual + + + manual + + + manual + + + manual + + + manual\cocos2d + + + manual\cocos2d + + + manual\cocos2d + + + manual\cocos2d + + + manual\cocos2d + + + manual\cocos2d + + + auto + + + + + auto + + + tolua + + + tolua + + + luajit + + + luajit + + + luajit + + + luajit + + + xxtea + + + auto + + + manual + + + manual + + + manual + + + manual + + + manual + + + manual + + + manual + + + manual\cocos2d + + + manual\cocos2d + + + manual\cocos2d + + + manual\cocos2d + + + manual\cocos2d + + + manual\cocos2d + + + auto + + + + + script + + + script + + + script + + + script + + + script + + + script + + + script + + + script + + + script + + + script + + + script + + + script + + + script + + + \ No newline at end of file diff --git a/cocos/scripting/lua-bindings/proj.win32/libluacocos3d.vcxproj b/cocos/scripting/lua-bindings/proj.win32/libluacocos3d.vcxproj new file mode 100644 index 0000000000..723b917192 --- /dev/null +++ b/cocos/scripting/lua-bindings/proj.win32/libluacocos3d.vcxproj @@ -0,0 +1,147 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + + + + + + + + + + {e24950fa-5bc1-4aee-a900-4f0259354bf0} + + + + {06840490-14A4-43D6-88BC-AAFA44D043EB} + libluacocos3d + Win32Proj + + + + StaticLibrary + Unicode + v100 + v110 + v110_xp + v120 + v120_xp + + + StaticLibrary + Unicode + v100 + v110 + v110_xp + v120 + v120_xp + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + $(SolutionDir)$(Configuration).win32\ + $(Configuration).win32\$(ProjectName)\ + $(SolutionDir)$(Configuration).win32\ + $(Configuration).win32\$(ProjectName)\ + AllRules.ruleset + + + AllRules.ruleset + + + + + $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath) + + + $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath) + + + + Disabled + $(EngineRoot)cocos\3d;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\lua\luajit\include;$(EngineRoot)cocos\scripting\lua-bindings\auto;$(EngineRoot)cocos\scripting\lua-bindings\manual;$(EngineRoot)cocos\scripting\lua-bindings\manual\cocos2d;$(EngineRoot)cocos\scripting\lua-bindings\manual\3d;%(AdditionalIncludeDirectories) + WIN32;_WINDOWS;_DEBUG;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + false + EnableFastChecks + MultiThreadedDebugDLL + + + + + + + Level3 + OldStyle + 4800;4267;4251;4244;%(DisableSpecificWarnings) + true + + + %(AdditionalLibraryDirectories) + + + + + + + + + + + + + MinSpace + true + $(EngineRoot)cocos\3d;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\lua\luajit\include;$(EngineRoot)cocos\scripting\lua-bindings\auto;$(EngineRoot)cocos\scripting\lua-bindings\manual;$(EngineRoot)cocos\scripting\lua-bindings\manual\cocos2d;$(EngineRoot)cocos\scripting\lua-bindings\manual\3d;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;LIBLUA_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDLL + true + + + + + + + Level3 + None + 4800;4267;4251;4244;%(DisableSpecificWarnings) + true + false + + + libcocos2d.lib;%(AdditionalLibraryDirectories) + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cocos/scripting/lua-bindings/proj.win32/libluacocos3d.vcxproj.filters b/cocos/scripting/lua-bindings/proj.win32/libluacocos3d.vcxproj.filters new file mode 100644 index 0000000000..b75ad2da73 --- /dev/null +++ b/cocos/scripting/lua-bindings/proj.win32/libluacocos3d.vcxproj.filters @@ -0,0 +1,30 @@ + + + + + {8d269c90-26ad-4ce8-b355-d8df01d59914} + + + {25c7b94b-a9a1-4b93-b285-93c9b620e2ad} + + + {af4b7d5f-f563-4069-ade8-c1a954e6fe5e} + + + + + auto + + + manual + + + + + auto + + + manual + + + \ No newline at end of file diff --git a/cocos/ui/proj.win32/libGUI.vcxproj.user b/cocos/scripting/lua-bindings/proj.win32/libluacocos3d.vcxproj.user similarity index 100% rename from cocos/ui/proj.win32/libGUI.vcxproj.user rename to cocos/scripting/lua-bindings/proj.win32/libluacocos3d.vcxproj.user diff --git a/cocos/scripting/lua-bindings/proj.win32/libluacocosbuilder.vcxproj b/cocos/scripting/lua-bindings/proj.win32/libluacocosbuilder.vcxproj new file mode 100644 index 0000000000..f5b6e86921 --- /dev/null +++ b/cocos/scripting/lua-bindings/proj.win32/libluacocosbuilder.vcxproj @@ -0,0 +1,153 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + + + + + + + + + + + + + + + + {811c0dab-7b96-4bd3-a154-b7572b58e4ab} + + + + {F8198014-F4F3-49F0-88AB-C1969A5829AF} + libluacocosbuilder + Win32Proj + + + + StaticLibrary + Unicode + v100 + v110 + v110_xp + v120 + v120_xp + + + StaticLibrary + Unicode + v100 + v110 + v110_xp + v120 + v120_xp + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + $(SolutionDir)$(Configuration).win32\ + $(Configuration).win32\$(ProjectName)\ + $(SolutionDir)$(Configuration).win32\ + $(Configuration).win32\$(ProjectName)\ + AllRules.ruleset + + + AllRules.ruleset + + + + + $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath) + + + $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath) + + + + Disabled + $(EngineRoot);$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\editor-support\cocosbuilder;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\lua\luajit\include;$(EngineRoot)cocos\scripting\lua-bindings\auto;$(EngineRoot)cocos\scripting\lua-bindings\manual;$(EngineRoot)cocos\scripting\lua-bindings\manual\cocos2d;%(AdditionalIncludeDirectories) + WIN32;_WINDOWS;_DEBUG;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + false + EnableFastChecks + MultiThreadedDebugDLL + + + + + + + Level3 + OldStyle + 4800;4267;4251;4244;%(DisableSpecificWarnings) + true + + + %(AdditionalLibraryDirectories) + + + + + + + + + + + + + MinSpace + true + $(EngineRoot);$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\editor-support\cocosbuilder;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\lua\luajit\include;$(EngineRoot)cocos\scripting\lua-bindings\auto;$(EngineRoot)cocos\scripting\lua-bindings\manual;$(EngineRoot)cocos\scripting\lua-bindings\manual\cocos2d;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;LIBLUA_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDLL + true + + + + + + + Level3 + None + 4800;4267;4251;4244;%(DisableSpecificWarnings) + true + false + + + libcocos2d.lib;%(AdditionalLibraryDirectories) + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cocos/scripting/lua-bindings/proj.win32/libluacocosbuilder.vcxproj.filters b/cocos/scripting/lua-bindings/proj.win32/libluacocosbuilder.vcxproj.filters new file mode 100644 index 0000000000..8be7929c39 --- /dev/null +++ b/cocos/scripting/lua-bindings/proj.win32/libluacocosbuilder.vcxproj.filters @@ -0,0 +1,47 @@ + + + + + {8d269c90-26ad-4ce8-b355-d8df01d59914} + + + {25c7b94b-a9a1-4b93-b285-93c9b620e2ad} + + + {af4b7d5f-f563-4069-ade8-c1a954e6fe5e} + + + {a70474d7-7a4d-41e4-93de-0a1e24b7ec5c} + + + + + auto + + + manual\cocosbuilder + + + manual\cocosbuilder + + + + + auto + + + manual\cocosbuilder + + + manual\cocosbuilder + + + + + script + + + script + + + \ No newline at end of file diff --git a/cocos/scripting/lua-bindings/proj.win32/libluacocosdenshion.vcxproj b/cocos/scripting/lua-bindings/proj.win32/libluacocosdenshion.vcxproj new file mode 100644 index 0000000000..ec511e58a1 --- /dev/null +++ b/cocos/scripting/lua-bindings/proj.win32/libluacocosdenshion.vcxproj @@ -0,0 +1,152 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + + + + + + + {f8edd7fa-9a51-4e80-baeb-860825d2eac6} + + + + + + + + + + + + {46A7D57A-7F25-4F52-823B-FFAC4FF3A624} + libluacocosdenshion + Win32Proj + + + + StaticLibrary + Unicode + v100 + v110 + v110_xp + v120 + v120_xp + + + StaticLibrary + Unicode + v100 + v110 + v110_xp + v120 + v120_xp + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + $(SolutionDir)$(Configuration).win32\ + $(Configuration).win32\$(ProjectName)\ + $(SolutionDir)$(Configuration).win32\ + $(Configuration).win32\$(ProjectName)\ + AllRules.ruleset + + + AllRules.ruleset + + + + + $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath) + + + $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath) + + + + Disabled + $(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\scripting\lua-bindings\auto;$(EngineRoot)cocos\scripting\lua-bindings\manual\cocosdenshion;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\lua\luajit\include;$(EngineRoot)cocos\scripting\lua-bindings\manual;%(AdditionalIncludeDirectories) + WIN32;_WINDOWS;_DEBUG;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + false + EnableFastChecks + MultiThreadedDebugDLL + + + + + + + Level3 + OldStyle + 4800;4267;4251;4244;%(DisableSpecificWarnings) + true + + + %(AdditionalLibraryDirectories) + + + + + + + + + + + + + MinSpace + true + $(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\scripting\lua-bindings\auto;$(EngineRoot)cocos\scripting\lua-bindings\manual\cocosdenshion;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\lua\luajit\include;$(EngineRoot)cocos\scripting\lua-bindings\manual;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;LIBLUA_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDLL + true + + + + + + + Level3 + None + 4800;4267;4251;4244;%(DisableSpecificWarnings) + true + false + + + libcocos2d.lib;%(AdditionalLibraryDirectories) + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cocos/scripting/lua-bindings/proj.win32/libluacocosdenshion.vcxproj.filters b/cocos/scripting/lua-bindings/proj.win32/libluacocosdenshion.vcxproj.filters new file mode 100644 index 0000000000..8a163cb31d --- /dev/null +++ b/cocos/scripting/lua-bindings/proj.win32/libluacocosdenshion.vcxproj.filters @@ -0,0 +1,44 @@ + + + + + {8d269c90-26ad-4ce8-b355-d8df01d59914} + + + {25c7b94b-a9a1-4b93-b285-93c9b620e2ad} + + + {af4b7d5f-f563-4069-ade8-c1a954e6fe5e} + + + {e6ef7820-87ef-4975-a15d-969267d181ad} + + + + + script + + + script + + + script + + + + + manual\cocosdenshion + + + auto + + + + + manual\cocosdenshion + + + auto + + + \ No newline at end of file diff --git a/cocos/scripting/lua-bindings/proj.win32/libluacocostudio.vcxproj b/cocos/scripting/lua-bindings/proj.win32/libluacocostudio.vcxproj new file mode 100644 index 0000000000..d16b5d4bc1 --- /dev/null +++ b/cocos/scripting/lua-bindings/proj.win32/libluacocostudio.vcxproj @@ -0,0 +1,152 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + + + + + + + + + + + + + + + {b57cf53f-2e49-4031-9822-047cc0e6bde2} + + + + {9640951E-C5D0-47B5-9C42-0BCADA261C50} + libluacocostudio + Win32Proj + + + + StaticLibrary + Unicode + v100 + v110 + v110_xp + v120 + v120_xp + + + StaticLibrary + Unicode + v100 + v110 + v110_xp + v120 + v120_xp + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + $(SolutionDir)$(Configuration).win32\ + $(Configuration).win32\$(ProjectName)\ + $(SolutionDir)$(Configuration).win32\ + $(Configuration).win32\$(ProjectName)\ + AllRules.ruleset + + + AllRules.ruleset + + + + + $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath) + + + $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath) + + + + Disabled + $(EngineRoot);$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\editor-support\cocostudio;$(EngineRoot)external;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\lua\luajit\include;$(EngineRoot)cocos\scripting\lua-bindings\auto;$(EngineRoot)cocos\scripting\lua-bindings\manual;$(EngineRoot)cocos\scripting\lua-bindings\manual\cocos2d;$(EngineRoot)cocos\scripting\lua-bindings\manual\cocostudio;%(AdditionalIncludeDirectories) + WIN32;_WINDOWS;_DEBUG;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + false + EnableFastChecks + MultiThreadedDebugDLL + + + + + + + Level3 + OldStyle + 4800;4267;4251;4244;%(DisableSpecificWarnings) + true + + + %(AdditionalLibraryDirectories) + + + + + + + + + + + + + MinSpace + true + $(EngineRoot);$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\editor-support\cocostudio;$(EngineRoot)external;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\lua\luajit\include;$(EngineRoot)cocos\scripting\lua-bindings\auto;$(EngineRoot)cocos\scripting\lua-bindings\manual;$(EngineRoot)cocos\scripting\lua-bindings\manual\cocos2d;$(EngineRoot)cocos\scripting\lua-bindings\manual\cocostudio;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;LIBLUA_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDLL + true + + + + + + + Level3 + None + 4800;4267;4251;4244;%(DisableSpecificWarnings) + true + false + + + libcocos2d.lib;%(AdditionalLibraryDirectories) + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cocos/scripting/lua-bindings/proj.win32/libluacocostudio.vcxproj.filters b/cocos/scripting/lua-bindings/proj.win32/libluacocostudio.vcxproj.filters new file mode 100644 index 0000000000..f88ce0910f --- /dev/null +++ b/cocos/scripting/lua-bindings/proj.win32/libluacocostudio.vcxproj.filters @@ -0,0 +1,44 @@ + + + + + {8d269c90-26ad-4ce8-b355-d8df01d59914} + + + {25c7b94b-a9a1-4b93-b285-93c9b620e2ad} + + + {af4b7d5f-f563-4069-ade8-c1a954e6fe5e} + + + {900827d1-f640-4a49-b4bd-34c6d4a4b8b5} + + + + + auto + + + manual\cocostudio + + + + + auto + + + manual\cocostudio + + + + + script + + + script + + + script + + + \ No newline at end of file diff --git a/cocos/scripting/lua-bindings/proj.win32/libluaextension.vcxproj b/cocos/scripting/lua-bindings/proj.win32/libluaextension.vcxproj new file mode 100644 index 0000000000..05d8ca4d15 --- /dev/null +++ b/cocos/scripting/lua-bindings/proj.win32/libluaextension.vcxproj @@ -0,0 +1,153 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + + + + + + + + + + + + + + + + {21b2c324-891f-48ea-ad1a-5ae13de12e28} + + + + {7068296E-38A4-4BCA-85DB-3A09BD014847} + libluaextension + Win32Proj + + + + StaticLibrary + Unicode + v100 + v110 + v110_xp + v120 + v120_xp + + + StaticLibrary + Unicode + v100 + v110 + v110_xp + v120 + v120_xp + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + $(SolutionDir)$(Configuration).win32\ + $(Configuration).win32\$(ProjectName)\ + $(SolutionDir)$(Configuration).win32\ + $(Configuration).win32\$(ProjectName)\ + AllRules.ruleset + + + AllRules.ruleset + + + + + $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath) + + + $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath) + + + + Disabled + $(EngineRoot);$(EngineRoot)extensions;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\lua\luajit\include;$(EngineRoot)cocos\scripting\lua-bindings\auto;$(EngineRoot)cocos\scripting\lua-bindings\manual;$(EngineRoot)cocos\scripting\lua-bindings\manual\cocos2d;$(EngineRoot)cocos\scripting\lua-bindings\manual\extension;%(AdditionalIncludeDirectories) + WIN32;_WINDOWS;_DEBUG;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + false + EnableFastChecks + MultiThreadedDebugDLL + + + + + + + Level3 + OldStyle + 4800;4267;4251;4244;%(DisableSpecificWarnings) + true + + + %(AdditionalLibraryDirectories) + + + + + + + + + + + + + MinSpace + true + $(EngineRoot);$(EngineRoot)extensions;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\lua\luajit\include;$(EngineRoot)cocos\scripting\lua-bindings\auto;$(EngineRoot)cocos\scripting\lua-bindings\manual;$(EngineRoot)cocos\scripting\lua-bindings\manual\cocos2d;$(EngineRoot)cocos\scripting\lua-bindings\manual\extension;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;LIBLUA_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDLL + true + + + + + + + Level3 + None + 4800;4267;4251;4244;%(DisableSpecificWarnings) + true + false + + + libcocos2d.lib;%(AdditionalLibraryDirectories) + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cocos/scripting/lua-bindings/proj.win32/libluaextension.vcxproj.filters b/cocos/scripting/lua-bindings/proj.win32/libluaextension.vcxproj.filters new file mode 100644 index 0000000000..78457289b0 --- /dev/null +++ b/cocos/scripting/lua-bindings/proj.win32/libluaextension.vcxproj.filters @@ -0,0 +1,47 @@ + + + + + {8d269c90-26ad-4ce8-b355-d8df01d59914} + + + {25c7b94b-a9a1-4b93-b285-93c9b620e2ad} + + + {af4b7d5f-f563-4069-ade8-c1a954e6fe5e} + + + {af407ec6-3b69-4f0f-a053-6f68467c82e9} + + + + + auto + + + manual\extension + + + + + auto + + + manual\extension + + + + + script + + + script + + + script + + + script + + + \ No newline at end of file diff --git a/cocos/scripting/lua-bindings/proj.win32/libluanetwork.vcxproj b/cocos/scripting/lua-bindings/proj.win32/libluanetwork.vcxproj new file mode 100644 index 0000000000..7c6a85f158 --- /dev/null +++ b/cocos/scripting/lua-bindings/proj.win32/libluanetwork.vcxproj @@ -0,0 +1,178 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {df2638c0-8128-4847-867c-6eafe3dee7b5} + + + + {65E52F4B-703F-419E-AD67-926241A10042} + libluacocosdenshion + Win32Proj + + + + StaticLibrary + Unicode + v100 + v110 + v110_xp + v120 + v120_xp + + + StaticLibrary + Unicode + v100 + v110 + v110_xp + v120 + v120_xp + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + $(SolutionDir)$(Configuration).win32\ + $(Configuration).win32\$(ProjectName)\ + $(SolutionDir)$(Configuration).win32\ + $(Configuration).win32\$(ProjectName)\ + AllRules.ruleset + + + AllRules.ruleset + + + + + $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath) + + + $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath) + + + + Disabled + $(EngineRoot);$(EngineRoot)extensions\network;$(EngineRoot)external\libwebsockets\win32\include;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\lua\luajit\include;$(EngineRoot)cocos\scripting\lua-bindings\manual;$(EngineRoot)cocos\scripting\lua-bindings\manual\cocos2d;$(EngineRoot)external\lua;%(AdditionalIncludeDirectories) + WIN32;_WINDOWS;_DEBUG;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + false + EnableFastChecks + MultiThreadedDebugDLL + + + + + + + Level3 + OldStyle + 4800;4267;4251;4244;%(DisableSpecificWarnings) + true + + + %(AdditionalLibraryDirectories) + + + + + + + + + + + + + MinSpace + true + $(EngineRoot);$(EngineRoot)extensions\network;$(EngineRoot)external\libwebsockets\win32\include;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\lua\luajit\include;$(EngineRoot)cocos\scripting\lua-bindings\manual;$(EngineRoot)cocos\scripting\lua-bindings\manual\cocos2d;$(EngineRoot)external\lua;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;LIBLUA_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDLL + true + + + + + + + Level3 + None + 4800;4267;4251;4244;%(DisableSpecificWarnings) + true + false + + + libcocos2d.lib;%(AdditionalLibraryDirectories) + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cocos/scripting/lua-bindings/proj.win32/libluanetwork.vcxproj.filters b/cocos/scripting/lua-bindings/proj.win32/libluanetwork.vcxproj.filters new file mode 100644 index 0000000000..1591a543b7 --- /dev/null +++ b/cocos/scripting/lua-bindings/proj.win32/libluanetwork.vcxproj.filters @@ -0,0 +1,126 @@ + + + + + {25c7b94b-a9a1-4b93-b285-93c9b620e2ad} + + + {af4b7d5f-f563-4069-ade8-c1a954e6fe5e} + + + {633582d6-6f80-4dd1-b719-951e1c1dc6ff} + + + {0c791425-97c1-4eaa-869d-2454d9670a72} + + + + + manual\network + + + manual\network + + + manual\network + + + manual\network + + + luasocket + + + luasocket + + + luasocket + + + luasocket + + + luasocket + + + luasocket + + + luasocket + + + luasocket + + + luasocket + + + luasocket + + + luasocket + + + luasocket + + + luasocket + + + + + manual\network + + + manual\network + + + manual\network + + + manual\network + + + luasocket + + + luasocket + + + luasocket + + + luasocket + + + luasocket + + + luasocket + + + luasocket + + + luasocket + + + luasocket + + + luasocket + + + luasocket + + + luasocket + + + luasocket + + + luasocket + + + \ No newline at end of file diff --git a/cocos/scripting/lua-bindings/proj.win32/libluaspine.vcxproj b/cocos/scripting/lua-bindings/proj.win32/libluaspine.vcxproj new file mode 100644 index 0000000000..e189ace30c --- /dev/null +++ b/cocos/scripting/lua-bindings/proj.win32/libluaspine.vcxproj @@ -0,0 +1,149 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + + + + + + + + + + + + {b7c2a162-dec9-4418-972e-240ab3cbfcae} + + + + {31EF6AB1-0D9A-4BC6-99B8-2C482EA373C4} + libluaextension + Win32Proj + + + + StaticLibrary + Unicode + v100 + v110 + v110_xp + v120 + v120_xp + + + StaticLibrary + Unicode + v100 + v110 + v110_xp + v120 + v120_xp + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + $(SolutionDir)$(Configuration).win32\ + $(Configuration).win32\luaspine + $(SolutionDir)$(Configuration).win32\ + $(Configuration).win32\luaspine + AllRules.ruleset + + + AllRules.ruleset + + + + + $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath) + + + $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath) + + + + Disabled + $(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\editor-support\spine;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\lua\luajit\include;$(EngineRoot)cocos\scripting\lua-bindings\auto;$(EngineRoot)cocos\scripting\lua-bindings\manual;$(EngineRoot)cocos\scripting\lua-bindings\manual\spine;$(EngineRoot)cocos\scripting\lua-bindings\manual\cocos2d;%(AdditionalIncludeDirectories) + WIN32;_WINDOWS;_DEBUG;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + false + EnableFastChecks + MultiThreadedDebugDLL + + + + + + + Level3 + OldStyle + 4800;4267;4251;4244;%(DisableSpecificWarnings) + true + + + %(AdditionalLibraryDirectories) + + + + + + + + + + + + + MinSpace + true + $(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\editor-support\spine;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\lua\luajit\include;$(EngineRoot)cocos\scripting\lua-bindings\auto;$(EngineRoot)cocos\scripting\lua-bindings\manual;$(EngineRoot)cocos\scripting\lua-bindings\manual\spine;$(EngineRoot)cocos\scripting\lua-bindings\manual\cocos2d;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;LIBLUA_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDLL + true + + + + + + + Level3 + None + 4800;4267;4251;4244;%(DisableSpecificWarnings) + true + false + + + libcocos2d.lib;%(AdditionalLibraryDirectories) + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cocos/scripting/lua-bindings/proj.win32/libluaspine.vcxproj.filters b/cocos/scripting/lua-bindings/proj.win32/libluaspine.vcxproj.filters new file mode 100644 index 0000000000..19b40b6120 --- /dev/null +++ b/cocos/scripting/lua-bindings/proj.win32/libluaspine.vcxproj.filters @@ -0,0 +1,33 @@ + + + + + {8d269c90-26ad-4ce8-b355-d8df01d59914} + + + {25c7b94b-a9a1-4b93-b285-93c9b620e2ad} + + + + + auto + + + manual + + + manual + + + + + auto + + + manual + + + manual + + + \ No newline at end of file diff --git a/cocos/scripting/lua-bindings/proj.win32/libluaui.vcxproj b/cocos/scripting/lua-bindings/proj.win32/libluaui.vcxproj new file mode 100644 index 0000000000..b0c50b170d --- /dev/null +++ b/cocos/scripting/lua-bindings/proj.win32/libluaui.vcxproj @@ -0,0 +1,156 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + + + + + + + + + + + + + + + + + + + {7e06e92c-537a-442b-9e4a-4761c84f8a1a} + + + + {FE78EEBB-3DBB-4713-8CBF-63D742C5BD82} + libluaui + Win32Proj + + + + StaticLibrary + Unicode + v100 + v110 + v110_xp + v120 + v120_xp + + + StaticLibrary + Unicode + v100 + v110 + v110_xp + v120 + v120_xp + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + $(SolutionDir)$(Configuration).win32\ + $(Configuration).win32\luaui + $(SolutionDir)$(Configuration).win32\ + $(Configuration).win32\luaui + AllRules.ruleset + + + AllRules.ruleset + + + + + $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath) + + + $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath) + + + + Disabled + $(EngineRoot)cocos\ui;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\lua\luajit\include;$(EngineRoot)cocos\scripting\lua-bindings\auto;$(EngineRoot)cocos\scripting\lua-bindings\manual;$(EngineRoot)cocos\scripting\lua-bindings\manual\cocos2d;$(EngineRoot)cocos\scripting\lua-bindings\ui;%(AdditionalIncludeDirectories) + WIN32;_WINDOWS;_DEBUG;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + false + EnableFastChecks + MultiThreadedDebugDLL + + + + + + + Level3 + OldStyle + 4800;4267;4251;4244;%(DisableSpecificWarnings) + true + + + %(AdditionalLibraryDirectories) + + + + + + + + + + + + + MinSpace + true + $(EngineRoot)cocos\ui;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\lua\luajit\include;$(EngineRoot)cocos\scripting\lua-bindings\auto;$(EngineRoot)cocos\scripting\lua-bindings\manual;$(EngineRoot)cocos\scripting\lua-bindings\manual\cocos2d;$(EngineRoot)cocos\scripting\lua-bindings\ui;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;LIBLUA_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDLL + true + + + + + + + Level3 + None + 4800;4267;4251;4244;%(DisableSpecificWarnings) + true + false + + + libcocos2d.lib;%(AdditionalLibraryDirectories) + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cocos/scripting/lua-bindings/proj.win32/libluaui.vcxproj.filters b/cocos/scripting/lua-bindings/proj.win32/libluaui.vcxproj.filters new file mode 100644 index 0000000000..2d25598cd1 --- /dev/null +++ b/cocos/scripting/lua-bindings/proj.win32/libluaui.vcxproj.filters @@ -0,0 +1,53 @@ + + + + + {8d269c90-26ad-4ce8-b355-d8df01d59914} + + + {25c7b94b-a9a1-4b93-b285-93c9b620e2ad} + + + {af4b7d5f-f563-4069-ade8-c1a954e6fe5e} + + + + + auto + + + auto + + + manual + + + manual + + + + + auto + + + auto + + + manual + + + manual + + + + + script + + + script + + + script + + + \ No newline at end of file diff --git a/cocos/scripting/lua-bindings/script/Cocos2d.lua b/cocos/scripting/lua-bindings/script/cocos2d/Cocos2d.lua similarity index 96% rename from cocos/scripting/lua-bindings/script/Cocos2d.lua rename to cocos/scripting/lua-bindings/script/cocos2d/Cocos2d.lua index 2c14f075e9..aa020eb804 100644 --- a/cocos/scripting/lua-bindings/script/Cocos2d.lua +++ b/cocos/scripting/lua-bindings/script/cocos2d/Cocos2d.lua @@ -1,10 +1,5 @@ -require "CocoStudio" - cc = cc or {} -cc.DIRECTOR_PROJECTION_2D = 0 -cc.DIRECTOR_PROJECTION_3D = 1 - function cc.clampf(value, min_inclusive, max_inclusive) -- body local temp = 0 @@ -367,15 +362,3 @@ end function cc.PhysicsMaterial(_density, _restitution, _friction) return { density = _density, restitution = _restitution, friction = _friction } end - -local ConfigType = -{ - NONE = 0, - COCOSTUDIO = 1, -} - -function __onParseConfig(configType,jasonStr) - if configType == ConfigType.COCOSTUDIO then - ccs.TriggerMng.getInstance():parse(jasonStr) - end -end diff --git a/cocos/scripting/lua-bindings/script/Cocos2dConstants.lua b/cocos/scripting/lua-bindings/script/cocos2d/Cocos2dConstants.lua similarity index 81% rename from cocos/scripting/lua-bindings/script/Cocos2dConstants.lua rename to cocos/scripting/lua-bindings/script/cocos2d/Cocos2dConstants.lua index efcac61305..c66734c530 100644 --- a/cocos/scripting/lua-bindings/script/Cocos2dConstants.lua +++ b/cocos/scripting/lua-bindings/script/cocos2d/Cocos2dConstants.lua @@ -186,59 +186,6 @@ cc.PLATFORM_OS_NACL = 7 cc.PLATFORM_OS_EMSCRIPTEN = 8 cc.PLATFORM_OS_TIZEN = 9 -cc.SCROLLVIEW_SCRIPT_SCROLL = 0 -cc.SCROLLVIEW_SCRIPT_ZOOM = 1 -cc.TABLECELL_TOUCHED = 2 -cc.TABLECELL_HIGH_LIGHT = 3 -cc.TABLECELL_UNHIGH_LIGHT = 4 -cc.TABLECELL_WILL_RECYCLE = 5 -cc.TABLECELL_SIZE_FOR_INDEX = 6 -cc.TABLECELL_SIZE_AT_INDEX = 7 -cc.NUMBER_OF_CELLS_IN_TABLEVIEW = 8 - -cc.SCROLLVIEW_DIRECTION_NONE = -1 -cc.SCROLLVIEW_DIRECTION_HORIZONTAL = 0 -cc.SCROLLVIEW_DIRECTION_VERTICAL = 1 -cc.SCROLLVIEW_DIRECTION_BOTH = 2 - -cc.CONTROL_EVENTTYPE_TOUCH_DOWN = 1 -cc.CONTROL_EVENTTYPE_DRAG_INSIDE = 2 -cc.CONTROL_EVENTTYPE_DRAG_OUTSIDE = 4 -cc.CONTROL_EVENTTYPE_DRAG_ENTER = 8 -cc.CONTROL_EVENTTYPE_DRAG_EXIT = 16 -cc.CONTROL_EVENTTYPE_TOUCH_UP_INSIDE = 32 -cc.CONTROL_EVENTTYPE_TOUCH_UP_OUTSIDE = 64 -cc.CONTROL_EVENTTYPE_TOUCH_CANCEL = 128 -cc.CONTROL_EVENTTYPE_VALUE_CHANGED = 256 - -cc.CONTROL_STATE_NORMAL = 1 -cc.CONTROL_STATE_HIGH_LIGHTED = 2 -cc.CONTROL_STATE_DISABLED = 4 -cc.CONTROL_STATE_SELECTED = 8 - - -cc.KEYBOARD_RETURNTYPE_DEFAULT = 0 -cc.KEYBOARD_RETURNTYPE_DONE = 1 -cc.KEYBOARD_RETURNTYPE_SEND = 2 -cc.KEYBOARD_RETURNTYPE_SEARCH = 3 -cc.KEYBOARD_RETURNTYPE_GO = 4 - - -cc.EDITBOX_INPUT_MODE_ANY = 0 -cc.EDITBOX_INPUT_MODE_EMAILADDR = 1 -cc.EDITBOX_INPUT_MODE_NUMERIC = 2 -cc.EDITBOX_INPUT_MODE_PHONENUMBER = 3 -cc.EDITBOX_INPUT_MODE_URL = 4 -cc.EDITBOX_INPUT_MODE_DECIMAL = 5 -cc.EDITBOX_INPUT_MODE_SINGLELINE = 6 - - -cc.EDITBOX_INPUT_FLAG_PASSWORD = 0 -cc.EDITBOX_INPUT_FLAG_SENSITIVE = 1 -cc.EDITBOX_INPUT_FLAG_INITIAL_CAPS_WORD = 2 -cc.EDITBOX_INPUT_FLAG_INITIAL_CAPS_SENTENCE = 3 -cc.EDITBOX_INPUT_FLAG_INITIAL_CAPS_ALL_CHARACTERS = 4 - cc.LANGUAGE_ENGLISH = 0 cc.LANGUAGE_CHINESE = 1 cc.LANGUAGE_FRENCH = 2 @@ -258,39 +205,6 @@ cc.NODE_ON_ENTER_TRANSITION_DID_FINISH = 2 cc.NODE_ON_EXIT_TRANSITION_DID_START = 3 cc.NODE_ON_CLEAN_UP = 4 -cc.CONTROL_STEPPER_PART_MINUS = 0 -cc.CONTROL_STEPPER_PART_PLUS = 1 -cc.CONTROL_STEPPER_PART_NONE = 2 - -cc.TABLEVIEW_FILL_TOPDOWN = 0 -cc.TABLEVIEW_FILL_BOTTOMUP = 1 - -cc.WEBSOCKET_OPEN = 0 -cc.WEBSOCKET_MESSAGE = 1 -cc.WEBSOCKET_CLOSE = 2 -cc.WEBSOCKET_ERROR = 3 - -cc.WEBSOCKET_STATE_CONNECTING = 0 -cc.WEBSOCKET_STATE_OPEN = 1 -cc.WEBSOCKET_STATE_CLOSING = 2 -cc.WEBSOCKET_STATE_CLOSED = 3 - - -cc.XMLHTTPREQUEST_RESPONSE_STRING = 0 -cc.XMLHTTPREQUEST_RESPONSE_ARRAY_BUFFER = 1 -cc.XMLHTTPREQUEST_RESPONSE_BLOB = 2 -cc.XMLHTTPREQUEST_RESPONSE_DOCUMENT = 3 -cc.XMLHTTPREQUEST_RESPONSE_JSON = 4 - -cc.ASSETSMANAGER_CREATE_FILE = 0 -cc.ASSETSMANAGER_NETWORK = 1 -cc.ASSETSMANAGER_NO_NEW_VERSION = 2 -cc.ASSETSMANAGER_UNCOMPRESS = 3 - -cc.ASSETSMANAGER_PROTOCOL_PROGRESS = 0 -cc.ASSETSMANAGER_PROTOCOL_SUCCESS = 1 -cc.ASSETSMANAGER_PROTOCOL_ERROR = 2 - cc.Handler = cc.Handler or {} cc.Handler.NODE = 0 cc.Handler.MENU_CLICKED = 1 @@ -577,38 +491,11 @@ cc.EventCode = CANCELLED = 3, } -cc.ControllerKey = +cc.DIRECTOR_PROJECTION_2D = 0 +cc.DIRECTOR_PROJECTION_3D = 1 + +cc.ConfigType = { - JOYSTICK_LEFT_X = 1000, - JOYSTICK_LEFT_Y = 1001, - JOYSTICK_RIGHT_X = 1002, - JOYSTICK_RIGHT_Y = 1003, - - BUTTON_A = 1004, - BUTTON_B = 1005, - BUTTON_C = 1006, - BUTTON_X = 1007, - BUTTON_Y = 1008, - BUTTON_Z = 1009, - - BUTTON_DPAD_UP = 1010, - BUTTON_DPAD_DOWN = 1011, - BUTTON_DPAD_LEFT = 1012, - BUTTON_DPAD_RIGHT = 1013, - BUTTON_DPAD_CENTER = 1014, - - BUTTON_LEFT_SHOULDER = 1015, - BUTTON_RIGHT_SHOULDER = 1016, - - AXIS_LEFT_TRIGGER = 1017, - AXIS_RIGHT_TRIGGER = 1018, - - BUTTON_LEFT_THUMBSTICK = 1019, - BUTTON_RIGHT_THUMBSTICK = 1020, - - BUTTON_START = 1021, - BUTTON_SELECT = 1022, - - BUTTON_PAUSE = 1023, - KEY_MAX = 1024, + NONE = 0, + COCOSTUDIO = 1, } diff --git a/cocos/scripting/lua-bindings/script/DeprecatedClass.lua b/cocos/scripting/lua-bindings/script/cocos2d/DeprecatedCocos2dClass.lua similarity index 80% rename from cocos/scripting/lua-bindings/script/DeprecatedClass.lua rename to cocos/scripting/lua-bindings/script/cocos2d/DeprecatedCocos2dClass.lua index 61cb41428b..3228789177 100644 --- a/cocos/scripting/lua-bindings/script/DeprecatedClass.lua +++ b/cocos/scripting/lua-bindings/script/cocos2d/DeprecatedCocos2dClass.lua @@ -55,14 +55,6 @@ end _G["CCEaseInOut"] = DeprecatedClass.CCEaseInOut() --CCEaseInOut class will be Deprecated,end ---SimpleAudioEngine class will be Deprecated,begin -function DeprecatedClass.SimpleAudioEngine() - deprecatedTip("SimpleAudioEngine","cc.SimpleAudioEngine") - return cc.SimpleAudioEngine -end -_G["SimpleAudioEngine"] = DeprecatedClass.SimpleAudioEngine() ---SimpleAudioEngine class will be Deprecated,end - --CCTransitionMoveInT class will be Deprecated,begin function DeprecatedClass.CCTransitionMoveInT() deprecatedTip("CCTransitionMoveInT","cc.TransitionMoveInT") @@ -79,14 +71,6 @@ end _G["CCTransitionMoveInR"] = DeprecatedClass.CCTransitionMoveInR() --CCTransitionMoveInR class will be Deprecated,end ---CCControlHuePicker class will be Deprecated,begin -function DeprecatedClass.CCControlHuePicker() - deprecatedTip("CCControlHuePicker","cc.ControlHuePicker") - return cc.ControlHuePicker -end -_G["CCControlHuePicker"] = DeprecatedClass.CCControlHuePicker() ---CCControlHuePicker class will be Deprecated,end - --CCParticleSnow class will be Deprecated,begin function DeprecatedClass.CCParticleSnow() deprecatedTip("CCParticleSnow","cc.ParticleSnow") @@ -143,14 +127,6 @@ end _G["CCTransitionRotoZoom"] = DeprecatedClass.CCTransitionRotoZoom() --CCTransitionRotoZoom class will be Deprecated,end ---CCControlColourPicker class will be Deprecated,begin -function DeprecatedClass.CCControlColourPicker() - deprecatedTip("CCControlColourPicker","cc.ControlColourPicker") - return cc.ControlColourPicker -end -_G["CCControlColourPicker"] = DeprecatedClass.CCControlColourPicker() ---CCControlColourPicker class will be Deprecated,end - --CCDirector class will be Deprecated,begin function DeprecatedClass.CCDirector() deprecatedTip("CCDirector","cc.Director") @@ -320,14 +296,6 @@ end _G["CCTransitionFlipAngular"] = DeprecatedClass.CCTransitionFlipAngular() --CCTransitionFlipAngular class will be Deprecated,end ---CCControl class will be Deprecated,begin -function DeprecatedClass.CCControl() - deprecatedTip("CCControl","cc.Control") - return cc.Control -end -_G["CCControl"] = DeprecatedClass.CCControl() ---CCControl class will be Deprecated,end - --CCEaseElasticInOut class will be Deprecated,begin function DeprecatedClass.CCEaseElasticInOut() deprecatedTip("CCEaseElasticInOut","cc.EaseElasticInOut") @@ -352,14 +320,6 @@ end _G["CCShow"] = DeprecatedClass.CCShow() --CCShow class will be Deprecated,end ---CCEditBox class will be Deprecated,begin -function DeprecatedClass.CCEditBox() - deprecatedTip("CCEditBox","cc.EditBox") - return cc.EditBox -end -_G["CCEditBox"] = DeprecatedClass.CCEditBox() ---CCEditBox class will be Deprecated,end - --CCFadeOut class will be Deprecated,begin function DeprecatedClass.CCFadeOut() deprecatedTip("CCFadeOut","cc.FadeOut") @@ -496,14 +456,6 @@ end _G["CCApplication"] = DeprecatedClass.CCApplication() --CCApplication class will be Deprecated,end ---CCControlSlider class will be Deprecated,begin -function DeprecatedClass.CCControlSlider() - deprecatedTip("CCControlSlider","cc.ControlSlider") - return cc.ControlSlider -end -_G["CCControlSlider"] = DeprecatedClass.CCControlSlider() ---CCControlSlider class will be Deprecated,end - --CCDelayTime class will be Deprecated,begin function DeprecatedClass.CCDelayTime() deprecatedTip("CCDelayTime","cc.DelayTime") @@ -528,14 +480,6 @@ end _G["CCLabelBMFont"] = DeprecatedClass.CCLabelBMFont() --CCLabelBMFont class will be Deprecated,end ---CCScale9Sprite class will be Deprecated,begin -function DeprecatedClass.CCScale9Sprite() - deprecatedTip("CCScale9Sprite","cc.Scale9Sprite") - return cc.Scale9Sprite -end -_G["CCScale9Sprite"] = DeprecatedClass.CCScale9Sprite() ---CCScale9Sprite class will be Deprecated,end - --CCFadeOutTRTiles class will be Deprecated,begin function DeprecatedClass.CCFadeOutTRTiles() deprecatedTip("CCFadeOutTRTiles","cc.FadeOutTRTiles") @@ -560,14 +504,6 @@ end _G["CCParticleSpiral"] = DeprecatedClass.CCParticleSpiral() --CCParticleSpiral class will be Deprecated,end ---CCBReader class will be Deprecated,begin -function DeprecatedClass.CCBReader() - deprecatedTip("CCBReader","cc.BReader") - return cc.BReader -end -_G["CCBReader"] = DeprecatedClass.CCBReader() ---CCBReader class will be Deprecated,end - --CCFiniteTimeAction class will be Deprecated,begin function DeprecatedClass.CCFiniteTimeAction() deprecatedTip("CCFiniteTimeAction","cc.FiniteTimeAction") @@ -704,14 +640,6 @@ end _G["CCFadeTo"] = DeprecatedClass.CCFadeTo() --CCFadeTo class will be Deprecated,end ---CCBAnimationManager class will be Deprecated,begin -function DeprecatedClass.CCBAnimationManager() - deprecatedTip("CCBAnimationManager","cc.BAnimationManager") - return cc.BAnimationManager -end -_G["CCBAnimationManager"] = DeprecatedClass.CCBAnimationManager() ---CCBAnimationManager class will be Deprecated,end - --CCRepeatForever class will be Deprecated,begin function DeprecatedClass.CCRepeatForever() deprecatedTip("CCRepeatForever","cc.RepeatForever") @@ -728,14 +656,6 @@ end _G["CCPlace"] = DeprecatedClass.CCPlace() --CCPlace class will be Deprecated,end ---CCScrollView class will be Deprecated,begin -function DeprecatedClass.CCScrollView() - deprecatedTip("CCScrollView","cc.ScrollView") - return cc.ScrollView -end -_G["CCScrollView"] = DeprecatedClass.CCScrollView() ---CCScrollView class will be Deprecated,end - --CCGLProgram class will be Deprecated,begin function DeprecatedClass.CCGLProgram() @@ -817,15 +737,6 @@ end _G["CCParticleFlower"] = DeprecatedClass.CCParticleFlower() --CCParticleFlower class will be Deprecated,end ---CCTableView class will be Deprecated,begin -function DeprecatedClass.CCTableView() - deprecatedTip("CCTableView","cc.TableView") - return cc.TableView -end -_G["CCTableView"] = DeprecatedClass.CCTableView() ---CCTableView class will be Deprecated,end - - --CCParticleSmoke class will be Deprecated,begin function DeprecatedClass.CCParticleSmoke() deprecatedTip("CCParticleSmoke","cc.ParticleSmoke") @@ -1194,14 +1105,6 @@ end _G["CCTransitionZoomFlipX"] = DeprecatedClass.CCTransitionZoomFlipX() --CCTransitionZoomFlipX class will be Deprecated,end ---CCControlPotentiometer class will be Deprecated,begin -function DeprecatedClass.CCControlPotentiometer() - deprecatedTip("CCControlPotentiometer","cc.ControlPotentiometer") - return cc.ControlPotentiometer -end -_G["CCControlPotentiometer"] = DeprecatedClass.CCControlPotentiometer() ---CCControlPotentiometer class will be Deprecated,end - --CCScaleBy class will be Deprecated,begin function DeprecatedClass.CCScaleBy() deprecatedTip("CCScaleBy","cc.ScaleBy") @@ -1338,14 +1241,6 @@ end _G["CCBezierTo"] = DeprecatedClass.CCBezierTo() --CCBezierTo class will be Deprecated,end ---CCControlButton class will be Deprecated,begin -function DeprecatedClass.CCControlButton() - deprecatedTip("CCControlButton","cc.ControlButton") - return cc.ControlButton -end -_G["CCControlButton"] = DeprecatedClass.CCControlButton() ---CCControlButton class will be Deprecated,end - --CCFollow class will be Deprecated,begin function DeprecatedClass.CCFollow() deprecatedTip("CCFollow","cc.Follow") @@ -1498,14 +1393,6 @@ end _G["CCSplitRows"] = DeprecatedClass.CCSplitRows() --CCSplitRows class will be Deprecated,end ---CCControlStepper class will be Deprecated,begin -function DeprecatedClass.CCControlStepper() - deprecatedTip("CCControlStepper","cc.ControlStepper") - return cc.ControlStepper -end -_G["CCControlStepper"] = DeprecatedClass.CCControlStepper() ---CCControlStepper class will be Deprecated,end - --CCSprite class will be Deprecated,begin function DeprecatedClass.CCSprite() deprecatedTip("CCSprite","cc.Sprite") @@ -1610,14 +1497,6 @@ end _G["CCRemoveSelf"] = DeprecatedClass.CCRemoveSelf() --CCRemoveSelf class will be Deprecated,end ---CCControlSaturationBrightnessPicker class will be Deprecated,begin -function DeprecatedClass.CCControlSaturationBrightnessPicker() - deprecatedTip("CCControlSaturationBrightnessPicker","cc.ControlSaturationBrightnessPicker") - return cc.ControlSaturationBrightnessPicker -end -_G["CCControlSaturationBrightnessPicker"] = DeprecatedClass.CCControlSaturationBrightnessPicker() ---CCControlSaturationBrightnessPicker class will be Deprecated,end - --CCLabelTTF class will be Deprecated,begin function DeprecatedClass.CCLabelTTF() deprecatedTip("CCLabelTTF","cc.LabelTTF") @@ -1786,14 +1665,6 @@ end _G["CCTransitionSlideInL"] = DeprecatedClass.CCTransitionSlideInL() --CCTransitionSlideInL class will be Deprecated,end ---CCControlSwitch class will be Deprecated,begin -function DeprecatedClass.CCControlSwitch() - deprecatedTip("CCControlSwitch","cc.ControlSwitch") - return cc.ControlSwitch -end -_G["CCControlSwitch"] = DeprecatedClass.CCControlSwitch() ---CCControlSwitch class will be Deprecated,end - --CCWavesTiles3D class will be Deprecated,begin function DeprecatedClass.CCWavesTiles3D() deprecatedTip("CCWavesTiles3D","cc.WavesTiles3D") @@ -1834,302 +1705,6 @@ end _G["CCCallFuncN"] = DeprecatedClass.CCCallFuncN() --CCCallFuncN class will be Deprecated,end ---CCArmature class will be Deprecated,begin -function DeprecatedClass.CCArmature() - deprecatedTip("CCArmature","ccs.Armature") - return ccs.Armature -end -_G["CCArmature"] = DeprecatedClass.CCArmature() ---CCArmature class will be Deprecated,end - ---CCArmatureAnimation class will be Deprecated,begin -function DeprecatedClass.CCArmatureAnimation() - deprecatedTip("CCArmatureAnimation","ccs.ArmatureAnimation") - return ccs.ArmatureAnimation -end -_G["CCArmatureAnimation"] = DeprecatedClass.CCArmatureAnimation() ---CCArmatureAnimation class will be Deprecated,end - ---CCSkin class will be Deprecated,begin -function DeprecatedClass.CCSkin() - deprecatedTip("CCSkin","ccs.Skin") - return ccs.Skin -end -_G["CCSkin"] = DeprecatedClass.CCSkin() ---CCSkin class will be Deprecated,end - ---CCBone class will be Deprecated,begin -function DeprecatedClass.CCBone() - deprecatedTip("CCBone","ccs.Bone") - return ccs.Bone -end -_G["CCBone"] = DeprecatedClass.CCBone() ---CCBone class will be Deprecated,end - ---CCArmatureDataManager class will be Deprecated,begin -function DeprecatedClass.CCArmatureDataManager() - deprecatedTip("CCArmatureDataManager","ccs.ArmatureDataManager") - return ccs.ArmatureDataManager -end -_G["CCArmatureDataManager"] = DeprecatedClass.CCArmatureDataManager() ---CCArmatureDataManager class will be Deprecated,end - ---CCBatchNode class will be Deprecated,begin -function DeprecatedClass.CCBatchNode() - deprecatedTip("CCBatchNode","ccs.BatchNode") - return ccs.BatchNode -end -_G["CCBatchNode"] = DeprecatedClass.CCBatchNode() ---CCBatchNode class will be Deprecated,end - ---CCTween class will be Deprecated,begin -function DeprecatedClass.CCTween() - deprecatedTip("CCTween","ccs.Tween") - return ccs.Tween -end -_G["CCTween"] = DeprecatedClass.CCTween() ---CCTween class will be Deprecated,end - ---CCBaseData class will be Deprecated,begin -function DeprecatedClass.CCBaseData() - deprecatedTip("CCBaseData","ccs.BaseData") - return ccs.BaseData -end -_G["CCBaseData"] = DeprecatedClass.CCBaseData() ---CCBaseData class will be Deprecated,end - ---CCDisplayManager class will be Deprecated,begin -function DeprecatedClass.CCDisplayManager() - deprecatedTip("CCDisplayManager","ccs.DisplayManager") - return ccs.DisplayManager -end -_G["CCDisplayManager"] = DeprecatedClass.CCDisplayManager() ---CCDisplayManager class will be Deprecated,end - ---UIHelper class will be Deprecated,begin -function DeprecatedClass.UIHelper() - deprecatedTip("UIHelper","ccs.UIHelper") - return ccs.UIHelper -end -_G["UIHelper"] = DeprecatedClass.UIHelper() ---UIHelper class will be Deprecated,end - ---UILayout class will be Deprecated,begin -function DeprecatedClass.UILayout() - deprecatedTip("UILayout","ccs.UILayout") - return ccs.UILayout -end -_G["UILayout"] = DeprecatedClass.UILayout() ---UILayout class will be Deprecated,end - ---UIWidget class will be Deprecated,begin -function DeprecatedClass.UIWidget() - deprecatedTip("UIWidget","ccs.UIWidget") - return ccs.UIWidget -end -_G["UIWidget"] = DeprecatedClass.UIWidget() ---UIWidget class will be Deprecated,end - ---UILayer class will be Deprecated,begin -function DeprecatedClass.UILayer() - deprecatedTip("UILayer","ccs.UILayer") - return ccs.UILayer -end -_G["UILayer"] = DeprecatedClass.UILayer() ---UILayer class will be Deprecated,end - ---UIButton class will be Deprecated,begin -function DeprecatedClass.UIButton() - deprecatedTip("UIButton","ccs.UIButton") - return ccs.UIButton -end -_G["UIButton"] = DeprecatedClass.UIButton() ---UIButton class will be Deprecated,end - ---UICheckBox class will be Deprecated,begin -function DeprecatedClass.UICheckBox() - deprecatedTip("UICheckBox","ccs.UICheckBox") - return ccs.UICheckBox -end -_G["UICheckBox"] = DeprecatedClass.UICheckBox() ---UICheckBox class will be Deprecated,end - ---UIImageView class will be Deprecated,begin -function DeprecatedClass.UIImageView() - deprecatedTip("UIImageView","ccs.UIImageView") - return ccs.UIImageView -end -_G["UIImageView"] = DeprecatedClass.UIImageView() ---UIImageView class will be Deprecated,end - ---UILabel class will be Deprecated,begin -function DeprecatedClass.UILabel() - deprecatedTip("UILabel","ccs.UILabel") - return ccs.UILabel -end -_G["UILabel"] = DeprecatedClass.UILabel() ---UILabel class will be Deprecated,end - ---UILabelAtlas class will be Deprecated,begin -function DeprecatedClass.UILabelAtlas() - deprecatedTip("UILabelAtlas","ccs.UILabelAtlas") - return ccs.UILabelAtlas -end -_G["UILabelAtlas"] = DeprecatedClass.UILabelAtlas() ---UILabelAtlas class will be Deprecated,end - ---UILabelBMFont class will be Deprecated,begin -function DeprecatedClass.UILabelBMFont() - deprecatedTip("UILabelBMFont","ccs.UILabelBMFont") - return ccs.UILabelBMFont -end -_G["UILabelBMFont"] = DeprecatedClass.UILabelBMFont() ---UILabelBMFont class will be Deprecated,end - ---UILoadingBar class will be Deprecated,begin -function DeprecatedClass.UILoadingBar() - deprecatedTip("UILoadingBar","ccs.UILoadingBar") - return ccs.UILoadingBar -end -_G["UILoadingBar"] = DeprecatedClass.UILoadingBar() ---UILoadingBar class will be Deprecated,end - ---UISlider class will be Deprecated,begin -function DeprecatedClass.UISlider() - deprecatedTip("UISlider","ccs.UISlider") - return ccs.UISlider -end -_G["UISlider"] = DeprecatedClass.UISlider() ---UISlider class will be Deprecated,end - ---UITextField class will be Deprecated,begin -function DeprecatedClass.UITextField() - deprecatedTip("UITextField","ccs.UITextField") - return ccs.UITextField -end -_G["UITextField"] = DeprecatedClass.UITextField() ---UITextField class will be Deprecated,end - ---UIScrollView class will be Deprecated,begin -function DeprecatedClass.UIScrollView() - deprecatedTip("UIScrollView","ccs.UIScrollView") - return ccs.UIScrollView -end -_G["UIScrollView"] = DeprecatedClass.UIScrollView() ---UIScrollView class will be Deprecated,end - ---UIPageView class will be Deprecated,begin -function DeprecatedClass.UIPageView() - deprecatedTip("UIPageView","ccs.UIPageView") - return ccs.UIPageView -end -_G["UIPageView"] = DeprecatedClass.UIPageView() ---UIPageView class will be Deprecated,end - ---UIListView class will be Deprecated,begin -function DeprecatedClass.UIListView() - deprecatedTip("UIListView","ccs.UIListView") - return ccs.UIListView -end -_G["UIListView"] = DeprecatedClass.UIListView() ---UIListView class will be Deprecated,end - ---UILayoutParameter class will be Deprecated,begin -function DeprecatedClass.UILayoutParameter() - deprecatedTip("UILayoutParameter","ccs.UILayoutParameter") - return ccs.UILayoutParameter -end -_G["UILayoutParameter"] = DeprecatedClass.UILayoutParameter() ---UILayoutParameter class will be Deprecated,end - ---UILinearLayoutParameter class will be Deprecated,begin -function DeprecatedClass.UILinearLayoutParameter() - deprecatedTip("UILinearLayoutParameter","ccs.UILinearLayoutParameter") - return ccs.UILinearLayoutParameter -end -_G["UILinearLayoutParameter"] = DeprecatedClass.UILinearLayoutParameter() ---UILinearLayoutParameter class will be Deprecated,end - ---UIRelativeLayoutParameter class will be Deprecated,begin -function DeprecatedClass.UIRelativeLayoutParameter() - deprecatedTip("UIRelativeLayoutParameter","ccs.UIRelativeLayoutParameter") - return ccs.UIRelativeLayoutParameter -end -_G["UIRelativeLayoutParameter"] = DeprecatedClass.UIRelativeLayoutParameter() ---UIRelativeLayoutParameter class will be Deprecated,end - ---CCComController class will be Deprecated,begin -function DeprecatedClass.CCComController() - deprecatedTip("CCComController","ccs.ComController") - return ccs.CCComController -end -_G["CCComController"] = DeprecatedClass.CCComController() ---CCComController class will be Deprecated,end - ---CCComAudio class will be Deprecated,begin -function DeprecatedClass.CCComAudio() - deprecatedTip("CCComAudio","ccs.ComAudio") - return ccs.ComAudio -end -_G["CCComAudio"] = DeprecatedClass.CCComAudio() ---CCComAudio class will be Deprecated,end - ---CCComAttribute class will be Deprecated,begin -function DeprecatedClass.CCComAttribute() - deprecatedTip("CCComAttribute","ccs.ComAttribute") - return ccs.ComAttribute -end -_G["CCComAttribute"] = DeprecatedClass.CCComAttribute() ---CCComAttribute class will be Deprecated,end - ---CCComRender class will be Deprecated,begin -function DeprecatedClass.CCComRender() - deprecatedTip("CCComRender","ccs.ComRender") - return ccs.ComRender -end -_G["CCComRender"] = DeprecatedClass.CCComRender() ---CCComRender class will be Deprecated,end - ---ActionManager class will be Deprecated,begin -function DeprecatedClass.ActionManager() - deprecatedTip("ActionManager","ccs.ActionManagerEx") - return ccs.ActionManagerEx -end -_G["ActionManager"] = DeprecatedClass.ActionManager() ---CCComRender class will be Deprecated,end - ---SceneReader class will be Deprecated,begin -function DeprecatedClass.SceneReader() - deprecatedTip("SceneReader","ccs.SceneReader") - return ccs.SceneReader -end -_G["SceneReader"] = DeprecatedClass.SceneReader() ---SceneReader class will be Deprecated,end - ---GUIReader class will be Deprecated,begin -function DeprecatedClass.GUIReader() - deprecatedTip("GUIReader","ccs.GUIReader") - return ccs.GUIReader -end -_G["GUIReader"] = DeprecatedClass.GUIReader() ---GUIReader class will be Deprecated,end - ---UIRootWidget class will be Deprecated,begin -function DeprecatedClass.UIRootWidget() - deprecatedTip("UIRootWidget","ccs.UIRootWidget") - return ccs.UIRootWidget -end -_G["UIRootWidget"] = DeprecatedClass.UIRootWidget() ---UIRootWidget class will be Deprecated,end - ---ActionObject class will be Deprecated,begin -function DeprecatedClass.ActionObject() - deprecatedTip("ActionObject","ccs.ActionObject") - return ccs.ActionObject -end -_G["ActionObject"] = DeprecatedClass.ActionObject() ---ActionObject class will be Deprecated,end - --CCEGLViewProtocol class will be Deprecated,begin function DeprecatedClass.CCEGLViewProtocol() deprecatedTip("CCEGLViewProtocol","cc.GLViewProtocol") @@ -2147,22 +1722,6 @@ end _G["CCEGLView"] = DeprecatedClass.CCEGLView() --CCEGLView class will be Deprecated,end ---CCBProxy class will be Deprecated,begin -function DeprecatedClass.CCBProxy() - deprecatedTip("CCBProxy","cc.CCBProxy") - return cc.CCBProxy -end -_G["CCBProxy"] = DeprecatedClass.CCBProxy() ---CCBProxy class will be Deprecated,end - ---WebSocket class will be Deprecated,begin -function DeprecatedClass.WebSocket() - deprecatedTip("WebSocket","cc.WebSocket") - return cc.WebSocket -end -_G["WebSocket"] = DeprecatedClass.WebSocket() ---WebSocket class will be Deprecated,end - --XMLHttpRequest class will be Deprecated,begin function DeprecatedClass.XMLHttpRequest() deprecatedTip("XMLHttpRequest","cc.XMLHttpRequest") diff --git a/cocos/scripting/lua-bindings/script/DeprecatedEnum.lua b/cocos/scripting/lua-bindings/script/cocos2d/DeprecatedCocos2dEnum.lua similarity index 71% rename from cocos/scripting/lua-bindings/script/DeprecatedEnum.lua rename to cocos/scripting/lua-bindings/script/cocos2d/DeprecatedCocos2dEnum.lua index fd21cc4ecb..58419c2d44 100644 --- a/cocos/scripting/lua-bindings/script/DeprecatedEnum.lua +++ b/cocos/scripting/lua-bindings/script/cocos2d/DeprecatedCocos2dEnum.lua @@ -1,7 +1,5 @@ require "Cocos2dConstants.lua" require "OpenglConstants.lua" -require "StudioConstants.lua" -require "GuiConstants.lua" --Enums will be deprecated,begin _G.kCCTextAlignmentLeft = cc.TEXT_ALIGNMENT_LEFT _G.kCCTextAlignmentRight = cc.TEXT_ALIGNMENT_RIGHT @@ -55,9 +53,6 @@ _G.kCCTMXTileVerticalFlag = cc.TMX_TILE_VERTICAL_FLAG _G.kCCTMXTileDiagonalFlag = cc.TMX_TILE_DIAGONAL_FLAG _G.kCCFlipedAll = cc.FLIPED_ALL _G.kCCFlippedMask = cc.FLIPPED_MASK -_G.kCCControlStepperPartMinus = cc.CONTROL_STEPPER_PART_MINUS -_G.kCCControlStepperPartPlus = cc.CONTROL_STEPPER_PART_PLUS -_G.kCCControlStepperPartNone = cc.CONTROL_STEPPER_PART_NONE _G.kLanguageEnglish = cc.LANGUAGE_ENGLISH _G.kLanguageChinese = cc.LANGUAGE_CHINESE @@ -373,124 +368,3 @@ _G.GL_ALPHA = gl.ALPHA _G.GL_CURRENT_VERTEX_ATTRIB = gl.CURRENT_VERTEX_ATTRIB _G.GL_SCISSOR_TEST = gl.SCISSOR_TEST _G.GL_TRIANGLES = gl.TRIANGLES - -_G.CCControlEventTouchDown = cc.CONTROL_EVENTTYPE_TOUCH_DOWN -_G.CCControlEventTouchDragInside = cc.CONTROL_EVENTTYPE_DRAG_INSIDE -_G.CCControlEventTouchDragOutside = cc.CONTROL_EVENTTYPE_DRAG_OUTSIDE -_G.CCControlEventTouchDragEnter = cc.CONTROL_EVENTTYPE_DRAG_ENTER -_G.CCControlEventTouchDragExit = cc.CONTROL_EVENTTYPE_DRAG_EXIT -_G.CCControlEventTouchUpInside = cc.CONTROL_EVENTTYPE_TOUCH_UP_INSIDE -_G.CCControlEventTouchUpOutside = cc.CONTROL_EVENTTYPE_TOUCH_UP_OUTSIDE -_G.CCControlEventTouchCancel = cc.CONTROL_EVENTTYPE_TOUCH_CANCEL -_G.CCControlEventValueChanged = cc.CONTROL_EVENTTYPE_VALUE_CHANGED -_G.CCControlStateNormal = cc.CONTROL_STATE_NORMAL -_G.CCControlStateHighlighted = cc.CONTROL_STATE_HIGH_LIGHTED -_G.CCControlStateDisabled = cc.CONTROL_STATE_DISABLED -_G.CCControlStateSelected = cc.CONTROL_STATE_SELECTED - -_G.kWebSocketScriptHandlerOpen = cc.WEBSOCKET_OPEN -_G.kWebSocketScriptHandlerMessage = cc.WEBSOCKET_MESSAGE -_G.kWebSocketScriptHandlerClose = cc.WEBSOCKET_CLOSE -_G.kWebSocketScriptHandlerError = cc.WEBSOCKET_ERROR - -_G.kStateConnecting = cc.WEBSOCKET_STATE_CONNECTING -_G.kStateOpen = cc.WEBSOCKET_STATE_OPEN -_G.kStateClosing = cc.WEBSOCKET_STATE_CLOSING -_G.kStateClosed = cc.WEBSOCKET_STATE_CLOSED - -_G.LAYOUT_COLOR_NONE = ccui.LayoutBackGroundColorType.none -_G.LAYOUT_COLOR_SOLID = ccui.LayoutBackGroundColorType.solid -_G.LAYOUT_COLOR_GRADIENT = ccui.LayoutBackGroundColorType.gradient - -_G.LAYOUT_ABSOLUTE = ccui.LayoutType.ABSOLUTE -_G.LAYOUT_LINEAR_VERTICAL = ccui.LayoutType.VERTICAL -_G.LAYOUT_LINEAR_HORIZONTAL = ccui.LayoutType.HORIZONTAL -_G.LAYOUT_RELATIVE = ccui.LayoutType.RELATIVE - -_G.BRIGHT_NONE = ccui.BrightStyle.none -_G.BRIGHT_NORMAL = ccui.BrightStyle.normal -_G.BRIGHT_HIGHLIGHT = ccui.BrightStyle.highlight - -_G.UI_TEX_TYPE_LOCAL = ccui.TextureResType.localType -_G.UI_TEX_TYPE_PLIST = ccui.TextureResType.plistType - -_G.TOUCH_EVENT_BEGAN = ccui.TouchEventType.began -_G.TOUCH_EVENT_MOVED = ccui.TouchEventType.moved -_G.TOUCH_EVENT_ENDED = ccui.TouchEventType.ended -_G.TOUCH_EVENT_CANCELED = ccui.TouchEventType.canceled - -_G.SIZE_ABSOLUTE = ccui.SizeType.absolute -_G.SIZE_PERCENT = ccui.SizeType.percent - -_G.POSITION_ABSOLUTE = ccui.PositionType.absolute -_G.POSITION_PERCENT = ccui.PositionType.percent - -_G.CHECKBOX_STATE_EVENT_SELECTED = ccui.CheckBoxEventType.selected -_G.CHECKBOX_STATE_EVENT_UNSELECTED = ccui.CheckBoxEventType.unselected - -_G.CHECKBOX_STATE_EVENT_SELECTED = ccui.CheckBoxEventType.selected -_G.CHECKBOX_STATE_EVENT_UNSELECTED = ccui.CheckBoxEventType.unselected - -_G.LoadingBarTypeLeft = ccui.LoadingBarDirection.LEFT -_G.LoadingBarTypeRight = ccui.LoadingBarDirection.RIGHT - -_G.LoadingBarTypeRight = ccui.SliderEventType.percent_changed - -_G.TEXTFIELD_EVENT_ATTACH_WITH_IME = ccui.TextFiledEventType.attach_with_ime -_G.TEXTFIELD_EVENT_DETACH_WITH_IME = ccui.TextFiledEventType.detach_with_ime -_G.TEXTFIELD_EVENT_INSERT_TEXT = ccui.TextFiledEventType.insert_text -_G.TEXTFIELD_EVENT_DELETE_BACKWARD = ccui.TextFiledEventType.delete_backward - -_G.SCROLLVIEW_EVENT_SCROLL_TO_TOP = ccui.ScrollViewDir.none -_G.SCROLLVIEW_DIR_VERTICAL = ccui.ScrollViewDir.vertical -_G.SCROLLVIEW_DIR_HORIZONTAL = ccui.ScrollViewDir.horizontal -_G.SCROLLVIEW_DIR_BOTH = ccui.ScrollViewDir.both - -_G.SCROLLVIEW_EVENT_SCROLL_TO_TOP = ccui.ScrollviewEventType.scrollToTop -_G.SCROLLVIEW_EVENT_SCROLL_TO_BOTTOM = ccui.ScrollviewEventType.scrollToBottom -_G.SCROLLVIEW_EVENT_SCROLL_TO_LEFT = ccui.ScrollviewEventType.scrollToLeft -_G.SCROLLVIEW_EVENT_SCROLL_TO_RIGHT = ccui.ScrollviewEventType.scrollToRight -_G.SCROLLVIEW_EVENT_SCROLLING = ccui.ScrollviewEventType.scrolling -_G.SCROLLVIEW_EVENT_BOUNCE_TOP = ccui.ScrollviewEventType.bounceTop -_G.SCROLLVIEW_EVENT_BOUNCE_BOTTOM = ccui.ScrollviewEventType.bounceBottom -_G.SCROLLVIEW_EVENT_BOUNCE_LEFT = ccui.ScrollviewEventType.bounceLeft -_G.SCROLLVIEW_EVENT_BOUNCE_RIGHT = ccui.ScrollviewEventType.bounceRight - -_G.PAGEVIEW_EVENT_TURNING = ccui.PageViewEventType.turning - -_G.PAGEVIEW_TOUCHLEFT = ccui.PVTouchDir.touch_left -_G.PAGEVIEW_TOUCHRIGHT = ccui.PVTouchDir.touch_right - -_G.LISTVIEW_DIR_NONE = ccui.ListViewDirection.none -_G.LISTVIEW_DIR_VERTICAL = ccui.ListViewDirection.vertical -_G.LISTVIEW_DIR_HORIZONTAL = ccui.ListViewDirection.horizontal - -_G.LISTVIEW_MOVE_DIR_NONE = ccui.ListViewMoveDirection.none -_G.LISTVIEW_MOVE_DIR_UP = ccui.ListViewMoveDirection.up -_G.LISTVIEW_MOVE_DIR_DOWN = ccui.ListViewMoveDirection.down -_G.LISTVIEW_MOVE_DIR_LEFT = ccui.ListViewMoveDirection.left -_G.LISTVIEW_MOVE_DIR_RIGHT = ccui.ListViewMoveDirection.right - -_G.LISTVIEW_EVENT_INIT_CHILD = ccui.ListViewEventType.init_child -_G.LISTVIEW_EVENT_UPDATE_CHILD = ccui.ListViewEventType.update_child - -_G.LAYOUT_PARAMETER_NONE = ccui.LayoutParameterType.none -_G.LAYOUT_PARAMETER_LINEAR = ccui.LayoutParameterType.linear -_G.LAYOUT_PARAMETER_RELATIVE = ccui.LayoutParameterType.relative - -_G.kCCScrollViewDirectionHorizontal = cc.SCROLLVIEW_DIRECTION_HORIZONTAL -_G.kCCScrollViewDirectionVertical = cc.SCROLLVIEW_DIRECTION_VERTICAL -_G.kCCTableViewFillTopDown = cc.TABLEVIEW_FILL_TOPDOWN -_G.kCCTableViewFillBottomUp = cc.TABLEVIEW_FILL_BOTTOMUP - -ccui.LoadingBarType = ccui.LoadingBarDirection -ccui.LoadingBarType.left = ccui.LoadingBarDirection.LEFT -ccui.LoadingBarType.right = ccui.LoadingBarDirection.RIGHT - -ccui.LayoutType.absolute = ccui.LayoutType.ABSOLUTE -ccui.LayoutType.linearVertical = ccui.LayoutType.VERTICAL -ccui.LayoutType.linearHorizontal = ccui.LayoutType.HORIZONTAL -ccui.LayoutType.relative = ccui.LayoutType.RELATIVE - -ccui.ListViewEventType.onsSelectedItem = ccui.ListViewEventType.ONSELECTEDITEM_START - diff --git a/cocos/scripting/lua-bindings/script/Deprecated.lua b/cocos/scripting/lua-bindings/script/cocos2d/DeprecatedCocos2dFunc.lua similarity index 76% rename from cocos/scripting/lua-bindings/script/Deprecated.lua rename to cocos/scripting/lua-bindings/script/cocos2d/DeprecatedCocos2dFunc.lua index bd2b0689bb..b0e065a8ee 100644 --- a/cocos/scripting/lua-bindings/script/Deprecated.lua +++ b/cocos/scripting/lua-bindings/script/cocos2d/DeprecatedCocos2dFunc.lua @@ -113,22 +113,6 @@ end rawset(CCFileUtils,"purgeFileUtils",CCFileUtilsDeprecated.purgeFileUtils) --functions of CCFileUtils will be deprecated end - ---functions of SimpleAudioEngine will be deprecated begin -local SimpleAudioEngineDeprecated = { } -function SimpleAudioEngineDeprecated.sharedEngine() - deprecatedTip("SimpleAudioEngine:sharedEngine","SimpleAudioEngine:getInstance") - return cc.SimpleAudioEngine:getInstance() -end -rawset(SimpleAudioEngine,"sharedEngine",SimpleAudioEngineDeprecated.sharedEngine) - -function SimpleAudioEngineDeprecated.playBackgroundMusic(self,...) - deprecatedTip("SimpleAudioEngine:playBackgroundMusic","SimpleAudioEngine:playMusic") - return self:playMusic(...) -end -rawset(SimpleAudioEngine,"playBackgroundMusic",SimpleAudioEngineDeprecated.playBackgroundMusic) ---functions of SimpleAudioEngine will be deprecated end - --functions of CCMenu will be deprecated begin local CCMenuDeprecated = { } function CCMenuDeprecated.createWithItem(self,...) @@ -690,32 +674,7 @@ local function tex2(u,v) deprecatedTip("tex2(u,v)","cc.tex2f(u,v)") return cc.tex2f(u,v) end -rawset(_G,"tex2",tex2) - ---functions of CCControl will be deprecated end -local CCControlDeprecated = { } -function CCControlDeprecated.addHandleOfControlEvent(self,func,controlEvent) - deprecatedTip("addHandleOfControlEvent","registerControlEventHandler") - print("come in addHandleOfControlEvent") - self:registerControlEventHandler(func,controlEvent) -end -rawset(CCControl,"addHandleOfControlEvent",CCControlDeprecated.addHandleOfControlEvent) ---functions of CCControl will be deprecated end - ---Enums of CCTableView will be deprecated begin -rawset(CCTableView, "kTableViewScroll",cc.SCROLLVIEW_SCRIPT_SCROLL) -rawset(CCTableView,"kTableViewZoom",cc.SCROLLVIEW_SCRIPT_ZOOM) -rawset(CCTableView,"kTableCellTouched",cc.TABLECELL_TOUCHED) -rawset(CCTableView,"kTableCellSizeForIndex",cc.TABLECELL_SIZE_FOR_INDEX) -rawset(CCTableView,"kTableCellSizeAtIndex",cc.TABLECELL_SIZE_AT_INDEX) -rawset(CCTableView,"kNumberOfCellsInTableView",cc.NUMBER_OF_CELLS_IN_TABLEVIEW) ---Enums of CCTableView will be deprecated end - ---Enums of CCScrollView will be deprecated begin -rawset(CCScrollView, "kScrollViewScroll",cc.SCROLLVIEW_SCRIPT_SCROLL) -rawset(CCScrollView,"kScrollViewZoom",cc.SCROLLVIEW_SCRIPT_ZOOM) ---Enums of CCScrollView will be deprecated end - +rawset(_G,"tex2",tex2) --functions of CCApplication will be deprecated end @@ -969,26 +928,6 @@ end rawset(CCTMXObjectGroup,"objectNamed", CCTMXObjectGroupDeprecated.objectNamed) --functions of CCTMXObject will be deprecated end - ---functions of WebSocket will be deprecated begin -local targetPlatform = CCApplication:getInstance():getTargetPlatform() -if (kTargetIphone == targetPlatform) or (kTargetIpad == targetPlatform) or (kTargetAndroid == targetPlatform) or (kTargetWindows == targetPlatform) then - local WebSocketDeprecated = { } - function WebSocketDeprecated.sendTextMsg(self, string) - deprecatedTip("WebSocket:sendTextMsg","WebSocket:sendString") - return self:sendString(string) - end - rawset(WebSocket,"sendTextMsg", WebSocketDeprecated.sendTextMsg) - - function WebSocketDeprecated.sendBinaryMsg(self, table,tablesize) - deprecatedTip("WebSocket:sendBinaryMsg","WebSocket:sendString") - string.char(unpack(table)) - return self:sendString(string.char(unpack(table))) - end - rawset(WebSocket,"sendBinaryMsg", WebSocketDeprecated.sendBinaryMsg) -end ---functions of WebSocket will be deprecated end - --functions of CCRenderTexture will be deprecated begin local CCRenderTextureDeprecated = { } function CCRenderTextureDeprecated.newCCImage(self) @@ -1027,78 +966,6 @@ end rawset(cc.Layer, "isKeypadEnabled", CCLayerDeprecated.isKeypadEnabled ) --functions of Layer will be deprecated end ---functions of ccs.GUIReader will be deprecated begin -local CCSGUIReaderDeprecated = { } -function CCSGUIReaderDeprecated.purgeGUIReader() - deprecatedTip("ccs.GUIReader:purgeGUIReader","ccs.GUIReader:destroyInstance") - return ccs.GUIReader:destroyInstance() -end -rawset(ccs.GUIReader,"purgeGUIReader",CCSGUIReaderDeprecated.purgeGUIReader) ---functions of ccs.GUIReader will be deprecated end - ---functions of ccs.ActionManagerEx will be deprecated begin -local CCSActionManagerExDeprecated = { } -function CCSActionManagerExDeprecated.destroyActionManager() - deprecatedTip("ccs.ActionManagerEx:destroyActionManager","ccs.ActionManagerEx:destroyInstance") - return ccs.ActionManagerEx:destroyInstance() -end -rawset(ccs.ActionManagerEx,"destroyActionManager",CCSActionManagerExDeprecated.destroyActionManager) ---functions of ccs.ActionManagerEx will be deprecated end - ---functions of ccs.SceneReader will be deprecated begin -local CCSSceneReaderDeprecated = { } -function CCSSceneReaderDeprecated.destroySceneReader(self) - deprecatedTip("ccs.SceneReader:destroySceneReader","ccs.SceneReader:destroyInstance") - return self:destroyInstance() -end -rawset(ccs.SceneReader,"destroySceneReader",CCSSceneReaderDeprecated.destroySceneReader) ---functions of ccs.SceneReader will be deprecated end - ---functions of CCArmatureDataManager will be deprecated begin -local CCArmatureDataManagerDeprecated = { } -function CCArmatureDataManagerDeprecated.sharedArmatureDataManager() - deprecatedTip("CCArmatureDataManager:sharedArmatureDataManager","ccs.ArmatureDataManager:getInstance") - return ccs.ArmatureDataManager:getInstance() -end -rawset(CCArmatureDataManager,"sharedArmatureDataManager",CCArmatureDataManagerDeprecated.sharedArmatureDataManager) - -function CCArmatureDataManagerDeprecated.purge() - deprecatedTip("CCArmatureDataManager:purge","ccs.ArmatureDataManager:destoryInstance") - return ccs.ArmatureDataManager:destoryInstance() -end -rawset(CCArmatureDataManager,"purge",CCArmatureDataManagerDeprecated.purge) ---functions of CCArmatureDataManager will be deprecated end - ---functions of GUIReader will be deprecated begin -local GUIReaderDeprecated = { } -function GUIReaderDeprecated.shareReader() - deprecatedTip("GUIReader:shareReader","ccs.GUIReader:getInstance") - return ccs.GUIReader:getInstance() -end -rawset(GUIReader,"shareReader",GUIReaderDeprecated.shareReader) - -function GUIReaderDeprecated.purgeGUIReader() - deprecatedTip("GUIReader:purgeGUIReader","ccs.GUIReader:destroyInstance") - return ccs.GUIReader:destroyInstance() -end -rawset(GUIReader,"purgeGUIReader",GUIReaderDeprecated.purgeGUIReader) ---functions of GUIReader will be deprecated end - ---functions of SceneReader will be deprecated begin -local SceneReaderDeprecated = { } -function SceneReaderDeprecated.sharedSceneReader() - deprecatedTip("SceneReader:sharedSceneReader","ccs.SceneReader:getInstance") - return ccs.SceneReader:getInstance() -end -rawset(SceneReader,"sharedSceneReader",SceneReaderDeprecated.sharedSceneReader) - -function SceneReaderDeprecated.purgeSceneReader(self) - deprecatedTip("SceneReader:purgeSceneReader","ccs.SceneReader:destroyInstance") - return self:destroyInstance() -end -rawset(SceneReader,"purgeSceneReader",SceneReaderDeprecated.purgeSceneReader) ---functions of SceneReader will be deprecated end - --functions of cc.Node will be deprecated begin local NodeDeprecated = { } function NodeDeprecated.setZOrder(self,zOrder) @@ -1146,156 +1013,3 @@ function GLProgram.addAttribute(self, attributeName, index) end rawset(cc.GLProgram,"addAttribute", GLProgram.addAttribute) --functions of cc.GLProgram will be deprecated end - ---functions of ccui.Text will be deprecated begin -local TextDeprecated = { } -function TextDeprecated.setText(self, str) - deprecatedTip("ccui.Text:setText","ccui.Text:setString") - return self:setString(str) -end -rawset(ccui.Text,"setText", TextDeprecated.setText) - -function TextDeprecated.getStringValue(self) - deprecatedTip("ccui.Text:getStringValue","ccui.Text:getString") - return self:getString() -end -rawset(ccui.Text,"getStringValue", TextDeprecated.getStringValue) - ---functions of ccui.Text will be deprecated begin - ---functions of ccui.TextAtlas will be deprecated begin -local TextAtlasDeprecated = { } -function TextAtlasDeprecated.setStringValue(self, str) - deprecatedTip("ccui.TextAtlas:setStringValue","ccui.TextAtlas:setString") - return self:setString(str) -end -rawset(ccui.TextAtlas,"setStringValue", TextAtlasDeprecated.setStringValue) - -function TextAtlasDeprecated.getStringValue(self) - deprecatedTip("ccui.TextAtlas:getStringValue","ccui.TextAtlas:getString") - return self:getString() -end -rawset(ccui.TextAtlas,"getStringValue", TextAtlasDeprecated.getStringValue) - ---functions of ccui.TextAtlas will be deprecated begin - - ---functions of ccui.TextBMFont will be deprecated begin -local TextBMFontDeprecated = { } -function TextBMFontDeprecated.setText(self, str) - deprecatedTip("ccui.TextBMFont:setText","ccui.TextBMFont:setString") - return self:setString(str) -end -rawset(ccui.TextBMFont,"setText", TextBMFontDeprecated.setText) - -function TextBMFontDeprecated.getStringValue(self) - deprecatedTip("ccui.Text:getStringValue","ccui.TextBMFont:getString") - return self:getString() -end -rawset(ccui.Text,"getStringValue", TextBMFontDeprecated.getStringValue) ---functions of ccui.TextBMFont will be deprecated begin - ---functions of cc.ShaderCache will be deprecated begin -local ShaderCacheDeprecated = { } -function ShaderCacheDeprecated.getProgram(self,strShader) - deprecatedTip("cc.ShaderCache:getProgram","cc.ShaderCache:getGLProgram") - return self:getGLProgram(strShader) -end -rawset(cc.ShaderCache,"getProgram", ShaderCacheDeprecated.getProgram) ---functions of ccui.TextBMFont will be deprecated begin - ---functions of ccui.Widget will be deprecated begin -local UIWidgetDeprecated = { } -function UIWidgetDeprecated.getLeftInParent(self) - deprecatedTip("ccui.Widget:getLeftInParent","ccui.Widget:getLeftBoundary") - return self:getLeftBoundary() -end -rawset(ccui.Widget,"getLeftInParent", UIWidgetDeprecated.getLeftInParent) - -function UIWidgetDeprecated.getBottomInParent(self) - deprecatedTip("ccui.Widget:getBottomInParent","ccui.Widget:getBottomBoundary") - return self:getBottomBoundary() -end -rawset(ccui.Widget,"getBottomInParent", UIWidgetDeprecated.getBottomInParent) - -function UIWidgetDeprecated.getRightInParent(self) - deprecatedTip("ccui.Widget:getRightInParent","ccui.Widget:getRightBoundary") - return self:getRightBoundary() -end -rawset(ccui.Widget,"getRightInParent", UIWidgetDeprecated.getRightInParent) - -function UIWidgetDeprecated.getTopInParent(self) - deprecatedTip("ccui.Widget:getTopInParent","ccui.Widget:getTopBoundary") - return self:getTopBoundary() -end -rawset(ccui.Widget,"getTopInParent", UIWidgetDeprecated.getTopInParent) - -function UIWidgetDeprecated.getSize(self) - deprecatedTip("ccui.Widget:getSize","ccui.Widget:getContentSize") - return self:getContentSize() -end -rawset(ccui.Widget,"getSize", UIWidgetDeprecated.getSize) - -function UIWidgetDeprecated.setSize(self, ...) - deprecatedTip("ccui.Widget:setSize","ccui.Widget:setContentSize") - return self:setContentSize(...) -end -rawset(ccui.Widget,"setSize", UIWidgetDeprecated.setSize) - ---functions of ccui.Widget will be deprecated end - ---functions of ccui.CheckBox will be deprecated begin -local UICheckBoxDeprecated = { } -function UICheckBoxDeprecated.addEventListenerCheckBox(self,handler) - deprecatedTip("ccui.CheckBox:addEventListenerCheckBox","ccui.CheckBox:addEventListener") - return self:addEventListener(handler) -end -rawset(ccui.CheckBox,"addEventListenerCheckBox", UICheckBoxDeprecated.addEventListenerCheckBox) ---functions of ccui.CheckBox will be deprecated end - ---functions of ccui.Slider will be deprecated begin -local UISliderDeprecated = { } -function UISliderDeprecated.addEventListenerSlider(self,handler) - deprecatedTip("ccui.Slider:addEventListenerSlider","ccui.Slider:addEventListener") - return self:addEventListener(handler) -end -rawset(ccui.Slider,"addEventListenerSlider", UISliderDeprecated.addEventListenerSlider) ---functions of ccui.Slider will be deprecated end - ---functions of ccui.TextField will be deprecated begin -local UITextFieldDeprecated = { } -function UITextFieldDeprecated.addEventListenerTextField(self,handler) - deprecatedTip("ccui.TextField:addEventListenerTextField","ccui.TextField:addEventListener") - return self:addEventListener(handler) -end -rawset(ccui.TextField,"addEventListenerTextField", UITextFieldDeprecated.addEventListenerTextField) ---functions of ccui.TextField will be deprecated end - ---functions of ccui.PageView will be deprecated begin -local UIPageViewDeprecated = { } -function UIPageViewDeprecated.addEventListenerPageView(self,handler) - deprecatedTip("ccui.PageView:addEventListenerPageView","ccui.PageView:addEventListener") - return self:addEventListener(handler) -end -rawset(ccui.PageView,"addEventListenerPageView", UIPageViewDeprecated.addEventListenerPageView) ---functions of ccui.PageView will be deprecated end - ---functions of ccui.ScrollView will be deprecated begin -local UIScrollViewDeprecated = { } -function UIScrollViewDeprecated.addEventListenerScrollView(self,handler) - deprecatedTip("ccui.ScrollView:addEventListenerScrollView","ccui.ScrollView:addEventListener") - return self:addEventListener(handler) -end -rawset(ccui.ScrollView,"addEventListenerScrollView", UIScrollViewDeprecated.addEventListenerScrollView) ---functions of ccui.ScrollView will be deprecated end - ---functions of ccui.ListView will be deprecated begin -local UIListViewDeprecated = { } -function UIListViewDeprecated.addEventListenerListView(self,handler) - deprecatedTip("ccui.ListView:addEventListenerListView","ccui.ListView:addEventListener") - return self:addEventListener(handler) -end -rawset(ccui.ListView,"addEventListenerListView", UIListViewDeprecated.addEventListenerListView) ---functions of ccui.ListView will be deprecated end - - diff --git a/cocos/scripting/lua-bindings/script/DeprecatedOpenglEnum.lua b/cocos/scripting/lua-bindings/script/cocos2d/DeprecatedOpenglEnum.lua similarity index 100% rename from cocos/scripting/lua-bindings/script/DeprecatedOpenglEnum.lua rename to cocos/scripting/lua-bindings/script/cocos2d/DeprecatedOpenglEnum.lua diff --git a/cocos/scripting/lua-bindings/script/DrawPrimitives.lua b/cocos/scripting/lua-bindings/script/cocos2d/DrawPrimitives.lua similarity index 100% rename from cocos/scripting/lua-bindings/script/DrawPrimitives.lua rename to cocos/scripting/lua-bindings/script/cocos2d/DrawPrimitives.lua diff --git a/cocos/scripting/lua-bindings/script/Opengl.lua b/cocos/scripting/lua-bindings/script/cocos2d/Opengl.lua similarity index 100% rename from cocos/scripting/lua-bindings/script/Opengl.lua rename to cocos/scripting/lua-bindings/script/cocos2d/Opengl.lua diff --git a/cocos/scripting/lua-bindings/script/OpenglConstants.lua b/cocos/scripting/lua-bindings/script/cocos2d/OpenglConstants.lua similarity index 100% rename from cocos/scripting/lua-bindings/script/OpenglConstants.lua rename to cocos/scripting/lua-bindings/script/cocos2d/OpenglConstants.lua diff --git a/cocos/scripting/lua-bindings/script/bitExtend.lua b/cocos/scripting/lua-bindings/script/cocos2d/bitExtend.lua similarity index 100% rename from cocos/scripting/lua-bindings/script/bitExtend.lua rename to cocos/scripting/lua-bindings/script/cocos2d/bitExtend.lua diff --git a/cocos/scripting/lua-bindings/script/extern.lua b/cocos/scripting/lua-bindings/script/cocos2d/extern.lua similarity index 100% rename from cocos/scripting/lua-bindings/script/extern.lua rename to cocos/scripting/lua-bindings/script/cocos2d/extern.lua diff --git a/cocos/scripting/lua-bindings/script/json.lua b/cocos/scripting/lua-bindings/script/cocos2d/json.lua similarity index 100% rename from cocos/scripting/lua-bindings/script/json.lua rename to cocos/scripting/lua-bindings/script/cocos2d/json.lua diff --git a/cocos/scripting/lua-bindings/script/luaj.lua b/cocos/scripting/lua-bindings/script/cocos2d/luaj.lua similarity index 100% rename from cocos/scripting/lua-bindings/script/luaj.lua rename to cocos/scripting/lua-bindings/script/cocos2d/luaj.lua diff --git a/cocos/scripting/lua-bindings/script/luaoc.lua b/cocos/scripting/lua-bindings/script/cocos2d/luaoc.lua similarity index 100% rename from cocos/scripting/lua-bindings/script/luaoc.lua rename to cocos/scripting/lua-bindings/script/cocos2d/luaoc.lua diff --git a/cocos/scripting/lua-bindings/script/CCBReaderLoad.lua b/cocos/scripting/lua-bindings/script/cocosbuilder/CCBReaderLoad.lua similarity index 100% rename from cocos/scripting/lua-bindings/script/CCBReaderLoad.lua rename to cocos/scripting/lua-bindings/script/cocosbuilder/CCBReaderLoad.lua diff --git a/cocos/scripting/lua-bindings/script/cocosbuilder/DeprecatedCocosBuilderClass.lua b/cocos/scripting/lua-bindings/script/cocosbuilder/DeprecatedCocosBuilderClass.lua new file mode 100644 index 0000000000..66f1f5affd --- /dev/null +++ b/cocos/scripting/lua-bindings/script/cocosbuilder/DeprecatedCocosBuilderClass.lua @@ -0,0 +1,32 @@ +-- This is the DeprecatedCocosBuilderClass + +DeprecatedCocosBuilderClass = {} or DeprecatedCocosBuilderClass + +--tip +local function deprecatedTip(old_name,new_name) + print("\n********** \n"..old_name.." was deprecated please use ".. new_name .. " instead.\n**********") +end + +--CCBReader class will be Deprecated,begin +function DeprecatedCocosBuilderClass.CCBReader() + deprecatedTip("CCBReader","cc.BReader") + return cc.BReader +end +_G["CCBReader"] = DeprecatedCocosBuilderClass.CCBReader() +--CCBReader class will be Deprecated,end + +--CCBAnimationManager class will be Deprecated,begin +function DeprecatedCocosBuilderClass.CCBAnimationManager() + deprecatedTip("CCBAnimationManager","cc.BAnimationManager") + return cc.BAnimationManager +end +_G["CCBAnimationManager"] = DeprecatedCocosBuilderClass.CCBAnimationManager() +--CCBAnimationManager class will be Deprecated,end + +--CCBProxy class will be Deprecated,begin +function DeprecatedCocosBuilderClass.CCBProxy() + deprecatedTip("CCBProxy","cc.CCBProxy") + return cc.CCBProxy +end +_G["CCBProxy"] = DeprecatedCocosBuilderClass.CCBProxy() +--CCBProxy class will be Deprecated,end diff --git a/cocos/scripting/lua-bindings/script/AudioEngine.lua b/cocos/scripting/lua-bindings/script/cocosdenshion/AudioEngine.lua similarity index 100% rename from cocos/scripting/lua-bindings/script/AudioEngine.lua rename to cocos/scripting/lua-bindings/script/cocosdenshion/AudioEngine.lua diff --git a/cocos/scripting/lua-bindings/script/cocosdenshion/DeprecatedCocosDenshionClass.lua b/cocos/scripting/lua-bindings/script/cocosdenshion/DeprecatedCocosDenshionClass.lua new file mode 100644 index 0000000000..49e3cc3c3d --- /dev/null +++ b/cocos/scripting/lua-bindings/script/cocosdenshion/DeprecatedCocosDenshionClass.lua @@ -0,0 +1,16 @@ +-- This is the DeprecatedCocosDenshionClass + +DeprecatedCocosDenshionClass = {} or DeprecatedCocosDenshionClass + +--tip +local function deprecatedTip(old_name,new_name) + print("\n********** \n"..old_name.." was deprecated please use ".. new_name .. " instead.\n**********") +end + +--SimpleAudioEngine class will be Deprecated,begin +function DeprecatedCocosDenshionClass.SimpleAudioEngine() + deprecatedTip("SimpleAudioEngine","cc.SimpleAudioEngine") + return cc.SimpleAudioEngine +end +_G["SimpleAudioEngine"] = DeprecatedCocosDenshionClass.SimpleAudioEngine() +--SimpleAudioEngine class will be Deprecated,end diff --git a/cocos/scripting/lua-bindings/script/cocosdenshion/DeprecatedCocosDenshionFunc.lua b/cocos/scripting/lua-bindings/script/cocosdenshion/DeprecatedCocosDenshionFunc.lua new file mode 100644 index 0000000000..f6a5401ed2 --- /dev/null +++ b/cocos/scripting/lua-bindings/script/cocosdenshion/DeprecatedCocosDenshionFunc.lua @@ -0,0 +1,19 @@ +--tip +local function deprecatedTip(old_name,new_name) + print("\n********** \n"..old_name.." was deprecated please use ".. new_name .. " instead.\n**********") +end + +--functions of SimpleAudioEngine will be deprecated begin +local SimpleAudioEngineDeprecated = { } +function SimpleAudioEngineDeprecated.sharedEngine() + deprecatedTip("SimpleAudioEngine:sharedEngine","SimpleAudioEngine:getInstance") + return cc.SimpleAudioEngine:getInstance() +end +rawset(SimpleAudioEngine,"sharedEngine",SimpleAudioEngineDeprecated.sharedEngine) + +function SimpleAudioEngineDeprecated.playBackgroundMusic(self,...) + deprecatedTip("SimpleAudioEngine:playBackgroundMusic","SimpleAudioEngine:playMusic") + return self:playMusic(...) +end +rawset(SimpleAudioEngine,"playBackgroundMusic",SimpleAudioEngineDeprecated.playBackgroundMusic) +--functions of SimpleAudioEngine will be deprecated end diff --git a/cocos/scripting/lua-bindings/script/CocoStudio.lua b/cocos/scripting/lua-bindings/script/cocostudio/CocoStudio.lua similarity index 98% rename from cocos/scripting/lua-bindings/script/CocoStudio.lua rename to cocos/scripting/lua-bindings/script/cocostudio/CocoStudio.lua index 66eb80121f..e0df56a60d 100644 --- a/cocos/scripting/lua-bindings/script/CocoStudio.lua +++ b/cocos/scripting/lua-bindings/script/cocostudio/CocoStudio.lua @@ -371,3 +371,9 @@ end function ccs.TriggerMng:isEmpty() return (not (nil == self._eventTriggers)) or table.getn(self._eventTriggers) <= 0 end + +function __onParseConfig(configType,jasonStr) + if configType == cc.ConfigType.COCOSTUDIO then + ccs.TriggerMng.getInstance():parse(jasonStr) + end +end diff --git a/cocos/scripting/lua-bindings/script/cocostudio/DeprecatedCocoStudioClass.lua b/cocos/scripting/lua-bindings/script/cocostudio/DeprecatedCocoStudioClass.lua new file mode 100644 index 0000000000..6dba789064 --- /dev/null +++ b/cocos/scripting/lua-bindings/script/cocostudio/DeprecatedCocoStudioClass.lua @@ -0,0 +1,304 @@ +-- This is the DeprecatedExtensionClass + +DeprecatedExtensionClass = {} or DeprecatedExtensionClass + +--tip +local function deprecatedTip(old_name,new_name) + print("\n********** \n"..old_name.." was deprecated please use ".. new_name .. " instead.\n**********") +end + +--CCArmature class will be Deprecated,begin +function DeprecatedExtensionClass.CCArmature() + deprecatedTip("CCArmature","ccs.Armature") + return ccs.Armature +end +_G["CCArmature"] = DeprecatedExtensionClass.CCArmature() +--CCArmature class will be Deprecated,end + +--CCArmatureAnimation class will be Deprecated,begin +function DeprecatedExtensionClass.CCArmatureAnimation() + deprecatedTip("CCArmatureAnimation","ccs.ArmatureAnimation") + return ccs.ArmatureAnimation +end +_G["CCArmatureAnimation"] = DeprecatedExtensionClass.CCArmatureAnimation() +--CCArmatureAnimation class will be Deprecated,end + +--CCSkin class will be Deprecated,begin +function DeprecatedExtensionClass.CCSkin() + deprecatedTip("CCSkin","ccs.Skin") + return ccs.Skin +end +_G["CCSkin"] = DeprecatedExtensionClass.CCSkin() +--CCSkin class will be Deprecated,end + +--CCBone class will be Deprecated,begin +function DeprecatedExtensionClass.CCBone() + deprecatedTip("CCBone","ccs.Bone") + return ccs.Bone +end +_G["CCBone"] = DeprecatedExtensionClass.CCBone() +--CCBone class will be Deprecated,end + +--CCArmatureDataManager class will be Deprecated,begin +function DeprecatedExtensionClass.CCArmatureDataManager() + deprecatedTip("CCArmatureDataManager","ccs.ArmatureDataManager") + return ccs.ArmatureDataManager +end +_G["CCArmatureDataManager"] = DeprecatedExtensionClass.CCArmatureDataManager() +--CCArmatureDataManager class will be Deprecated,end + +--CCBatchNode class will be Deprecated,begin +function DeprecatedExtensionClass.CCBatchNode() + deprecatedTip("CCBatchNode","ccs.BatchNode") + return ccs.BatchNode +end +_G["CCBatchNode"] = DeprecatedExtensionClass.CCBatchNode() +--CCBatchNode class will be Deprecated,end + +--CCTween class will be Deprecated,begin +function DeprecatedExtensionClass.CCTween() + deprecatedTip("CCTween","ccs.Tween") + return ccs.Tween +end +_G["CCTween"] = DeprecatedExtensionClass.CCTween() +--CCTween class will be Deprecated,end + +--CCBaseData class will be Deprecated,begin +function DeprecatedExtensionClass.CCBaseData() + deprecatedTip("CCBaseData","ccs.BaseData") + return ccs.BaseData +end +_G["CCBaseData"] = DeprecatedExtensionClass.CCBaseData() +--CCBaseData class will be Deprecated,end + +--CCDisplayManager class will be Deprecated,begin +function DeprecatedExtensionClass.CCDisplayManager() + deprecatedTip("CCDisplayManager","ccs.DisplayManager") + return ccs.DisplayManager +end +_G["CCDisplayManager"] = DeprecatedExtensionClass.CCDisplayManager() +--CCDisplayManager class will be Deprecated,end + +--UIHelper class will be Deprecated,begin +function DeprecatedExtensionClass.UIHelper() + deprecatedTip("UIHelper","ccs.UIHelper") + return ccs.UIHelper +end +_G["UIHelper"] = DeprecatedExtensionClass.UIHelper() +--UIHelper class will be Deprecated,end + +--UILayout class will be Deprecated,begin +function DeprecatedExtensionClass.UILayout() + deprecatedTip("UILayout","ccs.UILayout") + return ccs.UILayout +end +_G["UILayout"] = DeprecatedExtensionClass.UILayout() +--UILayout class will be Deprecated,end + +--UIWidget class will be Deprecated,begin +function DeprecatedExtensionClass.UIWidget() + deprecatedTip("UIWidget","ccs.UIWidget") + return ccs.UIWidget +end +_G["UIWidget"] = DeprecatedExtensionClass.UIWidget() +--UIWidget class will be Deprecated,end + +--UILayer class will be Deprecated,begin +function DeprecatedExtensionClass.UILayer() + deprecatedTip("UILayer","ccs.UILayer") + return ccs.UILayer +end +_G["UILayer"] = DeprecatedExtensionClass.UILayer() +--UILayer class will be Deprecated,end + +--UIButton class will be Deprecated,begin +function DeprecatedExtensionClass.UIButton() + deprecatedTip("UIButton","ccs.UIButton") + return ccs.UIButton +end +_G["UIButton"] = DeprecatedExtensionClass.UIButton() +--UIButton class will be Deprecated,end + +--UICheckBox class will be Deprecated,begin +function DeprecatedExtensionClass.UICheckBox() + deprecatedTip("UICheckBox","ccs.UICheckBox") + return ccs.UICheckBox +end +_G["UICheckBox"] = DeprecatedExtensionClass.UICheckBox() +--UICheckBox class will be Deprecated,end + +--UIImageView class will be Deprecated,begin +function DeprecatedExtensionClass.UIImageView() + deprecatedTip("UIImageView","ccs.UIImageView") + return ccs.UIImageView +end +_G["UIImageView"] = DeprecatedExtensionClass.UIImageView() +--UIImageView class will be Deprecated,end + +--UILabel class will be Deprecated,begin +function DeprecatedExtensionClass.UILabel() + deprecatedTip("UILabel","ccs.UILabel") + return ccs.UILabel +end +_G["UILabel"] = DeprecatedExtensionClass.UILabel() +--UILabel class will be Deprecated,end + +--UILabelAtlas class will be Deprecated,begin +function DeprecatedExtensionClass.UILabelAtlas() + deprecatedTip("UILabelAtlas","ccs.UILabelAtlas") + return ccs.UILabelAtlas +end +_G["UILabelAtlas"] = DeprecatedExtensionClass.UILabelAtlas() +--UILabelAtlas class will be Deprecated,end + +--UILabelBMFont class will be Deprecated,begin +function DeprecatedExtensionClass.UILabelBMFont() + deprecatedTip("UILabelBMFont","ccs.UILabelBMFont") + return ccs.UILabelBMFont +end +_G["UILabelBMFont"] = DeprecatedExtensionClass.UILabelBMFont() +--UILabelBMFont class will be Deprecated,end + +--UILoadingBar class will be Deprecated,begin +function DeprecatedExtensionClass.UILoadingBar() + deprecatedTip("UILoadingBar","ccs.UILoadingBar") + return ccs.UILoadingBar +end +_G["UILoadingBar"] = DeprecatedExtensionClass.UILoadingBar() +--UILoadingBar class will be Deprecated,end + +--UISlider class will be Deprecated,begin +function DeprecatedExtensionClass.UISlider() + deprecatedTip("UISlider","ccs.UISlider") + return ccs.UISlider +end +_G["UISlider"] = DeprecatedExtensionClass.UISlider() +--UISlider class will be Deprecated,end + +--UITextField class will be Deprecated,begin +function DeprecatedExtensionClass.UITextField() + deprecatedTip("UITextField","ccs.UITextField") + return ccs.UITextField +end +_G["UITextField"] = DeprecatedExtensionClass.UITextField() +--UITextField class will be Deprecated,end + +--UIScrollView class will be Deprecated,begin +function DeprecatedExtensionClass.UIScrollView() + deprecatedTip("UIScrollView","ccs.UIScrollView") + return ccs.UIScrollView +end +_G["UIScrollView"] = DeprecatedExtensionClass.UIScrollView() +--UIScrollView class will be Deprecated,end + +--UIPageView class will be Deprecated,begin +function DeprecatedExtensionClass.UIPageView() + deprecatedTip("UIPageView","ccs.UIPageView") + return ccs.UIPageView +end +_G["UIPageView"] = DeprecatedExtensionClass.UIPageView() +--UIPageView class will be Deprecated,end + +--UIListView class will be Deprecated,begin +function DeprecatedExtensionClass.UIListView() + deprecatedTip("UIListView","ccs.UIListView") + return ccs.UIListView +end +_G["UIListView"] = DeprecatedExtensionClass.UIListView() +--UIListView class will be Deprecated,end + +--UILayoutParameter class will be Deprecated,begin +function DeprecatedExtensionClass.UILayoutParameter() + deprecatedTip("UILayoutParameter","ccs.UILayoutParameter") + return ccs.UILayoutParameter +end +_G["UILayoutParameter"] = DeprecatedExtensionClass.UILayoutParameter() +--UILayoutParameter class will be Deprecated,end + +--UILinearLayoutParameter class will be Deprecated,begin +function DeprecatedExtensionClass.UILinearLayoutParameter() + deprecatedTip("UILinearLayoutParameter","ccs.UILinearLayoutParameter") + return ccs.UILinearLayoutParameter +end +_G["UILinearLayoutParameter"] = DeprecatedExtensionClass.UILinearLayoutParameter() +--UILinearLayoutParameter class will be Deprecated,end + +--UIRelativeLayoutParameter class will be Deprecated,begin +function DeprecatedExtensionClass.UIRelativeLayoutParameter() + deprecatedTip("UIRelativeLayoutParameter","ccs.UIRelativeLayoutParameter") + return ccs.UIRelativeLayoutParameter +end +_G["UIRelativeLayoutParameter"] = DeprecatedExtensionClass.UIRelativeLayoutParameter() +--UIRelativeLayoutParameter class will be Deprecated,end + +--CCComController class will be Deprecated,begin +function DeprecatedExtensionClass.CCComController() + deprecatedTip("CCComController","ccs.ComController") + return ccs.CCComController +end +_G["CCComController"] = DeprecatedExtensionClass.CCComController() +--CCComController class will be Deprecated,end + +--CCComAudio class will be Deprecated,begin +function DeprecatedExtensionClass.CCComAudio() + deprecatedTip("CCComAudio","ccs.ComAudio") + return ccs.ComAudio +end +_G["CCComAudio"] = DeprecatedExtensionClass.CCComAudio() +--CCComAudio class will be Deprecated,end + +--CCComAttribute class will be Deprecated,begin +function DeprecatedExtensionClass.CCComAttribute() + deprecatedTip("CCComAttribute","ccs.ComAttribute") + return ccs.ComAttribute +end +_G["CCComAttribute"] = DeprecatedExtensionClass.CCComAttribute() +--CCComAttribute class will be Deprecated,end + +--CCComRender class will be Deprecated,begin +function DeprecatedExtensionClass.CCComRender() + deprecatedTip("CCComRender","ccs.ComRender") + return ccs.ComRender +end +_G["CCComRender"] = DeprecatedExtensionClass.CCComRender() +--CCComRender class will be Deprecated,end + +--ActionManager class will be Deprecated,begin +function DeprecatedExtensionClass.ActionManager() + deprecatedTip("ActionManager","ccs.ActionManagerEx") + return ccs.ActionManagerEx +end +_G["ActionManager"] = DeprecatedExtensionClass.ActionManager() +--CCComRender class will be Deprecated,end + +--SceneReader class will be Deprecated,begin +function DeprecatedExtensionClass.SceneReader() + deprecatedTip("SceneReader","ccs.SceneReader") + return ccs.SceneReader +end +_G["SceneReader"] = DeprecatedExtensionClass.SceneReader() +--SceneReader class will be Deprecated,end + +--GUIReader class will be Deprecated,begin +function DeprecatedExtensionClass.GUIReader() + deprecatedTip("GUIReader","ccs.GUIReader") + return ccs.GUIReader +end +_G["GUIReader"] = DeprecatedExtensionClass.GUIReader() +--GUIReader class will be Deprecated,end + +--UIRootWidget class will be Deprecated,begin +function DeprecatedExtensionClass.UIRootWidget() + deprecatedTip("UIRootWidget","ccs.UIRootWidget") + return ccs.UIRootWidget +end +_G["UIRootWidget"] = DeprecatedExtensionClass.UIRootWidget() +--UIRootWidget class will be Deprecated,end + +--ActionObject class will be Deprecated,begin +function DeprecatedExtensionClass.ActionObject() + deprecatedTip("ActionObject","ccs.ActionObject") + return ccs.ActionObject +end +_G["ActionObject"] = DeprecatedExtensionClass.ActionObject() +--ActionObject class will be Deprecated,end \ No newline at end of file diff --git a/cocos/scripting/lua-bindings/script/cocostudio/DeprecatedCocoStudioFunc.lua b/cocos/scripting/lua-bindings/script/cocostudio/DeprecatedCocoStudioFunc.lua new file mode 100644 index 0000000000..72331f1b09 --- /dev/null +++ b/cocos/scripting/lua-bindings/script/cocostudio/DeprecatedCocoStudioFunc.lua @@ -0,0 +1,77 @@ +--tip +local function deprecatedTip(old_name,new_name) + print("\n********** \n"..old_name.." was deprecated please use ".. new_name .. " instead.\n**********") +end + +--functions of GUIReader will be deprecated begin +local GUIReaderDeprecated = { } +function GUIReaderDeprecated.shareReader() + deprecatedTip("GUIReader:shareReader","ccs.GUIReader:getInstance") + return ccs.GUIReader:getInstance() +end +rawset(GUIReader,"shareReader",GUIReaderDeprecated.shareReader) + +function GUIReaderDeprecated.purgeGUIReader() + deprecatedTip("GUIReader:purgeGUIReader","ccs.GUIReader:destroyInstance") + return ccs.GUIReader:destroyInstance() +end +rawset(GUIReader,"purgeGUIReader",GUIReaderDeprecated.purgeGUIReader) +--functions of GUIReader will be deprecated end + +--functions of SceneReader will be deprecated begin +local SceneReaderDeprecated = { } +function SceneReaderDeprecated.sharedSceneReader() + deprecatedTip("SceneReader:sharedSceneReader","ccs.SceneReader:getInstance") + return ccs.SceneReader:getInstance() +end +rawset(SceneReader,"sharedSceneReader",SceneReaderDeprecated.sharedSceneReader) + +function SceneReaderDeprecated.purgeSceneReader(self) + deprecatedTip("SceneReader:purgeSceneReader","ccs.SceneReader:destroyInstance") + return self:destroyInstance() +end +rawset(SceneReader,"purgeSceneReader",SceneReaderDeprecated.purgeSceneReader) +--functions of SceneReader will be deprecated end + + +--functions of ccs.GUIReader will be deprecated begin +local CCSGUIReaderDeprecated = { } +function CCSGUIReaderDeprecated.purgeGUIReader() + deprecatedTip("ccs.GUIReader:purgeGUIReader","ccs.GUIReader:destroyInstance") + return ccs.GUIReader:destroyInstance() +end +rawset(ccs.GUIReader,"purgeGUIReader",CCSGUIReaderDeprecated.purgeGUIReader) +--functions of ccs.GUIReader will be deprecated end + +--functions of ccs.ActionManagerEx will be deprecated begin +local CCSActionManagerExDeprecated = { } +function CCSActionManagerExDeprecated.destroyActionManager() + deprecatedTip("ccs.ActionManagerEx:destroyActionManager","ccs.ActionManagerEx:destroyInstance") + return ccs.ActionManagerEx:destroyInstance() +end +rawset(ccs.ActionManagerEx,"destroyActionManager",CCSActionManagerExDeprecated.destroyActionManager) +--functions of ccs.ActionManagerEx will be deprecated end + +--functions of ccs.SceneReader will be deprecated begin +local CCSSceneReaderDeprecated = { } +function CCSSceneReaderDeprecated.destroySceneReader(self) + deprecatedTip("ccs.SceneReader:destroySceneReader","ccs.SceneReader:destroyInstance") + return self:destroyInstance() +end +rawset(ccs.SceneReader,"destroySceneReader",CCSSceneReaderDeprecated.destroySceneReader) +--functions of ccs.SceneReader will be deprecated end + +--functions of CCArmatureDataManager will be deprecated begin +local CCArmatureDataManagerDeprecated = { } +function CCArmatureDataManagerDeprecated.sharedArmatureDataManager() + deprecatedTip("CCArmatureDataManager:sharedArmatureDataManager","ccs.ArmatureDataManager:getInstance") + return ccs.ArmatureDataManager:getInstance() +end +rawset(CCArmatureDataManager,"sharedArmatureDataManager",CCArmatureDataManagerDeprecated.sharedArmatureDataManager) + +function CCArmatureDataManagerDeprecated.purge() + deprecatedTip("CCArmatureDataManager:purge","ccs.ArmatureDataManager:destoryInstance") + return ccs.ArmatureDataManager:destoryInstance() +end +rawset(CCArmatureDataManager,"purge",CCArmatureDataManagerDeprecated.purge) +--functions of CCArmatureDataManager will be deprecated end diff --git a/cocos/scripting/lua-bindings/script/StudioConstants.lua b/cocos/scripting/lua-bindings/script/cocostudio/StudioConstants.lua similarity index 100% rename from cocos/scripting/lua-bindings/script/StudioConstants.lua rename to cocos/scripting/lua-bindings/script/cocostudio/StudioConstants.lua diff --git a/cocos/scripting/lua-bindings/script/controller/ControllerConstants.lua b/cocos/scripting/lua-bindings/script/controller/ControllerConstants.lua new file mode 100644 index 0000000000..074e254bfd --- /dev/null +++ b/cocos/scripting/lua-bindings/script/controller/ControllerConstants.lua @@ -0,0 +1,37 @@ +cc = cc or {} + +cc.ControllerKey = +{ + JOYSTICK_LEFT_X = 1000, + JOYSTICK_LEFT_Y = 1001, + JOYSTICK_RIGHT_X = 1002, + JOYSTICK_RIGHT_Y = 1003, + + BUTTON_A = 1004, + BUTTON_B = 1005, + BUTTON_C = 1006, + BUTTON_X = 1007, + BUTTON_Y = 1008, + BUTTON_Z = 1009, + + BUTTON_DPAD_UP = 1010, + BUTTON_DPAD_DOWN = 1011, + BUTTON_DPAD_LEFT = 1012, + BUTTON_DPAD_RIGHT = 1013, + BUTTON_DPAD_CENTER = 1014, + + BUTTON_LEFT_SHOULDER = 1015, + BUTTON_RIGHT_SHOULDER = 1016, + + AXIS_LEFT_TRIGGER = 1017, + AXIS_RIGHT_TRIGGER = 1018, + + BUTTON_LEFT_THUMBSTICK = 1019, + BUTTON_RIGHT_THUMBSTICK = 1020, + + BUTTON_START = 1021, + BUTTON_SELECT = 1022, + + BUTTON_PAUSE = 1023, + KEY_MAX = 1024, +} diff --git a/cocos/scripting/lua-bindings/script/extension/DeprecatedExtensionClass.lua b/cocos/scripting/lua-bindings/script/extension/DeprecatedExtensionClass.lua new file mode 100644 index 0000000000..03cc96c49e --- /dev/null +++ b/cocos/scripting/lua-bindings/script/extension/DeprecatedExtensionClass.lua @@ -0,0 +1,113 @@ +-- This is the DeprecatedExtensionClass + +DeprecatedExtensionClass = {} or DeprecatedExtensionClass + +--tip +local function deprecatedTip(old_name,new_name) + print("\n********** \n"..old_name.." was deprecated please use ".. new_name .. " instead.\n**********") +end + +--CCControl class will be Deprecated,begin +function DeprecatedExtensionClass.CCControl() + deprecatedTip("CCControl","cc.Control") + return cc.Control +end +_G["CCControl"] = DeprecatedExtensionClass.CCControl() +--CCControl class will be Deprecated,end + +--CCEditBox class will be Deprecated,begin +function DeprecatedExtensionClass.CCEditBox() + deprecatedTip("CCEditBox","cc.EditBox") + return cc.EditBox +end +_G["CCEditBox"] = DeprecatedExtensionClass.CCEditBox() +--CCEditBox class will be Deprecated,end + +--CCScrollView class will be Deprecated,begin +function DeprecatedExtensionClass.CCScrollView() + deprecatedTip("CCScrollView","cc.ScrollView") + return cc.ScrollView +end +_G["CCScrollView"] = DeprecatedExtensionClass.CCScrollView() +--CCScrollView class will be Deprecated,end + +--CCTableView class will be Deprecated,begin +function DeprecatedExtensionClass.CCTableView() + deprecatedTip("CCTableView","cc.TableView") + return cc.TableView +end +_G["CCTableView"] = DeprecatedExtensionClass.CCTableView() +--CCTableView class will be Deprecated,end + +--CCControlPotentiometer class will be Deprecated,begin +function DeprecatedExtensionClass.CCControlPotentiometer() + deprecatedTip("CCControlPotentiometer","cc.ControlPotentiometer") + return cc.ControlPotentiometer +end +_G["CCControlPotentiometer"] = DeprecatedExtensionClass.CCControlPotentiometer() +--CCControlPotentiometer class will be Deprecated,end + +--CCControlStepper class will be Deprecated,begin +function DeprecatedExtensionClass.CCControlStepper() + deprecatedTip("CCControlStepper","cc.ControlStepper") + return cc.ControlStepper +end +_G["CCControlStepper"] = DeprecatedExtensionClass.CCControlStepper() +--CCControlStepper class will be Deprecated,end + +--CCControlHuePicker class will be Deprecated,begin +function DeprecatedExtensionClass.CCControlHuePicker() + deprecatedTip("CCControlHuePicker","cc.ControlHuePicker") + return cc.ControlHuePicker +end +_G["CCControlHuePicker"] = DeprecatedExtensionClass.CCControlHuePicker() +--CCControlHuePicker class will be Deprecated,end + +--CCControlSlider class will be Deprecated,begin +function DeprecatedExtensionClass.CCControlSlider() + deprecatedTip("CCControlSlider","cc.ControlSlider") + return cc.ControlSlider +end +_G["CCControlSlider"] = DeprecatedExtensionClass.CCControlSlider() +--CCControlSlider class will be Deprecated,end + +--CCControlSaturationBrightnessPicker class will be Deprecated,begin +function DeprecatedExtensionClass.CCControlSaturationBrightnessPicker() + deprecatedTip("CCControlSaturationBrightnessPicker","cc.ControlSaturationBrightnessPicker") + return cc.ControlSaturationBrightnessPicker +end +_G["CCControlSaturationBrightnessPicker"] = DeprecatedExtensionClass.CCControlSaturationBrightnessPicker() +--CCControlSaturationBrightnessPicker class will be Deprecated,end + +--CCControlSwitch class will be Deprecated,begin +function DeprecatedExtensionClass.CCControlSwitch() + deprecatedTip("CCControlSwitch","cc.ControlSwitch") + return cc.ControlSwitch +end +_G["CCControlSwitch"] = DeprecatedExtensionClass.CCControlSwitch() +--CCControlSwitch class will be Deprecated,end + +--CCControlButton class will be Deprecated,begin +function DeprecatedExtensionClass.CCControlButton() + deprecatedTip("CCControlButton","cc.ControlButton") + return cc.ControlButton +end +_G["CCControlButton"] = DeprecatedExtensionClass.CCControlButton() +--CCControlButton class will be Deprecated,end + +--CCScale9Sprite class will be Deprecated,begin +function DeprecatedExtensionClass.CCScale9Sprite() + deprecatedTip("CCScale9Sprite","cc.Scale9Sprite") + return cc.Scale9Sprite +end +_G["CCScale9Sprite"] = DeprecatedExtensionClass.CCScale9Sprite() +--CCScale9Sprite class will be Deprecated,end + +--CCControlColourPicker class will be Deprecated,begin +function DeprecatedExtensionClass.CCControlColourPicker() + deprecatedTip("CCControlColourPicker","cc.ControlColourPicker") + return cc.ControlColourPicker +end +_G["CCControlColourPicker"] = DeprecatedExtensionClass.CCControlColourPicker() +--CCControlColourPicker class will be Deprecated,end + diff --git a/cocos/scripting/lua-bindings/script/extension/DeprecatedExtensionEnum.lua b/cocos/scripting/lua-bindings/script/extension/DeprecatedExtensionEnum.lua new file mode 100644 index 0000000000..aad58e5753 --- /dev/null +++ b/cocos/scripting/lua-bindings/script/extension/DeprecatedExtensionEnum.lua @@ -0,0 +1,23 @@ + +_G.kCCControlStepperPartMinus = cc.CONTROL_STEPPER_PART_MINUS +_G.kCCControlStepperPartPlus = cc.CONTROL_STEPPER_PART_PLUS +_G.kCCControlStepperPartNone = cc.CONTROL_STEPPER_PART_NONE + +_G.CCControlEventTouchDown = cc.CONTROL_EVENTTYPE_TOUCH_DOWN +_G.CCControlEventTouchDragInside = cc.CONTROL_EVENTTYPE_DRAG_INSIDE +_G.CCControlEventTouchDragOutside = cc.CONTROL_EVENTTYPE_DRAG_OUTSIDE +_G.CCControlEventTouchDragEnter = cc.CONTROL_EVENTTYPE_DRAG_ENTER +_G.CCControlEventTouchDragExit = cc.CONTROL_EVENTTYPE_DRAG_EXIT +_G.CCControlEventTouchUpInside = cc.CONTROL_EVENTTYPE_TOUCH_UP_INSIDE +_G.CCControlEventTouchUpOutside = cc.CONTROL_EVENTTYPE_TOUCH_UP_OUTSIDE +_G.CCControlEventTouchCancel = cc.CONTROL_EVENTTYPE_TOUCH_CANCEL +_G.CCControlEventValueChanged = cc.CONTROL_EVENTTYPE_VALUE_CHANGED +_G.CCControlStateNormal = cc.CONTROL_STATE_NORMAL +_G.CCControlStateHighlighted = cc.CONTROL_STATE_HIGH_LIGHTED +_G.CCControlStateDisabled = cc.CONTROL_STATE_DISABLED +_G.CCControlStateSelected = cc.CONTROL_STATE_SELECTED + +_G.kCCScrollViewDirectionHorizontal = cc.SCROLLVIEW_DIRECTION_HORIZONTAL +_G.kCCScrollViewDirectionVertical = cc.SCROLLVIEW_DIRECTION_VERTICAL +_G.kCCTableViewFillTopDown = cc.TABLEVIEW_FILL_TOPDOWN +_G.kCCTableViewFillBottomUp = cc.TABLEVIEW_FILL_BOTTOMUP diff --git a/cocos/scripting/lua-bindings/script/extension/DeprecatedExtensionFunc.lua b/cocos/scripting/lua-bindings/script/extension/DeprecatedExtensionFunc.lua new file mode 100644 index 0000000000..513c2cbf85 --- /dev/null +++ b/cocos/scripting/lua-bindings/script/extension/DeprecatedExtensionFunc.lua @@ -0,0 +1,28 @@ +--tip +local function deprecatedTip(old_name,new_name) + print("\n********** \n"..old_name.." was deprecated please use ".. new_name .. " instead.\n**********") +end + +--functions of CCControl will be deprecated end +local CCControlDeprecated = { } +function CCControlDeprecated.addHandleOfControlEvent(self,func,controlEvent) + deprecatedTip("addHandleOfControlEvent","registerControlEventHandler") + print("come in addHandleOfControlEvent") + self:registerControlEventHandler(func,controlEvent) +end +rawset(CCControl,"addHandleOfControlEvent",CCControlDeprecated.addHandleOfControlEvent) +--functions of CCControl will be deprecated end + +--Enums of CCTableView will be deprecated begin +rawset(CCTableView, "kTableViewScroll",cc.SCROLLVIEW_SCRIPT_SCROLL) +rawset(CCTableView,"kTableViewZoom",cc.SCROLLVIEW_SCRIPT_ZOOM) +rawset(CCTableView,"kTableCellTouched",cc.TABLECELL_TOUCHED) +rawset(CCTableView,"kTableCellSizeForIndex",cc.TABLECELL_SIZE_FOR_INDEX) +rawset(CCTableView,"kTableCellSizeAtIndex",cc.TABLECELL_SIZE_AT_INDEX) +rawset(CCTableView,"kNumberOfCellsInTableView",cc.NUMBER_OF_CELLS_IN_TABLEVIEW) +--Enums of CCTableView will be deprecated end + +--Enums of CCScrollView will be deprecated begin +rawset(CCScrollView, "kScrollViewScroll",cc.SCROLLVIEW_SCRIPT_SCROLL) +rawset(CCScrollView,"kScrollViewZoom",cc.SCROLLVIEW_SCRIPT_ZOOM) +--Enums of CCScrollView will be deprecated end diff --git a/cocos/scripting/lua-bindings/script/extension/ExtensionConstants.lua b/cocos/scripting/lua-bindings/script/extension/ExtensionConstants.lua new file mode 100644 index 0000000000..16065e1790 --- /dev/null +++ b/cocos/scripting/lua-bindings/script/extension/ExtensionConstants.lua @@ -0,0 +1,58 @@ +cc = cc or {} + +cc.CONTROL_STATE_NORMAL = 1 +cc.CONTROL_STATE_HIGH_LIGHTED = 2 +cc.CONTROL_STATE_DISABLED = 4 +cc.CONTROL_STATE_SELECTED = 8 + +cc.CONTROL_STEPPER_PART_MINUS = 0 +cc.CONTROL_STEPPER_PART_PLUS = 1 +cc.CONTROL_STEPPER_PART_NONE = 2 + +cc.TABLEVIEW_FILL_TOPDOWN = 0 +cc.TABLEVIEW_FILL_BOTTOMUP = 1 + +cc.SCROLLVIEW_SCRIPT_SCROLL = 0 +cc.SCROLLVIEW_SCRIPT_ZOOM = 1 +cc.TABLECELL_TOUCHED = 2 +cc.TABLECELL_HIGH_LIGHT = 3 +cc.TABLECELL_UNHIGH_LIGHT = 4 +cc.TABLECELL_WILL_RECYCLE = 5 +cc.TABLECELL_SIZE_FOR_INDEX = 6 +cc.TABLECELL_SIZE_AT_INDEX = 7 +cc.NUMBER_OF_CELLS_IN_TABLEVIEW = 8 + +cc.SCROLLVIEW_DIRECTION_NONE = -1 +cc.SCROLLVIEW_DIRECTION_HORIZONTAL = 0 +cc.SCROLLVIEW_DIRECTION_VERTICAL = 1 +cc.SCROLLVIEW_DIRECTION_BOTH = 2 + +cc.CONTROL_EVENTTYPE_TOUCH_DOWN = 1 +cc.CONTROL_EVENTTYPE_DRAG_INSIDE = 2 +cc.CONTROL_EVENTTYPE_DRAG_OUTSIDE = 4 +cc.CONTROL_EVENTTYPE_DRAG_ENTER = 8 +cc.CONTROL_EVENTTYPE_DRAG_EXIT = 16 +cc.CONTROL_EVENTTYPE_TOUCH_UP_INSIDE = 32 +cc.CONTROL_EVENTTYPE_TOUCH_UP_OUTSIDE = 64 +cc.CONTROL_EVENTTYPE_TOUCH_CANCEL = 128 +cc.CONTROL_EVENTTYPE_VALUE_CHANGED = 256 + +cc.EDITBOX_INPUT_MODE_ANY = 0 +cc.EDITBOX_INPUT_MODE_EMAILADDR = 1 +cc.EDITBOX_INPUT_MODE_NUMERIC = 2 +cc.EDITBOX_INPUT_MODE_PHONENUMBER = 3 +cc.EDITBOX_INPUT_MODE_URL = 4 +cc.EDITBOX_INPUT_MODE_DECIMAL = 5 +cc.EDITBOX_INPUT_MODE_SINGLELINE = 6 + +cc.EDITBOX_INPUT_FLAG_PASSWORD = 0 +cc.EDITBOX_INPUT_FLAG_SENSITIVE = 1 +cc.EDITBOX_INPUT_FLAG_INITIAL_CAPS_WORD = 2 +cc.EDITBOX_INPUT_FLAG_INITIAL_CAPS_SENTENCE = 3 +cc.EDITBOX_INPUT_FLAG_INITIAL_CAPS_ALL_CHARACTERS = 4 + +cc.KEYBOARD_RETURNTYPE_DEFAULT = 0 +cc.KEYBOARD_RETURNTYPE_DONE = 1 +cc.KEYBOARD_RETURNTYPE_SEND = 2 +cc.KEYBOARD_RETURNTYPE_SEARCH = 3 +cc.KEYBOARD_RETURNTYPE_GO = 4 diff --git a/cocos/scripting/lua-bindings/script/network/DeprecatedNetworkClass.lua b/cocos/scripting/lua-bindings/script/network/DeprecatedNetworkClass.lua new file mode 100644 index 0000000000..f465dc7bbd --- /dev/null +++ b/cocos/scripting/lua-bindings/script/network/DeprecatedNetworkClass.lua @@ -0,0 +1,16 @@ +-- This is the DeprecatedNetworkClass + +DeprecatedNetworkClass = {} or DeprecatedNetworkClass + +--tip +local function deprecatedTip(old_name,new_name) + print("\n********** \n"..old_name.." was deprecated please use ".. new_name .. " instead.\n**********") +end + +--WebSocket class will be Deprecated,begin +function DeprecatedNetworkClass.WebSocket() + deprecatedTip("WebSocket","cc.WebSocket") + return cc.WebSocket +end +_G["WebSocket"] = DeprecatedNetworkClass.WebSocket() +--WebSocket class will be Deprecated,end diff --git a/cocos/scripting/lua-bindings/script/network/DeprecatedNetworkEnum.lua b/cocos/scripting/lua-bindings/script/network/DeprecatedNetworkEnum.lua new file mode 100644 index 0000000000..da9051cd3e --- /dev/null +++ b/cocos/scripting/lua-bindings/script/network/DeprecatedNetworkEnum.lua @@ -0,0 +1,9 @@ +_G.kWebSocketScriptHandlerOpen = cc.WEBSOCKET_OPEN +_G.kWebSocketScriptHandlerMessage = cc.WEBSOCKET_MESSAGE +_G.kWebSocketScriptHandlerClose = cc.WEBSOCKET_CLOSE +_G.kWebSocketScriptHandlerError = cc.WEBSOCKET_ERROR + +_G.kStateConnecting = cc.WEBSOCKET_STATE_CONNECTING +_G.kStateOpen = cc.WEBSOCKET_STATE_OPEN +_G.kStateClosing = cc.WEBSOCKET_STATE_CLOSING +_G.kStateClosed = cc.WEBSOCKET_STATE_CLOSED diff --git a/cocos/scripting/lua-bindings/script/network/DeprecatedNetworkFunc.lua b/cocos/scripting/lua-bindings/script/network/DeprecatedNetworkFunc.lua new file mode 100644 index 0000000000..83869f7775 --- /dev/null +++ b/cocos/scripting/lua-bindings/script/network/DeprecatedNetworkFunc.lua @@ -0,0 +1,23 @@ +--tip +local function deprecatedTip(old_name,new_name) + print("\n********** \n"..old_name.." was deprecated please use ".. new_name .. " instead.\n**********") +end + +--functions of WebSocket will be deprecated begin +local targetPlatform = CCApplication:getInstance():getTargetPlatform() +if (kTargetIphone == targetPlatform) or (kTargetIpad == targetPlatform) or (kTargetAndroid == targetPlatform) or (kTargetWindows == targetPlatform) then + local WebSocketDeprecated = { } + function WebSocketDeprecated.sendTextMsg(self, string) + deprecatedTip("WebSocket:sendTextMsg","WebSocket:sendString") + return self:sendString(string) + end + rawset(WebSocket,"sendTextMsg", WebSocketDeprecated.sendTextMsg) + + function WebSocketDeprecated.sendBinaryMsg(self, table,tablesize) + deprecatedTip("WebSocket:sendBinaryMsg","WebSocket:sendString") + string.char(unpack(table)) + return self:sendString(string.char(unpack(table))) + end + rawset(WebSocket,"sendBinaryMsg", WebSocketDeprecated.sendBinaryMsg) +end +--functions of WebSocket will be deprecated end diff --git a/cocos/scripting/lua-bindings/script/network/NetworkConstants.lua b/cocos/scripting/lua-bindings/script/network/NetworkConstants.lua new file mode 100644 index 0000000000..0e7dd0004f --- /dev/null +++ b/cocos/scripting/lua-bindings/script/network/NetworkConstants.lua @@ -0,0 +1,18 @@ +cc = cc or {} + +cc.WEBSOCKET_OPEN = 0 +cc.WEBSOCKET_MESSAGE = 1 +cc.WEBSOCKET_CLOSE = 2 +cc.WEBSOCKET_ERROR = 3 + +cc.WEBSOCKET_STATE_CONNECTING = 0 +cc.WEBSOCKET_STATE_OPEN = 1 +cc.WEBSOCKET_STATE_CLOSING = 2 +cc.WEBSOCKET_STATE_CLOSED = 3 + + +cc.XMLHTTPREQUEST_RESPONSE_STRING = 0 +cc.XMLHTTPREQUEST_RESPONSE_ARRAY_BUFFER = 1 +cc.XMLHTTPREQUEST_RESPONSE_BLOB = 2 +cc.XMLHTTPREQUEST_RESPONSE_DOCUMENT = 3 +cc.XMLHTTPREQUEST_RESPONSE_JSON = 4 diff --git a/cocos/scripting/lua-bindings/script/ui/DeprecatedUIEnum.lua b/cocos/scripting/lua-bindings/script/ui/DeprecatedUIEnum.lua new file mode 100644 index 0000000000..bc3fc5a226 --- /dev/null +++ b/cocos/scripting/lua-bindings/script/ui/DeprecatedUIEnum.lua @@ -0,0 +1,92 @@ +require("GuiConstants") + +_G.LAYOUT_COLOR_NONE = ccui.LayoutBackGroundColorType.none +_G.LAYOUT_COLOR_SOLID = ccui.LayoutBackGroundColorType.solid +_G.LAYOUT_COLOR_GRADIENT = ccui.LayoutBackGroundColorType.gradient + +_G.LAYOUT_ABSOLUTE = ccui.LayoutType.ABSOLUTE +_G.LAYOUT_LINEAR_VERTICAL = ccui.LayoutType.VERTICAL +_G.LAYOUT_LINEAR_HORIZONTAL = ccui.LayoutType.HORIZONTAL +_G.LAYOUT_RELATIVE = ccui.LayoutType.RELATIVE + +_G.BRIGHT_NONE = ccui.BrightStyle.none +_G.BRIGHT_NORMAL = ccui.BrightStyle.normal +_G.BRIGHT_HIGHLIGHT = ccui.BrightStyle.highlight + +_G.UI_TEX_TYPE_LOCAL = ccui.TextureResType.localType +_G.UI_TEX_TYPE_PLIST = ccui.TextureResType.plistType + +_G.TOUCH_EVENT_BEGAN = ccui.TouchEventType.began +_G.TOUCH_EVENT_MOVED = ccui.TouchEventType.moved +_G.TOUCH_EVENT_ENDED = ccui.TouchEventType.ended +_G.TOUCH_EVENT_CANCELED = ccui.TouchEventType.canceled + +_G.SIZE_ABSOLUTE = ccui.SizeType.absolute +_G.SIZE_PERCENT = ccui.SizeType.percent + +_G.POSITION_ABSOLUTE = ccui.PositionType.absolute +_G.POSITION_PERCENT = ccui.PositionType.percent + +_G.CHECKBOX_STATE_EVENT_SELECTED = ccui.CheckBoxEventType.selected +_G.CHECKBOX_STATE_EVENT_UNSELECTED = ccui.CheckBoxEventType.unselected + +_G.CHECKBOX_STATE_EVENT_SELECTED = ccui.CheckBoxEventType.selected +_G.CHECKBOX_STATE_EVENT_UNSELECTED = ccui.CheckBoxEventType.unselected + +_G.LoadingBarTypeLeft = ccui.LoadingBarDirection.LEFT +_G.LoadingBarTypeRight = ccui.LoadingBarDirection.RIGHT + +_G.LoadingBarTypeRight = ccui.SliderEventType.percent_changed + +_G.TEXTFIELD_EVENT_ATTACH_WITH_IME = ccui.TextFiledEventType.attach_with_ime +_G.TEXTFIELD_EVENT_DETACH_WITH_IME = ccui.TextFiledEventType.detach_with_ime +_G.TEXTFIELD_EVENT_INSERT_TEXT = ccui.TextFiledEventType.insert_text +_G.TEXTFIELD_EVENT_DELETE_BACKWARD = ccui.TextFiledEventType.delete_backward + +_G.SCROLLVIEW_EVENT_SCROLL_TO_TOP = ccui.ScrollViewDir.none +_G.SCROLLVIEW_DIR_VERTICAL = ccui.ScrollViewDir.vertical +_G.SCROLLVIEW_DIR_HORIZONTAL = ccui.ScrollViewDir.horizontal +_G.SCROLLVIEW_DIR_BOTH = ccui.ScrollViewDir.both + +_G.SCROLLVIEW_EVENT_SCROLL_TO_TOP = ccui.ScrollviewEventType.scrollToTop +_G.SCROLLVIEW_EVENT_SCROLL_TO_BOTTOM = ccui.ScrollviewEventType.scrollToBottom +_G.SCROLLVIEW_EVENT_SCROLL_TO_LEFT = ccui.ScrollviewEventType.scrollToLeft +_G.SCROLLVIEW_EVENT_SCROLL_TO_RIGHT = ccui.ScrollviewEventType.scrollToRight +_G.SCROLLVIEW_EVENT_SCROLLING = ccui.ScrollviewEventType.scrolling +_G.SCROLLVIEW_EVENT_BOUNCE_TOP = ccui.ScrollviewEventType.bounceTop +_G.SCROLLVIEW_EVENT_BOUNCE_BOTTOM = ccui.ScrollviewEventType.bounceBottom +_G.SCROLLVIEW_EVENT_BOUNCE_LEFT = ccui.ScrollviewEventType.bounceLeft +_G.SCROLLVIEW_EVENT_BOUNCE_RIGHT = ccui.ScrollviewEventType.bounceRight + +_G.PAGEVIEW_EVENT_TURNING = ccui.PageViewEventType.turning + +_G.PAGEVIEW_TOUCHLEFT = ccui.PVTouchDir.touch_left +_G.PAGEVIEW_TOUCHRIGHT = ccui.PVTouchDir.touch_right + +_G.LISTVIEW_DIR_NONE = ccui.ListViewDirection.none +_G.LISTVIEW_DIR_VERTICAL = ccui.ListViewDirection.vertical +_G.LISTVIEW_DIR_HORIZONTAL = ccui.ListViewDirection.horizontal + +_G.LISTVIEW_MOVE_DIR_NONE = ccui.ListViewMoveDirection.none +_G.LISTVIEW_MOVE_DIR_UP = ccui.ListViewMoveDirection.up +_G.LISTVIEW_MOVE_DIR_DOWN = ccui.ListViewMoveDirection.down +_G.LISTVIEW_MOVE_DIR_LEFT = ccui.ListViewMoveDirection.left +_G.LISTVIEW_MOVE_DIR_RIGHT = ccui.ListViewMoveDirection.right + +_G.LISTVIEW_EVENT_INIT_CHILD = ccui.ListViewEventType.init_child +_G.LISTVIEW_EVENT_UPDATE_CHILD = ccui.ListViewEventType.update_child + +_G.LAYOUT_PARAMETER_NONE = ccui.LayoutParameterType.none +_G.LAYOUT_PARAMETER_LINEAR = ccui.LayoutParameterType.linear +_G.LAYOUT_PARAMETER_RELATIVE = ccui.LayoutParameterType.relative + +ccui.LoadingBarType = ccui.LoadingBarDirection +ccui.LoadingBarType.left = ccui.LoadingBarDirection.LEFT +ccui.LoadingBarType.right = ccui.LoadingBarDirection.RIGHT + +ccui.LayoutType.absolute = ccui.LayoutType.ABSOLUTE +ccui.LayoutType.linearVertical = ccui.LayoutType.VERTICAL +ccui.LayoutType.linearHorizontal = ccui.LayoutType.HORIZONTAL +ccui.LayoutType.relative = ccui.LayoutType.RELATIVE + +ccui.ListViewEventType.onsSelectedItem = ccui.ListViewEventType.ONSELECTEDITEM_START \ No newline at end of file diff --git a/cocos/scripting/lua-bindings/script/ui/DeprecatedUIFunc.lua b/cocos/scripting/lua-bindings/script/ui/DeprecatedUIFunc.lua new file mode 100644 index 0000000000..b11bf1d161 --- /dev/null +++ b/cocos/scripting/lua-bindings/script/ui/DeprecatedUIFunc.lua @@ -0,0 +1,154 @@ +--tip +local function deprecatedTip(old_name,new_name) + print("\n********** \n"..old_name.." was deprecated please use ".. new_name .. " instead.\n**********") +end + +--functions of ccui.Text will be deprecated begin +local TextDeprecated = { } +function TextDeprecated.setText(self, str) + deprecatedTip("ccui.Text:setText","ccui.Text:setString") + return self:setString(str) +end +rawset(ccui.Text,"setText", TextDeprecated.setText) + +function TextDeprecated.getStringValue(self) + deprecatedTip("ccui.Text:getStringValue","ccui.Text:getString") + return self:getString() +end +rawset(ccui.Text,"getStringValue", TextDeprecated.getStringValue) + +--functions of ccui.Text will be deprecated begin + +--functions of ccui.TextAtlas will be deprecated begin +local TextAtlasDeprecated = { } +function TextAtlasDeprecated.setStringValue(self, str) + deprecatedTip("ccui.TextAtlas:setStringValue","ccui.TextAtlas:setString") + return self:setString(str) +end +rawset(ccui.TextAtlas,"setStringValue", TextAtlasDeprecated.setStringValue) + +function TextAtlasDeprecated.getStringValue(self) + deprecatedTip("ccui.TextAtlas:getStringValue","ccui.TextAtlas:getString") + return self:getString() +end +rawset(ccui.TextAtlas,"getStringValue", TextAtlasDeprecated.getStringValue) +--functions of ccui.TextAtlas will be deprecated begin + + +--functions of ccui.TextBMFont will be deprecated begin +local TextBMFontDeprecated = { } +function TextBMFontDeprecated.setText(self, str) + deprecatedTip("ccui.TextBMFont:setText","ccui.TextBMFont:setString") + return self:setString(str) +end +rawset(ccui.TextBMFont,"setText", TextBMFontDeprecated.setText) + +function TextBMFontDeprecated.getStringValue(self) + deprecatedTip("ccui.Text:getStringValue","ccui.TextBMFont:getString") + return self:getString() +end +rawset(ccui.Text,"getStringValue", TextBMFontDeprecated.getStringValue) +--functions of ccui.TextBMFont will be deprecated begin + +--functions of cc.ShaderCache will be deprecated begin +local ShaderCacheDeprecated = { } +function ShaderCacheDeprecated.getProgram(self,strShader) + deprecatedTip("cc.ShaderCache:getProgram","cc.ShaderCache:getGLProgram") + return self:getGLProgram(strShader) +end +rawset(cc.ShaderCache,"getProgram", ShaderCacheDeprecated.getProgram) +--functions of ccui.TextBMFont will be deprecated begin + +--functions of ccui.Widget will be deprecated begin +local UIWidgetDeprecated = { } +function UIWidgetDeprecated.getLeftInParent(self) + deprecatedTip("ccui.Widget:getLeftInParent","ccui.Widget:getLeftBoundary") + return self:getLeftBoundary() +end +rawset(ccui.Widget,"getLeftInParent", UIWidgetDeprecated.getLeftInParent) + +function UIWidgetDeprecated.getBottomInParent(self) + deprecatedTip("ccui.Widget:getBottomInParent","ccui.Widget:getBottomBoundary") + return self:getBottomBoundary() +end +rawset(ccui.Widget,"getBottomInParent", UIWidgetDeprecated.getBottomInParent) + +function UIWidgetDeprecated.getRightInParent(self) + deprecatedTip("ccui.Widget:getRightInParent","ccui.Widget:getRightBoundary") + return self:getRightBoundary() +end +rawset(ccui.Widget,"getRightInParent", UIWidgetDeprecated.getRightInParent) + +function UIWidgetDeprecated.getTopInParent(self) + deprecatedTip("ccui.Widget:getTopInParent","ccui.Widget:getTopBoundary") + return self:getTopBoundary() +end +rawset(ccui.Widget,"getTopInParent", UIWidgetDeprecated.getTopInParent) + +function UIWidgetDeprecated.getSize(self) + deprecatedTip("ccui.Widget:getSize","ccui.Widget:getContentSize") + return self:getContentSize() +end +rawset(ccui.Widget,"getSize", UIWidgetDeprecated.getSize) + +function UIWidgetDeprecated.setSize(self, ...) + deprecatedTip("ccui.Widget:setSize","ccui.Widget:setContentSize") + return self:setContentSize(...) +end +rawset(ccui.Widget,"setSize", UIWidgetDeprecated.setSize) + +--functions of ccui.Widget will be deprecated end + +--functions of ccui.CheckBox will be deprecated begin +local UICheckBoxDeprecated = { } +function UICheckBoxDeprecated.addEventListenerCheckBox(self,handler) + deprecatedTip("ccui.CheckBox:addEventListenerCheckBox","ccui.CheckBox:addEventListener") + return self:addEventListener(handler) +end +rawset(ccui.CheckBox,"addEventListenerCheckBox", UICheckBoxDeprecated.addEventListenerCheckBox) +--functions of ccui.CheckBox will be deprecated end + +--functions of ccui.Slider will be deprecated begin +local UISliderDeprecated = { } +function UISliderDeprecated.addEventListenerSlider(self,handler) + deprecatedTip("ccui.Slider:addEventListenerSlider","ccui.Slider:addEventListener") + return self:addEventListener(handler) +end +rawset(ccui.Slider,"addEventListenerSlider", UISliderDeprecated.addEventListenerSlider) +--functions of ccui.Slider will be deprecated end + +--functions of ccui.TextField will be deprecated begin +local UITextFieldDeprecated = { } +function UITextFieldDeprecated.addEventListenerTextField(self,handler) + deprecatedTip("ccui.TextField:addEventListenerTextField","ccui.TextField:addEventListener") + return self:addEventListener(handler) +end +rawset(ccui.TextField,"addEventListenerTextField", UITextFieldDeprecated.addEventListenerTextField) +--functions of ccui.TextField will be deprecated end + +--functions of ccui.PageView will be deprecated begin +local UIPageViewDeprecated = { } +function UIPageViewDeprecated.addEventListenerPageView(self,handler) + deprecatedTip("ccui.PageView:addEventListenerPageView","ccui.PageView:addEventListener") + return self:addEventListener(handler) +end +rawset(ccui.PageView,"addEventListenerPageView", UIPageViewDeprecated.addEventListenerPageView) +--functions of ccui.PageView will be deprecated end + +--functions of ccui.ScrollView will be deprecated begin +local UIScrollViewDeprecated = { } +function UIScrollViewDeprecated.addEventListenerScrollView(self,handler) + deprecatedTip("ccui.ScrollView:addEventListenerScrollView","ccui.ScrollView:addEventListener") + return self:addEventListener(handler) +end +rawset(ccui.ScrollView,"addEventListenerScrollView", UIScrollViewDeprecated.addEventListenerScrollView) +--functions of ccui.ScrollView will be deprecated end + +--functions of ccui.ListView will be deprecated begin +local UIListViewDeprecated = { } +function UIListViewDeprecated.addEventListenerListView(self,handler) + deprecatedTip("ccui.ListView:addEventListenerListView","ccui.ListView:addEventListener") + return self:addEventListener(handler) +end +rawset(ccui.ListView,"addEventListenerListView", UIListViewDeprecated.addEventListenerListView) +--functions of ccui.ListView will be deprecated end diff --git a/cocos/scripting/lua-bindings/script/GuiConstants.lua b/cocos/scripting/lua-bindings/script/ui/GuiConstants.lua similarity index 100% rename from cocos/scripting/lua-bindings/script/GuiConstants.lua rename to cocos/scripting/lua-bindings/script/ui/GuiConstants.lua diff --git a/cocos/scripting/lua-bindings/script/experimentalConstants.lua b/cocos/scripting/lua-bindings/script/ui/experimentalUIConstants.lua similarity index 100% rename from cocos/scripting/lua-bindings/script/experimentalConstants.lua rename to cocos/scripting/lua-bindings/script/ui/experimentalUIConstants.lua diff --git a/cocos/storage/CMakeLists.txt b/cocos/storage/CMakeLists.txt index 68f06b7a0f..1ddd93f957 100644 --- a/cocos/storage/CMakeLists.txt +++ b/cocos/storage/CMakeLists.txt @@ -1,9 +1,13 @@ - -set(COCOS_STORAGE_SRC - storage/local-storage/LocalStorage.cpp - ) - -set(COCOS_STORAGE_LINK - sqlite3 +set(COCOS_STORAGE_SRC + local-storage/LocalStorage.cpp ) +add_library(sqlite3 STATIC + ${COCOS_STORAGE_SRC} +) + +set_target_properties(sqlite3 + PROPERTIES + ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib" + LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib" +) diff --git a/cocos/storage/local-storage/Android.mk b/cocos/storage/local-storage/Android.mk index c1351e7fb5..3a7a2604ee 100644 --- a/cocos/storage/local-storage/Android.mk +++ b/cocos/storage/local-storage/Android.mk @@ -17,7 +17,7 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/../.. LOCAL_CFLAGS += -Wno-psabi LOCAL_EXPORT_CFLAGS += -Wno-psabi -LOCAL_WHOLE_STATIC_LIBRARIES := cocos2dx_static +LOCAL_STATIC_LIBRARIES := cocos2dx_static include $(BUILD_STATIC_LIBRARY) diff --git a/cocos/storage/local-storage/proj.win32/libLocalStorage.vcxproj.filters b/cocos/storage/local-storage/proj.win32/libLocalStorage.vcxproj.filters deleted file mode 100644 index b23d606b74..0000000000 --- a/cocos/storage/local-storage/proj.win32/libLocalStorage.vcxproj.filters +++ /dev/null @@ -1,21 +0,0 @@ - - - - - {0310200c-b520-4f77-85f6-46f568b10f4d} - - - {69cfa37c-4b20-409e-ad74-a26314878d8a} - - - - - Source Files - - - - - Header Files - - - \ No newline at end of file diff --git a/cocos/ui/Android.mk b/cocos/ui/Android.mk index fed4a17385..ab417448f1 100644 --- a/cocos/ui/Android.mk +++ b/cocos/ui/Android.mk @@ -25,12 +25,12 @@ UILoadingBar.cpp \ UISlider.cpp \ UITextField.cpp \ UIRichText.cpp \ -CCProtectedNode.cpp \ UIHBox.cpp \ UIVBox.cpp \ UIRelativeBox.cpp \ UIVideoPlayerAndroid.cpp \ UIDeprecated.cpp \ +UIScale9Sprite.cpp \ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/.. \ $(LOCAL_PATH)/../editor-support @@ -42,8 +42,8 @@ $(LOCAL_PATH)/../.. \ $(LOCAL_PATH)/../editor-support -LOCAL_WHOLE_STATIC_LIBRARIES := cocos2dx_static -LOCAL_WHOLE_STATIC_LIBRARIES += cocos_extension_static +LOCAL_STATIC_LIBRARIES := cocos2dx_static +LOCAL_STATIC_LIBRARIES += cocos_extension_static include $(BUILD_STATIC_LIBRARY) diff --git a/cocos/ui/CMakeLists.txt b/cocos/ui/CMakeLists.txt index cd7066589d..3ccdf27b25 100644 --- a/cocos/ui/CMakeLists.txt +++ b/cocos/ui/CMakeLists.txt @@ -1,27 +1,46 @@ set(COCOS_UI_SRC - ui/CCProtectedNode.cpp - ui/CocosGUI.cpp - ui/UIButton.cpp - ui/UICheckBox.cpp - ui/UIHBox.cpp - ui/UIHelper.cpp - ui/UIImageView.cpp - ui/UILayout.cpp - ui/UILayoutParameter.cpp - ui/UILayoutManager.cpp - ui/UIListView.cpp - ui/UILoadingBar.cpp - ui/UIPageView.cpp - ui/UIRelativeBox.cpp - ui/UIRichText.cpp - ui/UIScrollView.cpp - ui/UISlider.cpp - ui/UITextAtlas.cpp - ui/UITextBMFont.cpp - ui/UIText.cpp - ui/UITextField.cpp - ui/UIVBox.cpp - ui/UIWidget.cpp - ui/UIDeprecated.cpp + CocosGUI.cpp + UIButton.cpp + UICheckBox.cpp + UIHBox.cpp + UIHelper.cpp + UIImageView.cpp + UILayout.cpp + UILayoutParameter.cpp + UILayoutManager.cpp + UIListView.cpp + UILoadingBar.cpp + UIPageView.cpp + UIRelativeBox.cpp + UIRichText.cpp + UIScrollView.cpp + UISlider.cpp + UITextAtlas.cpp + UITextBMFont.cpp + UIText.cpp + UITextField.cpp + UIVBox.cpp + UIWidget.cpp + UIDeprecated.cpp + UIScale9Sprite.cpp ) +include_directories( + ui + ../../base +) + + +add_library(ui STATIC + ${COCOS_UI_SRC} +) + +target_link_libraries(ui + cocos2d +) + +set_target_properties(ui + PROPERTIES + ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib" + LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib" +) diff --git a/cocos/ui/CocosGUI.h b/cocos/ui/CocosGUI.h index 5a6c1810bb..5fc08abefc 100644 --- a/cocos/ui/CocosGUI.h +++ b/cocos/ui/CocosGUI.h @@ -49,12 +49,14 @@ THE SOFTWARE. #include "ui/UIVideoPlayer.h" #endif #include "ui/UIDeprecated.h" +#include "ui/GUIExport.h" +#include "ui/UIScale9Sprite.h" NS_CC_BEGIN namespace ui { -const char* CocosGUIVersion(); +CC_GUI_DLL const char* CocosGUIVersion(); } NS_CC_END diff --git a/cocos/ui/GUIExport.h b/cocos/ui/GUIExport.h new file mode 100644 index 0000000000..aec8809e0f --- /dev/null +++ b/cocos/ui/GUIExport.h @@ -0,0 +1,28 @@ +#ifndef __CCLIBGUI_H__ +#define __CCLIBGUI_H__ + +#if defined(WIN32) && defined(_WINDOWS) + #ifdef __MINGW32__ + #include + #endif + + #if defined(_USEGUIDLL) + #define CC_GUI_DLL __declspec(dllexport) + #else /* use a DLL library */ + #define CC_GUI_DLL __declspec(dllimport) + #endif + + + /* Define NULL pointer value */ + #ifndef NULL + #ifdef __cplusplus + #define NULL 0 + #else + #define NULL ((void *)0) + #endif + #endif +#else + #define CC_GUI_DLL +#endif + +#endif /* __CCEXTENSIONEXPORT_H__*/ \ No newline at end of file diff --git a/cocos/ui/UIButton.cpp b/cocos/ui/UIButton.cpp index 6cfdbecc86..aebfd113d0 100644 --- a/cocos/ui/UIButton.cpp +++ b/cocos/ui/UIButton.cpp @@ -23,7 +23,7 @@ THE SOFTWARE. ****************************************************************************/ #include "ui/UIButton.h" -#include "extensions/GUI/CCControlExtension/CCScale9Sprite.h" +#include "ui/UIScale9Sprite.h" #include "2d/CCLabel.h" #include "2d/CCSprite.h" #include "2d/CCActionInterval.h" @@ -64,6 +64,7 @@ _normalTextureScaleXInSize(1.0f), _normalTextureScaleYInSize(1.0f), _pressedTextureScaleXInSize(1.0f), _pressedTextureScaleYInSize(1.0f), +_zoomScale(0.1f), _normalTextureLoaded(false), _pressedTextureLoaded(false), _disabledTextureLoaded(false), @@ -135,9 +136,13 @@ bool Button::init() void Button::initRenderer() { - _buttonNormalRenderer = Sprite::create(); - _buttonClickedRenderer = Sprite::create(); - _buttonDisableRenderer = Sprite::create(); + _buttonNormalRenderer = Scale9Sprite::create(); + _buttonClickedRenderer = Scale9Sprite::create(); + _buttonDisableRenderer = Scale9Sprite::create(); + _buttonClickedRenderer->setScale9Enabled(false); + _buttonNormalRenderer->setScale9Enabled(false); + _buttonDisableRenderer->setScale9Enabled(false); + _titleRenderer = Label::create(); _titleRenderer->setAnchorPoint(Vec2::ANCHOR_MIDDLE); @@ -153,33 +158,13 @@ void Button::setScale9Enabled(bool able) { return; } - _brightStyle = BrightStyle::NONE; + _scale9Enabled = able; - removeProtectedChild(_buttonNormalRenderer); - removeProtectedChild(_buttonClickedRenderer); - removeProtectedChild(_buttonDisableRenderer); - _buttonNormalRenderer = nullptr; - _buttonClickedRenderer = nullptr; - _buttonDisableRenderer = nullptr; - if (_scale9Enabled) - { - _buttonNormalRenderer = extension::Scale9Sprite::create(); - _buttonClickedRenderer = extension::Scale9Sprite::create(); - _buttonDisableRenderer = extension::Scale9Sprite::create(); - } - else - { - _buttonNormalRenderer = Sprite::create(); - _buttonClickedRenderer = Sprite::create(); - _buttonDisableRenderer = Sprite::create(); - } - - loadTextureNormal(_normalFileName, _normalTexType); - loadTexturePressed(_clickedFileName, _pressedTexType); - loadTextureDisabled(_disabledFileName, _disabledTexType); - addProtectedChild(_buttonNormalRenderer, NORMAL_RENDERER_Z, -1); - addProtectedChild(_buttonClickedRenderer, PRESSED_RENDERER_Z, -1); - addProtectedChild(_buttonDisableRenderer, DISABLED_RENDERER_Z, -1); + + _buttonNormalRenderer->setScale9Enabled(_scale9Enabled); + _buttonClickedRenderer->setScale9Enabled(_scale9Enabled); + _buttonDisableRenderer->setScale9Enabled(_scale9Enabled); + if (_scale9Enabled) { bool ignoreBefore = _ignoreSize; @@ -190,9 +175,12 @@ void Button::setScale9Enabled(bool able) { ignoreContentAdaptWithSize(_prevIgnoreSize); } + setCapInsetsNormalRenderer(_capInsetsNormal); setCapInsetsPressedRenderer(_capInsetsPressed); setCapInsetsDisabledRenderer(_capInsetsDisabled); + + _brightStyle = BrightStyle::NONE; setBright(_bright); } @@ -228,40 +216,23 @@ void Button::loadTextureNormal(const std::string& normal,TextureResType texType) } _normalFileName = normal; _normalTexType = texType; - if (_scale9Enabled) + + switch (_normalTexType) { - extension::Scale9Sprite* normalRendererScale9 = static_cast(_buttonNormalRenderer); - switch (_normalTexType) - { - case TextureResType::LOCAL: - normalRendererScale9->initWithFile(normal); - break; - case TextureResType::PLIST: - normalRendererScale9->initWithSpriteFrameName(normal); - break; - default: - break; - } - normalRendererScale9->setCapInsets(_capInsetsNormal); - } - else - { - Sprite* normalRenderer = static_cast(_buttonNormalRenderer); - switch (_normalTexType) - { - case TextureResType::LOCAL: - normalRenderer->setTexture(normal); - break; - case TextureResType::PLIST: - normalRenderer->setSpriteFrame(normal); - break; - default: - break; - } + case TextureResType::LOCAL: + _buttonNormalRenderer->initWithFile(normal); + break; + case TextureResType::PLIST: + _buttonNormalRenderer->initWithSpriteFrameName(normal); + break; + default: + break; } + _normalTextureSize = _buttonNormalRenderer->getContentSize(); updateFlippedX(); updateFlippedY(); + this->updateChildrenDisplayedRGBA(); updateContentSizeWithTextureSize(_normalTextureSize); _normalTextureLoaded = true; @@ -276,41 +247,25 @@ void Button::loadTexturePressed(const std::string& selected,TextureResType texTy } _clickedFileName = selected; _pressedTexType = texType; - if (_scale9Enabled) + + switch (_pressedTexType) { - extension::Scale9Sprite* clickedRendererScale9 = static_cast(_buttonClickedRenderer); - switch (_pressedTexType) - { - case TextureResType::LOCAL: - clickedRendererScale9->initWithFile(selected); - break; - case TextureResType::PLIST: - clickedRendererScale9->initWithSpriteFrameName(selected); - break; - default: - break; - } - clickedRendererScale9->setCapInsets(_capInsetsPressed); - } - else - { - Sprite* clickedRenderer = static_cast(_buttonClickedRenderer); - switch (_pressedTexType) - { - case TextureResType::LOCAL: - clickedRenderer->setTexture(selected); - break; - case TextureResType::PLIST: - clickedRenderer->setSpriteFrame(selected); - break; - default: - break; - } + case TextureResType::LOCAL: + _buttonClickedRenderer->initWithFile(selected); + break; + case TextureResType::PLIST: + _buttonClickedRenderer->initWithSpriteFrameName(selected); + break; + default: + break; } + _pressedTextureSize = _buttonClickedRenderer->getContentSize(); + //TODO: mark as dirty updateFlippedX(); updateFlippedY(); - + this->updateChildrenDisplayedRGBA(); + _pressedTextureLoaded = true; _pressedTextureAdaptDirty = true; } @@ -323,41 +278,24 @@ void Button::loadTextureDisabled(const std::string& disabled,TextureResType texT } _disabledFileName = disabled; _disabledTexType = texType; - if (_scale9Enabled) + + switch (_disabledTexType) { - extension::Scale9Sprite* disabledScale9 = static_cast(_buttonDisableRenderer); - switch (_disabledTexType) - { - case TextureResType::LOCAL: - disabledScale9->initWithFile(disabled); - break; - case TextureResType::PLIST: - disabledScale9->initWithSpriteFrameName(disabled); - break; - default: - break; - } - disabledScale9->setCapInsets(_capInsetsDisabled); - } - else - { - Sprite* disabledRenderer = static_cast(_buttonDisableRenderer); - switch (_disabledTexType) - { - case TextureResType::LOCAL: - disabledRenderer->setTexture(disabled); - break; - case TextureResType::PLIST: - disabledRenderer->setSpriteFrame(disabled); - break; - default: - break; - } + case TextureResType::LOCAL: + _buttonDisableRenderer->initWithFile(disabled); + break; + case TextureResType::PLIST: + _buttonDisableRenderer->initWithSpriteFrameName(disabled); + break; + default: + break; } + _disabledTextureSize = _buttonDisableRenderer->getContentSize(); updateFlippedX(); updateFlippedY(); - + this->updateChildrenDisplayedRGBA(); + _disabledTextureLoaded = true; _disabledTextureAdaptDirty = true; } @@ -376,7 +314,7 @@ void Button::setCapInsetsNormalRenderer(const Rect &capInsets) { return; } - static_cast(_buttonNormalRenderer)->setCapInsets(capInsets); + _buttonNormalRenderer->setCapInsets(capInsets); } const Rect& Button::getCapInsetsNormalRenderer()const @@ -391,7 +329,7 @@ void Button::setCapInsetsPressedRenderer(const Rect &capInsets) { return; } - static_cast(_buttonClickedRenderer)->setCapInsets(capInsets); + _buttonClickedRenderer->setCapInsets(capInsets); } const Rect& Button::getCapInsetsPressedRenderer()const @@ -406,7 +344,7 @@ void Button::setCapInsetsDisabledRenderer(const Rect &capInsets) { return; } - static_cast(_buttonDisableRenderer)->setCapInsets(capInsets); + _buttonDisableRenderer->setCapInsets(capInsets); } const Rect& Button::getCapInsetsDisabledRenderer()const @@ -432,28 +370,10 @@ void Button::onPressStateChangedToNormal() } else { - if (_scale9Enabled) - { - updateTexturesRGBA(); - } - else - { - _buttonNormalRenderer->stopAllActions(); - _buttonNormalRenderer->setScale(_normalTextureScaleXInSize, _normalTextureScaleYInSize); - } + _buttonNormalRenderer->stopAllActions(); + _buttonNormalRenderer->setScale(_normalTextureScaleXInSize, _normalTextureScaleYInSize); } } - -void Button::updateTexturesRGBA() -{ - _buttonNormalRenderer->setColor(this->getColor()); - _buttonClickedRenderer->setColor(this->getColor()); - _buttonDisableRenderer->setColor(this->getColor()); - - _buttonNormalRenderer->setOpacity(this->getOpacity()); - _buttonClickedRenderer->setOpacity(this->getOpacity()); - _buttonDisableRenderer->setOpacity(this->getOpacity()); -} void Button::onPressStateChangedToPressed() { @@ -462,13 +382,14 @@ void Button::onPressStateChangedToPressed() _buttonNormalRenderer->setVisible(false); _buttonClickedRenderer->setVisible(true); _buttonDisableRenderer->setVisible(false); + if (_pressedActionEnabled) { _buttonNormalRenderer->stopAllActions(); _buttonClickedRenderer->stopAllActions(); - Action *zoomAction = ScaleTo::create(0.05f, _pressedTextureScaleXInSize + 0.1f, _pressedTextureScaleYInSize + 0.1f); + Action *zoomAction = ScaleTo::create(0.05f, _pressedTextureScaleXInSize + _zoomScale, _pressedTextureScaleYInSize + _zoomScale); _buttonClickedRenderer->runAction(zoomAction); - _buttonNormalRenderer->setScale(_pressedTextureScaleXInSize + 0.1f, _pressedTextureScaleYInSize + 0.1f); + _buttonNormalRenderer->setScale(_pressedTextureScaleXInSize + _zoomScale, _pressedTextureScaleYInSize + _zoomScale); } } else @@ -483,7 +404,7 @@ void Button::onPressStateChangedToPressed() else { _buttonNormalRenderer->stopAllActions(); - _buttonNormalRenderer->setScale(_normalTextureScaleXInSize + 0.1f, _normalTextureScaleYInSize + 0.1f); + _buttonNormalRenderer->setScale(_normalTextureScaleXInSize +_zoomScale, _normalTextureScaleYInSize + _zoomScale); } } } @@ -501,36 +422,19 @@ void Button::updateFlippedX() { float flip = _flippedX ? -1.0f : 1.0f; _titleRenderer->setScaleX(flip); - if (_scale9Enabled) - { - _buttonNormalRenderer->setScaleX(flip); - _buttonClickedRenderer->setScaleX(flip); - _buttonDisableRenderer->setScaleX(flip); - } - else - { - static_cast(_buttonNormalRenderer)->setFlippedX(_flippedX); - static_cast(_buttonClickedRenderer)->setFlippedX(_flippedX); - static_cast(_buttonDisableRenderer)->setFlippedX(_flippedX); - } + + _buttonNormalRenderer->setFlippedX(_flippedX); + _buttonClickedRenderer->setFlippedX(_flippedX); + _buttonDisableRenderer->setFlippedX(_flippedX); } void Button::updateFlippedY() { float flip = _flippedY ? -1.0f : 1.0f; _titleRenderer->setScaleY(flip); - if (_scale9Enabled) - { - _buttonNormalRenderer->setScaleY(flip); - _buttonClickedRenderer->setScaleY(flip); - _buttonDisableRenderer->setScaleY(flip); - } - else - { - static_cast(_buttonNormalRenderer)->setFlippedY(_flippedY); - static_cast(_buttonClickedRenderer)->setFlippedY(_flippedY); - static_cast(_buttonDisableRenderer)->setFlippedY(_flippedY); - } + _buttonNormalRenderer->setFlippedY(_flippedY); + _buttonClickedRenderer->setFlippedY(_flippedY); + _buttonDisableRenderer->setFlippedY(_flippedY); } void Button::updateTitleLocation() @@ -605,8 +509,9 @@ void Button::normalTextureScaleChangedWithSize() { if (_scale9Enabled) { - static_cast(_buttonNormalRenderer)->setPreferredSize(_contentSize); + _buttonNormalRenderer->setPreferredSize(_contentSize); _normalTextureScaleXInSize = _normalTextureScaleYInSize = 1.0f; + _buttonNormalRenderer->setScale(_normalTextureScaleXInSize,_normalTextureScaleYInSize); } else { @@ -641,8 +546,9 @@ void Button::pressedTextureScaleChangedWithSize() { if (_scale9Enabled) { - static_cast(_buttonClickedRenderer)->setPreferredSize(_contentSize); + _buttonClickedRenderer->setPreferredSize(_contentSize); _pressedTextureScaleXInSize = _pressedTextureScaleYInSize = 1.0f; + _buttonClickedRenderer->setScale(_pressedTextureScaleXInSize,_pressedTextureScaleYInSize); } else { @@ -676,7 +582,8 @@ void Button::disabledTextureScaleChangedWithSize() { if (_scale9Enabled) { - static_cast(_buttonDisableRenderer)->setPreferredSize(_contentSize); + _buttonDisableRenderer->setScale(1.0); + _buttonDisableRenderer->setPreferredSize(_contentSize); } else { @@ -737,6 +644,16 @@ float Button::getTitleFontSize() const { return _fontSize; } + +void Button::setZoomScale(float scale) +{ + _zoomScale = scale; +} + +float Button::getZoomScale()const +{ + return _zoomScale; +} void Button::setTitleFontName(const std::string& fontName) { @@ -787,6 +704,7 @@ void Button::copySpecialProperties(Widget *widget) setTitleFontSize(button->getTitleFontSize()); setTitleColor(button->getTitleColor()); setPressedActionEnabled(button->_pressedActionEnabled); + setZoomScale(button->_zoomScale); } } diff --git a/cocos/ui/UIButton.h b/cocos/ui/UIButton.h index 0510717c56..6d33e19770 100644 --- a/cocos/ui/UIButton.h +++ b/cocos/ui/UIButton.h @@ -26,18 +26,20 @@ THE SOFTWARE. #define __UIBUTTON_H__ #include "ui/UIWidget.h" +#include "ui/GUIExport.h" NS_CC_BEGIN class Label; namespace ui{ - + + class Scale9Sprite; /** * @js NA * @lua NA */ -class Button : public Widget +class CC_GUI_DLL Button : public Widget { DECLARE_CLASS_GUI_INFO @@ -186,6 +188,14 @@ public: float getTitleFontSize() const; void setTitleFontName(const std::string& fontName); const std::string& getTitleFontName() const; + /** When user pressed the button, the button will zoom to a scale. + * The final scale of the button equals (button original scale + _zoomScale) + */ + void setZoomScale(float scale); + /** + * @brief Return a zoom scale + */ + float getZoomScale()const; CC_CONSTRUCTOR_ACCESS: virtual bool init() override; @@ -204,9 +214,7 @@ protected: virtual void updateFlippedX() override; virtual void updateFlippedY() override; - - void updateTexturesRGBA(); - + void normalTextureScaleChangedWithSize(); void pressedTextureScaleChangedWithSize(); void disabledTextureScaleChangedWithSize(); @@ -218,10 +226,12 @@ protected: virtual void copySpecialProperties(Widget* model) override; protected: - Node* _buttonNormalRenderer; - Node* _buttonClickedRenderer; - Node* _buttonDisableRenderer; + Scale9Sprite* _buttonNormalRenderer; + Scale9Sprite* _buttonClickedRenderer; + Scale9Sprite* _buttonDisableRenderer; Label* _titleRenderer; + + float _zoomScale; std::string _normalFileName; std::string _clickedFileName; std::string _disabledFileName; diff --git a/cocos/ui/UICheckBox.cpp b/cocos/ui/UICheckBox.cpp index 4ddb8799ab..a16d4be64a 100644 --- a/cocos/ui/UICheckBox.cpp +++ b/cocos/ui/UICheckBox.cpp @@ -184,7 +184,8 @@ void CheckBox::loadTextureBackGround(const std::string& backGround,TextureResTyp } updateFlippedX(); updateFlippedY(); - + this->updateChildrenDisplayedRGBA(); + updateContentSizeWithTextureSize(_backGroundBoxRenderer->getContentSize()); _backGroundBoxRendererAdaptDirty = true; } @@ -210,7 +211,8 @@ void CheckBox::loadTextureBackGroundSelected(const std::string& backGroundSelect } updateFlippedX(); updateFlippedY(); - + this->updateChildrenDisplayedRGBA(); + _backGroundSelectedBoxRendererAdaptDirty = true; } @@ -235,7 +237,8 @@ void CheckBox::loadTextureFrontCross(const std::string& cross,TextureResType tex } updateFlippedX(); updateFlippedY(); - + this->updateChildrenDisplayedRGBA(); + _frontCrossRendererAdaptDirty = true; } @@ -260,7 +263,8 @@ void CheckBox::loadTextureBackGroundDisabled(const std::string& backGroundDisabl } updateFlippedX(); updateFlippedY(); - + this->updateChildrenDisplayedRGBA(); + _backGroundBoxDisabledRendererAdaptDirty = true; } @@ -285,7 +289,8 @@ void CheckBox::loadTextureFrontCrossDisabled(const std::string& frontCrossDisabl } updateFlippedX(); updateFlippedY(); - + this->updateChildrenDisplayedRGBA(); + _frontCrossDisabledRendererAdaptDirty = true; } @@ -334,7 +339,7 @@ void CheckBox::onPressStateChangedToDisabled() } } -void CheckBox::setSelectedState(bool selected) +void CheckBox::setSelected(bool selected) { if (selected == _isSelected) { @@ -343,14 +348,15 @@ void CheckBox::setSelectedState(bool selected) _isSelected = selected; _frontCrossRenderer->setVisible(_isSelected); } - -bool CheckBox::getSelectedState()const + +bool CheckBox::isSelected()const { return _isSelected; } void CheckBox::selectedEvent() { + this->retain(); if (_checkBoxEventCallback) { _checkBoxEventCallback(this, EventType::SELECTED); @@ -360,10 +366,12 @@ void CheckBox::selectedEvent() { (_checkBoxEventListener->*_checkBoxEventSelector)(this,CHECKBOX_STATE_EVENT_SELECTED); } + this->release(); } void CheckBox::unSelectedEvent() { + this->retain(); if (_checkBoxEventCallback) { _checkBoxEventCallback(this, EventType::UNSELECTED); } @@ -371,6 +379,7 @@ void CheckBox::unSelectedEvent() { (_checkBoxEventListener->*_checkBoxEventSelector)(this,CHECKBOX_STATE_EVENT_UNSELECTED); } + this->release(); } void CheckBox::addEventListenerCheckBox(Ref *target, SEL_SelectedStateEvent selector) diff --git a/cocos/ui/UICheckBox.h b/cocos/ui/UICheckBox.h index db7900fcbf..a58bd32d13 100644 --- a/cocos/ui/UICheckBox.h +++ b/cocos/ui/UICheckBox.h @@ -26,6 +26,7 @@ THE SOFTWARE. #define __UICHECKBOX_H__ #include "ui/UIWidget.h" +#include "ui/GUIExport.h" NS_CC_BEGIN @@ -46,7 +47,7 @@ typedef void (Ref::*SEL_SelectedStateEvent)(Ref*,CheckBoxEventType); * @js NA * @lua NA */ -class CheckBox : public Widget +class CC_GUI_DLL CheckBox : public Widget { DECLARE_CLASS_GUI_INFO @@ -165,14 +166,17 @@ public: * * @param selected true that checkbox is selected, false otherwise. */ - void setSelectedState(bool selected); + CC_DEPRECATED_ATTRIBUTE void setSelectedState(bool selected){this->setSelected(selected);} /** * Gets selcted state of checkbox. * * @return selected true that checkbox is selected, false otherwise. */ - bool getSelectedState()const; + CC_DEPRECATED_ATTRIBUTE bool getSelectedState()const{return this->isSelected();} + + bool isSelected()const; + void setSelected(bool selected); //add a call back function would called when checkbox is selected or unselected. CC_DEPRECATED_ATTRIBUTE void addEventListenerCheckBox(Ref* target,SEL_SelectedStateEvent selector); diff --git a/cocos/ui/UIHBox.h b/cocos/ui/UIHBox.h index 1b6cf95ae9..872fe90664 100644 --- a/cocos/ui/UIHBox.h +++ b/cocos/ui/UIHBox.h @@ -26,12 +26,13 @@ #define __UIHBox_H__ #include "ui/UILayout.h" +#include "ui/GUIExport.h" NS_CC_BEGIN namespace ui { -class HBox : public Layout{ +class CC_GUI_DLL HBox : public Layout{ public: diff --git a/cocos/ui/UIHelper.cpp b/cocos/ui/UIHelper.cpp index 11b44c6b1d..73f1fdbabc 100644 --- a/cocos/ui/UIHelper.cpp +++ b/cocos/ui/UIHelper.cpp @@ -108,6 +108,43 @@ Widget* Helper::seekActionWidgetByActionTag(Widget* root, int tag) } return nullptr; } + +std::string Helper::getSubStringOfUTF8String(const std::string& str, std::string::size_type start, std::string::size_type length) +{ + if (length==0) + { + return ""; + } + std::string::size_type c, i, ix, q, min=std::string::npos, max=std::string::npos; + for (q=0, i=0, ix=str.length(); i < ix; i++, q++) + { + if (q==start) + { + min = i; + } + if (q <= start+length || length==std::string::npos) + { + max = i; + } + + c = (unsigned char) str[i]; + + if (c<=127) i+=0; + else if ((c & 0xE0) == 0xC0) i+=1; + else if ((c & 0xF0) == 0xE0) i+=2; + else if ((c & 0xF8) == 0xF0) i+=3; + else return "";//invalid utf8 + } + if (q <= start+length || length == std::string::npos) + { + max = i; + } + if (min==std::string::npos || max==std::string::npos) + { + return ""; + } + return str.substr(min,max); +} } diff --git a/cocos/ui/UIHelper.h b/cocos/ui/UIHelper.h index 68fa8dbfb9..fb6136e7c7 100644 --- a/cocos/ui/UIHelper.h +++ b/cocos/ui/UIHelper.h @@ -27,6 +27,7 @@ THE SOFTWARE. #include #include "base/CCPlatformMacros.h" +#include "ui/GUIExport.h" NS_CC_BEGIN @@ -38,7 +39,7 @@ namespace ui { * @js NA * @lua NA */ -class Helper +class CC_GUI_DLL Helper { public: /** @@ -65,6 +66,18 @@ public: /*temp action*/ static Widget* seekActionWidgetByActionTag(Widget* root, int tag); + + /** + * @brief Get a UTF8 substring from a std::string with a given start position and length + * Sample: std::string str = "中国中国中国”; substr = getSubStringOfUTF8String(str,0,2) will = "中国" + * @param start The start position of the substring. + * @param length The length of the substring in UTF8 count + * @return a UTF8 substring + */ + static std::string getSubStringOfUTF8String(const std::string& str, + std::string::size_type start, + std::string::size_type length); + }; } diff --git a/cocos/ui/UIImageView.cpp b/cocos/ui/UIImageView.cpp index 6f3471e0b7..3df8706952 100644 --- a/cocos/ui/UIImageView.cpp +++ b/cocos/ui/UIImageView.cpp @@ -23,16 +23,12 @@ THE SOFTWARE. ****************************************************************************/ #include "ui/UIImageView.h" -#include "extensions/GUI/CCControlExtension/CCScale9Sprite.h" +#include "ui/UIScale9Sprite.h" #include "2d/CCSprite.h" NS_CC_BEGIN namespace ui { - - -#define STATIC_CAST_CCSPRITE static_cast(_imageRenderer) -#define STATIC_CAST_SCALE9SPRITE static_cast(_imageRenderer) static const int IMAGE_RENDERER_Z = (-1); @@ -108,7 +104,9 @@ bool ImageView::init(const std::string &imageFileName, TextureResType texType) void ImageView::initRenderer() { - _imageRenderer = Sprite::create(); + _imageRenderer = Scale9Sprite::create(); + _imageRenderer->setScale9Enabled(false); + addProtectedChild(_imageRenderer, IMAGE_RENDERER_Z, -1); } @@ -123,77 +121,52 @@ void ImageView::loadTexture(const std::string& fileName, TextureResType texType) switch (_imageTexType) { case TextureResType::LOCAL: - if (_scale9Enabled) - { - extension::Scale9Sprite* imageRendererScale9 = STATIC_CAST_SCALE9SPRITE; - imageRendererScale9->initWithFile(fileName); - imageRendererScale9->setCapInsets(_capInsets); - } - else - { - Sprite* imageRenderer = STATIC_CAST_CCSPRITE; - imageRenderer->setTexture(fileName); - } + _imageRenderer->initWithFile(fileName); break; case TextureResType::PLIST: - if (_scale9Enabled) - { - extension::Scale9Sprite* imageRendererScale9 = STATIC_CAST_SCALE9SPRITE; - imageRendererScale9->initWithSpriteFrameName(fileName); - imageRendererScale9->setCapInsets(_capInsets); - } - else - { - Sprite* imageRenderer = STATIC_CAST_CCSPRITE; - imageRenderer->setSpriteFrame(fileName); - } + _imageRenderer->initWithSpriteFrameName(fileName); break; default: break; } + _imageTextureSize = _imageRenderer->getContentSize(); updateFlippedX(); updateFlippedY(); - + this->updateChildrenDisplayedRGBA(); + updateContentSizeWithTextureSize(_imageTextureSize); _imageRendererAdaptDirty = true; } void ImageView::setTextureRect(const Rect &rect) { + //This API should be refactor if (_scale9Enabled) { } else { - STATIC_CAST_CCSPRITE->setTextureRect(rect); + auto sprite = _imageRenderer->getSprite(); + if (sprite) + { + sprite->setTextureRect(rect); + } + else + { + CCLOG("Warning!! you should load texture before set the texture's rect!"); + } } } void ImageView::updateFlippedX() { - if (_scale9Enabled) - { - int flip = _flippedX ? -1 : 1; - STATIC_CAST_SCALE9SPRITE->setScaleX(flip); - } - else - { - STATIC_CAST_CCSPRITE->setFlippedX(_flippedX); - } + _imageRenderer->setFlippedX(_flippedX); } void ImageView::updateFlippedY() { - if (_scale9Enabled) - { - int flip = _flippedY ? -1 : 1; - STATIC_CAST_SCALE9SPRITE->setScaleY(flip); - } - else - { - STATIC_CAST_CCSPRITE->setFlippedY(_flippedY); - } + _imageRenderer->setFlippedY(_flippedY); } @@ -206,18 +179,8 @@ void ImageView::setScale9Enabled(bool able) _scale9Enabled = able; - removeProtectedChild(_imageRenderer); - _imageRenderer = nullptr; - if (_scale9Enabled) - { - _imageRenderer = extension::Scale9Sprite::create(); - } - else - { - _imageRenderer = Sprite::create(); - } - loadTexture(_textureFile,_imageTexType); - addProtectedChild(_imageRenderer, IMAGE_RENDERER_Z, -1); + _imageRenderer->setScale9Enabled(_scale9Enabled); + if (_scale9Enabled) { bool ignoreBefore = _ignoreSize; @@ -252,7 +215,7 @@ void ImageView::setCapInsets(const Rect &capInsets) { return; } - STATIC_CAST_SCALE9SPRITE->setCapInsets(capInsets); + _imageRenderer->setCapInsets(capInsets); } const Rect& ImageView::getCapInsets()const @@ -298,7 +261,7 @@ void ImageView::imageTextureScaleChangedWithSize() { if (_scale9Enabled) { - static_cast(_imageRenderer)->setPreferredSize(_contentSize); + _imageRenderer->setPreferredSize(_contentSize); } else { diff --git a/cocos/ui/UIImageView.h b/cocos/ui/UIImageView.h index ada869b34a..a3150a8de4 100644 --- a/cocos/ui/UIImageView.h +++ b/cocos/ui/UIImageView.h @@ -26,16 +26,17 @@ THE SOFTWARE. #define __UIIMAGEVIEW_H__ #include "ui/UIWidget.h" +#include "ui/GUIExport.h" NS_CC_BEGIN namespace ui { - + class Scale9Sprite; /** * @js NA * @lua NA */ -class ImageView : public Widget +class CC_GUI_DLL ImageView : public Widget { DECLARE_CLASS_GUI_INFO @@ -131,7 +132,7 @@ protected: bool _scale9Enabled; bool _prevIgnoreSize; Rect _capInsets; - Node* _imageRenderer; + Scale9Sprite* _imageRenderer; std::string _textureFile; TextureResType _imageTexType; Size _imageTextureSize; diff --git a/cocos/ui/UILayout.cpp b/cocos/ui/UILayout.cpp index 50074ae5ae..105b4ef0df 100644 --- a/cocos/ui/UILayout.cpp +++ b/cocos/ui/UILayout.cpp @@ -24,7 +24,7 @@ THE SOFTWARE. #include "ui/UILayout.h" #include "ui/UIHelper.h" -#include "extensions/GUI/CCControlExtension/CCScale9Sprite.h" +#include "ui/UIScale9Sprite.h" #include "renderer/CCGLProgram.h" #include "renderer/CCGLProgramCache.h" #include "base/CCDirector.h" @@ -33,7 +33,6 @@ THE SOFTWARE. #include "ui/UILayoutManager.h" #include "2d/CCDrawNode.h" #include "2d/CCLayer.h" -#include "CCGLView.h" #include "2d/CCSprite.h" #include "base/CCEventFocus.h" @@ -90,7 +89,8 @@ _backGroundImageColor(Color3B::WHITE), _backGroundImageOpacity(255), _passFocusToChild(true), _loopFocus(false), -_isFocusPassing(false) +_isFocusPassing(false), +_isInterceptTouch(false) { //no-op } @@ -577,7 +577,7 @@ void Layout::onSizeChanged() _backGroundImage->setPosition(Vec2(_contentSize.width/2.0f, _contentSize.height/2.0f)); if (_backGroundScale9Enabled && _backGroundImage) { - static_cast(_backGroundImage)->setPreferredSize(_contentSize); + _backGroundImage->setPreferredSize(_contentSize); } } if (_colorRender) @@ -596,11 +596,13 @@ void Layout::setBackGroundImageScale9Enabled(bool able) { return; } - removeProtectedChild(_backGroundImage); - _backGroundImage = nullptr; _backGroundScale9Enabled = able; - addBackGroundImage(); - setBackGroundImage(_backGroundImageFileName,_bgImageTexType); + if (nullptr == _backGroundImage) + { + addBackGroundImage(); + setBackGroundImage(_backGroundImageFileName,_bgImageTexType); + } + _backGroundImage->setScale9Enabled(_backGroundScale9Enabled); setBackGroundImageCapInsets(_backGroundImageCapInsets); } @@ -621,36 +623,22 @@ void Layout::setBackGroundImage(const std::string& fileName,TextureResType texTy } _backGroundImageFileName = fileName; _bgImageTexType = texType; - if (_backGroundScale9Enabled) + + switch (_bgImageTexType) { - extension::Scale9Sprite* bgiScale9 = static_cast(_backGroundImage); - switch (_bgImageTexType) - { - case TextureResType::LOCAL: - bgiScale9->initWithFile(fileName); - break; - case TextureResType::PLIST: - bgiScale9->initWithSpriteFrameName(fileName); - break; - default: - break; - } - bgiScale9->setPreferredSize(_contentSize); + case TextureResType::LOCAL: + _backGroundImage->initWithFile(fileName); + break; + case TextureResType::PLIST: + _backGroundImage->initWithSpriteFrameName(fileName); + break; + default: + break; } - else - { - switch (_bgImageTexType) - { - case TextureResType::LOCAL: - static_cast(_backGroundImage)->setTexture(fileName); - break; - case TextureResType::PLIST: - static_cast(_backGroundImage)->setSpriteFrame(fileName); - break; - default: - break; - } + if (_backGroundScale9Enabled) { + _backGroundImage->setPreferredSize(_contentSize); } + _backGroundImageTextureSize = _backGroundImage->getContentSize(); _backGroundImage->setPosition(Vec2(_contentSize.width/2.0f, _contentSize.height/2.0f)); updateBackGroundImageRGBA(); @@ -661,7 +649,7 @@ void Layout::setBackGroundImageCapInsets(const Rect &capInsets) _backGroundImageCapInsets = capInsets; if (_backGroundScale9Enabled && _backGroundImage) { - static_cast(_backGroundImage)->setCapInsets(capInsets); + _backGroundImage->setCapInsets(capInsets); } } @@ -706,17 +694,11 @@ void Layout::supplyTheLayoutParameterLackToChild(Widget *child) void Layout::addBackGroundImage() { - if (_backGroundScale9Enabled) - { - _backGroundImage = extension::Scale9Sprite::create(); - addProtectedChild(_backGroundImage, BACKGROUNDIMAGE_Z, -1); - static_cast(_backGroundImage)->setPreferredSize(_contentSize); - } - else - { - _backGroundImage = Sprite::create(); - addProtectedChild(_backGroundImage, BACKGROUNDIMAGE_Z, -1); - } + _backGroundImage = Scale9Sprite::create(); + _backGroundImage->setScale9Enabled(false); + + addProtectedChild(_backGroundImage, BACKGROUNDIMAGE_Z, -1); + _backGroundImage->setPosition(Vec2(_contentSize.width/2.0f, _contentSize.height/2.0f)); } @@ -948,6 +930,12 @@ Layout::Type Layout::getLayoutType() const { return _layoutType; } + +void Layout::forceDoLayout() +{ + this->requestDoLayout(); + this->doLayout(); +} void Layout::requestDoLayout() { @@ -987,10 +975,14 @@ LayoutManager* Layout::createLayoutManager() void Layout::doLayout() { + if (!_doLayoutDirty) { return; } + + sortAllChildren(); + LayoutManager* executant = this->createLayoutManager(); if (executant) @@ -1034,6 +1026,7 @@ void Layout::copySpecialProperties(Widget *widget) setClippingType(layout->_clippingType); _loopFocus = layout->_loopFocus; _passFocusToChild = layout->_passFocusToChild; + _isInterceptTouch = layout->_isInterceptTouch; } } diff --git a/cocos/ui/UILayout.h b/cocos/ui/UILayout.h index e43df22522..0ce92d964b 100644 --- a/cocos/ui/UILayout.h +++ b/cocos/ui/UILayout.h @@ -26,6 +26,7 @@ THE SOFTWARE. #define __LAYOUT_H__ #include "ui/UIWidget.h" +#include "ui/GUIExport.h" #include "renderer/CCCustomCommand.h" #include "renderer/CCGroupCommand.h" @@ -35,12 +36,13 @@ class DrawNode; class LayerColor; class LayerGradient; + namespace ui { class LayoutManager; +class Scale9Sprite; - -class LayoutProtocol +class CC_GUI_DLL LayoutProtocol { public: LayoutProtocol(){} @@ -62,7 +64,7 @@ public: #endif #endif -class Layout : public Widget, public LayoutProtocol +class CC_GUI_DLL Layout : public Widget, public LayoutProtocol { DECLARE_CLASS_GUI_INFO @@ -265,7 +267,14 @@ public: */ virtual void removeAllChildrenWithCleanup(bool cleanup) override; + /** + * force refresh widget layout + */ + void forceDoLayout(); + /** + * request to refresh widget layout + */ void requestDoLayout(); virtual void onEnter() override; @@ -454,15 +463,18 @@ protected: bool checkFocusEnabledChild()const; protected: - bool _clippingEnabled; //background bool _backGroundScale9Enabled; - Node* _backGroundImage; + Scale9Sprite* _backGroundImage; std::string _backGroundImageFileName; Rect _backGroundImageCapInsets; BackGroundColorType _colorType; TextureResType _bgImageTexType; + Size _backGroundImageTextureSize; + Color3B _backGroundImageColor; + GLubyte _backGroundImageOpacity; + LayerColor* _colorRender; LayerGradient* _gradientRender; Color3B _cColor; @@ -470,14 +482,15 @@ protected: Color3B _gEndColor; Vec2 _alongVector; GLubyte _cOpacity; - Size _backGroundImageTextureSize; + + //clipping + bool _clippingEnabled; Type _layoutType; ClippingType _clippingType; DrawNode* _clippingStencil; bool _scissorRectDirty; Rect _clippingRect; Layout* _clippingParent; - bool _doLayoutDirty; bool _clippingRectDirty; //clipping @@ -495,10 +508,7 @@ protected: GLboolean _currentAlphaTestEnabled; GLenum _currentAlphaTestFunc; GLclampf _currentAlphaTestRef; - - - Color3B _backGroundImageColor; - GLubyte _backGroundImageOpacity; + GLint _mask_layer_le; GroupCommand _groupCommand; @@ -508,6 +518,9 @@ protected: CustomCommand _beforeVisitCmdScissor; CustomCommand _afterVisitCmdScissor; + bool _doLayoutDirty; + bool _isInterceptTouch; + //whether enable loop focus or not bool _loopFocus; //on default, it will pass the focus to the next nearest widget diff --git a/cocos/ui/UILayoutManager.h b/cocos/ui/UILayoutManager.h index 5f82b3c39b..cbeefa5589 100644 --- a/cocos/ui/UILayoutManager.h +++ b/cocos/ui/UILayoutManager.h @@ -27,6 +27,7 @@ #include "base/CCRef.h" #include "base/CCVector.h" +#include "ui/GUIExport.h" NS_CC_BEGIN @@ -36,7 +37,7 @@ class LayoutProtocol; class Widget; class RelativeLayoutParameter; -class LayoutManager : public Ref +class CC_GUI_DLL LayoutManager : public Ref { public: virtual ~LayoutManager(){}; @@ -47,7 +48,7 @@ public: friend class Layout; }; -class LinearVerticalLayoutManager : public LayoutManager +class CC_GUI_DLL LinearVerticalLayoutManager : public LayoutManager { private: LinearVerticalLayoutManager(){}; @@ -58,7 +59,7 @@ private: friend class Layout; }; -class LinearHorizontalLayoutManager : public LayoutManager +class CC_GUI_DLL LinearHorizontalLayoutManager : public LayoutManager { private: LinearHorizontalLayoutManager(){}; @@ -69,7 +70,7 @@ private: friend class Layout; }; -class RelativeLayoutManager : public LayoutManager +class CC_GUI_DLL RelativeLayoutManager : public LayoutManager { private: RelativeLayoutManager() diff --git a/cocos/ui/UILayoutParameter.h b/cocos/ui/UILayoutParameter.h index 4681c82d3b..93f072081e 100644 --- a/cocos/ui/UILayoutParameter.h +++ b/cocos/ui/UILayoutParameter.h @@ -27,7 +27,7 @@ #include #include "base/CCRef.h" - +#include "ui/GUIExport.h" NS_CC_BEGIN @@ -37,7 +37,7 @@ namespace ui { * @js NA * @lua NA */ -class Margin +class CC_GUI_DLL Margin { public: float left; @@ -69,7 +69,7 @@ public: #endif #endif -class LayoutParameter : public Ref +class CC_GUI_DLL LayoutParameter : public Ref { public: enum class Type @@ -132,12 +132,10 @@ protected: Type _layoutParameterType; }; -class LayoutParameterProtocol +class CC_GUI_DLL LayoutParameterProtocol { public: - LayoutParameterProtocol(){} virtual ~LayoutParameterProtocol(){} - virtual LayoutParameter* getLayoutParameter() const= 0; }; @@ -146,7 +144,7 @@ public: * @js NA * @lua NA */ -class LinearLayoutParameter : public LayoutParameter +class CC_GUI_DLL LinearLayoutParameter : public LayoutParameter { public: enum class LinearGravity @@ -209,7 +207,7 @@ protected: */ -class RelativeLayoutParameter : public LayoutParameter +class CC_GUI_DLL RelativeLayoutParameter : public LayoutParameter { public: enum class RelativeAlign diff --git a/cocos/ui/UIListView.cpp b/cocos/ui/UIListView.cpp index 5689f49be1..ac1827dce2 100644 --- a/cocos/ui/UIListView.cpp +++ b/cocos/ui/UIListView.cpp @@ -24,7 +24,6 @@ THE SOFTWARE. #include "ui/UIListView.h" #include "ui/UIHelper.h" -#include "extensions/GUI/CCControlExtension/CCScale9Sprite.h" NS_CC_BEGIN @@ -473,6 +472,7 @@ void ListView::addEventListener(const ccListViewCallback& callback) void ListView::selectedItemEvent(TouchEventType event) { + this->retain(); switch (event) { case TouchEventType::BEGAN: @@ -498,7 +498,7 @@ void ListView::selectedItemEvent(TouchEventType event) } break; } - + this->release(); } void ListView::interceptTouchEvent(TouchEventType event, Widget *sender, Touch* touch) diff --git a/cocos/ui/UIListView.h b/cocos/ui/UIListView.h index 53737812a6..65856ff1f7 100644 --- a/cocos/ui/UIListView.h +++ b/cocos/ui/UIListView.h @@ -27,6 +27,7 @@ THE SOFTWARE. #define __UILISTVIEW_H__ #include "ui/UIScrollView.h" +#include "ui/GUIExport.h" NS_CC_BEGIN @@ -41,7 +42,7 @@ typedef enum typedef void (Ref::*SEL_ListViewEvent)(Ref*,ListViewEventType); #define listvieweventselector(_SELECTOR) (SEL_ListViewEvent)(&_SELECTOR) -class ListView : public ScrollView +class CC_GUI_DLL ListView : public ScrollView { DECLARE_CLASS_GUI_INFO diff --git a/cocos/ui/UILoadingBar.cpp b/cocos/ui/UILoadingBar.cpp index 6e7e34415d..71f69ebea6 100644 --- a/cocos/ui/UILoadingBar.cpp +++ b/cocos/ui/UILoadingBar.cpp @@ -23,7 +23,7 @@ THE SOFTWARE. ****************************************************************************/ #include "ui/UILoadingBar.h" -#include "extensions/GUI/CCControlExtension/CCScale9Sprite.h" +#include "ui/UIScale9Sprite.h" #include "2d/CCSprite.h" NS_CC_BEGIN @@ -81,7 +81,8 @@ LoadingBar* LoadingBar::create(const std::string &textureName, float percentage) void LoadingBar::initRenderer() { - _barRenderer = Sprite::create(); + _barRenderer = Scale9Sprite::create(); + _barRenderer->setScale9Enabled(false); addProtectedChild(_barRenderer, BAR_RENDERER_Z, -1); _barRenderer->setAnchorPoint(Vec2(0.0,0.5)); } @@ -99,18 +100,16 @@ void LoadingBar::setDirection(cocos2d::ui::LoadingBar::Direction direction) { case Direction::LEFT: _barRenderer->setAnchorPoint(Vec2(0.0f,0.5f)); - _barRenderer->setPosition(Vec2(-_totalLength*0.5f,0.0f)); - if (!_scale9Enabled) - { - static_cast(_barRenderer)->setFlippedX(false); + _barRenderer->setPosition(Vec2(0,0.0f)); + if (!_scale9Enabled) { + _barRenderer->setFlippedX(false); } break; case Direction::RIGHT: _barRenderer->setAnchorPoint(Vec2(1.0f,0.5f)); - _barRenderer->setPosition(Vec2(_totalLength*0.5f,0.0f)); - if (!_scale9Enabled) - { - static_cast(_barRenderer)->setFlippedX(true); + _barRenderer->setPosition(Vec2(_totalLength,0.0f)); + if (!_scale9Enabled) { + _barRenderer->setFlippedX(true); } break; } @@ -134,28 +133,10 @@ void LoadingBar::loadTexture(const std::string& texture,TextureResType texType) switch (_renderBarTexType) { case TextureResType::LOCAL: - if (_scale9Enabled) - { - extension::Scale9Sprite* barRendererScale9 = static_cast(_barRenderer); - barRendererScale9->initWithFile(texture); - barRendererScale9->setCapInsets(_capInsets); - } - else - { - static_cast(_barRenderer)->setTexture(texture); - } + _barRenderer->initWithFile(texture); break; case TextureResType::PLIST: - if (_scale9Enabled) - { - extension::Scale9Sprite* barRendererScale9 = static_cast(_barRenderer); - barRendererScale9->initWithSpriteFrameName(texture); - barRendererScale9->setCapInsets(_capInsets); - } - else - { - static_cast(_barRenderer)->setSpriteFrame(texture); - } + _barRenderer->initWithSpriteFrameName(texture); break; default: break; @@ -167,19 +148,20 @@ void LoadingBar::loadTexture(const std::string& texture,TextureResType texType) { case Direction::LEFT: _barRenderer->setAnchorPoint(Vec2(0.0f,0.5f)); - if (!_scale9Enabled) - { - static_cast(_barRenderer)->setFlippedX(false); + if (!_scale9Enabled) { + _barRenderer->setFlippedX(false); } break; case Direction::RIGHT: _barRenderer->setAnchorPoint(Vec2(1.0f,0.5f)); - if (!_scale9Enabled) - { - static_cast(_barRenderer)->setFlippedX(true); + if (!_scale9Enabled) { + _barRenderer->setFlippedX(true); } break; } + _barRenderer->setCapInsets(_capInsets); + this->updateChildrenDisplayedRGBA(); + barRendererScaleChangedWithSize(); updateContentSizeWithTextureSize(_barRendererTextureSize); _barRendererAdaptDirty = true; @@ -192,18 +174,8 @@ void LoadingBar::setScale9Enabled(bool enabled) return; } _scale9Enabled = enabled; - removeProtectedChild(_barRenderer); - _barRenderer = nullptr; - if (_scale9Enabled) - { - _barRenderer = extension::Scale9Sprite::create(); - } - else - { - _barRenderer = Sprite::create(); - } - loadTexture(_textureFile,_renderBarTexType); - addProtectedChild(_barRenderer, BAR_RENDERER_Z, -1); + _barRenderer->setScale9Enabled(_scale9Enabled); + if (_scale9Enabled) { bool ignoreBefore = _ignoreSize; @@ -230,7 +202,7 @@ void LoadingBar::setCapInsets(const Rect &capInsets) { return; } - static_cast(_barRenderer)->setCapInsets(capInsets); + _barRenderer->setCapInsets(capInsets); } const Rect& LoadingBar::getCapInsets()const @@ -257,7 +229,7 @@ void LoadingBar::setPercent(float percent) } else { - Sprite* spriteRenderer = static_cast(_barRenderer); + Sprite* spriteRenderer = _barRenderer->getSprite(); Rect rect = spriteRenderer->getTextureRect(); rect.size.width = _barRendererTextureSize.width * res; spriteRenderer->setTextureRect(rect, spriteRenderer->isTextureRectRotated(), rect.size); @@ -351,7 +323,7 @@ void LoadingBar::barRendererScaleChangedWithSize() void LoadingBar::setScale9Scale() { float width = (float)(_percent) / 100.0f * _totalLength; - static_cast(_barRenderer)->setPreferredSize(Size(width, _contentSize.height)); + _barRenderer->setPreferredSize(Size(width, _contentSize.height)); } std::string LoadingBar::getDescription() const diff --git a/cocos/ui/UILoadingBar.h b/cocos/ui/UILoadingBar.h index 6fe4910130..be68f76306 100644 --- a/cocos/ui/UILoadingBar.h +++ b/cocos/ui/UILoadingBar.h @@ -26,16 +26,17 @@ THE SOFTWARE. #define __UILOADINGBAR_H__ #include "ui/UIWidget.h" +#include "ui/GUIExport.h" NS_CC_BEGIN namespace ui { - + class Scale9Sprite; /** * @js NA * @lua NA */ -class LoadingBar : public Widget +class CC_GUI_DLL LoadingBar : public Widget { DECLARE_CLASS_GUI_INFO @@ -153,7 +154,7 @@ protected: Direction _direction; float _percent; float _totalLength; - Node* _barRenderer; + Scale9Sprite* _barRenderer; TextureResType _renderBarTexType; Size _barRendererTextureSize; bool _scale9Enabled; diff --git a/cocos/ui/UIPageView.cpp b/cocos/ui/UIPageView.cpp index fcca3e38b7..f7b98d22a5 100644 --- a/cocos/ui/UIPageView.cpp +++ b/cocos/ui/UIPageView.cpp @@ -44,7 +44,9 @@ _autoScrollDirection(AutoScrollDirection::LEFT), _childFocusCancelOffset(5.0f), _pageViewEventListener(nullptr), _pageViewEventSelector(nullptr), -_eventCallback(nullptr) +_eventCallback(nullptr), +_customScrollThreshold(0.0), +_usingCustomScrollThreshold(false) { this->setTouchEnabled(true); } @@ -341,25 +343,31 @@ bool PageView::onTouchBegan(Touch *touch, Event *unusedEvent) void PageView::onTouchMoved(Touch *touch, Event *unusedEvent) { - handleMoveLogic(touch); - Widget* widgetParent = getWidgetParent(); - if (widgetParent) + Layout::onTouchMoved(touch, unusedEvent); + if (!_isInterceptTouch) { - widgetParent->interceptTouchEvent(TouchEventType::MOVED,this,touch); + handleMoveLogic(touch); } - moveEvent(); } void PageView::onTouchEnded(Touch *touch, Event *unusedEvent) { Layout::onTouchEnded(touch, unusedEvent); - handleReleaseLogic(touch); + if (!_isInterceptTouch) + { + handleReleaseLogic(touch); + } + _isInterceptTouch = false; } void PageView::onTouchCancelled(Touch *touch, Event *unusedEvent) { Layout::onTouchCancelled(touch, unusedEvent); - handleReleaseLogic(touch); + if (!_isInterceptTouch) + { + handleReleaseLogic(touch); + } + _isInterceptTouch = false; } void PageView::doLayout() @@ -447,6 +455,28 @@ void PageView::handleMoveLogic(Touch *touch) } scrollPages(offset); } + +void PageView::setCustomScrollThreshold(float threshold) +{ + CCASSERT(threshold > 0, "Invalid threshold!"); + _customScrollThreshold = threshold; + this->setUsingCustomScrollThreshold(true); +} + +float PageView::getCustomScrollThreshold()const +{ + return _customScrollThreshold; +} + +void PageView::setUsingCustomScrollThreshold(bool flag) +{ + _usingCustomScrollThreshold = flag; +} + +bool PageView::isUsingCustomScrollThreshold()const +{ + return _usingCustomScrollThreshold; +} void PageView::handleReleaseLogic(Touch *touch) { @@ -461,7 +491,10 @@ void PageView::handleReleaseLogic(Touch *touch) ssize_t pageCount = this->getPageCount(); float curPageLocation = curPagePos.x; float pageWidth = getContentSize().width; - float boundary = pageWidth/2.0f; + if (!_usingCustomScrollThreshold) { + _customScrollThreshold = pageWidth / 2.0; + } + float boundary = _customScrollThreshold; if (curPageLocation <= -boundary) { if (_curPageIdx >= pageCount-1) @@ -499,12 +532,16 @@ void PageView::interceptTouchEvent(TouchEventType event, Widget *sender, Touch * switch (event) { case TouchEventType::BEGAN: - //no-op + { + _touchBeganPosition = touch->getLocation(); + _isInterceptTouch = true; + } break; case TouchEventType::MOVED: { float offset = 0; offset = fabs(sender->getTouchBeganPosition().x - touchPoint.x); + _touchMovePosition = touch->getLocation(); if (offset > _childFocusCancelOffset) { sender->setHighlighted(false); @@ -514,13 +551,21 @@ void PageView::interceptTouchEvent(TouchEventType event, Widget *sender, Touch * break; case TouchEventType::CANCELED: case TouchEventType::ENDED: + { + _touchEndPosition = touch->getLocation(); handleReleaseLogic(touch); + if (sender->isSwallowTouches()) + { + _isInterceptTouch = false; + } + } break; } } void PageView::pageTurningEvent() { + this->retain(); if (_pageViewEventListener && _pageViewEventSelector) { (_pageViewEventListener->*_pageViewEventSelector)(this, PAGEVIEW_EVENT_TURNING); @@ -528,6 +573,7 @@ void PageView::pageTurningEvent() if (_eventCallback) { _eventCallback(this,EventType::TURNING); } + this->release(); } void PageView::addEventListenerPageView(Ref *target, SEL_PageViewEvent selector) @@ -588,6 +634,8 @@ void PageView::copySpecialProperties(Widget *widget) _eventCallback = pageView->_eventCallback; _pageViewEventListener = pageView->_pageViewEventListener; _pageViewEventSelector = pageView->_pageViewEventSelector; + _usingCustomScrollThreshold = pageView->_usingCustomScrollThreshold; + _customScrollThreshold = pageView->_customScrollThreshold; } } diff --git a/cocos/ui/UIPageView.h b/cocos/ui/UIPageView.h index 52df2509ef..65078870e9 100644 --- a/cocos/ui/UIPageView.h +++ b/cocos/ui/UIPageView.h @@ -26,6 +26,7 @@ THE SOFTWARE. #define __UIPAGEVIEW_H__ #include "ui/UILayout.h" +#include "ui/GUIExport.h" NS_CC_BEGIN @@ -39,7 +40,7 @@ typedef enum typedef void (Ref::*SEL_PageViewEvent)(Ref*, PageViewEventType); #define pagevieweventselector(_SELECTOR)(SEL_PageViewEvent)(&_SELECTOR) -class PageView : public Layout +class CC_GUI_DLL PageView : public Layout { DECLARE_CLASS_GUI_INFO @@ -167,6 +168,23 @@ public: virtual std::string getDescription() const override; virtual void onEnter() override; + /** + * @brief If you don't specify the value, the pageView will scroll when half pageview width reached + */ + void setCustomScrollThreshold(float threshold); + /** + *@brief Return user defined scroll page threshold + */ + float getCustomScrollThreshold()const; + /** + *@brief Set using user defined scroll page threshold or not + * If you set it to false, then the default scroll threshold is pageView.width / 2 + */ + void setUsingCustomScrollThreshold(bool flag); + /** + *@brief Query whether we are using user defined scroll page threshold or not + */ + bool isUsingCustomScrollThreshold()const; CC_CONSTRUCTOR_ACCESS: virtual bool init() override; @@ -218,7 +236,9 @@ protected: float _leftBoundary; float _rightBoundary; - + float _customScrollThreshold; + bool _usingCustomScrollThreshold; + float _childFocusCancelOffset; Ref* _pageViewEventListener; diff --git a/cocos/ui/UIRelativeBox.h b/cocos/ui/UIRelativeBox.h index b4e7082b6d..ffef51b215 100644 --- a/cocos/ui/UIRelativeBox.h +++ b/cocos/ui/UIRelativeBox.h @@ -26,12 +26,13 @@ #define __UIRelativeBox_H__ #include "ui/UILayout.h" +#include "ui/GUIExport.h" NS_CC_BEGIN namespace ui { -class RelativeBox : public Layout{ +class CC_GUI_DLL RelativeBox : public Layout{ public: diff --git a/cocos/ui/UIRichText.cpp b/cocos/ui/UIRichText.cpp index af9bb06265..e6d53993d2 100644 --- a/cocos/ui/UIRichText.cpp +++ b/cocos/ui/UIRichText.cpp @@ -27,47 +27,12 @@ #include "2d/CCLabel.h" #include "2d/CCSprite.h" #include "base/ccUTF8.h" +#include "ui/UIHelper.h" NS_CC_BEGIN namespace ui { - -static std::string utf8_substr(const std::string& str, unsigned long start, unsigned long leng) -{ - if (leng==0) - { - return ""; - } - unsigned long c, i, ix, q, min=std::string::npos, max=std::string::npos; - for (q=0, i=0, ix=str.length(); i < ix; i++, q++) - { - if (q==start) - { - min = i; - } - if (q <= start+leng || leng==std::string::npos) - { - max = i; - } - - c = (unsigned char) str[i]; - - if (c<=127) i+=0; - else if ((c & 0xE0) == 0xC0) i+=1; - else if ((c & 0xF0) == 0xE0) i+=2; - else if ((c & 0xF8) == 0xF0) i+=3; - else return "";//invalid utf8 - } - if (q <= start+leng || leng == std::string::npos) - { - max = i; - } - if (min==std::string::npos || max==std::string::npos) - { - return ""; - } - return str.substr(min,max); -} + bool RichElement::init(int tag, const Color3B &color, GLubyte opacity) { @@ -318,18 +283,18 @@ void RichText::handleTextRenderer(const std::string& text, const std::string& fo std::string curText = text; size_t stringLength = StringUtils::getCharacterCountInUTF8String(text); int leftLength = stringLength * (1.0f - overstepPercent); - std::string leftWords = utf8_substr(curText,0,leftLength); - std::string cutWords = utf8_substr(curText, leftLength, curText.length() - leftLength); + std::string leftWords = Helper::getSubStringOfUTF8String(curText,0,leftLength); + std::string cutWords = Helper::getSubStringOfUTF8String(curText, leftLength, stringLength - leftLength); if (leftLength > 0) { Label* leftRenderer = nullptr; if (fileExist) { - leftRenderer = Label::createWithTTF(utf8_substr(leftWords, 0, leftLength), fontName, fontSize); + leftRenderer = Label::createWithTTF(Helper::getSubStringOfUTF8String(leftWords, 0, leftLength), fontName, fontSize); } else { - leftRenderer = Label::createWithSystemFont(utf8_substr(leftWords, 0, leftLength), fontName, fontSize); + leftRenderer = Label::createWithSystemFont(Helper::getSubStringOfUTF8String(leftWords, 0, leftLength), fontName, fontSize); } if (leftRenderer) { @@ -461,6 +426,11 @@ void RichText::formarRenderers() _elementRenderersContainer->setPosition(_contentSize.width / 2.0f, _contentSize.height / 2.0f); } +void RichText::adaptRenderers() +{ + this->formatText(); +} + void RichText::pushToContainer(cocos2d::Node *renderer) { if (_elementRenders.size() <= 0) @@ -469,15 +439,6 @@ void RichText::pushToContainer(cocos2d::Node *renderer) } _elementRenders[_elementRenders.size()-1]->pushBack(renderer); } - -void RichText::visit(cocos2d::Renderer *renderer, const Mat4 &parentTransform, uint32_t parentFlags) -{ - if (_enabled) - { - formatText(); - Widget::visit(renderer, parentTransform, parentFlags); - } -} void RichText::setVerticalSpace(float space) { diff --git a/cocos/ui/UIRichText.h b/cocos/ui/UIRichText.h index cab8927b5c..62aca834a0 100644 --- a/cocos/ui/UIRichText.h +++ b/cocos/ui/UIRichText.h @@ -26,12 +26,13 @@ #define __UIRICHTEXT_H__ #include "ui/UIWidget.h" +#include "ui/GUIExport.h" NS_CC_BEGIN namespace ui { -class RichElement : public Ref +class CC_GUI_DLL RichElement : public Ref { public: enum class Type @@ -51,7 +52,7 @@ protected: friend class RichText; }; -class RichElementText : public RichElement +class CC_GUI_DLL RichElementText : public RichElement { public: RichElementText(){_type = Type::TEXT;}; @@ -66,7 +67,7 @@ protected: }; -class RichElementImage : public RichElement +class CC_GUI_DLL RichElementImage : public RichElement { public: RichElementImage(){_type = Type::IMAGE;}; @@ -80,7 +81,7 @@ protected: friend class RichText; }; -class RichElementCustomNode : public RichElement +class CC_GUI_DLL RichElementCustomNode : public RichElement { public: RichElementCustomNode(){_type = Type::CUSTOM;}; @@ -92,7 +93,7 @@ protected: friend class RichText; }; -class RichText : public Widget +class CC_GUI_DLL RichText : public Widget { public: RichText(); @@ -102,7 +103,7 @@ public: void pushBackElement(RichElement* element); void removeElement(int index); void removeElement(RichElement* element); - virtual void visit(cocos2d::Renderer *renderer, const Mat4 &parentTransform, uint32_t parentFlags) override; + void setVerticalSpace(float space); virtual void setAnchorPoint(const Vec2 &pt); virtual const Size& getVirtualRendererSize() const override; @@ -114,6 +115,8 @@ CC_CONSTRUCTOR_ACCESS: virtual bool init() override; protected: + virtual void adaptRenderers(); + virtual void initRenderer(); void pushToContainer(Node* renderer); void handleTextRenderer(const std::string& text, const std::string& fontName, float fontSize, const Color3B& color, GLubyte opacity); diff --git a/cocos/ui/UIScale9Sprite.cpp b/cocos/ui/UIScale9Sprite.cpp new file mode 100644 index 0000000000..c3f79d13b2 --- /dev/null +++ b/cocos/ui/UIScale9Sprite.cpp @@ -0,0 +1,1070 @@ +/**************************************************************************** + 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 "UIScale9Sprite.h" +#include "2d/CCSprite.h" +#include "2d/CCSpriteFrameCache.h" +#include "base/CCVector.h" +#include "base/CCDirector.h" + +NS_CC_BEGIN +namespace ui { + + Scale9Sprite::Scale9Sprite() + : _spritesGenerated(false) + , _spriteFrameRotated(false) + , _positionsAreDirty(false) + , _scale9Image(nullptr) + , _topLeft(nullptr) + , _top(nullptr) + , _topRight(nullptr) + , _left(nullptr) + , _centre(nullptr) + , _right(nullptr) + , _bottomLeft(nullptr) + , _bottom(nullptr) + , _bottomRight(nullptr) + , _insetLeft(0) + , _insetTop(0) + , _insetRight(0) + , _insetBottom(0), + _scale9Enabled(true) + { + this->setAnchorPoint(Vec2(0.5,0.5)); + } + + Scale9Sprite::~Scale9Sprite() + { + this->cleanupSlicedSprites(); + CC_SAFE_RELEASE(_scale9Image); + } + + void Scale9Sprite::cleanupSlicedSprites() + { + if (_topLeft && _topLeft->isRunning()) + { + _topLeft->onExit(); + } + if (_top && _top->isRunning()) + { + _top->onExit(); + } + if (_topRight && _topRight->isRunning()) + { + _topRight->onExit(); + } + + if (_left && _left->isRunning()) + { + _left->onExit(); + } + + if (_centre && _centre->isRunning()) + { + _centre->onExit(); + } + + if (_right && _right->isRunning()) + { + _right->onExit(); + } + + if (_bottomLeft && _bottomLeft->isRunning()) + { + _bottomLeft->onExit(); + } + + if (_bottomRight && _bottomRight->isRunning()) + { + _bottomRight->onExit(); + } + + if (_bottom && _bottom->isRunning()) + { + _bottom->onExit(); + } + + CC_SAFE_RELEASE_NULL(_topLeft); + CC_SAFE_RELEASE_NULL(_top); + CC_SAFE_RELEASE_NULL(_topRight); + CC_SAFE_RELEASE_NULL(_left); + CC_SAFE_RELEASE_NULL(_centre); + CC_SAFE_RELEASE_NULL(_right); + CC_SAFE_RELEASE_NULL(_bottomLeft); + CC_SAFE_RELEASE_NULL(_bottom); + CC_SAFE_RELEASE_NULL(_bottomRight); + } + + bool Scale9Sprite::init() + { + return this->init(NULL, Rect::ZERO, Rect::ZERO); + } + + bool Scale9Sprite::init(Sprite* sprite, const Rect& rect, const Rect& capInsets) + { + return this->init(sprite, rect, false, capInsets); + } + + bool Scale9Sprite::init(Sprite* sprite, const Rect& rect, bool rotated, const Rect& capInsets) + { + if(sprite) + { + this->updateWithSprite(sprite, rect, rotated, capInsets); + } + this->setCascadeColorEnabled(true); + this->setCascadeOpacityEnabled(true); + this->setAnchorPoint(Vec2(0.5f, 0.5f)); + this->_positionsAreDirty = true; + + return true; + } + +#define TRANSLATE_X(x, y, xtranslate) \ +x+=xtranslate; \ + +#define TRANSLATE_Y(x, y, ytranslate) \ +y+=ytranslate; \ + + bool Scale9Sprite::updateWithSprite(Sprite* sprite, const Rect& originalRect, bool rotated, const Rect& capInsets) + { + GLubyte opacity = getOpacity(); + Color3B color = getColor(); + Rect rect(originalRect); + + // Release old sprites + this->cleanupSlicedSprites(); + _protectedChildren.clear(); + + if(this->_scale9Image != sprite) + { + CC_SAFE_RELEASE(this->_scale9Image); + _scale9Image = sprite; + CC_SAFE_RETAIN(_scale9Image); + } + + if (!_scale9Image) + { + return false; + } + + _capInsets = capInsets; + _spriteFrameRotated = rotated; + + // If there is no given rect + if ( rect.equals(Rect::ZERO) ) + { + // Get the texture size as original + Size textureSize = _scale9Image->getTexture()->getContentSize(); + + rect = Rect(0, 0, textureSize.width, textureSize.height); + } + + // Set the given rect's size as original size + _spriteRect = rect; + _originalSize = rect.size; + _preferredSize = _originalSize; + _capInsetsInternal = capInsets; + + if (_scale9Enabled) + { + this->createSlicedSprites(rect, rotated); + } + + this->setContentSize(rect.size); + + if (_spritesGenerated) + { + // Restore color and opacity + this->setOpacity(opacity); + this->setColor(color); + } + _spritesGenerated = true; + + return true; + } + + void Scale9Sprite::createSlicedSprites(const Rect& rect, bool rotated) + { + float w = rect.size.width; + float h = rect.size.height; + + // If there is no specified center region + if ( _capInsetsInternal.equals(Rect::ZERO) ) + { + // log("... cap insets not specified : using default cap insets ..."); + _capInsetsInternal = Rect(w/3, h/3, w/3, h/3); + } + + float left_w = _capInsetsInternal.origin.x; + float center_w = _capInsetsInternal.size.width; + float right_w = rect.size.width - (left_w + center_w); + + float top_h = _capInsetsInternal.origin.y; + float center_h = _capInsetsInternal.size.height; + float bottom_h = rect.size.height - (top_h + center_h); + + // calculate rects + + // ... top row + float x = 0.0; + float y = 0.0; + + // top left + Rect lefttopbounds = Rect(x, y, left_w, top_h); + + // top center + TRANSLATE_X(x, y, left_w); + Rect centertopbounds = Rect(x, y, center_w, top_h); + + // top right + TRANSLATE_X(x, y, center_w); + Rect righttopbounds = Rect(x, y, right_w, top_h); + + // ... center row + x = 0.0; + y = 0.0; + TRANSLATE_Y(x, y, top_h); + + // center left + Rect leftcenterbounds = Rect(x, y, left_w, center_h); + + // center center + TRANSLATE_X(x, y, left_w); + Rect centerbounds = Rect(x, y, center_w, center_h); + + // center right + TRANSLATE_X(x, y, center_w); + Rect rightcenterbounds = Rect(x, y, right_w, center_h); + + // ... bottom row + x = 0.0; + y = 0.0; + TRANSLATE_Y(x, y, top_h); + TRANSLATE_Y(x, y, center_h); + + // bottom left + Rect leftbottombounds = Rect(x, y, left_w, bottom_h); + + // bottom center + TRANSLATE_X(x, y, left_w); + Rect centerbottombounds = Rect(x, y, center_w, bottom_h); + + // bottom right + TRANSLATE_X(x, y, center_w); + Rect rightbottombounds = Rect(x, y, right_w, bottom_h); + + + Rect rotatedcenterbounds = centerbounds; + Rect rotatedrightbottombounds = rightbottombounds; + Rect rotatedleftbottombounds = leftbottombounds; + Rect rotatedrighttopbounds = righttopbounds; + Rect rotatedlefttopbounds = lefttopbounds; + Rect rotatedrightcenterbounds = rightcenterbounds; + Rect rotatedleftcenterbounds = leftcenterbounds; + Rect rotatedcenterbottombounds = centerbottombounds; + Rect rotatedcentertopbounds = centertopbounds; + + if (!rotated) + { + + AffineTransform t = AffineTransform::IDENTITY; + t = AffineTransformTranslate(t, rect.origin.x, rect.origin.y); + + rotatedcenterbounds = RectApplyAffineTransform(rotatedcenterbounds, t); + rotatedrightbottombounds = RectApplyAffineTransform(rotatedrightbottombounds, t); + rotatedleftbottombounds = RectApplyAffineTransform(rotatedleftbottombounds, t); + rotatedrighttopbounds = RectApplyAffineTransform(rotatedrighttopbounds, t); + rotatedlefttopbounds = RectApplyAffineTransform(rotatedlefttopbounds, t); + rotatedrightcenterbounds = RectApplyAffineTransform(rotatedrightcenterbounds, t); + rotatedleftcenterbounds = RectApplyAffineTransform(rotatedleftcenterbounds, t); + rotatedcenterbottombounds = RectApplyAffineTransform(rotatedcenterbottombounds, t); + rotatedcentertopbounds = RectApplyAffineTransform(rotatedcentertopbounds, t); + + + } else { + // set up transformation of coordinates + // to handle the case where the sprite is stored rotated + // in the spritesheet + // log("rotated"); + + AffineTransform t = AffineTransform::IDENTITY; + + t = AffineTransformTranslate(t, rect.size.height+rect.origin.x, rect.origin.y); + t = AffineTransformRotate(t, 1.57079633f); + + centerbounds = RectApplyAffineTransform(centerbounds, t); + rightbottombounds = RectApplyAffineTransform(rightbottombounds, t); + leftbottombounds = RectApplyAffineTransform(leftbottombounds, t); + righttopbounds = RectApplyAffineTransform(righttopbounds, t); + lefttopbounds = RectApplyAffineTransform(lefttopbounds, t); + rightcenterbounds = RectApplyAffineTransform(rightcenterbounds, t); + leftcenterbounds = RectApplyAffineTransform(leftcenterbounds, t); + centerbottombounds = RectApplyAffineTransform(centerbottombounds, t); + centertopbounds = RectApplyAffineTransform(centertopbounds, t); + + rotatedcenterbounds.origin = centerbounds.origin; + rotatedrightbottombounds.origin = rightbottombounds.origin; + rotatedleftbottombounds.origin = leftbottombounds.origin; + rotatedrighttopbounds.origin = righttopbounds.origin; + rotatedlefttopbounds.origin = lefttopbounds.origin; + rotatedrightcenterbounds.origin = rightcenterbounds.origin; + rotatedleftcenterbounds.origin = leftcenterbounds.origin; + rotatedcenterbottombounds.origin = centerbottombounds.origin; + rotatedcentertopbounds.origin = centertopbounds.origin; + + + } + + + // Centre + _centre = Sprite::createWithTexture(_scale9Image->getTexture(), rotatedcenterbounds, rotated); + _centre->retain(); + this->addProtectedChild(_centre); + + + // Top + _top = Sprite::createWithTexture(_scale9Image->getTexture(), rotatedcentertopbounds, rotated); + _top->retain(); + this->addProtectedChild(_top); + + // Bottom + _bottom = Sprite::createWithTexture(_scale9Image->getTexture(), rotatedcenterbottombounds, rotated); + _bottom->retain(); + this->addProtectedChild(_bottom); + + // Left + _left = Sprite::createWithTexture(_scale9Image->getTexture(), rotatedleftcenterbounds, rotated); + _left->retain(); + this->addProtectedChild(_left); + + // Right + _right = Sprite::createWithTexture(_scale9Image->getTexture(), rotatedrightcenterbounds, rotated); + _right->retain(); + this->addProtectedChild(_right); + + // Top left + _topLeft = Sprite::createWithTexture(_scale9Image->getTexture(), rotatedlefttopbounds, rotated); + _topLeft->retain(); + this->addProtectedChild(_topLeft); + + // Top right + _topRight = Sprite::createWithTexture(_scale9Image->getTexture(), rotatedrighttopbounds, rotated); + _topRight->retain(); + this->addProtectedChild(_topRight); + + // Bottom left + _bottomLeft = Sprite::createWithTexture(_scale9Image->getTexture(), rotatedleftbottombounds, rotated); + _bottomLeft->retain(); + this->addProtectedChild(_bottomLeft); + + // Bottom right + _bottomRight = Sprite::createWithTexture(_scale9Image->getTexture(), rotatedrightbottombounds, rotated); + _bottomRight->retain(); + this->addProtectedChild(_bottomRight); + } + + void Scale9Sprite::setContentSize(const Size &size) + { + Node::setContentSize(size); + this->_positionsAreDirty = true; + } + + void Scale9Sprite::updatePositions() + { + // Check that instances are non-NULL + if(!((_topLeft) && + (_topRight) && + (_bottomRight) && + (_bottomLeft) && + (_centre))) + { + // if any of the above sprites are NULL, return + return; + } + + Size size = this->_contentSize; + + float sizableWidth = size.width - _topLeft->getContentSize().width - _topRight->getContentSize().width; + float sizableHeight = size.height - _topLeft->getContentSize().height - _bottomRight->getContentSize().height; + + float horizontalScale = sizableWidth/_centre->getContentSize().width; + float verticalScale = sizableHeight/_centre->getContentSize().height; + + _centre->setScaleX(horizontalScale); + _centre->setScaleY(verticalScale); + + float rescaledWidth = _centre->getContentSize().width * horizontalScale; + float rescaledHeight = _centre->getContentSize().height * verticalScale; + + float leftWidth = _bottomLeft->getContentSize().width; + float bottomHeight = _bottomLeft->getContentSize().height; + + _bottomLeft->setAnchorPoint(Vec2(0,0)); + _bottomRight->setAnchorPoint(Vec2(0,0)); + _topLeft->setAnchorPoint(Vec2(0,0)); + _topRight->setAnchorPoint(Vec2(0,0)); + _left->setAnchorPoint(Vec2(0,0)); + _right->setAnchorPoint(Vec2(0,0)); + _top->setAnchorPoint(Vec2(0,0)); + _bottom->setAnchorPoint(Vec2(0,0)); + _centre->setAnchorPoint(Vec2(0,0)); + + // Position corners + _bottomLeft->setPosition(Vec2(0,0)); + _bottomRight->setPosition(Vec2(leftWidth+rescaledWidth,0)); + _topLeft->setPosition(Vec2(0, bottomHeight+rescaledHeight)); + _topRight->setPosition(Vec2(leftWidth+rescaledWidth, bottomHeight+rescaledHeight)); + + // Scale and position borders + _left->setPosition(Vec2(0, bottomHeight)); + _left->setScaleY(verticalScale); + _right->setPosition(Vec2(leftWidth+rescaledWidth,bottomHeight)); + _right->setScaleY(verticalScale); + _bottom->setPosition(Vec2(leftWidth,0)); + _bottom->setScaleX(horizontalScale); + _top->setPosition(Vec2(leftWidth,bottomHeight+rescaledHeight)); + _top->setScaleX(horizontalScale); + + // Position centre + _centre->setPosition(Vec2(leftWidth, bottomHeight)); + } + + bool Scale9Sprite::initWithFile(const std::string& file, const Rect& rect, const Rect& capInsets) + { + Sprite *sprite = Sprite::create(file); + bool pReturn = this->init(sprite, rect, capInsets); + return pReturn; + } + + Scale9Sprite* Scale9Sprite::create(const std::string& file, const Rect& rect, const Rect& capInsets) + { + Scale9Sprite* pReturn = new Scale9Sprite(); + if ( pReturn && pReturn->initWithFile(file, rect, capInsets) ) + { + pReturn->autorelease(); + return pReturn; + } + CC_SAFE_DELETE(pReturn); + return NULL; + } + + bool Scale9Sprite::initWithFile(const std::string& file, const Rect& rect) + { + bool pReturn = this->initWithFile(file, rect, Rect::ZERO); + return pReturn; + } + + Scale9Sprite* Scale9Sprite::create(const std::string& file, const Rect& rect) + { + Scale9Sprite* pReturn = new Scale9Sprite(); + if ( pReturn && pReturn->initWithFile(file, rect) ) + { + pReturn->autorelease(); + return pReturn; + } + CC_SAFE_DELETE(pReturn); + return NULL; + } + + + bool Scale9Sprite::initWithFile(const Rect& capInsets, const std::string& file) + { + bool pReturn = this->initWithFile(file, Rect::ZERO, capInsets); + return pReturn; + } + + Scale9Sprite* Scale9Sprite::create(const Rect& capInsets, const std::string& file) + { + Scale9Sprite* pReturn = new Scale9Sprite(); + if ( pReturn && pReturn->initWithFile(capInsets, file) ) + { + pReturn->autorelease(); + return pReturn; + } + CC_SAFE_DELETE(pReturn); + return NULL; + } + + bool Scale9Sprite::initWithFile(const std::string& file) + { + bool pReturn = this->initWithFile(file, Rect::ZERO); + return pReturn; + + } + + Scale9Sprite* Scale9Sprite::create(const std::string& file) + { + Scale9Sprite* pReturn = new Scale9Sprite(); + if ( pReturn && pReturn->initWithFile(file) ) + { + pReturn->autorelease(); + return pReturn; + } + CC_SAFE_DELETE(pReturn); + return NULL; + } + + bool Scale9Sprite::initWithSpriteFrame(SpriteFrame* spriteFrame, const Rect& capInsets) + { + Texture2D* texture = spriteFrame->getTexture(); + CCASSERT(texture != NULL, "CCTexture must be not nil"); + + Sprite *sprite = Sprite::createWithSpriteFrame(spriteFrame); + CCASSERT(sprite != NULL, "sprite must be not nil"); + + bool pReturn = this->init(sprite, spriteFrame->getRect(), spriteFrame->isRotated(), capInsets); + return pReturn; + } + + Scale9Sprite* Scale9Sprite::createWithSpriteFrame(SpriteFrame* spriteFrame, const Rect& capInsets) + { + Scale9Sprite* pReturn = new Scale9Sprite(); + if ( pReturn && pReturn->initWithSpriteFrame(spriteFrame, capInsets) ) + { + pReturn->autorelease(); + return pReturn; + } + CC_SAFE_DELETE(pReturn); + return NULL; + } + bool Scale9Sprite::initWithSpriteFrame(SpriteFrame* spriteFrame) + { + CCASSERT(spriteFrame != NULL, "Invalid spriteFrame for sprite"); + bool pReturn = this->initWithSpriteFrame(spriteFrame, Rect::ZERO); + return pReturn; + } + + Scale9Sprite* Scale9Sprite::createWithSpriteFrame(SpriteFrame* spriteFrame) + { + Scale9Sprite* pReturn = new Scale9Sprite(); + if ( pReturn && pReturn->initWithSpriteFrame(spriteFrame) ) + { + pReturn->autorelease(); + return pReturn; + } + CC_SAFE_DELETE(pReturn); + return NULL; + } + + bool Scale9Sprite::initWithSpriteFrameName(const std::string& spriteFrameName, const Rect& capInsets) + { + CCASSERT((SpriteFrameCache::getInstance()) != NULL, "SpriteFrameCache::getInstance() must be non-NULL"); + + SpriteFrame *frame = SpriteFrameCache::getInstance()->getSpriteFrameByName(spriteFrameName); + CCASSERT(frame != NULL, "CCSpriteFrame must be non-NULL"); + + if (NULL == frame) return false; + + bool pReturn = this->initWithSpriteFrame(frame, capInsets); + return pReturn; + } + + Scale9Sprite* Scale9Sprite::createWithSpriteFrameName(const std::string& spriteFrameName, const Rect& capInsets) + { + Scale9Sprite* pReturn = new Scale9Sprite(); + if ( pReturn && pReturn->initWithSpriteFrameName(spriteFrameName, capInsets) ) + { + pReturn->autorelease(); + return pReturn; + } + CC_SAFE_DELETE(pReturn); + return NULL; + } + + bool Scale9Sprite::initWithSpriteFrameName(const std::string& spriteFrameName) + { + bool pReturn = this->initWithSpriteFrameName(spriteFrameName, Rect::ZERO); + return pReturn; + } + + Scale9Sprite* Scale9Sprite::createWithSpriteFrameName(const std::string& spriteFrameName) + { + Scale9Sprite* pReturn = new Scale9Sprite(); + if ( pReturn && pReturn->initWithSpriteFrameName(spriteFrameName) ) + { + pReturn->autorelease(); + return pReturn; + } + CC_SAFE_DELETE(pReturn); + + log("Could not allocate Scale9Sprite()"); + return NULL; + + } + + Scale9Sprite* Scale9Sprite::resizableSpriteWithCapInsets(const Rect& capInsets) + { + Scale9Sprite* pReturn = new Scale9Sprite(); + if ( pReturn && pReturn->init(_scale9Image, _spriteRect, capInsets) ) + { + pReturn->autorelease(); + return pReturn; + } + CC_SAFE_DELETE(pReturn); + return NULL; + } + + Scale9Sprite* Scale9Sprite::create() + { + Scale9Sprite *pReturn = new Scale9Sprite(); + if (pReturn && pReturn->init()) + { + pReturn->autorelease(); + return pReturn; + } + CC_SAFE_DELETE(pReturn); + return NULL; + } + + /** sets the opacity. + @warning If the the texture has premultiplied alpha then, the R, G and B channels will be modifed. + Values goes from 0 to 255, where 255 means fully opaque. + */ + + + + void Scale9Sprite::updateCapInset() + { + Rect insets; + if (this->_insetLeft == 0 && this->_insetTop == 0 && this->_insetRight == 0 && this->_insetBottom == 0) + { + insets = Rect::ZERO; + } + else + { + insets = Rect(_insetLeft, + _insetTop, + _spriteRect.size.width-_insetLeft-_insetRight, + _spriteRect.size.height-_insetTop-_insetBottom); + } + this->setCapInsets(insets); + } + + + void Scale9Sprite::setSpriteFrame(SpriteFrame * spriteFrame) + { + Sprite * sprite = Sprite::createWithTexture(spriteFrame->getTexture()); + this->updateWithSprite(sprite, spriteFrame->getRect(), spriteFrame->isRotated(), Rect::ZERO); + + // Reset insets + this->_insetLeft = 0; + this->_insetTop = 0; + this->_insetRight = 0; + this->_insetBottom = 0; + } + + void Scale9Sprite::setPreferredSize(const Size& preferedSize) + { + this->setContentSize(preferedSize); + this->_preferredSize = preferedSize; + } + + + void Scale9Sprite::setCapInsets(const Rect& capInsets) + { + Size contentSize = this->_contentSize; + this->updateWithSprite(this->_scale9Image, this->_spriteRect, _spriteFrameRotated, capInsets); + this->setContentSize(contentSize); + } + + + void Scale9Sprite::setInsetLeft(float insetLeft) + { + this->_insetLeft = insetLeft; + this->updateCapInset(); + } + + void Scale9Sprite::setInsetTop(float insetTop) + { + this->_insetTop = insetTop; + this->updateCapInset(); + } + + void Scale9Sprite::setInsetRight(float insetRight) + { + this->_insetRight = insetRight; + this->updateCapInset(); + } + + void Scale9Sprite::setInsetBottom(float insetBottom) + { + this->_insetBottom = insetBottom; + this->updateCapInset(); + } + + void Scale9Sprite::visit(Renderer *renderer, const Mat4 &parentTransform, uint32_t parentFlags) + { + + // quick return if not visible. children won't be drawn. + if (!_visible) + { + return; + } + + uint32_t flags = processParentFlags(parentTransform, parentFlags); + + // IMPORTANT: + // To ease the migration to v3.0, we still support the Mat4 stack, + // but it is deprecated and your code should not rely on it + Director* director = Director::getInstance(); + CCASSERT(nullptr != director, "Director is null when seting matrix stack"); + director->pushMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_MODELVIEW); + director->loadMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_MODELVIEW, _modelViewTransform); + + int i = 0; // used by _children + int j = 0; // used by _protectedChildren + + sortAllChildren(); + sortAllProtectedChildren(); + + // + // draw children and protectedChildren zOrder < 0 + // + for( ; i < _children.size(); i++ ) + { + auto node = _children.at(i); + + if ( node && node->getLocalZOrder() < 0 ) + node->visit(renderer, _modelViewTransform, flags); + else + break; + } + + if (_scale9Enabled) + { + for( ; j < _protectedChildren.size(); j++ ) + { + auto node = _protectedChildren.at(j); + + if ( node && node->getLocalZOrder() < 0 ) + node->visit(renderer, _modelViewTransform, flags); + else + break; + } + } + else + { + if (_scale9Image) + { + _scale9Image->visit(renderer, _modelViewTransform, flags); + } + } + + // + // draw self + // + if (isVisitableByVisitingCamera()) + this->draw(renderer, _modelViewTransform, flags); + + // + // draw children and protectedChildren zOrder >= 0 + // + if (_scale9Enabled) + { + for(auto it=_protectedChildren.cbegin()+j; it != _protectedChildren.cend(); ++it) + (*it)->visit(renderer, _modelViewTransform, flags); + } + else + { + if (_scale9Image) + { + _scale9Image->visit(renderer, _modelViewTransform, flags); + } + } + + + for(auto it=_children.cbegin()+i; it != _children.cend(); ++it) + (*it)->visit(renderer, _modelViewTransform, flags); + + // reset for next frame + _orderOfArrival = 0; + + director->popMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_MODELVIEW); + + } + + Size Scale9Sprite::getOriginalSize()const + { + return _originalSize; + } + + + Size Scale9Sprite::getPreferredSize() const + { + return _preferredSize; + } + + Rect Scale9Sprite::getCapInsets()const + { + return _capInsets; + } + + + float Scale9Sprite::getInsetLeft()const + { + return this->_insetLeft; + } + + float Scale9Sprite::getInsetTop()const + { + return this->_insetTop; + } + + float Scale9Sprite::getInsetRight()const + { + return this->_insetRight; + } + + float Scale9Sprite::getInsetBottom()const + { + return this->_insetBottom; + } + + void Scale9Sprite::setScale9Enabled(bool enabled) + { + if (_scale9Enabled == enabled) + { + return; + } + _scale9Enabled = enabled; + + this->cleanupSlicedSprites(); + _protectedChildren.clear(); + + if (_scale9Enabled) + { + if (_scale9Image) + { + this->updateWithSprite(this->_scale9Image, + this->_spriteRect, + _spriteFrameRotated, _capInsets); + } + } + _positionsAreDirty = true; + } + + bool Scale9Sprite::isScale9Enabled() const + { + return _scale9Enabled; + } + + void Scale9Sprite::addProtectedChild(cocos2d::Node *child) + { + _reorderProtectedChildDirty = true; + _protectedChildren.pushBack(child); + } + + void Scale9Sprite::sortAllProtectedChildren() + { + if(this->_positionsAreDirty) + { + this->updatePositions(); + this->adjustScale9ImagePosition(); + this->_positionsAreDirty = false; + } + if( _reorderProtectedChildDirty ) + { + std::sort( std::begin(_protectedChildren), std::end(_protectedChildren), nodeComparisonLess ); + _reorderProtectedChildDirty = false; + } + } + + void Scale9Sprite::adjustScale9ImagePosition() + { + if (_scale9Image) + { + _scale9Image->setPosition(Vec2(_contentSize.width * _scale9Image->getAnchorPoint().x, + _contentSize.height * _scale9Image->getAnchorPoint().y)); + } + } + + void Scale9Sprite::setAnchorPoint(const cocos2d::Vec2 &position) + { + Node::setAnchorPoint(position); + if (!_scale9Enabled) + { + if (_scale9Image) + { + _scale9Image->setAnchorPoint(position); + _positionsAreDirty = true; + } + } + } + + void Scale9Sprite::cleanup() + { + Node::cleanup(); + // timers + for( const auto &child: _protectedChildren) + child->cleanup(); + } + + void Scale9Sprite::onEnter() + { +#if CC_ENABLE_SCRIPT_BINDING + if (_scriptType == kScriptTypeJavascript) + { + if (ScriptEngineManager::sendNodeEventToJSExtended(this, kNodeOnEnter)) + return; + } +#endif + Node::onEnter(); + for( const auto &child: _protectedChildren) + child->onEnter(); + } + + void Scale9Sprite::onExit() + { + Node::onExit(); + for( const auto &child: _protectedChildren) + child->onExit(); + } + + void Scale9Sprite::onEnterTransitionDidFinish() + { + Node::onEnterTransitionDidFinish(); + for( const auto &child: _protectedChildren) + child->onEnterTransitionDidFinish(); + } + + void Scale9Sprite::onExitTransitionDidStart() + { + Node::onExitTransitionDidStart(); + for( const auto &child: _protectedChildren) + child->onExitTransitionDidStart(); + } + + void Scale9Sprite::updateDisplayedColor(const cocos2d::Color3B &parentColor) + { + _displayedColor.r = _realColor.r * parentColor.r/255.0; + _displayedColor.g = _realColor.g * parentColor.g/255.0; + _displayedColor.b = _realColor.b * parentColor.b/255.0; + updateColor(); + + if (_scale9Image) + { + _scale9Image->updateDisplayedColor(_displayedColor); + } + + for(const auto &child : _protectedChildren) + { + child->updateDisplayedColor(_displayedColor); + } + + if (_cascadeColorEnabled) + { + for(const auto &child : _children) + { + child->updateDisplayedColor(_displayedColor); + } + } + } + + void Scale9Sprite::updateDisplayedOpacity(GLubyte parentOpacity) + { + _displayedOpacity = _realOpacity * parentOpacity/255.0; + updateColor(); + + if (_scale9Image) + { + _scale9Image->updateDisplayedOpacity(_displayedOpacity); + } + + for(auto child : _protectedChildren) + { + child->updateDisplayedOpacity(_displayedOpacity); + } + + if (_cascadeOpacityEnabled) + { + for(auto child : _children) + { + child->updateDisplayedOpacity(_displayedOpacity); + } + } + } + + void Scale9Sprite::disableCascadeColor() + { + for(auto child : _children) + { + child->updateDisplayedColor(Color3B::WHITE); + } + for(auto child : _protectedChildren) + { + child->updateDisplayedColor(Color3B::WHITE); + } + if (_scale9Image) + { + _scale9Image->updateDisplayedColor(Color3B::WHITE); + } + } + + Sprite* Scale9Sprite::getSprite()const + { + return _scale9Image; + } + + void Scale9Sprite::setFlippedX(bool flippedX) + { + _flippedX = flippedX; + if (_scale9Enabled) + { + this->setScaleX(-1); + } + else + { + if (_scale9Image) + { + _scale9Image->setFlippedX(flippedX); + } + } + } + + void Scale9Sprite::setFlippedY(bool flippedY) + { + _flippedY = flippedY; + if (_scale9Enabled) + { + this->setScaleY(-1); + } + else + { + if (_scale9Image) + { + _scale9Image->setFlippedY(flippedY); + } + } + } + + bool Scale9Sprite::isFlippedX()const + { + return _flippedX; + } + + bool Scale9Sprite::isFlippedY()const + { + return _flippedY; + } +}} diff --git a/cocos/ui/UIScale9Sprite.h b/cocos/ui/UIScale9Sprite.h new file mode 100644 index 0000000000..1db19b9e1d --- /dev/null +++ b/cocos/ui/UIScale9Sprite.h @@ -0,0 +1,414 @@ +/**************************************************************************** + 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 __cocos2d_libs__UIScale9Sprite__ +#define __cocos2d_libs__UIScale9Sprite__ + +#include "2d/CCNode.h" +#include "2d/CCSpriteFrame.h" +#include "2d/CCSpriteBatchNode.h" +#include "base/CCPlatformMacros.h" +#include "ui/GUIExport.h" + +NS_CC_BEGIN +namespace ui { + + /** + * A 9-slice sprite for cocos2d. + * + * 9-slice scaling allows you to specify how scaling is applied + * to specific areas of a sprite. With 9-slice scaling (3x3 grid), + * you can ensure that the sprite does not become distorted when + * scaled. + * Note: When you set _scale9Enabled to false, then you could call scale9Sprite->getSprite() to return a new Sprite pointer. + * Then you could call any methods of Sprite class with the return pointers. + * + */ + class CC_GUI_DLL Scale9Sprite : public Node + { + public: + /** + * @js ctor + */ + Scale9Sprite(); + /** + * @js NA + * @lua NA + */ + virtual ~Scale9Sprite(); + + public: + static Scale9Sprite* create(); + + /** + * Creates a 9-slice sprite with a texture file, a delimitation zone and + * with the specified cap insets. + * + * @see initWithFile(const char *file, const Rect& rect, const Rect& capInsets) + */ + static Scale9Sprite* create(const std::string& file, const Rect& rect, const Rect& capInsets); + + /** + * Creates a 9-slice sprite with a texture file. The whole texture will be + * broken down into a 3×3 grid of equal blocks. + * + * @see initWithFile(const Rect& capInsets, const char *file) + */ + static Scale9Sprite* create(const Rect& capInsets, const std::string& file); + + /** + * Creates a 9-slice sprite with a texture file and a delimitation zone. The + * texture will be broken down into a 3×3 grid of equal blocks. + * + * @see initWithFile(const char *file, const Rect& rect) + */ + static Scale9Sprite* create(const std::string& file, const Rect& rect); + + /** + * Creates a 9-slice sprite with a texture file. The whole texture will be + * broken down into a 3×3 grid of equal blocks. + * + * @see initWithFile(const char *file) + */ + static Scale9Sprite* create(const std::string& file); + + /** + * Creates a 9-slice sprite with an sprite frame. + * Once the sprite is created, you can then call its "setContentSize:" method + * to resize the sprite will all it's 9-slice goodness intract. + * It respects the anchorPoint too. + * + * @see initWithSpriteFrame(SpriteFrame *spriteFrame) + */ + static Scale9Sprite* createWithSpriteFrame(SpriteFrame* spriteFrame); + + /** + * Creates a 9-slice sprite with an sprite frame and the centre of its zone. + * Once the sprite is created, you can then call its "setContentSize:" method + * to resize the sprite will all it's 9-slice goodness intract. + * It respects the anchorPoint too. + * + * @see initWithSpriteFrame(SpriteFrame *spriteFrame, const Rect& capInsets) + */ + static Scale9Sprite* createWithSpriteFrame(SpriteFrame* spriteFrame, const Rect& capInsets); + + /** + * Creates a 9-slice sprite with an sprite frame name. + * Once the sprite is created, you can then call its "setContentSize:" method + * to resize the sprite will all it's 9-slice goodness intract. + * It respects the anchorPoint too. + * + * @see initWithSpriteFrameName(const char *spriteFrameName) + */ + static Scale9Sprite* createWithSpriteFrameName(const std::string& spriteFrameName); + + /** + * Creates a 9-slice sprite with an sprite frame name and the centre of its + * zone. + * Once the sprite is created, you can then call its "setContentSize:" method + * to resize the sprite will all it's 9-slice goodness intract. + * It respects the anchorPoint too. + * + * @see initWithSpriteFrameName(const char *spriteFrameName, const Rect& capInsets) + */ + static Scale9Sprite* createWithSpriteFrameName(const std::string& spriteFrameName, const Rect& capInsets); + + /** + * Initializes a 9-slice sprite with a texture file, a delimitation zone and + * with the specified cap insets. + * Once the sprite is created, you can then call its "setContentSize:" method + * to resize the sprite will all it's 9-slice goodness intract. + * It respects the anchorPoint too. + * + * @param file The name of the texture file. + * @param rect The rectangle that describes the sub-part of the texture that + * is the whole image. If the shape is the whole texture, set this to the + * texture's full rect. + * @param capInsets The values to use for the cap insets. + */ + virtual bool initWithFile(const std::string& file, const Rect& rect, const Rect& capInsets); + + /** + * Initializes a 9-slice sprite with a texture file and a delimitation zone. The + * texture will be broken down into a 3×3 grid of equal blocks. + * Once the sprite is created, you can then call its "setContentSize:" method + * to resize the sprite will all it's 9-slice goodness intract. + * It respects the anchorPoint too. + * + * @param file The name of the texture file. + * @param rect The rectangle that describes the sub-part of the texture that + * is the whole image. If the shape is the whole texture, set this to the + * texture's full rect. + */ + virtual bool initWithFile(const std::string& file, const Rect& rect); + + /** + * Initializes a 9-slice sprite with a texture file and with the specified cap + * insets. + * Once the sprite is created, you can then call its "setContentSize:" method + * to resize the sprite will all it's 9-slice goodness intract. + * It respects the anchorPoint too. + * + * @param file The name of the texture file. + * @param capInsets The values to use for the cap insets. + */ + virtual bool initWithFile(const Rect& capInsets, const std::string& file); + + /** + * Initializes a 9-slice sprite with a texture file. The whole texture will be + * broken down into a 3×3 grid of equal blocks. + * Once the sprite is created, you can then call its "setContentSize:" method + * to resize the sprite will all it's 9-slice goodness intract. + * It respects the anchorPoint too. + * + * @param file The name of the texture file. + */ + virtual bool initWithFile(const std::string& file); + + /** + * Initializes a 9-slice sprite with an sprite frame and with the specified + * cap insets. + * Once the sprite is created, you can then call its "setContentSize:" method + * to resize the sprite will all it's 9-slice goodness intract. + * It respects the anchorPoint too. + * + * @param spriteFrame The sprite frame object. + * @param capInsets The values to use for the cap insets. + */ + virtual bool initWithSpriteFrame(SpriteFrame* spriteFrame, const Rect& capInsets); + + /** + * Initializes a 9-slice sprite with an sprite frame. + * Once the sprite is created, you can then call its "setContentSize:" method + * to resize the sprite will all it's 9-slice goodness intract. + * It respects the anchorPoint too. + * + * @param spriteFrame The sprite frame object. + */ + virtual bool initWithSpriteFrame(SpriteFrame* spriteFrame); + + /** + * Initializes a 9-slice sprite with an sprite frame name and with the specified + * cap insets. + * Once the sprite is created, you can then call its "setContentSize:" method + * to resize the sprite will all it's 9-slice goodness intract. + * It respects the anchorPoint too. + * + * @param spriteFrameName The sprite frame name. + * @param capInsets The values to use for the cap insets. + */ + virtual bool initWithSpriteFrameName(const std::string& spriteFrameName, const Rect& capInsets); + + /** + * Initializes a 9-slice sprite with an sprite frame name. + * Once the sprite is created, you can then call its "setContentSize:" method + * to resize the sprite will all it's 9-slice goodness intract. + * It respects the anchorPoint too. + * + * @param spriteFrameName The sprite frame name. + */ + virtual bool initWithSpriteFrameName(const std::string& spriteFrameName); + + virtual bool init(); + virtual bool init(Sprite* sprite, const Rect& rect, bool rotated, const Rect& capInsets); + virtual bool init(Sprite* sprite, const Rect& rect, const Rect& capInsets); + /** + * Creates and returns a new sprite object with the specified cap insets. + * You use this method to add cap insets to a sprite or to change the existing + * cap insets of a sprite. In both cases, you get back a new image and the + * original sprite remains untouched. + * + * @param capInsets The values to use for the cap insets. + */ + Scale9Sprite* resizableSpriteWithCapInsets(const Rect& capInsets); + + virtual bool updateWithSprite(Sprite* sprite, const Rect& rect, bool rotated, const Rect& capInsets); + virtual void setSpriteFrame(SpriteFrame * spriteFrame); + + // overrides + virtual void setContentSize(const Size & size) override; + virtual void setAnchorPoint(const Vec2& anchorPoint) override; + + Size getOriginalSize() const; + void setPreferredSize(const Size& size); + Size getPreferredSize() const; + void setCapInsets(const Rect& rect); + Rect getCapInsets()const; + void setInsetLeft(float leftInset); + float getInsetLeft()const; + void setInsetTop(float topInset); + float getInsetTop()const; + void setInsetRight(float rightInset); + float getInsetRight()const; + void setInsetBottom(float bottomInset); + float getInsetBottom()const; + void setScale9Enabled(bool enabled); + bool isScale9Enabled()const; + + + + /// @} end of Children and Parent + + virtual void visit(Renderer *renderer, const Mat4 &parentTransform, uint32_t parentFlags) override; + + virtual void cleanup() override; + + virtual void onEnter() override; + + /** Event callback that is invoked when the Node enters in the 'stage'. + * If the Node enters the 'stage' with a transition, this event is called when the transition finishes. + * If you override onEnterTransitionDidFinish, you shall call its parent's one, e.g. Node::onEnterTransitionDidFinish() + * @js NA + * @lua NA + */ + virtual void onEnterTransitionDidFinish() override; + + /** + * Event callback that is invoked every time the Node leaves the 'stage'. + * If the Node leaves the 'stage' with a transition, this event is called when the transition finishes. + * During onExit you can't access a sibling node. + * If you override onExit, you shall call its parent's one, e.g., Node::onExit(). + * @js NA + * @lua NA + */ + virtual void onExit() override; + + /** + * Event callback that is called every time the Node leaves the 'stage'. + * If the Node leaves the 'stage' with a transition, this callback is called when the transition starts. + * @js NA + * @lua NA + */ + virtual void onExitTransitionDidStart() override; + + virtual void updateDisplayedOpacity(GLubyte parentOpacity) override; + virtual void updateDisplayedColor(const Color3B& parentColor) override; + virtual void disableCascadeColor() override; + + Sprite* getSprite()const; + + /** + * Sets whether the widget should be flipped horizontally or not. + * + * @param bFlippedX true if the widget should be flipped horizaontally, false otherwise. + */ + virtual void setFlippedX(bool flippedX); + + /** + * Returns the flag which indicates whether the widget is flipped horizontally or not. + * + * It only flips the texture of the widget, and not the texture of the widget's children. + * Also, flipping the texture doesn't alter the anchorPoint. + * If you want to flip the anchorPoint too, and/or to flip the children too use: + * widget->setScaleX(sprite->getScaleX() * -1); + * + * @return true if the widget is flipped horizaontally, false otherwise. + */ + virtual bool isFlippedX()const; + + /** + * Sets whether the widget should be flipped vertically or not. + * + * @param bFlippedY true if the widget should be flipped vertically, flase otherwise. + */ + virtual void setFlippedY(bool flippedY); + + /** + * Return the flag which indicates whether the widget is flipped vertically or not. + * + * It only flips the texture of the widget, and not the texture of the widget's children. + * Also, flipping the texture doesn't alter the anchorPoint. + * If you want to flip the anchorPoint too, and/or to flip the children too use: + * widget->setScaleY(widget->getScaleY() * -1); + * + * @return true if the widget is flipped vertically, flase otherwise. + */ + virtual bool isFlippedY()const; + + protected: + void updateCapInset(); + void updatePositions(); + void createSlicedSprites(const Rect& rect, bool rotated); + void cleanupSlicedSprites(); + void adjustScale9ImagePosition(); + /** + * Sorts the children array once before drawing, instead of every time when a child is added or reordered. + * This appraoch can improves the performance massively. + * @note Don't call this manually unless a child added needs to be removed in the same frame + */ + virtual void sortAllProtectedChildren(); + + bool _spritesGenerated; + Rect _spriteRect; + bool _spriteFrameRotated; + Rect _capInsetsInternal; + bool _positionsAreDirty; + + Sprite* _scale9Image; //the original sprite + Sprite* _topLeft; + Sprite* _top; + Sprite* _topRight; + Sprite* _left; + Sprite* _centre; + Sprite* _right; + Sprite* _bottomLeft; + Sprite* _bottom; + Sprite* _bottomRight; + + bool _scale9Enabled; + + /** Original sprite's size. */ + Size _originalSize; + /** Prefered sprite's size. By default the prefered size is the original size. */ + + //if the preferredSize component is given as -1, it is ignored + Size _preferredSize; + /** + * The end-cap insets. + * On a non-resizeable sprite, this property is set to CGRect::ZERO; the sprite + * does not use end caps and the entire sprite is subject to stretching. + */ + Rect _capInsets; + /** Sets the left side inset */ + float _insetLeft; + /** Sets the top side inset */ + float _insetTop; + /** Sets the right side inset */ + float _insetRight; + /** Sets the bottom side inset */ + float _insetBottom; + + /// helper that reorder a child + void addProtectedChild(Node* child); + + Vector _protectedChildren; ///holds the 9 sprites + bool _reorderProtectedChildDirty; + + bool _flippedX; + bool _flippedY; + }; + +}} //end of namespace + +#endif /* defined(__cocos2d_libs__UIScale9Sprite__) */ diff --git a/cocos/ui/UIScrollView.cpp b/cocos/ui/UIScrollView.cpp index 4669199ad9..a9451fd813 100644 --- a/cocos/ui/UIScrollView.cpp +++ b/cocos/ui/UIScrollView.cpp @@ -1498,9 +1498,12 @@ void ScrollView::handleReleaseLogic(Touch *touch) bool ScrollView::onTouchBegan(Touch *touch, Event *unusedEvent) { bool pass = Layout::onTouchBegan(touch, unusedEvent); - if (_hitted) + if (!_isInterceptTouch) { - handlePressLogic(touch); + if (_hitted) + { + handlePressLogic(touch); + } } return pass; } @@ -1508,19 +1511,30 @@ bool ScrollView::onTouchBegan(Touch *touch, Event *unusedEvent) void ScrollView::onTouchMoved(Touch *touch, Event *unusedEvent) { Layout::onTouchMoved(touch, unusedEvent); - handleMoveLogic(touch); + if (!_isInterceptTouch) + { + handleMoveLogic(touch); + } } void ScrollView::onTouchEnded(Touch *touch, Event *unusedEvent) { Layout::onTouchEnded(touch, unusedEvent); - handleReleaseLogic(touch); + if (!_isInterceptTouch) + { + handleReleaseLogic(touch); + } + _isInterceptTouch = false; } void ScrollView::onTouchCancelled(Touch *touch, Event *unusedEvent) { Layout::onTouchCancelled(touch, unusedEvent); - handleReleaseLogic(touch); + if (!_isInterceptTouch) + { + handleReleaseLogic(touch); + } + _isInterceptTouch = false; } void ScrollView::update(float dt) @@ -1550,33 +1564,42 @@ void ScrollView::interceptTouchEvent(Widget::TouchEventType event, Widget *sende switch (event) { case TouchEventType::BEGAN: + { + _isInterceptTouch = true; _touchBeganPosition = touch->getLocation(); handlePressLogic(touch); - break; - + } + break; case TouchEventType::MOVED: { float offset = (sender->getTouchBeganPosition() - touchPoint).getLength(); + _touchMovePosition = touch->getLocation(); if (offset > _childFocusCancelOffset) { sender->setHighlighted(false); - _touchMovePosition = touch->getLocation(); handleMoveLogic(touch); } } - break; + break; case TouchEventType::CANCELED: case TouchEventType::ENDED: + { _touchEndPosition = touch->getLocation(); handleReleaseLogic(touch); - break; + if (sender->isSwallowTouches()) + { + _isInterceptTouch = false; + } + } + break; } } void ScrollView::scrollToTopEvent() { + this->retain(); if (_scrollViewEventListener && _scrollViewEventSelector) { (_scrollViewEventListener->*_scrollViewEventSelector)(this, SCROLLVIEW_EVENT_SCROLL_TO_TOP); @@ -1584,10 +1607,12 @@ void ScrollView::scrollToTopEvent() if (_eventCallback) { _eventCallback(this,EventType::SCROLL_TO_TOP); } + this->release(); } void ScrollView::scrollToBottomEvent() { + this->retain(); if (_scrollViewEventListener && _scrollViewEventSelector) { (_scrollViewEventListener->*_scrollViewEventSelector)(this, SCROLLVIEW_EVENT_SCROLL_TO_BOTTOM); @@ -1595,10 +1620,12 @@ void ScrollView::scrollToBottomEvent() if (_eventCallback) { _eventCallback(this,EventType::SCROLL_TO_BOTTOM); } + this->release(); } void ScrollView::scrollToLeftEvent() { + this->retain(); if (_scrollViewEventListener && _scrollViewEventSelector) { (_scrollViewEventListener->*_scrollViewEventSelector)(this, SCROLLVIEW_EVENT_SCROLL_TO_LEFT); @@ -1606,10 +1633,12 @@ void ScrollView::scrollToLeftEvent() if (_eventCallback) { _eventCallback(this,EventType::SCROLL_TO_LEFT); } + this->release(); } void ScrollView::scrollToRightEvent() { + this->retain(); if (_scrollViewEventListener && _scrollViewEventSelector) { (_scrollViewEventListener->*_scrollViewEventSelector)(this, SCROLLVIEW_EVENT_SCROLL_TO_RIGHT); @@ -1617,10 +1646,12 @@ void ScrollView::scrollToRightEvent() if (_eventCallback) { _eventCallback(this,EventType::SCROLL_TO_RIGHT); } + this->release(); } void ScrollView::scrollingEvent() { + this->retain(); if (_scrollViewEventListener && _scrollViewEventSelector) { (_scrollViewEventListener->*_scrollViewEventSelector)(this, SCROLLVIEW_EVENT_SCROLLING); @@ -1628,10 +1659,12 @@ void ScrollView::scrollingEvent() if (_eventCallback) { _eventCallback(this,EventType::SCROLLING); } + this->release(); } void ScrollView::bounceTopEvent() { + this->retain(); if (_scrollViewEventListener && _scrollViewEventSelector) { (_scrollViewEventListener->*_scrollViewEventSelector)(this, SCROLLVIEW_EVENT_BOUNCE_TOP); @@ -1639,10 +1672,12 @@ void ScrollView::bounceTopEvent() if (_eventCallback) { _eventCallback(this,EventType::BOUNCE_TOP); } + this->release(); } void ScrollView::bounceBottomEvent() { + this->retain(); if (_scrollViewEventListener && _scrollViewEventSelector) { (_scrollViewEventListener->*_scrollViewEventSelector)(this, SCROLLVIEW_EVENT_BOUNCE_BOTTOM); @@ -1650,10 +1685,12 @@ void ScrollView::bounceBottomEvent() if (_eventCallback) { _eventCallback(this,EventType::BOUNCE_BOTTOM); } + this->release(); } void ScrollView::bounceLeftEvent() { + this->retain(); if (_scrollViewEventListener && _scrollViewEventSelector) { (_scrollViewEventListener->*_scrollViewEventSelector)(this, SCROLLVIEW_EVENT_BOUNCE_LEFT); @@ -1661,10 +1698,12 @@ void ScrollView::bounceLeftEvent() if (_eventCallback) { _eventCallback(this,EventType::BOUNCE_LEFT); } + this->release(); } void ScrollView::bounceRightEvent() { + this->retain(); if (_scrollViewEventListener && _scrollViewEventSelector) { (_scrollViewEventListener->*_scrollViewEventSelector)(this, SCROLLVIEW_EVENT_BOUNCE_RIGHT); @@ -1672,6 +1711,7 @@ void ScrollView::bounceRightEvent() if (_eventCallback) { _eventCallback(this,EventType::BOUNCE_RIGHT); } + this->release(); } void ScrollView::addEventListenerScrollView(Ref *target, SEL_ScrollViewEvent selector) diff --git a/cocos/ui/UIScrollView.h b/cocos/ui/UIScrollView.h index ae2bd6ab43..cc0dd25d45 100644 --- a/cocos/ui/UIScrollView.h +++ b/cocos/ui/UIScrollView.h @@ -26,6 +26,7 @@ THE SOFTWARE. #define __UISCROLLVIEW_H__ #include "ui/UILayout.h" +#include "ui/GUIExport.h" NS_CC_BEGIN @@ -50,7 +51,7 @@ typedef void (Ref::*SEL_ScrollViewEvent)(Ref*, ScrollviewEventType); #define scrollvieweventselector(_SELECTOR) (SEL_ScrollViewEvent)(&_SELECTOR) -class ScrollView : public Layout +class CC_GUI_DLL ScrollView : public Layout { DECLARE_CLASS_GUI_INFO diff --git a/cocos/ui/UISlider.cpp b/cocos/ui/UISlider.cpp index 642749d540..08f06e293e 100644 --- a/cocos/ui/UISlider.cpp +++ b/cocos/ui/UISlider.cpp @@ -23,7 +23,7 @@ THE SOFTWARE. ****************************************************************************/ #include "ui/UISlider.h" -#include "extensions/GUI/CCControlExtension/CCScale9Sprite.h" +#include "ui/UIScale9Sprite.h" #include "2d/CCSprite.h" NS_CC_BEGIN @@ -98,20 +98,30 @@ bool Slider::init() void Slider::initRenderer() { - _barRenderer = Sprite::create(); - _progressBarRenderer = Sprite::create(); + _barRenderer = Scale9Sprite::create(); + _progressBarRenderer = Scale9Sprite::create(); + _barRenderer->setScale9Enabled(false); + _progressBarRenderer->setScale9Enabled(false); + _progressBarRenderer->setAnchorPoint(Vec2(0.0f, 0.5f)); + addProtectedChild(_barRenderer, BASEBAR_RENDERER_Z, -1); addProtectedChild(_progressBarRenderer, PROGRESSBAR_RENDERER_Z, -1); + _slidBallNormalRenderer = Sprite::create(); _slidBallPressedRenderer = Sprite::create(); _slidBallPressedRenderer->setVisible(false); _slidBallDisabledRenderer = Sprite::create(); _slidBallDisabledRenderer->setVisible(false); + _slidBallRenderer = Node::create(); + _slidBallRenderer->addChild(_slidBallNormalRenderer); _slidBallRenderer->addChild(_slidBallPressedRenderer); _slidBallRenderer->addChild(_slidBallDisabledRenderer); + _slidBallRenderer->setCascadeColorEnabled(true); + _slidBallRenderer->setCascadeOpacityEnabled(true); + addProtectedChild(_slidBallRenderer, SLIDBALL_RENDERER_Z, -1); } @@ -126,29 +136,15 @@ void Slider::loadBarTexture(const std::string& fileName, TextureResType texType) switch (_barTexType) { case TextureResType::LOCAL: - if (_scale9Enabled) - { - static_cast(_barRenderer)->initWithFile(fileName); - } - else - { - static_cast(_barRenderer)->setTexture(fileName); - } + _barRenderer->initWithFile(fileName); break; case TextureResType::PLIST: - if (_scale9Enabled) - { - static_cast(_barRenderer)->initWithSpriteFrameName(fileName); - } - else - { - static_cast(_barRenderer)->setSpriteFrame(fileName); - } + _barRenderer->initWithSpriteFrameName(fileName); break; default: break; } - + this->updateChildrenDisplayedRGBA(); _barRendererAdaptDirty = true; _progressBarRendererDirty = true; updateContentSizeWithTextureSize(_barRenderer->getContentSize()); @@ -165,29 +161,15 @@ void Slider::loadProgressBarTexture(const std::string& fileName, TextureResType switch (_progressBarTexType) { case TextureResType::LOCAL: - if (_scale9Enabled) - { - static_cast(_progressBarRenderer)->initWithFile(fileName); - } - else - { - static_cast(_progressBarRenderer)->setTexture(fileName); - } + _progressBarRenderer->initWithFile(fileName); break; case TextureResType::PLIST: - if (_scale9Enabled) - { - static_cast(_progressBarRenderer)->initWithSpriteFrameName(fileName); - } - else - { - static_cast(_progressBarRenderer)->setSpriteFrame(fileName); - } + _progressBarRenderer->initWithSpriteFrameName(fileName); break; default: break; } - + this->updateChildrenDisplayedRGBA(); _progressBarRenderer->setAnchorPoint(Vec2(0.0f, 0.5f)); _progressBarTextureSize = _progressBarRenderer->getContentSize(); _progressBarRendererDirty = true; @@ -201,24 +183,9 @@ void Slider::setScale9Enabled(bool able) } _scale9Enabled = able; - removeProtectedChild(_barRenderer); - removeProtectedChild(_progressBarRenderer); - _barRenderer = nullptr; - _progressBarRenderer = nullptr; - if (_scale9Enabled) - { - _barRenderer = extension::Scale9Sprite::create(); - _progressBarRenderer = extension::Scale9Sprite::create(); - } - else - { - _barRenderer = Sprite::create(); - _progressBarRenderer = Sprite::create(); - } - loadBarTexture(_textureFile, _barTexType); - loadProgressBarTexture(_progressBarTextureFile, _progressBarTexType); - addProtectedChild(_barRenderer, BASEBAR_RENDERER_Z, -1); - addProtectedChild(_progressBarRenderer, PROGRESSBAR_RENDERER_Z, -1); + _barRenderer->setScale9Enabled(_scale9Enabled); + _progressBarRenderer->setScale9Enabled(_scale9Enabled); + if (_scale9Enabled) { bool ignoreBefore = _ignoreSize; @@ -260,7 +227,7 @@ void Slider::setCapInsetsBarRenderer(const Rect &capInsets) { return; } - static_cast(_barRenderer)->setCapInsets(capInsets); + _barRenderer->setCapInsets(capInsets); } const Rect& Slider::getCapInsetsBarRenderer()const @@ -275,7 +242,7 @@ void Slider::setCapInsetProgressBarRebderer(const Rect &capInsets) { return; } - static_cast(_progressBarRenderer)->setCapInsets(capInsets); + _progressBarRenderer->setCapInsets(capInsets); } const Rect& Slider::getCapInsetsProgressBarRebderer()const @@ -309,6 +276,7 @@ void Slider::loadSlidBallTextureNormal(const std::string& normal,TextureResType default: break; } + this->updateChildrenDisplayedRGBA(); } void Slider::loadSlidBallTexturePressed(const std::string& pressed,TextureResType texType) @@ -330,6 +298,7 @@ void Slider::loadSlidBallTexturePressed(const std::string& pressed,TextureResTyp default: break; } + this->updateChildrenDisplayedRGBA(); } void Slider::loadSlidBallTextureDisabled(const std::string& disabled,TextureResType texType) @@ -351,6 +320,7 @@ void Slider::loadSlidBallTexturePressed(const std::string& pressed,TextureResTyp default: break; } + this->updateChildrenDisplayedRGBA(); } void Slider::setPercent(int percent) @@ -369,14 +339,17 @@ void Slider::setPercent(int percent) _slidBallRenderer->setPosition(Vec2(dis, _contentSize.height / 2.0f)); if (_scale9Enabled) { - static_cast(_progressBarRenderer)->setPreferredSize(Size(dis,_progressBarTextureSize.height)); + _progressBarRenderer->setPreferredSize(Size(dis,_progressBarTextureSize.height)); } else { - Sprite* spriteRenderer = static_cast(_progressBarRenderer); - Rect rect = spriteRenderer->getTextureRect(); - rect.size.width = _progressBarTextureSize.width * res; - spriteRenderer->setTextureRect(rect, spriteRenderer->isTextureRectRotated(), rect.size); + Sprite* spriteRenderer = _progressBarRenderer->getSprite(); + + if (nullptr != spriteRenderer) { + Rect rect = spriteRenderer->getTextureRect(); + rect.size.width = _progressBarTextureSize.width * res; + spriteRenderer->setTextureRect(rect, spriteRenderer->isTextureRectRotated(), rect.size); + } } } @@ -439,6 +412,7 @@ void Slider::addEventListener(const ccSliderCallback& callback) void Slider::percentChangedEvent() { + this->retain(); if (_sliderEventListener && _sliderEventSelector) { (_sliderEventListener->*_sliderEventSelector)(this,SLIDER_PERCENTCHANGED); @@ -446,6 +420,7 @@ void Slider::percentChangedEvent() if (_eventCallback) { _eventCallback(this, EventType::ON_PERCENTAGE_CHANGED); } + this->release(); } int Slider::getPercent()const @@ -497,7 +472,7 @@ void Slider::barRendererScaleChangedWithSize() _barLength = _contentSize.width; if (_scale9Enabled) { - static_cast(_barRenderer)->setPreferredSize(_contentSize); + _barRenderer->setPreferredSize(_contentSize); } else { @@ -534,7 +509,7 @@ void Slider::progressBarRendererScaleChangedWithSize() { if (_scale9Enabled) { - static_cast(_progressBarRenderer)->setPreferredSize(_contentSize); + _progressBarRenderer->setPreferredSize(_contentSize); _progressBarTextureSize = _progressBarRenderer->getContentSize(); } else diff --git a/cocos/ui/UISlider.h b/cocos/ui/UISlider.h index de8ed765b2..5c64aa32b9 100644 --- a/cocos/ui/UISlider.h +++ b/cocos/ui/UISlider.h @@ -26,13 +26,15 @@ THE SOFTWARE. #define __UISLIDER_H__ #include "ui/UIWidget.h" +#include "ui/GUIExport.h" NS_CC_BEGIN class Sprite; namespace ui { - + class Scale9Sprite; + typedef enum { SLIDER_PERCENTCHANGED @@ -45,7 +47,7 @@ typedef void (Ref::*SEL_SlidPercentChangedEvent)(Ref*,SliderEventType); * @js NA * @lua NA */ -class Slider : public Widget +class CC_GUI_DLL Slider : public Widget { DECLARE_CLASS_GUI_INFO @@ -225,8 +227,8 @@ protected: virtual void copySpecialProperties(Widget* model) override; virtual void adaptRenderers() override; protected: - Node* _barRenderer; - Node* _progressBarRenderer; + Scale9Sprite* _barRenderer; + Scale9Sprite* _progressBarRenderer; Size _progressBarTextureSize; Sprite* _slidBallNormalRenderer; diff --git a/cocos/ui/UIText.cpp b/cocos/ui/UIText.cpp index 2a0cd717b8..894db64db4 100644 --- a/cocos/ui/UIText.cpp +++ b/cocos/ui/UIText.cpp @@ -207,6 +207,16 @@ TextVAlignment Text::getTextVerticalAlignment()const { return _labelRenderer->getVerticalAlignment(); } + +void Text::setTextColor(const Color4B color) +{ + _labelRenderer->setTextColor(color); +} + +const Color4B& Text::getTextColor() const +{ + return _labelRenderer->getTextColor(); +} void Text::setTouchScaleChangeEnabled(bool enable) { diff --git a/cocos/ui/UIText.h b/cocos/ui/UIText.h index 3c38101abd..d08901b658 100644 --- a/cocos/ui/UIText.h +++ b/cocos/ui/UIText.h @@ -26,6 +26,7 @@ THE SOFTWARE. #define __UILABEL_H__ #include "ui/UIWidget.h" +#include "ui/GUIExport.h" NS_CC_BEGIN @@ -38,7 +39,7 @@ namespace ui { *@js *@lua NA */ -class Text : public Widget +class CC_GUI_DLL Text : public Widget { DECLARE_CLASS_GUI_INFO @@ -160,6 +161,10 @@ public: TextVAlignment getTextVerticalAlignment()const; + void setTextColor(const Color4B color); + + const Color4B& getTextColor() const; + /** * Enable shadow for the label * diff --git a/cocos/ui/UITextAtlas.h b/cocos/ui/UITextAtlas.h index 8058aa4d7d..cf00db4cfe 100644 --- a/cocos/ui/UITextAtlas.h +++ b/cocos/ui/UITextAtlas.h @@ -26,6 +26,7 @@ THE SOFTWARE. #define __UILABELATLAS_H__ #include "ui/UIWidget.h" +#include "ui/GUIExport.h" NS_CC_BEGIN @@ -37,7 +38,7 @@ namespace ui { * @js NA * @lua NA */ -class TextAtlas : public Widget +class CC_GUI_DLL TextAtlas : public Widget { DECLARE_CLASS_GUI_INFO diff --git a/cocos/ui/UITextBMFont.h b/cocos/ui/UITextBMFont.h index 707f42382c..5d3c7955fb 100644 --- a/cocos/ui/UITextBMFont.h +++ b/cocos/ui/UITextBMFont.h @@ -26,6 +26,7 @@ THE SOFTWARE. #define __UILABELBMFONT_H__ #include "ui/UIWidget.h" +#include "ui/GUIExport.h" NS_CC_BEGIN @@ -37,7 +38,7 @@ namespace ui { * @js NA * @lua NA */ -class TextBMFont : public Widget +class CC_GUI_DLL TextBMFont : public Widget { DECLARE_CLASS_GUI_INFO diff --git a/cocos/ui/UITextField.cpp b/cocos/ui/UITextField.cpp index 8b70bb5297..4bac5b186d 100644 --- a/cocos/ui/UITextField.cpp +++ b/cocos/ui/UITextField.cpp @@ -24,27 +24,12 @@ THE SOFTWARE. #include "ui/UITextField.h" #include "platform/CCFileUtils.h" +#include "ui/UIHelper.h" +#include "base/ccUTF8.h" NS_CC_BEGIN namespace ui { - -static int _calcCharCount(const char * pszText) -{ - int n = 0; - char ch = 0; - while ((ch = *pszText)) - { - CC_BREAK_IF(! ch); - - if (0x80 != (0xC0 & ch)) - { - ++n; - } - ++pszText; - } - return n; -} UICCTextField::UICCTextField() : _maxLengthEnabled(false) @@ -130,7 +115,7 @@ void UICCTextField::insertText(const char* text, size_t len) { if (_maxLengthEnabled) { - int text_count = _calcCharCount(getString().c_str()); + long text_count = StringUtils::getCharacterCountInUTF8String(getString()); if (text_count >= _maxLength) { // password @@ -141,69 +126,16 @@ void UICCTextField::insertText(const char* text, size_t len) return; } -#if ((CC_TARGET_PLATFORM == CC_PLATFORM_IOS) || (CC_TARGET_PLATFORM == CC_PLATFORM_MAC) || (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32)) - int input_count = _calcCharCount(text); - int total = total = text_count + input_count; + long input_count = StringUtils::getCharacterCountInUTF8String(text); + long total = text_count + input_count; if (total > _maxLength) { - int end = 0; - int length = _maxLength - text_count; + long length = _maxLength - text_count; - for (int i = 0; i < length; ++i) - { - char value = text[i]; - - if (value >= 0 && value <= 127) // ascii - { - end++; - } - else - { - end += 3; - } - } - input_text = input_text.substr(0, end); - len = end; + input_text = Helper::getSubStringOfUTF8String(input_text, 0, length); + len = input_text.length(); } -#elif (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) - int input_count = _calcCharCount(text); - int total = text_count + input_count; - if (total > _maxLength) - { - int ascii = 0; - int unicode = 0; - int end = 0; - int count = 0; - - for (int i = 0; i < total * 3; ++i) - { - char value = text[i]; - - if (value >= 0 && value <= 127) // ascii - { - ascii++; - count++; - } - else - { - unicode++; - if (unicode % 3 == 0) - { - count++; - } - } - - if (count == _maxLength) - { - break; - } - } - end = ascii + unicode; - input_text = input_text.substr(0, end); - len = end; - } -#endif } } TextFieldTTF::insertText(input_text.c_str(), len); @@ -294,8 +226,8 @@ void UICCTextField::setPasswordStyleText(const std::string& styleText) void UICCTextField::setPasswordText(const std::string& text) { std::string tempStr = ""; - int text_count = _calcCharCount(text.c_str()); - int max = text_count; + long text_count = StringUtils::getCharacterCountInUTF8String(text); + long max = text_count; if (_maxLengthEnabled) { @@ -479,40 +411,11 @@ void TextField::setText(const std::string& text) if (isMaxLengthEnabled()) { int max = _textFieldRenderer->getMaxLength(); - int text_count = _calcCharCount(text.c_str()); - int total = text_count + _calcCharCount(getStringValue().c_str()); + long text_count = StringUtils::getCharacterCountInUTF8String(text); + long total = text_count + StringUtils::getCharacterCountInUTF8String(getStringValue()); if (total > max) { - int ascii = 0; - int unicode = 0; - int end = 0; - int count = 0; - - for (int i = 0; i < total * 3; ++i) - { - char value = text[i]; - - if (value >= 0 && value <= 127) // ascii - { - ascii++; - count++; - } - else - { - unicode++; - if (unicode % 3 == 0) - { - count++; - } - } - - if (count == max) - { - break; - } - } - end = ascii + unicode; - strText = strText.substr(0, end); + strText = Helper::getSubStringOfUTF8String(strText, 0, max); } } @@ -542,6 +445,26 @@ const std::string& TextField::getPlaceHolder()const { return _textFieldRenderer->getPlaceHolder(); } + +const Color4B& TextField::getPlaceHolderColor()const +{ + return _textFieldRenderer->getColorSpaceHolder(); +} + +void TextField::setPlaceHolderColor(const cocos2d::Color3B &color) +{ + _textFieldRenderer->setColorSpaceHolder(color); +} + +void TextField::setPlaceHolderColor(const cocos2d::Color4B &color) +{ + _textFieldRenderer->setColorSpaceHolder(color); +} + +void TextField::setTextColor(const cocos2d::Color4B &textColor) +{ + _textFieldRenderer->setTextColor(textColor); +} void TextField::setFontSize(int size) { @@ -729,6 +652,7 @@ void TextField::setDeleteBackward(bool deleteBackward) void TextField::attachWithIMEEvent() { + this->retain(); if (_textFieldEventListener && _textFieldEventSelector) { (_textFieldEventListener->*_textFieldEventSelector)(this, TEXTFIELD_EVENT_ATTACH_WITH_IME); @@ -736,10 +660,12 @@ void TextField::attachWithIMEEvent() if (_eventCallback) { _eventCallback(this, EventType::ATTACH_WITH_IME); } + this->release(); } void TextField::detachWithIMEEvent() { + this->retain(); if (_textFieldEventListener && _textFieldEventSelector) { (_textFieldEventListener->*_textFieldEventSelector)(this, TEXTFIELD_EVENT_DETACH_WITH_IME); @@ -747,10 +673,12 @@ void TextField::detachWithIMEEvent() if (_eventCallback) { _eventCallback(this, EventType::DETACH_WITH_IME); } + this->release(); } void TextField::insertTextEvent() { + this->retain(); if (_textFieldEventListener && _textFieldEventSelector) { (_textFieldEventListener->*_textFieldEventSelector)(this, TEXTFIELD_EVENT_INSERT_TEXT); @@ -758,10 +686,12 @@ void TextField::insertTextEvent() if (_eventCallback) { _eventCallback(this, EventType::INSERT_TEXT); } + this->release(); } void TextField::deleteBackwardEvent() { + this->retain(); if (_textFieldEventListener && _textFieldEventSelector) { (_textFieldEventListener->*_textFieldEventSelector)(this, TEXTFIELD_EVENT_DELETE_BACKWARD); @@ -769,6 +699,7 @@ void TextField::deleteBackwardEvent() if (_eventCallback) { _eventCallback(this, EventType::DELETE_BACKWARD); } + this->release(); } void TextField::addEventListenerTextField(Ref *target, SEL_TextFieldEvent selecor) diff --git a/cocos/ui/UITextField.h b/cocos/ui/UITextField.h index b26456fd33..6738ef2685 100644 --- a/cocos/ui/UITextField.h +++ b/cocos/ui/UITextField.h @@ -27,6 +27,7 @@ THE SOFTWARE. #include "ui/UIWidget.h" #include "2d/CCTextFieldTTF.h" +#include "ui/GUIExport.h" NS_CC_BEGIN @@ -36,7 +37,7 @@ namespace ui { * @js NA * @lua NA */ -class UICCTextField: public TextFieldTTF, public TextFieldDelegate +class CC_GUI_DLL UICCTextField: public TextFieldTTF, public TextFieldDelegate { public: UICCTextField(); @@ -106,7 +107,7 @@ typedef void (Ref::*SEL_TextFieldEvent)(Ref*, TextFiledEventType); * @js NA * @lua NA */ -class TextField : public Widget +class CC_GUI_DLL TextField : public Widget { DECLARE_CLASS_GUI_INFO @@ -134,6 +135,10 @@ public: void setPlaceHolder(const std::string& value); const std::string& getPlaceHolder()const; + const Color4B& getPlaceHolderColor()const; + void setPlaceHolderColor(const Color3B& color); + void setPlaceHolderColor(const Color4B& color); + void setTextColor(const Color4B& textColor); void setFontSize(int size); int getFontSize()const; diff --git a/cocos/ui/UIVBox.h b/cocos/ui/UIVBox.h index 216234f47f..dae3bf149b 100644 --- a/cocos/ui/UIVBox.h +++ b/cocos/ui/UIVBox.h @@ -26,12 +26,13 @@ #define __UIVBox_H__ #include "ui/UILayout.h" +#include "ui/GUIExport.h" NS_CC_BEGIN namespace ui { -class VBox : public Layout{ +class CC_GUI_DLL VBox : public Layout{ public: diff --git a/cocos/ui/UIVideoPlayerAndroid.cpp b/cocos/ui/UIVideoPlayerAndroid.cpp index aecf889a51..ae61f94b14 100644 --- a/cocos/ui/UIVideoPlayerAndroid.cpp +++ b/cocos/ui/UIVideoPlayerAndroid.cpp @@ -31,7 +31,6 @@ #include #include "jni/JniHelper.h" #include "base/CCDirector.h" -#include "CCGLView.h" #include "base/CCEventListenerKeyboard.h" //----------------------------------------------------------------------------------------------------------- diff --git a/cocos/ui/UIVideoPlayerIOS.mm b/cocos/ui/UIVideoPlayerIOS.mm index ae26500b0e..51cda4a9b7 100644 --- a/cocos/ui/UIVideoPlayerIOS.mm +++ b/cocos/ui/UIVideoPlayerIOS.mm @@ -29,9 +29,9 @@ using namespace cocos2d::experimental::ui; //------------------------------------------------------------------------------------- #include "CCEAGLView.h" -#include "CCGLView.h" #import #include "base/CCDirector.h" +#include "CCFileUtils.h" @interface UIVideoViewWrapperIos : NSObject @@ -133,11 +133,11 @@ using namespace cocos2d::experimental::ui; } if (videoSource == 1) { - self.moviePlayer = [[MPMoviePlayerController alloc] initWithContentURL:[NSURL URLWithString:@(videoUrl.c_str())]]; + self.moviePlayer = [[[MPMoviePlayerController alloc] initWithContentURL:[NSURL URLWithString:@(videoUrl.c_str())]] autorelease]; self.moviePlayer.movieSourceType = MPMovieSourceTypeStreaming; } else { NSString *path = [UIVideoViewWrapperIos fullPathFromRelativePath:@(videoUrl.c_str())]; - self.moviePlayer = [[MPMoviePlayerController alloc] initWithContentURL:[NSURL fileURLWithPath:path]]; + self.moviePlayer = [[[MPMoviePlayerController alloc] initWithContentURL:[NSURL fileURLWithPath:path]] autorelease]; self.moviePlayer.movieSourceType = MPMovieSourceTypeFile; } self.moviePlayer.allowsAirPlay = false; @@ -210,7 +210,7 @@ using namespace cocos2d::experimental::ui; -(void) setVisible:(bool)visible { if (self.moviePlayer != NULL) { - [self.moviePlayer.view setHidden:visible]; + [self.moviePlayer.view setHidden:!visible]; } } @@ -260,23 +260,7 @@ using namespace cocos2d::experimental::ui; +(NSString*) fullPathFromRelativePath:(NSString*) relPath { - // do not convert an absolute path (starting with '/') - if(([relPath length] > 0) && ([relPath characterAtIndex:0] == '/')) - { - return relPath; - } - - NSMutableArray *imagePathComponents = [NSMutableArray arrayWithArray:[relPath pathComponents]]; - NSString *file = [imagePathComponents lastObject]; - - [imagePathComponents removeLastObject]; - NSString *imageDirectory = [NSString pathWithComponents:imagePathComponents]; - - NSString *fullpath = [[NSBundle mainBundle] pathForResource:file ofType:nil inDirectory:imageDirectory]; - if (fullpath == nil) - fullpath = relPath; - - return fullpath; + return [NSString stringWithCString: cocos2d::FileUtils::getInstance()->fullPathForFilename(std::string([relPath UTF8String])).c_str() encoding: [NSString defaultCStringEncoding]]; } @end //------------------------------------------------------------------------------------------------------------ @@ -323,7 +307,7 @@ void VideoPlayer::draw(Renderer* renderer, const Mat4 &transform, uint32_t flags auto directorInstance = Director::getInstance(); auto glView = directorInstance->getOpenGLView(); auto frameSize = glView->getFrameSize(); - auto scaleFactor = directorInstance->getContentScaleFactor(); + auto scaleFactor = [static_cast(glView->getEAGLView()) contentScaleFactor]; auto winSize = directorInstance->getWinSize(); diff --git a/cocos/ui/UIWidget.cpp b/cocos/ui/UIWidget.cpp index be7cd54206..6f1ea39994 100644 --- a/cocos/ui/UIWidget.cpp +++ b/cocos/ui/UIWidget.cpp @@ -152,14 +152,14 @@ _sizeType(SizeType::ABSOLUTE), _sizePercent(Vec2::ZERO), _positionType(PositionType::ABSOLUTE), _positionPercent(Vec2::ZERO), -_reorderWidgetChildDirty(true), _hitted(false), _touchListener(nullptr), _flippedX(false), _flippedY(false), _focused(false), _focusEnabled(true), -_layoutParameterType(LayoutParameter::Type::NONE) +_layoutParameterType(LayoutParameter::Type::NONE), +_propagateTouchEvents(true) { } @@ -208,9 +208,6 @@ bool Widget::init() this->setAnchorPoint(Vec2(0.5f, 0.5f)); ignoreContentAdaptWithSize(true); - - this->setCascadeColorEnabled(true); - this->setCascadeOpacityEnabled(true); return true; } @@ -261,10 +258,7 @@ void Widget::setContentSize(const cocos2d::Size &contentSize) { _contentSize = getVirtualRendererSize(); } - else - { - _contentSize = contentSize; - } + if (_running) { Widget* widgetParent = getWidgetParent(); @@ -322,7 +316,6 @@ void Widget::setSizePercent(const Vec2 &percent) this->setContentSize(cSize); } _customSize = cSize; - onSizeChanged(); } void Widget::updateSizeAndPosition() @@ -376,7 +369,8 @@ void Widget::updateSizeAndPosition(const cocos2d::Size &parentSize) default: break; } - onSizeChanged(); + + //update position & position percent Vec2 absPos = getPosition(); switch (_positionType) { @@ -429,7 +423,6 @@ void Widget::ignoreContentAdaptWithSize(bool ignore) { this->setContentSize(_customSize); } - onSizeChanged(); } bool Widget::isIgnoreContentAdaptWithSize() const @@ -489,7 +482,6 @@ void Widget::updateContentSizeWithTextureSize(const cocos2d::Size &size) { this->setContentSize(_customSize); } - onSizeChanged(); } void Widget::setTouchEnabled(bool enable) @@ -599,6 +591,12 @@ void Widget::onPressStateChangedToDisabled() { } + +void Widget::updateChildrenDisplayedRGBA() +{ + this->setColor(this->getColor()); + this->setOpacity(this->getOpacity()); +} Widget* Widget::getAncensterWidget(Node* node) @@ -653,6 +651,33 @@ bool Widget::isAncestorsEnabled() return parentWidget->isAncestorsEnabled(); } + +void Widget::setPropagateTouchEvents(bool isPropagate) +{ + _propagateTouchEvents = isPropagate; +} + +bool Widget::isPropagateTouchEvents()const +{ + return _propagateTouchEvents; +} + +void Widget::setSwallowTouches(bool swallow) +{ + if (_touchListener) + { + _touchListener->setSwallowTouches(swallow); + } +} + +bool Widget::isSwallowTouches()const +{ + if (_touchListener) + { + return _touchListener->isSwallowTouches(); + } + return false; +} bool Widget::onTouchBegan(Touch *touch, Event *unusedEvent) { @@ -670,24 +695,42 @@ bool Widget::onTouchBegan(Touch *touch, Event *unusedEvent) return false; } setHighlighted(true); + + /* + * Propagate touch events to its parents + */ + if (_propagateTouchEvents) + { + this->propagateTouchEvent(TouchEventType::BEGAN, this, touch); + } + + pushDownEvent(); + return true; +} + +void Widget::propagateTouchEvent(cocos2d::ui::Widget::TouchEventType event, cocos2d::ui::Widget *sender, cocos2d::Touch *touch) +{ Widget* widgetParent = getWidgetParent(); if (widgetParent) { - widgetParent->interceptTouchEvent(TouchEventType::BEGAN, this, touch); + widgetParent->interceptTouchEvent(event, sender, touch); } - pushDownEvent(); - return true; } void Widget::onTouchMoved(Touch *touch, Event *unusedEvent) { _touchMovePosition = touch->getLocation(); + setHighlighted(hitTest(_touchMovePosition)); - Widget* widgetParent = getWidgetParent(); - if (widgetParent) + + /* + * Propagate touch events to its parents + */ + if (_propagateTouchEvents) { - widgetParent->interceptTouchEvent(TouchEventType::MOVED, this, touch); + this->propagateTouchEvent(TouchEventType::MOVED, this, touch); } + moveEvent(); } @@ -695,10 +738,12 @@ void Widget::onTouchEnded(Touch *touch, Event *unusedEvent) { _touchEndPosition = touch->getLocation(); - Widget* widgetParent = getWidgetParent(); - if (widgetParent) + /* + * Propagate touch events to its parents + */ + if (_propagateTouchEvents) { - widgetParent->interceptTouchEvent(TouchEventType::ENDED, this, touch); + this->propagateTouchEvent(TouchEventType::ENDED, this, touch); } bool highlight = _highlight; @@ -722,7 +767,9 @@ void Widget::onTouchCancelled(Touch *touch, Event *unusedEvent) void Widget::pushDownEvent() { - if (_touchEventCallback) { + this->retain(); + if (_touchEventCallback) + { _touchEventCallback(this, TouchEventType::BEGAN); } @@ -730,11 +777,14 @@ void Widget::pushDownEvent() { (_touchEventListener->*_touchEventSelector)(this,TOUCH_EVENT_BEGAN); } + this->release(); } void Widget::moveEvent() { - if (_touchEventCallback) { + this->retain(); + if (_touchEventCallback) + { _touchEventCallback(this, TouchEventType::MOVED); } @@ -742,12 +792,14 @@ void Widget::moveEvent() { (_touchEventListener->*_touchEventSelector)(this,TOUCH_EVENT_MOVED); } + this->release(); } void Widget::releaseUpEvent() { - - if (_touchEventCallback) { + this->retain(); + if (_touchEventCallback) + { _touchEventCallback(this, TouchEventType::ENDED); } @@ -755,10 +807,12 @@ void Widget::releaseUpEvent() { (_touchEventListener->*_touchEventSelector)(this,TOUCH_EVENT_ENDED); } + this->release(); } void Widget::cancelUpEvent() { + this->retain(); if (_touchEventCallback) { _touchEventCallback(this, TouchEventType::CANCELED); @@ -768,7 +822,7 @@ void Widget::cancelUpEvent() { (_touchEventListener->*_touchEventSelector)(this,TOUCH_EVENT_CANCELED); } - + this->release(); } void Widget::addTouchEventListener(Ref *target, SEL_TouchEvent selector) @@ -1031,6 +1085,7 @@ void Widget::copyProperties(Widget *widget) _touchEventSelector = widget->_touchEventSelector; _focused = widget->_focused; _focusEnabled = widget->_focusEnabled; + _propagateTouchEvents = widget->_propagateTouchEvents; copySpecialProperties(widget); @@ -1039,7 +1094,6 @@ void Widget::copyProperties(Widget *widget) { setLayoutParameter(iter->second->clone()); } - onSizeChanged(); } void Widget::setFlippedX(bool flippedX) diff --git a/cocos/ui/UIWidget.h b/cocos/ui/UIWidget.h index 8ea40cc9d5..c178b0fedb 100644 --- a/cocos/ui/UIWidget.h +++ b/cocos/ui/UIWidget.h @@ -25,9 +25,10 @@ THE SOFTWARE. #ifndef __UIWIDGET_H__ #define __UIWIDGET_H__ -#include "ui/CCProtectedNode.h" +#include "2d/CCProtectedNode.h" #include "ui/UILayoutParameter.h" #include "ui/GUIDefine.h" +#include "ui/GUIExport.h" #include "base/CCMap.h" NS_CC_BEGIN @@ -61,7 +62,7 @@ typedef void (Ref::*SEL_TouchEvent)(Ref*,TouchEventType); #endif -class Widget : public ProtectedNode, public LayoutParameterProtocol +class CC_GUI_DLL Widget : public ProtectedNode, public LayoutParameterProtocol { public: enum class FocusDirection @@ -501,10 +502,20 @@ public: void updateSizeAndPosition(const Size& parentSize); - /*temp action*/ void setActionTag(int tag); int getActionTag()const; + /** + *@brief Allow widget touch events to propagate to its parents. Set false will disable propagation + */ + void setPropagateTouchEvents(bool isPropagate); + bool isPropagateTouchEvents()const; + /** + *@brief Specify widget to swallow touches or not + */ + void setSwallowTouches(bool swallow); + bool isSwallowTouches()const; + /** *@return whether the widget is focused or not */ @@ -574,12 +585,19 @@ CC_CONSTRUCTOR_ACCESS: virtual bool init() override; /* - * Sends the touch event to widget's parent + * @brief Sends the touch event to widget's parent, if a widget wants to handle touch event under another widget, + * it must overide this function. * @param event the touch event type, it could be BEGAN/MOVED/CANCELED/ENDED * @param parent * @param point */ virtual void interceptTouchEvent(TouchEventType event, Widget* sender, Touch *touch); + + /** + *@brief Propagate touch events to its parents + */ + void propagateTouchEvent(TouchEventType event, Widget* sender, Touch *touch); + friend class PageView; /** * This method is called when a focus change event happens @@ -620,6 +638,7 @@ protected: virtual void updateFlippedX(){}; virtual void updateFlippedY(){}; virtual void adaptRenderers(){}; + void updateChildrenDisplayedRGBA(); void copyProperties(Widget* model); virtual Widget* createCloneInstance(); @@ -640,9 +659,9 @@ protected: bool _bright; bool _touchEnabled; bool _highlight; - bool _reorderWidgetChildDirty; bool _affectByClipping; bool _ignoreSize; + bool _propagateTouchEvents; BrightStyle _brightStyle; SizeType _sizeType; diff --git a/cocos/ui/proj.win32/libGUI.vcxproj b/cocos/ui/proj.win32/libui.vcxproj similarity index 83% rename from cocos/ui/proj.win32/libGUI.vcxproj rename to cocos/ui/proj.win32/libui.vcxproj index 2483ce7005..ed67cf90df 100644 --- a/cocos/ui/proj.win32/libGUI.vcxproj +++ b/cocos/ui/proj.win32/libui.vcxproj @@ -11,8 +11,8 @@ - + @@ -27,6 +27,7 @@ + @@ -37,7 +38,6 @@ - @@ -53,6 +53,7 @@ + @@ -62,13 +63,22 @@ + + + {21b2c324-891f-48ea-ad1a-5ae13de12e28} + + + {98a51ba8-fc3a-415b-ac8f-8c7bd464e93e} + + {7E06E92C-537A-442B-9E4A-4761C84F8A1A} - libGUI + libui + libui - StaticLibrary + DynamicLibrary true v100 v110 @@ -78,7 +88,7 @@ Unicode - StaticLibrary + DynamicLibrary false v100 v110 @@ -115,7 +125,7 @@ $(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\editor-support;$(EngineRoot)external;$(EngineRoot)extensions;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_USEGUIDLL;%(PreprocessorDefinitions) true 4267;4251;4244;%(DisableSpecificWarnings) false @@ -123,6 +133,8 @@ true + $(OutDir);%(AdditionalLibraryDirectories) + opengl32.lib;glew32.lib;%(AdditionalDependencies) @@ -133,7 +145,7 @@ true - WIN32;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_WINDOWS;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_USEGUIDLL;%(PreprocessorDefinitions) $(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\editor-support;$(EngineRoot)external;$(EngineRoot)extensions;%(AdditionalIncludeDirectories) None false @@ -142,6 +154,8 @@ true true true + $(OutDir);%(AdditionalLibraryDirectories) + opengl32.lib;glew32.lib;%(AdditionalDependencies) diff --git a/cocos/ui/proj.win32/libGUI.vcxproj.filters b/cocos/ui/proj.win32/libui.vcxproj.filters similarity index 96% rename from cocos/ui/proj.win32/libGUI.vcxproj.filters rename to cocos/ui/proj.win32/libui.vcxproj.filters index 66f11c6cdd..c51a43c85d 100644 --- a/cocos/ui/proj.win32/libGUI.vcxproj.filters +++ b/cocos/ui/proj.win32/libui.vcxproj.filters @@ -72,9 +72,6 @@ UIWidgets - - BaseClasses - Layouts @@ -90,6 +87,12 @@ System + + System + + + BaseClasses + @@ -146,9 +149,6 @@ UIWidgets - - BaseClasses - Layouts @@ -164,5 +164,8 @@ System + + BaseClasses + \ No newline at end of file diff --git a/extensions/proj.win32/libExtensions.vcxproj.user b/cocos/ui/proj.win32/libui.vcxproj.user similarity index 81% rename from extensions/proj.win32/libExtensions.vcxproj.user rename to cocos/ui/proj.win32/libui.vcxproj.user index ace9a86acb..a375ae3527 100644 --- a/extensions/proj.win32/libExtensions.vcxproj.user +++ b/cocos/ui/proj.win32/libui.vcxproj.user @@ -1,3 +1,4 @@  + \ No newline at end of file diff --git a/cocos/ui/proj.wp8/libGUI.vcxproj b/cocos/ui/proj.wp8/libGUI.vcxproj index 461ca405b9..5e2e4e6453 100644 --- a/cocos/ui/proj.wp8/libGUI.vcxproj +++ b/cocos/ui/proj.wp8/libGUI.vcxproj @@ -165,7 +165,6 @@ - @@ -188,9 +187,9 @@ + - @@ -214,5 +213,6 @@ + \ No newline at end of file diff --git a/cocos/ui/proj.wp8/libGUI.vcxproj.filters b/cocos/ui/proj.wp8/libGUI.vcxproj.filters index 0513dc6afb..7a7b4ae6b4 100644 --- a/cocos/ui/proj.wp8/libGUI.vcxproj.filters +++ b/cocos/ui/proj.wp8/libGUI.vcxproj.filters @@ -69,9 +69,6 @@ BaseClasses - - BaseClasses - Layouts @@ -87,6 +84,9 @@ System + + BaseClasses + @@ -143,9 +143,6 @@ BaseClasses - - BaseClasses - Layouts @@ -161,5 +158,8 @@ System + + BaseClasses + \ No newline at end of file diff --git a/docs/RELEASE_NOTES.md b/docs/RELEASE_NOTES.md index 7543b76c52..78cd8ae2f3 100644 --- a/docs/RELEASE_NOTES.md +++ b/docs/RELEASE_NOTES.md @@ -1,4 +1,4 @@ -# cocos2d-x v3.2 Release Notes # +# cocos2d-x v3.3alpha0 Release Notes # **Table of Contents** *generated with [DocToc](http://doctoc.herokuapp.com/)* @@ -28,9 +28,7 @@ # Misc Information -* Download: http://cdn.cocos2d-x.org/cocos2d-x-3.2.zip -* Full Changelog: https://github.com/cocos2d/cocos2d-x/blob/cocos2d-x-3.2/CHANGELOG -* API Reference: http://www.cocos2d-x.org/reference/native-cpp/V3.2/index.html +* Full Changelog: https://github.com/cocos2d/cocos2d-x/blob/cocos2d-x-3.3alpha0/CHANGELOG * v3.0 Release Notes can be found here: [v3.0 Release Notes](https://github.com/cocos2d/cocos2d-x/blob/cocos2d-x-3.0/docs/RELEASE_NOTES.md) # Requirements @@ -49,7 +47,7 @@ * Xcode 5.1 or newer for iOS or Mac * gcc 4.9 or newer for Linux -* ndk-r9d or newer for Android +* ndk-r9d for Android * Visual Studio 2012 or newer for Windows (win32) * Visual Studio 2012 or newer for Windows Phone 8 @@ -117,179 +115,77 @@ Run Please refer to this document: [ReadMe](../README.md) -# Highlights of v3.2 +# Highlights of v3.3alpha0 -* `Animation3D`/`Animate3D`, new nodes for 3d animation -* `fbx-conv` supports generating binary format which is supported by `Sprite3D` -* Game controller support -* Fast tilemap support -* Added `utils::cpatureScreen` to take screenshot -* Physics body supports scale and rotation -* Added `Node::enumerateChildren` and `utils::findChildren`, and support c++ 11 regular expression -* Added `Node::setNormalizedPosition`, `Node`'s position in pixel will be calculated according its parent's content size - -# Documents - -* [Sprite3D & Animation3D](http://cocos2d-x.org/wiki/Sprite3D) -* [Game controller](http://www.cocos2d-x.org/wiki/Game_Controller) -* [How to compile shader on WP8](http://cocos2d-x.org/wiki/How_to_update_wp8_shader) - -# Toolchain requirement changed - -`Node::enumerateChildren()` uses `std::regex` which will cause crash using gcc v4.8 or lower version. -Because `OTHER_LDFLAGS` can not work in Xcode6 beta3. So we used fat library(including 64-bit libaries) on iOS. But Xcode 5.0 or lower version has building problem by this way. - -So - -* NDK r9d or newer version is required for Android building -* gcc 4.9 is required for linux building -* Xcode 5.1 or newer is required on iOS - -# atof issue on Android - -We found a bug of `atof` on Android when using libc++. The bug is that, the return value of `atof` may be `-inf` when passing some valid digit string. - -For example - -```c++ -atof("90.099998474121094"); // -> return value is -inf -``` - -We have reported it to google guys, and they confirmed that it is a bug. In order to work around this issue, we added `utils::atof()`. - -The corresponding pull request for this issue is [here](https://github.com/cocos2d/cocos2d-x/pull/7440). You can refer to this pull request for demail information. +* 3d: `Camera`, `AABB`, `OBB` and `Ray` +* ui: added `Scale9Sprite` +* FileUitls: added `isDirectoryExist()`, `createDirectory()`, `removeDirectory()`, `removeFile()`, `renameFile()` and `getFileSize()` +* Device: added `setKeepScreenOn()` on iOS and Android +* Added c++11 random support +* RenderTexture: added a call back function for `saveToFile()` +* SpriteFrameCache: support loading from plist file content data +* Many other small features added and many bugs fixed # Features in detail -## Sprite3D & Animation3D +## Camera + +This version of camera is powerful then previous one. And you can add it as a child anywhere. If you want to let a Node to be visited by a camera, Node's camera mask should include Camera's flag: -Sample code to use binary version ```c++ -auto sprite3d = Sprite3D::create("filename.c3b"); -addChild(sprite3d); - -auto animation3d = Animation3D("filename.c3b"); -auto animate3d = Animate3D::create(animation3d); -sprite3d->runAction(RepeatForEver::create(animate)); +// let sprite to be visited by a camera +auto sprite = Sprite::create("myFile.png"); +sprite->setCameraMask(CameraFlag::USER1); +auto camera = Camera::createPerspective(60, winSize.width/winSize.height, 1, 1000); +camera->setCameraFlag(CameraFlag::USER1); +scene->addChild(camera); ``` -Detail information please refer to [Sprite3D & Animation3D](http://cocos2d-x.org/wiki/Sprite3D). +If you have many Nodes that want to be visited by a camera, there is a convenient way: -### `fbx-conv` usage - -* Mac OS X - -``` -$ cd COCOS2DX_ROOT/tools/fbx-conv/mac -$ ./fbx-conv [-a|-b|-t] FBXFile -``` - -* Windows - -``` -cd COCOS2DX_ROOT/tools/fbx-conv/windows -fbx-conv [-a|-b|-t] FBXFile -``` - -Options: - -* -a: export both text and binary format -* -b: export binary format -* -t: export text format - -## Game controller - -Supported controller type: - -* Android standard controllers -* Amazon tv -* OUYA -* Moga -* Nibiru -* iOS standard controllers - -Sample codes ```c++ -// register event listener -auto listener = EventListenerController::create(); -listner->onKeyDown = ... +auto layer = Layer::create(); +auto sprite1 = Sprite::create(); +auto sprite2 = Sprite::create(); +layer->addChild(sprite1); +layer->addChild(sprite2); +// it will set camera mask for all its children +layer->setCameraMask(CameraFlg::USER1); + +auto camera = Camera::createPerspective(); +camera->setCameraFlag(CameraFlag::USER1); +scene->addChild(camera); +``` + +Full test case please refer to `tests/cpp-tests/res/Camera3DTest/Camera3DTest.cpp`. + +## AABB, OBB and Ray + +TBD + +## ui::Scale9Sprite + +TBD + +## c++11 random support + +Since `rand()` is not good(refer to [this document](http://c-faq.com/lib/randrange.html)), we use c++11 random library to do generate random number, and provide a function to easily using: + +```c++ +int randInt = cocos2d::random(1, 10); +float randFloat = cocos2d::random(1.f, 10.f); +``` + +## RenderTexture save function + +`RenderTexture::saveToFile()` will not save rendertexture when the function returns, because it just send render command to renderer. The file will be saved after render command is executed. It is not convenient if you want to use the saved file to do some work. So we added a parameter in `RenderTexture::saveToFile()` to set a call back function when the file is saved. + +```c++ +renderTexture->begin(); ... -eventDispatcher->addEventListenerWithSceneGraphPriority(listener, this); +renderTexture->end(); -// start connecting controller -Controller::startDiscoveryController(); +renderTexture->saveToFile("myFile.png", true, callback); -// handler key down/ key up event -void GameControllerTest::onKeyDown(Controller *controller, int keyCode, Event *event) -{ - switch (keyCode) - { - case Controller::Key::BUTTON_A: - ... - break; - - ... - } -} ``` -Detail information please refer to [Game controller](http://www.cocos2d-x.org/wiki/Game_Controller). - -## Fast tilemap - -Fast tilemap has the same API as `TMXTiledMap` without deprecated functions. - -Sample code -```c++ -auto tilemap = FastTMXTiledMap::create("MyFile.tmx"); -addChild(tilemap); -``` - -Full demo please refer to `COCOS2DX_ROOT/tests/cpp-tests/Classes/TileMapTest/TileMapTest2.cpp`. - -## Node::enumerateChildren - -This functions is used to enumerate children of a `Node`. It supports c++ 11 regular expression. - -```c++ -// Find nodes whose name is 'nameToFind' and end with digits. -node->enumerateChildren("nameToFind[[:digit:]]+", [](Node* node) -> bool { - ... - return false; // return true to stop at first match -}); - -// Find nodes whose name is 'nameToFind' and end with digits recursively. -node->enumerateChildren("nameToFind[[:digit:]]+", [](Node* node) -> bool { - ... - return false; // return true to stop at first match -}); -``` - -Full test please refer to `NodeNameTest` in `COCOS2DX_ROOT/tests/cpp-tests/NodeTest/NodeTest.cpp`. - -Because this function uses `std::regex` which is not supported well in gcc 4.8 or lower version. So we use `clang` and `stdc++` instead for Android building. This lead to the result that `NDK r9d` or newer is required. And `gcc 4.9` is required on linux. - -## utils::findChildren - -This is a helper function to find children of a `Node` share a name. The implementation of this function bases on `Node::enumerateChildren`. - -```c++ -auto children = utils::findChildren(node, "nameToFind"); - -... -``` - -## Node::setNormalizedPosition - -Can use this function to set Node's position(x,y) using value between 0 and 1. `Can use this function when it has a parent node.` The positions in pixels is calculated like the following: - -```c++ -// pseudo code -void setNormalizedPosition(Vec2 pos) -{ - Size s = getParent()->getContentSize(); - _position = pos * s; -} -``` - -Full test please refer to `NodeNormalizedPositionTest1/2` in `tests/cpp-tests/Classes/NodeTest/NodeTest.cpp`. diff --git a/download-deps.py b/download-deps.py index 994c942f86..bd48c13631 100755 --- a/download-deps.py +++ b/download-deps.py @@ -64,6 +64,10 @@ class CocosZipInstaller(object): self._current_version = data["version"] self._repo_name = data["repo_name"] + try: + self._move_dirs = data["move_dirs"] + except: + self._move_dirs = None self._filename = self._current_version + '.zip' self._url = data["repo_parent"] + self._repo_name + '/archive/' + self._filename self._zip_file_size = int(data["zip_file_size"]) @@ -190,13 +194,13 @@ class CocosZipInstaller(object): def ask_to_delete_downloaded_zip_file(self): - ret = self.get_input_value("==> Whether to delete '%s' file? It may be reused when you execute this script next time! (yes/no): " % self._filename) + ret = self.get_input_value("==> Do you want to keep '%s'? So you don't have to download it later. (yes/no): " % self._filename) ret = ret.strip() - if ret != 'yes' and ret != 'no': - print("==> Invalid answer, please answer 'yes' or 'no'!") - return self.ask_to_delete_downloaded_zip_file() + if ret != 'yes' and ret != 'y' and ret != 'no' and ret != 'n': + print("==> Cache the dependency libraries by default") + return False else: - return True if ret == 'yes' else False + return True if ret == 'no' or ret =='n' else False def download_zip_file(self): if not os.path.isfile(self._filename): @@ -230,7 +234,7 @@ class CocosZipInstaller(object): data = json.load(data_file) return data - def run(self, folder_for_extracting, remove_downloaded, force_update, download_only): + def run(self, workpath, folder_for_extracting, remove_downloaded, force_update, download_only): if not force_update and not self.need_to_update(): print("==> Not need to update!") return @@ -246,6 +250,12 @@ class CocosZipInstaller(object): if not os.path.exists(folder_for_extracting): os.mkdir(folder_for_extracting) distutils.dir_util.copy_tree(self._extracted_folder_name, folder_for_extracting) + if self._move_dirs is not None: + for srcDir in self._move_dirs.keys(): + distDir = os.path.join( os.path.join(workpath, self._move_dirs[srcDir]), srcDir) + if os.path.exists(distDir): + shutil.rmtree(distDir) + shutil.move( os.path.join(folder_for_extracting, srcDir), distDir) print("==> Cleaning...") if os.path.exists(self._extracted_folder_name): shutil.rmtree(self._extracted_folder_name) @@ -293,13 +303,13 @@ def main(): 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_path, opts.remove_downloaded, opts.force_update, opts.download_only) + installer.run(workpath,external_path, opts.remove_downloaded, opts.force_update, opts.download_only) print("=======================================================") print("==> Prepare to download lua runtime binaries") runtime_path = os.path.join(workpath, 'templates', 'lua-template-runtime', 'runtime') installer = CocosZipInstaller(workpath, os.path.join(runtime_path, 'config.json'), os.path.join(runtime_path, 'version.json')) - installer.run(runtime_path, opts.remove_downloaded, opts.force_update, opts.download_only) + installer.run(workpath, runtime_path, opts.remove_downloaded, opts.force_update, opts.download_only) # -------------- main -------------- if __name__ == '__main__': diff --git a/extensions/Android.mk b/extensions/Android.mk index e2ececf020..66206c6331 100644 --- a/extensions/Android.mk +++ b/extensions/Android.mk @@ -30,10 +30,8 @@ physics-nodes/CCPhysicsDebugNode.cpp \ physics-nodes/CCPhysicsSprite.cpp LOCAL_WHOLE_STATIC_LIBRARIES := cocos2dx_static -LOCAL_WHOLE_STATIC_LIBRARIES += cocosdenshion_static LOCAL_WHOLE_STATIC_LIBRARIES += cocos_curl_static LOCAL_WHOLE_STATIC_LIBRARIES += box2d_static -LOCAL_WHOLE_STATIC_LIBRARIES += libwebsockets_static LOCAL_CXXFLAGS += -fexceptions @@ -46,8 +44,5 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/.. \ include $(BUILD_STATIC_LIBRARY) $(call import-module,.) -$(call import-module,audio/android) $(call import-module,curl/prebuilt/android) $(call import-module,Box2D) -$(call import-module,websockets/prebuilt/android) - diff --git a/extensions/ExtensionExport.h b/extensions/ExtensionExport.h new file mode 100644 index 0000000000..da01ffc98e --- /dev/null +++ b/extensions/ExtensionExport.h @@ -0,0 +1,28 @@ +#ifndef __CCEXTENSIONEXPORT_H__ +#define __CCEXTENSIONEXPORT_H__ + +#if defined(WIN32) && defined(_WINDOWS) + #ifdef __MINGW32__ + #include + #endif + + #if defined(_USREXDLL) + #define CC_EX_DLL __declspec(dllexport) + #else /* use a DLL library */ + #define CC_EX_DLL __declspec(dllimport) + #endif + + + /* Define NULL pointer value */ + #ifndef NULL + #ifdef __cplusplus + #define NULL 0 + #else + #define NULL ((void *)0) + #endif + #endif +#else + #define CC_EX_DLL +#endif + +#endif /* __CCEXTENSIONEXPORT_H__*/ \ No newline at end of file diff --git a/extensions/GUI/CCControlExtension/CCControl.h b/extensions/GUI/CCControlExtension/CCControl.h index cf6efa865d..1f7192a170 100644 --- a/extensions/GUI/CCControlExtension/CCControl.h +++ b/extensions/GUI/CCControlExtension/CCControl.h @@ -32,6 +32,7 @@ #include "CCControlUtils.h" #include "2d/CCLayer.h" +#include "extensions/ExtensionExport.h" NS_CC_EXT_BEGIN @@ -61,11 +62,11 @@ class Invocation; * * To use the Control you have to subclass it. */ -class Control : public Layer +class CC_EX_DLL Control : public Layer { public: /** Kinds of possible events for the control objects. */ - enum class EventType + enum class CC_EX_DLL EventType { TOUCH_DOWN = 1 << 0, // A touch-down event in the control. DRAG_INSIDE = 1 << 1, // An event where a finger is dragged inside the bounds of the control. @@ -266,7 +267,7 @@ private: CC_DISALLOW_COPY_AND_ASSIGN(Control); }; -Control::EventType operator|(Control::EventType a, Control::EventType b); +CC_EX_DLL Control::EventType operator|(Control::EventType a, Control::EventType b); // end of GUI group /// @} diff --git a/extensions/GUI/CCControlExtension/CCControlButton.h b/extensions/GUI/CCControlExtension/CCControlButton.h index cd73e63c5a..f7484e2172 100644 --- a/extensions/GUI/CCControlExtension/CCControlButton.h +++ b/extensions/GUI/CCControlExtension/CCControlButton.h @@ -34,6 +34,7 @@ #include "CCInvocation.h" #include "CCScale9Sprite.h" #include "base/CCMap.h" +#include "extensions/ExtensionExport.h" NS_CC_EXT_BEGIN @@ -51,7 +52,7 @@ NS_CC_EXT_BEGIN */ /** @class ControlButton Button control for Cocos2D. */ -class ControlButton : public Control +class CC_EX_DLL ControlButton : public Control { public: static ControlButton* create(); diff --git a/extensions/GUI/CCControlExtension/CCControlColourPicker.h b/extensions/GUI/CCControlExtension/CCControlColourPicker.h index 2cb09328c7..df282adda8 100644 --- a/extensions/GUI/CCControlExtension/CCControlColourPicker.h +++ b/extensions/GUI/CCControlExtension/CCControlColourPicker.h @@ -37,6 +37,7 @@ #include "CCControlUtils.h" #include "CCControlHuePicker.h" #include "CCControlSaturationBrightnessPicker.h" +#include "extensions/ExtensionExport.h" NS_CC_EXT_BEGIN @@ -47,7 +48,7 @@ NS_CC_EXT_BEGIN * @{ */ -class ControlColourPicker: public Control +class CC_EX_DLL ControlColourPicker: public Control { public: static ControlColourPicker* create(); diff --git a/extensions/GUI/CCControlExtension/CCControlHuePicker.h b/extensions/GUI/CCControlExtension/CCControlHuePicker.h index 9f007a2092..06e6371efd 100644 --- a/extensions/GUI/CCControlExtension/CCControlHuePicker.h +++ b/extensions/GUI/CCControlExtension/CCControlHuePicker.h @@ -35,6 +35,7 @@ #include "CCControl.h" #include "CCInvocation.h" +#include "extensions/ExtensionExport.h" NS_CC_EXT_BEGIN @@ -45,7 +46,7 @@ NS_CC_EXT_BEGIN * @{ */ -class ControlHuePicker : public Control +class CC_EX_DLL ControlHuePicker : public Control { public: static ControlHuePicker* create(Node* target, Vec2 pos); diff --git a/extensions/GUI/CCControlExtension/CCControlPotentiometer.h b/extensions/GUI/CCControlExtension/CCControlPotentiometer.h index fc8156a8b8..c70ec15e06 100644 --- a/extensions/GUI/CCControlExtension/CCControlPotentiometer.h +++ b/extensions/GUI/CCControlExtension/CCControlPotentiometer.h @@ -29,6 +29,7 @@ #include "CCControl.h" #include "2d/CCProgressTimer.h" +#include "extensions/ExtensionExport.h" NS_CC_EXT_BEGIN @@ -40,7 +41,7 @@ NS_CC_EXT_BEGIN */ /** @class ControlPotentiometer Potentiometer control for Cocos2D. */ -class ControlPotentiometer : public Control +class CC_EX_DLL ControlPotentiometer : public Control { public: /** diff --git a/extensions/GUI/CCControlExtension/CCControlSaturationBrightnessPicker.h b/extensions/GUI/CCControlExtension/CCControlSaturationBrightnessPicker.h index 0ae9cbeaa1..cff046281d 100644 --- a/extensions/GUI/CCControlExtension/CCControlSaturationBrightnessPicker.h +++ b/extensions/GUI/CCControlExtension/CCControlSaturationBrightnessPicker.h @@ -35,6 +35,7 @@ #include "CCControl.h" #include "CCInvocation.h" +#include "extensions/ExtensionExport.h" NS_CC_EXT_BEGIN @@ -45,7 +46,7 @@ NS_CC_EXT_BEGIN * @{ */ -class ControlSaturationBrightnessPicker : public Control +class CC_EX_DLL ControlSaturationBrightnessPicker : public Control { /** Contains the receiver's current saturation value. */ CC_SYNTHESIZE_READONLY(float, _saturation, Saturation); diff --git a/extensions/GUI/CCControlExtension/CCControlSlider.h b/extensions/GUI/CCControlExtension/CCControlSlider.h index eeca322c25..03bb5d9543 100644 --- a/extensions/GUI/CCControlExtension/CCControlSlider.h +++ b/extensions/GUI/CCControlExtension/CCControlSlider.h @@ -32,6 +32,7 @@ #include "CCControl.h" #include "CCInvocation.h" +#include "extensions/ExtensionExport.h" NS_CC_EXT_BEGIN @@ -42,7 +43,7 @@ NS_CC_EXT_BEGIN * @{ */ -class ControlSlider: public Control +class CC_EX_DLL ControlSlider: public Control { public: /** diff --git a/extensions/GUI/CCControlExtension/CCControlStepper.h b/extensions/GUI/CCControlExtension/CCControlStepper.h index 1b45a497f6..ae9bdaa22d 100644 --- a/extensions/GUI/CCControlExtension/CCControlStepper.h +++ b/extensions/GUI/CCControlExtension/CCControlStepper.h @@ -30,6 +30,7 @@ #include "CCControl.h" #include "2d/CCLabel.h" +#include "extensions/ExtensionExport.h" NS_CC_EXT_BEGIN @@ -40,7 +41,7 @@ NS_CC_EXT_BEGIN * @{ */ -class ControlStepper : public Control +class CC_EX_DLL ControlStepper : public Control { public: enum class Part diff --git a/extensions/GUI/CCControlExtension/CCControlSwitch.h b/extensions/GUI/CCControlExtension/CCControlSwitch.h index 6575937e13..98e67d77e2 100644 --- a/extensions/GUI/CCControlExtension/CCControlSwitch.h +++ b/extensions/GUI/CCControlExtension/CCControlSwitch.h @@ -29,7 +29,7 @@ #define __CCCONTROLSWITCH_H__ #include "CCControl.h" - +#include "extensions/ExtensionExport.h" namespace cocos2d { class Sprite; } namespace cocos2d { class Label; } @@ -46,7 +46,7 @@ class ControlSwitchSprite; */ /** @class ControlSwitch Switch control for Cocos2D. */ -class ControlSwitch : public Control +class CC_EX_DLL ControlSwitch : public Control { public: /** Creates a switch with a mask sprite, on/off sprites for on/off states, a thumb sprite and an on/off labels. */ diff --git a/extensions/GUI/CCControlExtension/CCControlUtils.h b/extensions/GUI/CCControlExtension/CCControlUtils.h index 4df2a0f125..abc6abd894 100644 --- a/extensions/GUI/CCControlExtension/CCControlUtils.h +++ b/extensions/GUI/CCControlExtension/CCControlUtils.h @@ -36,6 +36,7 @@ #include "2d/CCSprite.h" #include "../../ExtensionMacros.h" +#include "extensions/ExtensionExport.h" NS_CC_EXT_BEGIN @@ -62,7 +63,7 @@ typedef struct */ //helper class to store Color3B's in mutable arrays -class Color3bObject : public Ref +class CC_EX_DLL Color3bObject : public Ref { public: Color3B value; @@ -73,7 +74,7 @@ public: Color3bObject(Color3B s_value):value(s_value){} }; -class ControlUtils +class CC_EX_DLL ControlUtils { public: /** diff --git a/extensions/GUI/CCControlExtension/CCInvocation.h b/extensions/GUI/CCControlExtension/CCInvocation.h index e8a2a12b8d..015f582a23 100644 --- a/extensions/GUI/CCControlExtension/CCInvocation.h +++ b/extensions/GUI/CCControlExtension/CCInvocation.h @@ -32,6 +32,7 @@ #include "base/CCRef.h" #include "../../ExtensionMacros.h" +#include "extensions/ExtensionExport.h" #include "CCControl.h" NS_CC_EXT_BEGIN @@ -45,7 +46,7 @@ NS_CC_EXT_BEGIN #define cccontrol_selector(_SELECTOR) static_cast(&_SELECTOR) -class Invocation : public Ref +class CC_EX_DLL Invocation : public Ref { public: /** diff --git a/extensions/GUI/CCControlExtension/CCScale9Sprite.cpp b/extensions/GUI/CCControlExtension/CCScale9Sprite.cpp index 8d55e46003..099b1f128b 100644 --- a/extensions/GUI/CCControlExtension/CCScale9Sprite.cpp +++ b/extensions/GUI/CCControlExtension/CCScale9Sprite.cpp @@ -131,8 +131,6 @@ bool Scale9Sprite::updateWithBatchNode(SpriteBatchNode* batchnode, const Rect& o return false; } - _scale9Image->removeAllChildrenWithCleanup(true); - _capInsets = capInsets; _spriteFrameRotated = rotated; @@ -238,48 +236,48 @@ bool Scale9Sprite::updateWithBatchNode(SpriteBatchNode* batchnode, const Rect& o // Centre _centre = Sprite::createWithTexture(_scale9Image->getTexture(), centerbounds); _centre->retain(); - this->addChild(_centre, 0); + this->addChild(_centre); // Top _top = Sprite::createWithTexture(_scale9Image->getTexture(), centertopbounds); _top->retain(); - this->addChild(_top, 1); + this->addChild(_top); // Bottom _bottom = Sprite::createWithTexture(_scale9Image->getTexture(), centerbottombounds); _bottom->retain(); - this->addChild(_bottom, 1); + this->addChild(_bottom); // Left _left = Sprite::createWithTexture(_scale9Image->getTexture(), leftcenterbounds); _left->retain(); - this->addChild(_left, 1); + this->addChild(_left); // Right _right = Sprite::createWithTexture(_scale9Image->getTexture(), rightcenterbounds); _right->retain(); - this->addChild(_right, 1); + this->addChild(_right); // Top left _topLeft = Sprite::createWithTexture(_scale9Image->getTexture(), lefttopbounds); _topLeft->retain(); - this->addChild(_topLeft, 2); + this->addChild(_topLeft); // Top right _topRight = Sprite::createWithTexture(_scale9Image->getTexture(), righttopbounds); _topRight->retain(); - this->addChild(_topRight, 2); + this->addChild(_topRight); // Bottom left _bottomLeft = Sprite::createWithTexture(_scale9Image->getTexture(), leftbottombounds); _bottomLeft->retain(); - this->addChild(_bottomLeft, 2); + this->addChild(_bottomLeft); // Bottom right _bottomRight = Sprite::createWithTexture(_scale9Image->getTexture(), rightbottombounds); _bottomRight->retain(); - this->addChild(_bottomRight, 2); + this->addChild(_bottomRight); } else { // set up transformation of coordinates // to handle the case where the sprite is stored rotated @@ -329,46 +327,46 @@ bool Scale9Sprite::updateWithBatchNode(SpriteBatchNode* batchnode, const Rect& o // Top _top = Sprite::createWithTexture(_scale9Image->getTexture(), rotatedcentertopbounds, true); _top->retain(); - this->addChild(_top, 1); + this->addChild(_top); // Bottom _bottom = Sprite::createWithTexture(_scale9Image->getTexture(), rotatedcenterbottombounds, true); _bottom->retain(); - this->addChild(_bottom, 1); + this->addChild(_bottom); // Left _left = Sprite::createWithTexture(_scale9Image->getTexture(), rotatedleftcenterbounds, true); _left->retain(); - this->addChild(_left, 1); + this->addChild(_left); // Right _right = Sprite::createWithTexture(_scale9Image->getTexture(), rotatedrightcenterbounds, true); _right->retain(); - this->addChild(_right, 1); + this->addChild(_right); // Top left _topLeft = Sprite::createWithTexture(_scale9Image->getTexture(), rotatedlefttopbounds, true); _topLeft->retain(); - this->addChild(_topLeft, 2); + this->addChild(_topLeft); // Top right _topRight = Sprite::createWithTexture(_scale9Image->getTexture(), rotatedrighttopbounds, true); _topRight->retain(); - this->addChild(_topRight, 2); + this->addChild(_topRight); // Bottom left _bottomLeft = Sprite::createWithTexture(_scale9Image->getTexture(), rotatedleftbottombounds, true); _bottomLeft->retain(); - this->addChild(_bottomLeft, 2); + this->addChild(_bottomLeft); // Bottom right _bottomRight = Sprite::createWithTexture(_scale9Image->getTexture(), rotatedrightbottombounds, true); _bottomRight->retain(); - this->addChild(_bottomRight, 2); + this->addChild(_bottomRight); } this->setContentSize(rect.size); - this->addChild(_scale9Image); +// this->addChild(_scale9Image); if (_spritesGenerated) { diff --git a/extensions/GUI/CCControlExtension/CCScale9Sprite.h b/extensions/GUI/CCControlExtension/CCScale9Sprite.h index dc3c6b8696..fc1dea95ba 100644 --- a/extensions/GUI/CCControlExtension/CCScale9Sprite.h +++ b/extensions/GUI/CCControlExtension/CCScale9Sprite.h @@ -31,7 +31,7 @@ THE SOFTWARE. #include "2d/CCNode.h" #include "2d/CCSpriteFrame.h" #include "2d/CCSpriteBatchNode.h" - +#include "extensions/ExtensionExport.h" #include "../../ExtensionMacros.h" NS_CC_EXT_BEGIN @@ -53,7 +53,7 @@ NS_CC_EXT_BEGIN * * @see http://yannickloriot.com/library/ios/cccontrolextension/Classes/CCScale9Sprite.html */ -class Scale9Sprite : public Node +class CC_EX_DLL Scale9Sprite : public Node { public: /** diff --git a/extensions/GUI/CCEditBox/CCEditBox.h b/extensions/GUI/CCEditBox/CCEditBox.h index f6a12dbf46..9203cbfaac 100644 --- a/extensions/GUI/CCEditBox/CCEditBox.h +++ b/extensions/GUI/CCEditBox/CCEditBox.h @@ -29,6 +29,7 @@ #include "base/CCIMEDelegate.h" #include "extensions/ExtensionMacros.h" #include "../CCControlExtension/CCControlExtensions.h" +#include "extensions/ExtensionExport.h" NS_CC_EXT_BEGIN @@ -36,7 +37,7 @@ class EditBox; class EditBoxImpl; -class EditBoxDelegate +class CC_EX_DLL EditBoxDelegate { public: /** @@ -88,7 +89,7 @@ public: * */ -class EditBox +class CC_EX_DLL EditBox : public ControlButton , public IMEDelegate { diff --git a/extensions/GUI/CCEditBox/CCEditBoxImpl.h b/extensions/GUI/CCEditBox/CCEditBoxImpl.h index 44118c1c0b..79d3d8f3fa 100644 --- a/extensions/GUI/CCEditBox/CCEditBoxImpl.h +++ b/extensions/GUI/CCEditBox/CCEditBoxImpl.h @@ -28,11 +28,12 @@ #include "extensions/ExtensionMacros.h" #include "CCEditBox.h" +#include "extensions/ExtensionExport.h" NS_CC_EXT_BEGIN -class EditBoxImpl +class CC_EX_DLL EditBoxImpl { public: /** @@ -62,7 +63,7 @@ public: virtual void setPlaceHolder(const char* pText) = 0; virtual void doAnimationWhenKeyboardMove(float duration, float distance) = 0; - virtual void openKeyboard() = 0; + virtual void openKeyboard() = 0; virtual void closeKeyboard() = 0; virtual void setPosition(const Vec2& pos) = 0; diff --git a/extensions/GUI/CCEditBox/CCEditBoxImplMac.h b/extensions/GUI/CCEditBox/CCEditBoxImplMac.h index a5b93c4f58..34085e8278 100644 --- a/extensions/GUI/CCEditBox/CCEditBoxImplMac.h +++ b/extensions/GUI/CCEditBox/CCEditBoxImplMac.h @@ -39,6 +39,8 @@ @interface CCEditBoxImplMac : NSObject { + NSTextField* textField_; + NSSecureTextField* secureTextField_; void* editBox_; BOOL editState_; NSMutableDictionary* placeholderAttributes_; diff --git a/extensions/GUI/CCEditBox/CCEditBoxImplMac.mm b/extensions/GUI/CCEditBox/CCEditBoxImplMac.mm index 8ca0fd5d25..47063b2907 100644 --- a/extensions/GUI/CCEditBox/CCEditBoxImplMac.mm +++ b/extensions/GUI/CCEditBox/CCEditBoxImplMac.mm @@ -29,9 +29,6 @@ #if (CC_TARGET_PLATFORM == CC_PLATFORM_MAC) #include "CCEditBox.h" -#define GLFW_EXPOSE_NATIVE_NSGL -#define GLFW_EXPOSE_NATIVE_COCOA -#include "glfw3native.h" #define getEditBoxImplMac() ((cocos2d::extension::EditBoxImplMac*)editBox_) @@ -49,7 +46,7 @@ - (id) getNSWindow { auto glview = cocos2d::Director::getInstance()->getOpenGLView(); - return glfwGetCocoaWindow(glview->getWindow()); + return glview->getCocoaWindow(); } - (void)dealloc @@ -162,7 +159,7 @@ { } -- (BOOL)textFieldShouldBeginEditing:(NSTextField *)sender // return NO to disallow editing. +- (void)controlTextDidBeginEditing:(NSNotification *)notification { editState_ = YES; cocos2d::extension::EditBoxDelegate* pDelegate = getEditBoxImplMac()->getDelegate(); @@ -180,10 +177,9 @@ cocos2d::ScriptEngineManager::getInstance()->getScriptEngine()->sendEvent(&event); } #endif - return YES; } -- (BOOL)textFieldShouldEndEditing:(NSTextField *)sender +- (void)controlTextDidEndEditing:(NSNotification *)notification { editState_ = NO; cocos2d::extension::EditBoxDelegate* pDelegate = getEditBoxImplMac()->getDelegate(); @@ -206,7 +202,6 @@ cocos2d::ScriptEngineManager::getInstance()->getScriptEngine()->sendEvent(&event); } #endif - return YES; } /** @@ -287,7 +282,7 @@ void EditBoxImplMac::doAnimationWhenKeyboardMove(float duration, float distance) bool EditBoxImplMac::initWithSize(const Size& size) { - GLViewProtocol* eglView = Director::getInstance()->getOpenGLView(); + GLView* eglView = Director::getInstance()->getOpenGLView(); NSRect rect = NSMakeRect(0, 0, size.width * eglView->getScaleX(),size.height * eglView->getScaleY()); @@ -307,7 +302,10 @@ bool EditBoxImplMac::initWithSize(const Size& size) void EditBoxImplMac::setFont(const char* pFontName, int fontSize) { NSString * fntName = [NSString stringWithUTF8String:pFontName]; - NSFont *textFont = [NSFont fontWithName:fntName size:fontSize]; + float retinaFactor = _inRetinaMode ? 2.0f : 1.0f; + auto glview = cocos2d::Director::getInstance()->getOpenGLView(); + float scaleFactor = glview->getScaleX(); + NSFont *textFont = [NSFont fontWithName:fntName size:fontSize * scaleFactor / retinaFactor]; if (textFont != nil) { [_sysEdit.textField setFont:textFont]; [_sysEdit.secureTextField setFont:textFont]; @@ -317,14 +315,17 @@ void EditBoxImplMac::setFont(const char* pFontName, int fontSize) void EditBoxImplMac::setPlaceholderFont(const char* pFontName, int fontSize) { NSString *fontName = [NSString stringWithUTF8String:pFontName]; - NSFont *font = [NSFont fontWithName:fontName size:fontSize]; + float retinaFactor = _inRetinaMode ? 2.0f : 1.0f; + auto glview = cocos2d::Director::getInstance()->getOpenGLView(); + float scaleFactor = glview->getScaleX(); + NSFont *font = [NSFont fontWithName:fontName size:fontSize * scaleFactor / retinaFactor]; if (!font) { CCLOGWARN("Font not found: %s", pFontName); return; } - _sysEdit.placeholderAttributes[NSFontAttributeName] = font; + [_sysEdit.placeholderAttributes setObject:font forKey:NSFontAttributeName]; /* reload placeholder */ const char *placeholder = [_sysEdit.textField.cell placeholderAttributedString].string.UTF8String; @@ -343,7 +344,7 @@ void EditBoxImplMac::setFontColor(const Color3B& color) void EditBoxImplMac::setPlaceholderFontColor(const Color3B& color) { NSColor *nsColor = [NSColor colorWithCalibratedRed:color.r/255.f green:color.g / 255.f blue:color.b / 255.f alpha:1.0f]; - _sysEdit.placeholderAttributes[NSForegroundColorAttributeName] = nsColor; + [_sysEdit.placeholderAttributes setObject:nsColor forKey:NSForegroundColorAttributeName]; /* reload placeholder */ const char *placeholder = [_sysEdit.textField.cell placeholderAttributedString].string.UTF8String; @@ -431,7 +432,7 @@ NSPoint EditBoxImplMac::convertDesignCoordToScreenCoord(const Vec2& designCoord, NSRect frame = [_sysEdit.textField frame]; CGFloat height = frame.size.height; - GLViewProtocol* eglView = Director::getInstance()->getOpenGLView(); + GLView* eglView = Director::getInstance()->getOpenGLView(); Vec2 visiblePos = Vec2(designCoord.x * eglView->getScaleX(), designCoord.y * eglView->getScaleY()); Vec2 screenGLPos = visiblePos + eglView->getViewPortRect().origin; diff --git a/extensions/GUI/CCEditBox/CCEditBoxImplWin.cpp b/extensions/GUI/CCEditBox/CCEditBoxImplWin.cpp index 3ae5275689..2259e4dda0 100644 --- a/extensions/GUI/CCEditBox/CCEditBoxImplWin.cpp +++ b/extensions/GUI/CCEditBox/CCEditBoxImplWin.cpp @@ -26,17 +26,8 @@ #if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) -#ifndef GLFW_EXPOSE_NATIVE_WIN32 -#define GLFW_EXPOSE_NATIVE_WIN32 -#endif - -#ifndef GLFW_EXPOSE_NATIVE_WGL -#define GLFW_EXPOSE_NATIVE_WGL -#endif - #include "CCEditBox.h" #include "proj.win32/Win32InputBox.h" -#include "glfw3native.h" NS_CC_EXT_BEGIN @@ -257,9 +248,8 @@ void EditBoxImplWin::openKeyboard() std::string text = getText(); if (text.length()) strncpy(pText, text.c_str(), 100); - GLView *glView = Director::getInstance()->getOpenGLView(); - GLFWwindow *glfwWindow = glView->getWindow(); - HWND hwnd = glfwGetWin32Window(glfwWindow); + auto glView = Director::getInstance()->getOpenGLView(); + HWND hwnd = glView->getWin32Window(); bool didChange = CWin32InputBox::InputBox("Input", placeHolder.c_str(), pText, 100, false, hwnd) == IDOK; if (didChange) diff --git a/extensions/GUI/CCEditBox/CCEditBoxImplWin.h b/extensions/GUI/CCEditBox/CCEditBoxImplWin.h index 7b29251644..4d04fb6cce 100644 --- a/extensions/GUI/CCEditBox/CCEditBoxImplWin.h +++ b/extensions/GUI/CCEditBox/CCEditBoxImplWin.h @@ -32,12 +32,13 @@ #include "extensions/ExtensionMacros.h" #include "CCEditBoxImpl.h" +#include "extensions/ExtensionExport.h" NS_CC_EXT_BEGIN class EditBox; -class EditBoxImplWin : public EditBoxImpl +class CC_EX_DLL EditBoxImplWin : public EditBoxImpl { public: /** diff --git a/extensions/GUI/CCEditBox/CCEditBoxImplWp8.cpp b/extensions/GUI/CCEditBox/CCEditBoxImplWp8.cpp index b3ccf3809e..245149d164 100644 --- a/extensions/GUI/CCEditBox/CCEditBoxImplWp8.cpp +++ b/extensions/GUI/CCEditBox/CCEditBoxImplWp8.cpp @@ -24,7 +24,7 @@ THE SOFTWARE. #include "CCEditBoxImplWp8.h" #include "CCEditBox.h" -#include "CCGLView.h" +#include "CCGLViewImpl.h" #include "base/CCScriptSupport.h" #include "base/ccUTF8.h" @@ -89,7 +89,7 @@ void CCEditBoxImplWp8::openKeyboard() } }); - GLView::sharedOpenGLView()->OpenXamlEditBox(stringToPlatformString(placeHolder), stringToPlatformString(getText()), m_nMaxLength, (int)m_eEditBoxInputMode, (int)m_eEditBoxInputFlag, receiveHandler); + GLViewImpl::sharedOpenGLView()->OpenXamlEditBox(stringToPlatformString(placeHolder), stringToPlatformString(getText()), m_nMaxLength, (int)m_eEditBoxInputMode, (int)m_eEditBoxInputFlag, receiveHandler); } bool CCEditBoxImplWp8::initWithSize( const Size& size ) diff --git a/extensions/GUI/CCScrollView/CCScrollView.cpp b/extensions/GUI/CCScrollView/CCScrollView.cpp index d45c9f62a8..4c698d5fbb 100644 --- a/extensions/GUI/CCScrollView/CCScrollView.cpp +++ b/extensions/GUI/CCScrollView/CCScrollView.cpp @@ -24,7 +24,6 @@ ****************************************************************************/ #include "CCScrollView.h" -#include "CCGLView.h" #include "platform/CCDevice.h" #include "2d/CCActionInstant.h" #include "2d/CCActionInterval.h" @@ -52,10 +51,7 @@ static float convertDistanceFromPointToInch(float pointDis) ScrollView::ScrollView() -: _zoomScale(0.0f) -, _minZoomScale(0.0f) -, _maxZoomScale(0.0f) -, _delegate(nullptr) +: _delegate(nullptr) , _direction(Direction::BOTH) , _dragging(false) , _container(nullptr) @@ -66,6 +62,7 @@ ScrollView::ScrollView() , _minScale(0.0f) , _maxScale(0.0f) , _touchListener(nullptr) +, _scissorRestored(false) { } @@ -567,10 +564,10 @@ void ScrollView::onAfterDraw() void ScrollView::visit(Renderer *renderer, const Mat4 &parentTransform, uint32_t parentFlags) { - // quick return if not visible - if (!isVisible()) + // quick return if not visible + if (!isVisible()) { - return; + return; } uint32_t flags = processParentFlags(parentTransform, parentFlags); @@ -584,44 +581,45 @@ void ScrollView::visit(Renderer *renderer, const Mat4 &parentTransform, uint32_t director->loadMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_MODELVIEW, _modelViewTransform); this->beforeDraw(); + bool visibleByCamera = isVisitableByVisitingCamera(); - if (!_children.empty()) + if (!_children.empty()) { - int i=0; + int i=0; // draw children zOrder < 0 - for( ; i < _children.size(); i++ ) + for( ; i < _children.size(); i++ ) { - Node *child = _children.at(i); - if ( child->getLocalZOrder() < 0 ) + Node *child = _children.at(i); + if ( child->getLocalZOrder() < 0 ) { - child->visit(renderer, _modelViewTransform, flags); - } + child->visit(renderer, _modelViewTransform, flags); + } else { - break; + break; } - } + } // this draw - this->draw(renderer, _modelViewTransform, flags); + if (visibleByCamera) + this->draw(renderer, _modelViewTransform, flags); - // draw children zOrder >= 0 - for( ; i < _children.size(); i++ ) + // draw children zOrder >= 0 + for( ; i < _children.size(); i++ ) { Node *child = _children.at(i); child->visit(renderer, _modelViewTransform, flags); - } - - } - else + } + } + else if (visibleByCamera) { - this->draw(renderer, _modelViewTransform, flags); + this->draw(renderer, _modelViewTransform, flags); } this->afterDraw(); - director->popMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_MODELVIEW); + director->popMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_MODELVIEW); } bool ScrollView::onTouchBegan(Touch* touch, Event* event) diff --git a/extensions/GUI/CCScrollView/CCScrollView.h b/extensions/GUI/CCScrollView/CCScrollView.h index 2f4c224418..72695df5c7 100644 --- a/extensions/GUI/CCScrollView/CCScrollView.h +++ b/extensions/GUI/CCScrollView/CCScrollView.h @@ -30,6 +30,7 @@ #include "base/CCEventListenerTouch.h" #include "2d/CCActionTween.h" #include "extensions/ExtensionMacros.h" +#include "extensions/ExtensionExport.h" NS_CC_EXT_BEGIN @@ -40,7 +41,7 @@ NS_CC_EXT_BEGIN class ScrollView; -class ScrollViewDelegate +class CC_EX_DLL ScrollViewDelegate { public: /** @@ -65,7 +66,7 @@ public: * ScrollView support for cocos2d-x. * It provides scroll view functionalities to cocos2d projects natively. */ -class ScrollView : public Layer, public ActionTweenDelegate +class CC_EX_DLL ScrollView : public Layer, public ActionTweenDelegate { public: enum class Direction @@ -145,6 +146,24 @@ public: * @param dt The animation duration */ void setZoomScaleInDuration(float s, float dt); + + /** + * Set min scale + * + * @param minScale min scale + */ + void setMinScale(float minScale) { + _minScale = minScale; + } + /** + * Set max scale + * + * @param maxScale max scale + */ + void setMaxScale(float maxScale) { + _maxScale = maxScale; + } + /** * Returns the current container's minimum offset. You may want this while you animate scrolling by yourself */ @@ -162,10 +181,12 @@ public: /** * Provided to make scroll view compatible with SWLayer's pause method */ + using Layer::pause; // fix warning void pause(Ref* sender); /** * Provided to make scroll view compatible with SWLayer's resume method */ + using Layer::resume; // fix warning void resume(Ref* sender); void setTouchEnabled(bool enabled); @@ -274,19 +295,7 @@ protected: void handleZoom(); Rect getViewRect(); - - /** - * current zoom scale - */ - float _zoomScale; - /** - * min zoom scale - */ - float _minZoomScale; - /** - * max zoom scale - */ - float _maxZoomScale; + /** * scroll view delegate */ diff --git a/extensions/GUI/CCScrollView/CCTableView.cpp b/extensions/GUI/CCScrollView/CCTableView.cpp index b074fc4e88..7a443cc549 100644 --- a/extensions/GUI/CCScrollView/CCTableView.cpp +++ b/extensions/GUI/CCScrollView/CCTableView.cpp @@ -591,9 +591,12 @@ void TableView::onTouchEnded(Touch *pTouch, Event *pEvent) bool TableView::onTouchBegan(Touch *pTouch, Event *pEvent) { - if (!this->isVisible()) + for (Node *c = this; c != nullptr; c = c->getParent()) { - return false; + if (!c->isVisible()) + { + return false; + } } bool touchResult = ScrollView::onTouchBegan(pTouch, pEvent); diff --git a/extensions/GUI/CCScrollView/CCTableView.h b/extensions/GUI/CCScrollView/CCTableView.h index c4d89b33a9..018c653110 100644 --- a/extensions/GUI/CCScrollView/CCTableView.h +++ b/extensions/GUI/CCScrollView/CCTableView.h @@ -28,6 +28,7 @@ #include "CCScrollView.h" #include "CCTableViewCell.h" +#include "extensions/ExtensionExport.h" #include #include @@ -39,7 +40,7 @@ class TableView; /** * Sole purpose of this delegate is to single touch event in this version. */ -class TableViewDelegate : public ScrollViewDelegate +class CC_EX_DLL TableViewDelegate : public ScrollViewDelegate { public: /** @@ -90,7 +91,7 @@ public: /** * Data source that governs table backend data. */ -class TableViewDataSource +class CC_EX_DLL TableViewDataSource { public: /** @@ -139,7 +140,7 @@ public: * * This is a very basic, minimal implementation to bring UITableView-like component into cocos2d world. */ -class TableView : public ScrollView, public ScrollViewDelegate +class CC_EX_DLL TableView : public ScrollView, public ScrollViewDelegate { public: diff --git a/extensions/GUI/CCScrollView/CCTableViewCell.h b/extensions/GUI/CCScrollView/CCTableViewCell.h index 9d45d665d8..4bc594db66 100644 --- a/extensions/GUI/CCScrollView/CCTableViewCell.h +++ b/extensions/GUI/CCScrollView/CCTableViewCell.h @@ -28,13 +28,14 @@ #include "extensions/ExtensionMacros.h" #include "2d/CCNode.h" +#include "extensions/ExtensionExport.h" NS_CC_EXT_BEGIN /** * Abstract class for SWTableView cell node */ -class TableViewCell: public Node +class CC_EX_DLL TableViewCell: public Node { public: CREATE_FUNC(TableViewCell); diff --git a/extensions/assets-manager/AssetsManager.cpp b/extensions/assets-manager/AssetsManager.cpp index 52073d2f07..06df43b5a2 100644 --- a/extensions/assets-manager/AssetsManager.cpp +++ b/extensions/assets-manager/AssetsManager.cpp @@ -159,6 +159,7 @@ bool AssetsManager::checkUpdate() curl_easy_setopt(_curl, CURLOPT_NOSIGNAL, 1L); curl_easy_setopt(_curl, CURLOPT_LOW_SPEED_LIMIT, LOW_SPEED_LIMIT); curl_easy_setopt(_curl, CURLOPT_LOW_SPEED_TIME, LOW_SPEED_TIME); + curl_easy_setopt(_curl, CURLOPT_FOLLOWLOCATION, 1 ); res = curl_easy_perform(_curl); if (res != 0) @@ -209,6 +210,8 @@ void AssetsManager::downloadAndUncompress() if (! uncompress()) { Director::getInstance()->getScheduler()->performFunctionInCocosThread([&, this]{ + UserDefault::getInstance()->setStringForKey(this->keyOfDownloadedVersion().c_str(),""); + UserDefault::getInstance()->flush(); if (this->_delegate) this->_delegate->onError(ErrorCode::UNCOMPRESS); }); @@ -525,6 +528,7 @@ bool AssetsManager::downLoad() curl_easy_setopt(_curl, CURLOPT_NOSIGNAL, 1L); curl_easy_setopt(_curl, CURLOPT_LOW_SPEED_LIMIT, LOW_SPEED_LIMIT); curl_easy_setopt(_curl, CURLOPT_LOW_SPEED_TIME, LOW_SPEED_TIME); + curl_easy_setopt(_curl, CURLOPT_FOLLOWLOCATION, 1 ); res = curl_easy_perform(_curl); curl_easy_cleanup(_curl); diff --git a/extensions/assets-manager/AssetsManager.h b/extensions/assets-manager/AssetsManager.h index e37ee4b3d9..7032d381a7 100644 --- a/extensions/assets-manager/AssetsManager.h +++ b/extensions/assets-manager/AssetsManager.h @@ -31,6 +31,7 @@ #include "cocos2d.h" #include "extensions/ExtensionMacros.h" +#include "extensions/ExtensionExport.h" NS_CC_EXT_BEGIN @@ -41,7 +42,7 @@ class AssetsManagerDelegateProtocol; * The updated package should be a zip file. And there should be a file named * version in the server, which contains version code. */ -class AssetsManager : public Node +class CC_EX_DLL AssetsManager : public Node { public: enum class ErrorCode diff --git a/extensions/physics-nodes/CCPhysicsDebugNode.h b/extensions/physics-nodes/CCPhysicsDebugNode.h index 390f24bfaa..16c0f56400 100644 --- a/extensions/physics-nodes/CCPhysicsDebugNode.h +++ b/extensions/physics-nodes/CCPhysicsDebugNode.h @@ -25,6 +25,7 @@ #include "extensions/ExtensionMacros.h" #include "2d/CCDrawNode.h" +#include "extensions/ExtensionExport.h" struct cpSpace; @@ -40,7 +41,7 @@ NS_CC_EXT_BEGIN @since v2.1 */ -class PhysicsDebugNode : public DrawNode +class CC_EX_DLL PhysicsDebugNode : public DrawNode { public: diff --git a/extensions/physics-nodes/CCPhysicsSprite.h b/extensions/physics-nodes/CCPhysicsSprite.h index fa1f0489d0..33f48a20b0 100644 --- a/extensions/physics-nodes/CCPhysicsSprite.h +++ b/extensions/physics-nodes/CCPhysicsSprite.h @@ -25,6 +25,7 @@ #include "2d/CCSprite.h" #include "extensions/ExtensionMacros.h" +#include "extensions/ExtensionExport.h" struct cpBody; class b2Body; @@ -43,7 +44,7 @@ NS_CC_EXT_BEGIN - If you update the rotation or position manually, the physics body will be updated - You can't enble both Chipmunk support and Box2d support at the same time. Only one can be enabled at compile time */ -class PhysicsSprite : public Sprite +class CC_EX_DLL PhysicsSprite : public Sprite { public: diff --git a/extensions/proj.win32/libExtensions.vcxproj b/extensions/proj.win32/libextension.vcxproj similarity index 84% rename from extensions/proj.win32/libExtensions.vcxproj rename to extensions/proj.win32/libextension.vcxproj index b3a911b84e..a1023d1184 100644 --- a/extensions/proj.win32/libExtensions.vcxproj +++ b/extensions/proj.win32/libextension.vcxproj @@ -12,12 +12,13 @@ {21B2C324-891F-48EA-AD1A-5AE13DE12E28} - Extensions.win32 + libextension.win32 Win32Proj + libextension - StaticLibrary + DynamicLibrary Unicode v100 v110 @@ -26,7 +27,7 @@ v120_xp - StaticLibrary + DynamicLibrary Unicode v100 v110 @@ -69,7 +70,7 @@ Disabled $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(EngineRoot);$(EngineRoot)cocos\audio\include;$(EngineRoot)external;$(EngineRoot)external\unzip;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\curl\include\win32;$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\libwebsockets\win32\include;$(EngineRoot)external\win32-specific\zlib\include;..\;%(AdditionalIncludeDirectories) - WIN32;_WINDOWS;_DEBUG;_LIB;COCOS2D_DEBUG=1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_WINDOWS;_DEBUG;COCOS2D_DEBUG=1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_USREXDLL;%(PreprocessorDefinitions) false EnableFastChecks MultiThreadedDebugDLL @@ -80,13 +81,21 @@ 4267;4251;4244;%(DisableSpecificWarnings) true + + libcocos2d.lib + $(OutDir);%(AdditionalLibraryDirectories) + + + $(OutDir);%(AdditionalLibraryDirectories) + libcocos2d.lib;opengl32.lib;glew32.lib;libcurl_imp.lib;libchipmunk.lib;libBox2D.lib;glfw3.lib;%(AdditionalDependencies) + MinSpace true $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(EngineRoot);$(EngineRoot)cocos\audio\include;$(EngineRoot)external;$(EngineRoot)external\unzip;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\curl\include\win32;$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\libwebsockets\win32\include;$(EngineRoot)external\win32-specific\zlib\include;..\;%(AdditionalIncludeDirectories) - WIN32;_WINDOWS;NDEBUG;_LIB;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_WINDOWS;NDEBUG;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_USREXDLL;%(PreprocessorDefinitions) MultiThreadedDLL true @@ -97,6 +106,10 @@ true false + + $(OutDir);%(AdditionalLibraryDirectories) + libcocos2d.lib;opengl32.lib;glew32.lib;libcurl_imp.lib;libchipmunk.lib;libBox2D.lib;glfw3.lib;%(AdditionalDependencies) + @@ -123,6 +136,7 @@ + @@ -148,6 +162,14 @@ + + + {98a51ba8-fc3a-415b-ac8f-8c7bd464e93e} + + + {929480e7-23c0-4df6-8456-096d71547116} + + diff --git a/extensions/proj.win32/libExtensions.vcxproj.filters b/extensions/proj.win32/libextension.vcxproj.filters similarity index 99% rename from extensions/proj.win32/libExtensions.vcxproj.filters rename to extensions/proj.win32/libextension.vcxproj.filters index fe37d0def2..fcad0bd423 100644 --- a/extensions/proj.win32/libExtensions.vcxproj.filters +++ b/extensions/proj.win32/libextension.vcxproj.filters @@ -157,5 +157,6 @@ physics_nodes + \ No newline at end of file diff --git a/cocos/scripting/lua-bindings/proj.win32/liblua.vcxproj.user b/extensions/proj.win32/libextension.vcxproj.user similarity index 100% rename from cocos/scripting/lua-bindings/proj.win32/liblua.vcxproj.user rename to extensions/proj.win32/libextension.vcxproj.user diff --git a/external/Box2D/proj.win32/Box2D.vcxproj b/external/Box2D/proj.win32/libbox2d.vcxproj similarity index 99% rename from external/Box2D/proj.win32/Box2D.vcxproj rename to external/Box2D/proj.win32/libbox2d.vcxproj index 8193b38dff..188b960501 100644 --- a/external/Box2D/proj.win32/Box2D.vcxproj +++ b/external/Box2D/proj.win32/libbox2d.vcxproj @@ -11,9 +11,9 @@ - libBox2D + libbox2d {929480E7-23C0-4DF6-8456-096D71547116} - Box2D.win32 + libbox2d.win32 Win32Proj diff --git a/external/Box2D/proj.win32/Box2D.vcxproj.filters b/external/Box2D/proj.win32/libbox2d.vcxproj.filters similarity index 100% rename from external/Box2D/proj.win32/Box2D.vcxproj.filters rename to external/Box2D/proj.win32/libbox2d.vcxproj.filters diff --git a/external/config.json b/external/config.json index 4fd1120e81..9448062a1d 100644 --- a/external/config.json +++ b/external/config.json @@ -1,6 +1,9 @@ { - "version":"v3-deps-5", - "zip_file_size":"57171285", + "version":"v3-deps-7", + "zip_file_size":"67964573", "repo_name":"cocos2d-x-3rd-party-libs-bin", - "repo_parent":"https://github.com/cocos2d/" + "repo_parent":"https://github.com/cocos2d/", + "move_dirs":{ + "fbx-conv":"tools" + } } diff --git a/external/missing-files.txt b/external/missing-files.txt new file mode 100644 index 0000000000..f2904b550f --- /dev/null +++ b/external/missing-files.txt @@ -0,0 +1,8 @@ +Git user attention + +Please execute “download-deps.py” to download and install dependencies. + + $ cd cocos2d-x + $ python download-deps.py + +Please execute download-deps.py once you synchronize with this repo. If there aren't any updates, it will not download dependencies again. diff --git a/licenses/LICENSE_spine.txt b/licenses/LICENSE_spine.txt new file mode 100644 index 0000000000..b7df802e2e --- /dev/null +++ b/licenses/LICENSE_spine.txt @@ -0,0 +1,33 @@ +/****************************************************************************** + * Spine Runtime Software License - Version 1.1 + * + * Copyright (c) 2013, Esoteric Software + * All rights reserved. + * + * Redistribution and use in source and binary forms in whole or in part, with + * or without modification, are permitted provided that the following conditions + * are met: + * + * 1. A Spine Essential, Professional, Enterprise, or Education License must + * be purchased from Esoteric Software and the license must remain valid: + * http://esotericsoftware.com/ + * 2. Redistributions of source code must retain this license, which is the + * above copyright notice, this declaration of conditions and the following + * disclaimer. + * 3. Redistributions in binary form must reproduce this license, which is the + * above copyright notice, this declaration of conditions and the following + * disclaimer, in the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + *****************************************************************************/ + diff --git a/setup.py b/setup.py index 08ca197bdb..e5fec47e9f 100755 --- a/setup.py +++ b/setup.py @@ -557,7 +557,7 @@ class SetEnvVar(object): if ret is not None: print(" ->Path " + ret + " was found\n") else: - print(" ->Command " + ret + " not found\n") + print(" ->Command " + cmd + " not found\n") return ret def _find_value_from_sys(self, var_name): diff --git a/templates/cocos2dx_files.json b/templates/cocos2dx_files.json index 5859854630..c1e45b22d8 100644 --- a/templates/cocos2dx_files.json +++ b/templates/cocos2dx_files.json @@ -6,8 +6,6 @@ "README.md", "build/BuildHelpers.CMakeLists.txt", "build/android-build.py", - "build/build-mingw32-clang-make.sh", - "build/build-mingw32-gcc-make.sh", "build/cocos2d-win32.vc2012.sln", "build/cocos2d-wp8.vc2012.sln", "build/cocos2d_libs.xcodeproj/project.pbxproj", @@ -147,6 +145,8 @@ "cocos/2d/CCParticleSystemQuad.h", "cocos/2d/CCProgressTimer.cpp", "cocos/2d/CCProgressTimer.h", + "cocos/2d/CCProtectedNode.cpp", + "cocos/2d/CCProtectedNode.h", "cocos/2d/CCRenderTexture.cpp", "cocos/2d/CCRenderTexture.h", "cocos/2d/CCScene.cpp", @@ -180,8 +180,7 @@ "cocos/2d/CCTweenFunction.cpp", "cocos/2d/CCTweenFunction.h", "cocos/2d/CMakeLists.txt", - "cocos/2d/cocos2d.vcxproj", - "cocos/2d/cocos2d.vcxproj.filters", + "cocos/2d/cocos2d.def", "cocos/2d/cocos2d_headers.props", "cocos/2d/cocos2d_winrt.props", "cocos/2d/cocos2d_winrt.vcxproj", @@ -191,12 +190,20 @@ "cocos/2d/cocos2d_wp8.vcxproj.filters", "cocos/2d/cocos2d_wp8_headers.props", "cocos/2d/cocos2dx.props", + "cocos/2d/libcocos2d.vcxproj", + "cocos/2d/libcocos2d.vcxproj.filters", + "cocos/3d/3dExport.h", + "cocos/3d/Android.mk", + "cocos/3d/CCAABB.cpp", + "cocos/3d/CCAABB.h", "cocos/3d/CCAnimate3D.cpp", "cocos/3d/CCAnimate3D.h", "cocos/3d/CCAnimation3D.cpp", "cocos/3d/CCAnimation3D.h", "cocos/3d/CCAnimationCurve.h", "cocos/3d/CCAnimationCurve.inl", + "cocos/3d/CCAttachNode.cpp", + "cocos/3d/CCAttachNode.h", "cocos/3d/CCBundle3D.cpp", "cocos/3d/CCBundle3D.h", "cocos/3d/CCBundle3DData.h", @@ -206,13 +213,27 @@ "cocos/3d/CCMesh.h", "cocos/3d/CCMeshSkin.cpp", "cocos/3d/CCMeshSkin.h", + "cocos/3d/CCOBB.cpp", + "cocos/3d/CCOBB.h", "cocos/3d/CCObjLoader.cpp", "cocos/3d/CCObjLoader.h", + "cocos/3d/CCRay.cpp", + "cocos/3d/CCRay.h", + "cocos/3d/CCSkeleton3D.cpp", + "cocos/3d/CCSkeleton3D.h", "cocos/3d/CCSprite3D.cpp", "cocos/3d/CCSprite3D.h", "cocos/3d/CCSprite3DMaterial.cpp", "cocos/3d/CCSprite3DMaterial.h", + "cocos/3d/CCSubMesh.cpp", + "cocos/3d/CCSubMesh.h", + "cocos/3d/CCSubMeshState.cpp", + "cocos/3d/CCSubMeshState.h", "cocos/3d/CMakeLists.txt", + "cocos/3d/cocos3d.h", + "cocos/3d/proj.win32/libcocos3d.vcxproj", + "cocos/3d/proj.win32/libcocos3d.vcxproj.filters", + "cocos/3d/proj.win32/libcocos3d.vcxproj.user", "cocos/Android.mk", "cocos/CMakeLists.txt", "cocos/audio/CMakeLists.txt", @@ -253,9 +274,9 @@ "cocos/audio/openal/OpenALDecoder.cpp", "cocos/audio/openal/OpenALDecoder.h", "cocos/audio/openal/SimpleAudioEngineOpenAL.cpp", - "cocos/audio/proj.win32/CocosDenshion.vcxproj", - "cocos/audio/proj.win32/CocosDenshion.vcxproj.filters", - "cocos/audio/proj.win32/CocosDenshion.vcxproj.user", + "cocos/audio/proj.win32/libcocosdenshion.vcxproj", + "cocos/audio/proj.win32/libcocosdenshion.vcxproj.filters", + "cocos/audio/proj.win32/libcocosdenshion.vcxproj.user", "cocos/audio/proj.wp8/CocosDenshion.vcxproj", "cocos/audio/proj.wp8/CocosDenshion.vcxproj.filters", "cocos/audio/proj.wp8/CocosDenshion.vcxproj.user", @@ -274,6 +295,8 @@ "cocos/audio/wp8/SimpleAudioEngine.cpp", "cocos/base/CCAutoreleasePool.cpp", "cocos/base/CCAutoreleasePool.h", + "cocos/base/CCCamera.cpp", + "cocos/base/CCCamera.h", "cocos/base/CCConfiguration.cpp", "cocos/base/CCConfiguration.h", "cocos/base/CCConsole.cpp", @@ -328,6 +351,8 @@ "cocos/base/CCIMEDispatcher.cpp", "cocos/base/CCIMEDispatcher.h", "cocos/base/CCMap.h", + "cocos/base/CCModuleManager.cpp", + "cocos/base/CCModuleManager.h", "cocos/base/CCNS.cpp", "cocos/base/CCNS.h", "cocos/base/CCPlatformConfig.h", @@ -368,6 +393,8 @@ "cocos/base/ccFPSImages.c", "cocos/base/ccFPSImages.h", "cocos/base/ccMacros.h", + "cocos/base/ccRandom.cpp", + "cocos/base/ccRandom.h", "cocos/base/ccTypes.cpp", "cocos/base/ccTypes.h", "cocos/base/ccUTF8.cpp", @@ -377,6 +404,8 @@ "cocos/base/etc1.cpp", "cocos/base/etc1.h", "cocos/base/firePngData.h", + "cocos/base/pvr.cpp", + "cocos/base/pvr.h", "cocos/base/s3tc.cpp", "cocos/base/s3tc.h", "cocos/base/uthash.h", @@ -452,9 +481,9 @@ "cocos/editor-support/cocosbuilder/CCSpriteLoader.h", "cocos/editor-support/cocosbuilder/CMakeLists.txt", "cocos/editor-support/cocosbuilder/CocosBuilder.h", - "cocos/editor-support/cocosbuilder/proj.win32/libCocosBuilder.vcxproj", "cocos/editor-support/cocosbuilder/proj.win32/libCocosBuilder.vcxproj.filters", "cocos/editor-support/cocosbuilder/proj.win32/libCocosBuilder.vcxproj.user", + "cocos/editor-support/cocosbuilder/proj.win32/libcocosbuilder.vcxproj", "cocos/editor-support/cocosbuilder/proj.wp8/libCocosBuilder.vcxproj", "cocos/editor-support/cocosbuilder/proj.wp8/libCocosBuilder.vcxproj.filters", "cocos/editor-support/cocosbuilder/proj.wp8/libCocosBuilder.vcxproj.user", @@ -537,6 +566,7 @@ "cocos/editor-support/cocostudio/CocoLoader.cpp", "cocos/editor-support/cocostudio/CocoLoader.h", "cocos/editor-support/cocostudio/CocoStudio.h", + "cocos/editor-support/cocostudio/CocosStudioExport.h", "cocos/editor-support/cocostudio/DictionaryHelper.cpp", "cocos/editor-support/cocostudio/DictionaryHelper.h", "cocos/editor-support/cocostudio/TriggerBase.cpp", @@ -574,9 +604,9 @@ "cocos/editor-support/cocostudio/WidgetReader/WidgetReader.cpp", "cocos/editor-support/cocostudio/WidgetReader/WidgetReader.h", "cocos/editor-support/cocostudio/WidgetReader/WidgetReaderProtocol.h", - "cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj", - "cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj.filters", - "cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj.user", + "cocos/editor-support/cocostudio/proj.win32/libcocostudio.vcxproj", + "cocos/editor-support/cocostudio/proj.win32/libcocostudio.vcxproj.filters", + "cocos/editor-support/cocostudio/proj.win32/libcocostudio.vcxproj.user", "cocos/editor-support/cocostudio/proj.wp8/libCocosStudio.vcxproj", "cocos/editor-support/cocostudio/proj.wp8/libCocosStudio.vcxproj.filters", "cocos/editor-support/cocostudio/proj.wp8/libCocosStudio.vcxproj.user", @@ -683,9 +713,9 @@ "cocos/network/SocketIO.h", "cocos/network/WebSocket.cpp", "cocos/network/WebSocket.h", - "cocos/network/proj.win32/libNetwork.vcxproj", - "cocos/network/proj.win32/libNetwork.vcxproj.filters", - "cocos/network/proj.win32/libNetwork.vcxproj.user", + "cocos/network/proj.win32/libnetwork.vcxproj", + "cocos/network/proj.win32/libnetwork.vcxproj.filters", + "cocos/network/proj.win32/libnetwork.vcxproj.user", "cocos/network/proj.wp8/libNetwork.vcxproj", "cocos/network/proj.wp8/libNetwork.vcxproj.filters", "cocos/physics/CCPhysicsBody.cpp", @@ -715,8 +745,8 @@ "cocos/platform/CCDevice.h", "cocos/platform/CCFileUtils.cpp", "cocos/platform/CCFileUtils.h", - "cocos/platform/CCGLViewProtocol.cpp", - "cocos/platform/CCGLViewProtocol.h", + "cocos/platform/CCGLView.cpp", + "cocos/platform/CCGLView.h", "cocos/platform/CCImage.cpp", "cocos/platform/CCImage.h", "cocos/platform/CCSAXParser.cpp", @@ -732,8 +762,8 @@ "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/CCGLViewImpl.cpp", + "cocos/platform/android/CCGLViewImpl.h", "cocos/platform/android/CCPlatformDefine.h", "cocos/platform/android/CCStdC.h", "cocos/platform/android/ControllerManualAdapter/.classpath", @@ -802,8 +832,8 @@ "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/desktop/CCGLViewImpl.cpp", + "cocos/platform/desktop/CCGLViewImpl.h", "cocos/platform/ios/CCApplication.h", "cocos/platform/ios/CCApplication.mm", "cocos/platform/ios/CCCommon.mm", @@ -816,8 +846,8 @@ "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/CCGLViewImpl.h", + "cocos/platform/ios/CCGLViewImpl.mm", "cocos/platform/ios/CCImage.mm", "cocos/platform/ios/CCPlatformDefine.h", "cocos/platform/ios/CCStdC.h", @@ -859,8 +889,8 @@ "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/CCGLViewImpl.cpp", + "cocos/platform/winrt/CCGLViewImpl.h", "cocos/platform/winrt/CCGL_Angle.h", "cocos/platform/winrt/CCPThreadWinRT.cpp", "cocos/platform/winrt/CCPThreadWinRT.h", @@ -904,8 +934,8 @@ "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/CCGLViewImpl.cpp", + "cocos/platform/wp8/CCGLViewImpl.h", "cocos/platform/wp8/Direct3DBase.cpp", "cocos/platform/wp8/Direct3DBase.h", "cocos/platform/wp8/DirectXBase.cpp", @@ -929,6 +959,10 @@ "cocos/renderer/CCGroupCommand.h", "cocos/renderer/CCMeshCommand.cpp", "cocos/renderer/CCMeshCommand.h", + "cocos/renderer/CCPrimitive.cpp", + "cocos/renderer/CCPrimitive.h", + "cocos/renderer/CCPrimitiveCommand.cpp", + "cocos/renderer/CCPrimitiveCommand.h", "cocos/renderer/CCQuadCommand.cpp", "cocos/renderer/CCQuadCommand.h", "cocos/renderer/CCRenderCommand.cpp", @@ -942,6 +976,10 @@ "cocos/renderer/CCTextureAtlas.h", "cocos/renderer/CCTextureCache.cpp", "cocos/renderer/CCTextureCache.h", + "cocos/renderer/CCVertexIndexBuffer.cpp", + "cocos/renderer/CCVertexIndexBuffer.h", + "cocos/renderer/CCVertexIndexData.cpp", + "cocos/renderer/CCVertexIndexData.h", "cocos/renderer/CMakeLists.txt", "cocos/renderer/ccGLStateCache.cpp", "cocos/renderer/ccGLStateCache.h", @@ -977,18 +1015,14 @@ "cocos/storage/local-storage/LocalStorage.cpp", "cocos/storage/local-storage/LocalStorage.h", "cocos/storage/local-storage/LocalStorageAndroid.cpp", - "cocos/storage/local-storage/proj.win32/libLocalStorage.vcxproj", - "cocos/storage/local-storage/proj.win32/libLocalStorage.vcxproj.filters", - "cocos/storage/local-storage/proj.win32/libLocalStorage.vcxproj.user", "cocos/storage/local-storage/proj.wp8/libLocalStorage.vcxproj", "cocos/storage/local-storage/proj.wp8/libLocalStorage.vcxproj.filters", "cocos/ui/Android.mk", - "cocos/ui/CCProtectedNode.cpp", - "cocos/ui/CCProtectedNode.h", "cocos/ui/CMakeLists.txt", "cocos/ui/CocosGUI.cpp", "cocos/ui/CocosGUI.h", "cocos/ui/GUIDefine.h", + "cocos/ui/GUIExport.h", "cocos/ui/UIButton.cpp", "cocos/ui/UIButton.h", "cocos/ui/UICheckBox.cpp", @@ -1017,6 +1051,8 @@ "cocos/ui/UIRelativeBox.h", "cocos/ui/UIRichText.cpp", "cocos/ui/UIRichText.h", + "cocos/ui/UIScale9Sprite.cpp", + "cocos/ui/UIScale9Sprite.h", "cocos/ui/UIScrollView.cpp", "cocos/ui/UIScrollView.h", "cocos/ui/UISlider.cpp", @@ -1036,9 +1072,9 @@ "cocos/ui/UIVideoPlayerIOS.mm", "cocos/ui/UIWidget.cpp", "cocos/ui/UIWidget.h", - "cocos/ui/proj.win32/libGUI.vcxproj", - "cocos/ui/proj.win32/libGUI.vcxproj.filters", - "cocos/ui/proj.win32/libGUI.vcxproj.user", + "cocos/ui/proj.win32/libui.vcxproj", + "cocos/ui/proj.win32/libui.vcxproj.filters", + "cocos/ui/proj.win32/libui.vcxproj.user", "cocos/ui/proj.wp8/libGUI.vcxproj", "cocos/ui/proj.wp8/libGUI.vcxproj.filters", "docs/CODING_STYLE.md", @@ -1050,6 +1086,7 @@ "download-deps.py", "extensions/Android.mk", "extensions/CMakeLists.txt", + "extensions/ExtensionExport.h", "extensions/ExtensionMacros.h", "extensions/GUI/CCControlExtension/CCControl.cpp", "extensions/GUI/CCControlExtension/CCControl.h", @@ -1105,9 +1142,9 @@ "extensions/physics-nodes/CCPhysicsSprite.h", "extensions/proj.win32/Win32InputBox.cpp", "extensions/proj.win32/Win32InputBox.h", - "extensions/proj.win32/libExtensions.vcxproj", - "extensions/proj.win32/libExtensions.vcxproj.filters", - "extensions/proj.win32/libExtensions.vcxproj.user", + "extensions/proj.win32/libextension.vcxproj", + "extensions/proj.win32/libextension.vcxproj.filters", + "extensions/proj.win32/libextension.vcxproj.user", "extensions/proj.wp8/libExtensions.vcxproj", "extensions/proj.wp8/libExtensions.vcxproj.filters", "extensions/proj.wp8/pch.cpp", @@ -1207,8 +1244,8 @@ "external/Box2D/Dynamics/b2WorldCallbacks.h", "external/Box2D/Rope/b2Rope.cpp", "external/Box2D/Rope/b2Rope.h", - "external/Box2D/proj.win32/Box2D.vcxproj", - "external/Box2D/proj.win32/Box2D.vcxproj.filters", + "external/Box2D/proj.win32/libbox2d.vcxproj", + "external/Box2D/proj.win32/libbox2d.vcxproj.filters", "external/Box2D/proj.wp8/Box2D.vcxproj", "external/Box2D/proj.wp8/Box2D.vcxproj.filters", "external/ConvertUTF/ConvertUTF.c", @@ -2018,6 +2055,7 @@ "external/linux-specific/fmod/prebuilt/64-bit/libfmodex64.so", "external/linux-specific/fmod/prebuilt/64-bit/libfmodexL64-4.38.00.so", "external/linux-specific/fmod/prebuilt/64-bit/libfmodexL64.so", + "external/missing-files.txt", "external/nslog/CCNSLog.h", "external/nslog/ios/CCNSLog.mm", "external/nslog/ios/LoggerClient.h", @@ -2267,6 +2305,7 @@ "licenses/LICENSE_llvm.txt", "licenses/LICENSE_lua.txt", "licenses/LICENSE_ogg_vorbis.txt", + "licenses/LICENSE_spine.txt", "licenses/LICENSE_tolua++.txt", "licenses/LICENSE_unicode.txt", "licenses/LICENSE_zlib.txt", @@ -3551,10 +3590,19 @@ "plugin/tools/toolsForPublish/checkEnvironment.sh", "plugin/tools/toolsForPublish/genPrebuildMK.sh", "plugin/tools/toolsForPublish/publishPlugin.sh", + "tools/fbx-conv/README.md", + "tools/fbx-conv/mac/fbx-conv", + "tools/fbx-conv/mac/libfbxsdk.dylib", + "tools/gen-prebuilt/README.md", + "tools/gen-prebuilt/build_config.json", + "tools/gen-prebuilt/excopy.py", + "tools/gen-prebuilt/gen_prebuilt_libs.py", + "tools/gen-prebuilt/module_config.json", + "tools/gen-prebuilt/module_organize.py", + "tools/missing-tools.txt", "tools/particle/convert_YCoordFlipped.py" ], "lua": [ - "cocos/scripting/lua-bindings/Android.mk", "cocos/scripting/lua-bindings/CMakeLists.txt", "cocos/scripting/lua-bindings/auto/api/Action.lua", "cocos/scripting/lua-bindings/auto/api/ActionCamera.lua", @@ -3590,6 +3638,7 @@ "cocos/scripting/lua-bindings/auto/api/ArmatureDisplayData.lua", "cocos/scripting/lua-bindings/auto/api/AssetsManager.lua", "cocos/scripting/lua-bindings/auto/api/AtlasNode.lua", + "cocos/scripting/lua-bindings/auto/api/AttachNode.lua", "cocos/scripting/lua-bindings/auto/api/BaseData.lua", "cocos/scripting/lua-bindings/auto/api/BatchNode.lua", "cocos/scripting/lua-bindings/auto/api/BezierBy.lua", @@ -3601,6 +3650,7 @@ "cocos/scripting/lua-bindings/auto/api/CCBAnimationManager.lua", "cocos/scripting/lua-bindings/auto/api/CCBReader.lua", "cocos/scripting/lua-bindings/auto/api/CallFunc.lua", + "cocos/scripting/lua-bindings/auto/api/Camera.lua", "cocos/scripting/lua-bindings/auto/api/CardinalSplineBy.lua", "cocos/scripting/lua-bindings/auto/api/CardinalSplineTo.lua", "cocos/scripting/lua-bindings/auto/api/CatmullRomBy.lua", @@ -3711,7 +3761,7 @@ "cocos/scripting/lua-bindings/auto/api/GLProgramCache.lua", "cocos/scripting/lua-bindings/auto/api/GLProgramState.lua", "cocos/scripting/lua-bindings/auto/api/GLView.lua", - "cocos/scripting/lua-bindings/auto/api/GLViewProtocol.lua", + "cocos/scripting/lua-bindings/auto/api/GLViewImpl.lua", "cocos/scripting/lua-bindings/auto/api/GUIReader.lua", "cocos/scripting/lua-bindings/auto/api/Grid3D.lua", "cocos/scripting/lua-bindings/auto/api/Grid3DAction.lua", @@ -3841,6 +3891,7 @@ "cocos/scripting/lua-bindings/auto/api/ShuffleTiles.lua", "cocos/scripting/lua-bindings/auto/api/SimpleAudioEngine.lua", "cocos/scripting/lua-bindings/auto/api/Skeleton.lua", + "cocos/scripting/lua-bindings/auto/api/Skeleton3D.lua", "cocos/scripting/lua-bindings/auto/api/SkeletonAnimation.lua", "cocos/scripting/lua-bindings/auto/api/SkewBy.lua", "cocos/scripting/lua-bindings/auto/api/SkewFrame.lua", @@ -3858,6 +3909,7 @@ "cocos/scripting/lua-bindings/auto/api/SpriteFrame.lua", "cocos/scripting/lua-bindings/auto/api/SpriteFrameCache.lua", "cocos/scripting/lua-bindings/auto/api/StopGrid.lua", + "cocos/scripting/lua-bindings/auto/api/SubMeshState.lua", "cocos/scripting/lua-bindings/auto/api/TMXLayer.lua", "cocos/scripting/lua-bindings/auto/api/TMXLayerInfo.lua", "cocos/scripting/lua-bindings/auto/api/TMXMapInfo.lua", @@ -3933,7 +3985,10 @@ "cocos/scripting/lua-bindings/auto/api/WavesTiles3D.lua", "cocos/scripting/lua-bindings/auto/api/Widget.lua", "cocos/scripting/lua-bindings/auto/api/ZOrderFrame.lua", + "cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_3d_auto_api.lua", "cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_auto_api.lua", + "cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_cocosbuilder_auto_api.lua", + "cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_cocosdenshion_auto_api.lua", "cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_controller_auto_api.lua", "cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_experimental_auto_api.lua", "cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_experimental_video_auto_api.lua", @@ -3942,8 +3997,14 @@ "cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_spine_auto_api.lua", "cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_studio_auto_api.lua", "cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_ui_auto_api.lua", + "cocos/scripting/lua-bindings/auto/lua_cocos2dx_3d_auto.cpp", + "cocos/scripting/lua-bindings/auto/lua_cocos2dx_3d_auto.hpp", "cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp", "cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp", + "cocos/scripting/lua-bindings/auto/lua_cocos2dx_cocosbuilder_auto.cpp", + "cocos/scripting/lua-bindings/auto/lua_cocos2dx_cocosbuilder_auto.hpp", + "cocos/scripting/lua-bindings/auto/lua_cocos2dx_cocosdenshion_auto.cpp", + "cocos/scripting/lua-bindings/auto/lua_cocos2dx_cocosdenshion_auto.hpp", "cocos/scripting/lua-bindings/auto/lua_cocos2dx_controller_auto.cpp", "cocos/scripting/lua-bindings/auto/lua_cocos2dx_controller_auto.hpp", "cocos/scripting/lua-bindings/auto/lua_cocos2dx_experimental_auto.cpp", @@ -3960,8 +4021,8 @@ "cocos/scripting/lua-bindings/auto/lua_cocos2dx_studio_auto.hpp", "cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.cpp", "cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.hpp", - "cocos/scripting/lua-bindings/manual/CCBProxy.cpp", - "cocos/scripting/lua-bindings/manual/CCBProxy.h", + "cocos/scripting/lua-bindings/manual/3d/lua_cocos2dx_3d_manual.cpp", + "cocos/scripting/lua-bindings/manual/3d/lua_cocos2dx_3d_manual.h", "cocos/scripting/lua-bindings/manual/CCLuaBridge.cpp", "cocos/scripting/lua-bindings/manual/CCLuaBridge.h", "cocos/scripting/lua-bindings/manual/CCLuaEngine.cpp", @@ -3974,72 +4035,113 @@ "cocos/scripting/lua-bindings/manual/Cocos2dxLuaLoader.h", "cocos/scripting/lua-bindings/manual/LuaBasicConversions.cpp", "cocos/scripting/lua-bindings/manual/LuaBasicConversions.h", - "cocos/scripting/lua-bindings/manual/LuaOpengl.cpp", - "cocos/scripting/lua-bindings/manual/LuaOpengl.h", - "cocos/scripting/lua-bindings/manual/LuaScriptHandlerMgr.cpp", - "cocos/scripting/lua-bindings/manual/LuaScriptHandlerMgr.h", - "cocos/scripting/lua-bindings/manual/LuaSkeletonAnimation.cpp", - "cocos/scripting/lua-bindings/manual/LuaSkeletonAnimation.h", - "cocos/scripting/lua-bindings/manual/Lua_web_socket.cpp", - "cocos/scripting/lua-bindings/manual/Lua_web_socket.h", - "cocos/scripting/lua-bindings/manual/lua_cocos2dx_coco_studio_manual.cpp", - "cocos/scripting/lua-bindings/manual/lua_cocos2dx_coco_studio_manual.hpp", - "cocos/scripting/lua-bindings/manual/lua_cocos2dx_controller_manual.cpp", - "cocos/scripting/lua-bindings/manual/lua_cocos2dx_controller_manual.hpp", - "cocos/scripting/lua-bindings/manual/lua_cocos2dx_deprecated.cpp", - "cocos/scripting/lua-bindings/manual/lua_cocos2dx_deprecated.h", - "cocos/scripting/lua-bindings/manual/lua_cocos2dx_experimental_manual.cpp", - "cocos/scripting/lua-bindings/manual/lua_cocos2dx_experimental_manual.hpp", - "cocos/scripting/lua-bindings/manual/lua_cocos2dx_experimental_video_manual.cpp", - "cocos/scripting/lua-bindings/manual/lua_cocos2dx_experimental_video_manual.hpp", - "cocos/scripting/lua-bindings/manual/lua_cocos2dx_extension_manual.cpp", - "cocos/scripting/lua-bindings/manual/lua_cocos2dx_extension_manual.h", - "cocos/scripting/lua-bindings/manual/lua_cocos2dx_manual.cpp", - "cocos/scripting/lua-bindings/manual/lua_cocos2dx_manual.hpp", - "cocos/scripting/lua-bindings/manual/lua_cocos2dx_physics_manual.cpp", - "cocos/scripting/lua-bindings/manual/lua_cocos2dx_physics_manual.hpp", - "cocos/scripting/lua-bindings/manual/lua_cocos2dx_spine_manual.cpp", - "cocos/scripting/lua-bindings/manual/lua_cocos2dx_spine_manual.hpp", - "cocos/scripting/lua-bindings/manual/lua_cocos2dx_ui_manual.cpp", - "cocos/scripting/lua-bindings/manual/lua_cocos2dx_ui_manual.hpp", - "cocos/scripting/lua-bindings/manual/lua_debugger.c", - "cocos/scripting/lua-bindings/manual/lua_debugger.h", - "cocos/scripting/lua-bindings/manual/lua_extensions.c", - "cocos/scripting/lua-bindings/manual/lua_extensions.h", - "cocos/scripting/lua-bindings/manual/lua_xml_http_request.cpp", - "cocos/scripting/lua-bindings/manual/lua_xml_http_request.h", + "cocos/scripting/lua-bindings/manual/cocos2d/LuaOpengl.cpp", + "cocos/scripting/lua-bindings/manual/cocos2d/LuaOpengl.h", + "cocos/scripting/lua-bindings/manual/cocos2d/LuaScriptHandlerMgr.cpp", + "cocos/scripting/lua-bindings/manual/cocos2d/LuaScriptHandlerMgr.h", + "cocos/scripting/lua-bindings/manual/cocos2d/lua_cocos2dx_deprecated.cpp", + "cocos/scripting/lua-bindings/manual/cocos2d/lua_cocos2dx_deprecated.h", + "cocos/scripting/lua-bindings/manual/cocos2d/lua_cocos2dx_experimental_manual.cpp", + "cocos/scripting/lua-bindings/manual/cocos2d/lua_cocos2dx_experimental_manual.hpp", + "cocos/scripting/lua-bindings/manual/cocos2d/lua_cocos2dx_manual.cpp", + "cocos/scripting/lua-bindings/manual/cocos2d/lua_cocos2dx_manual.hpp", + "cocos/scripting/lua-bindings/manual/cocos2d/lua_cocos2dx_physics_manual.cpp", + "cocos/scripting/lua-bindings/manual/cocos2d/lua_cocos2dx_physics_manual.hpp", + "cocos/scripting/lua-bindings/manual/cocosbuilder/CCBProxy.cpp", + "cocos/scripting/lua-bindings/manual/cocosbuilder/CCBProxy.h", + "cocos/scripting/lua-bindings/manual/cocosbuilder/lua_cocos2dx_cocosbuilder_manual.cpp", + "cocos/scripting/lua-bindings/manual/cocosbuilder/lua_cocos2dx_cocosbuilder_manual.h", + "cocos/scripting/lua-bindings/manual/cocosdenshion/lua_cocos2dx_cocosdenshion_manual.cpp", + "cocos/scripting/lua-bindings/manual/cocosdenshion/lua_cocos2dx_cocosdenshion_manual.h", + "cocos/scripting/lua-bindings/manual/cocostudio/lua_cocos2dx_coco_studio_manual.cpp", + "cocos/scripting/lua-bindings/manual/cocostudio/lua_cocos2dx_coco_studio_manual.hpp", + "cocos/scripting/lua-bindings/manual/controller/lua_cocos2dx_controller_manual.cpp", + "cocos/scripting/lua-bindings/manual/controller/lua_cocos2dx_controller_manual.hpp", + "cocos/scripting/lua-bindings/manual/extension/lua_cocos2dx_extension_manual.cpp", + "cocos/scripting/lua-bindings/manual/extension/lua_cocos2dx_extension_manual.h", + "cocos/scripting/lua-bindings/manual/network/Lua_web_socket.cpp", + "cocos/scripting/lua-bindings/manual/network/Lua_web_socket.h", + "cocos/scripting/lua-bindings/manual/network/lua_cocos2dx_network_manual.cpp", + "cocos/scripting/lua-bindings/manual/network/lua_cocos2dx_network_manual.h", + "cocos/scripting/lua-bindings/manual/network/lua_extensions.c", + "cocos/scripting/lua-bindings/manual/network/lua_extensions.h", + "cocos/scripting/lua-bindings/manual/network/lua_xml_http_request.cpp", + "cocos/scripting/lua-bindings/manual/network/lua_xml_http_request.h", "cocos/scripting/lua-bindings/manual/platform/android/CCLuaJavaBridge.cpp", "cocos/scripting/lua-bindings/manual/platform/android/CCLuaJavaBridge.h", "cocos/scripting/lua-bindings/manual/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxLuaJavaBridge.cpp", "cocos/scripting/lua-bindings/manual/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxLuaJavaBridge.h", "cocos/scripting/lua-bindings/manual/platform/ios/CCLuaObjcBridge.h", "cocos/scripting/lua-bindings/manual/platform/ios/CCLuaObjcBridge.mm", + "cocos/scripting/lua-bindings/manual/spine/LuaSkeletonAnimation.cpp", + "cocos/scripting/lua-bindings/manual/spine/LuaSkeletonAnimation.h", + "cocos/scripting/lua-bindings/manual/spine/lua_cocos2dx_spine_manual.cpp", + "cocos/scripting/lua-bindings/manual/spine/lua_cocos2dx_spine_manual.hpp", "cocos/scripting/lua-bindings/manual/tolua_fix.cpp", "cocos/scripting/lua-bindings/manual/tolua_fix.h", + "cocos/scripting/lua-bindings/manual/ui/lua_cocos2dx_experimental_video_manual.cpp", + "cocos/scripting/lua-bindings/manual/ui/lua_cocos2dx_experimental_video_manual.hpp", + "cocos/scripting/lua-bindings/manual/ui/lua_cocos2dx_ui_manual.cpp", + "cocos/scripting/lua-bindings/manual/ui/lua_cocos2dx_ui_manual.hpp", + "cocos/scripting/lua-bindings/manual/video/lua_cocos2dx_experimental_video_manual.cpp", + "cocos/scripting/lua-bindings/manual/video/lua_cocos2dx_experimental_video_manual.hpp", + "cocos/scripting/lua-bindings/proj.android/Android.mk", "cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/project.pbxproj", - "cocos/scripting/lua-bindings/proj.win32/liblua.vcxproj", - "cocos/scripting/lua-bindings/proj.win32/liblua.vcxproj.filters", - "cocos/scripting/lua-bindings/proj.win32/liblua.vcxproj.user", - "cocos/scripting/lua-bindings/script/AudioEngine.lua", - "cocos/scripting/lua-bindings/script/CCBReaderLoad.lua", - "cocos/scripting/lua-bindings/script/CocoStudio.lua", - "cocos/scripting/lua-bindings/script/Cocos2d.lua", - "cocos/scripting/lua-bindings/script/Cocos2dConstants.lua", - "cocos/scripting/lua-bindings/script/Deprecated.lua", - "cocos/scripting/lua-bindings/script/DeprecatedClass.lua", - "cocos/scripting/lua-bindings/script/DeprecatedEnum.lua", - "cocos/scripting/lua-bindings/script/DeprecatedOpenglEnum.lua", - "cocos/scripting/lua-bindings/script/DrawPrimitives.lua", - "cocos/scripting/lua-bindings/script/GuiConstants.lua", - "cocos/scripting/lua-bindings/script/Opengl.lua", - "cocos/scripting/lua-bindings/script/OpenglConstants.lua", - "cocos/scripting/lua-bindings/script/StudioConstants.lua", - "cocos/scripting/lua-bindings/script/bitExtend.lua", - "cocos/scripting/lua-bindings/script/experimentalConstants.lua", - "cocos/scripting/lua-bindings/script/extern.lua", - "cocos/scripting/lua-bindings/script/json.lua", - "cocos/scripting/lua-bindings/script/luaj.lua", - "cocos/scripting/lua-bindings/script/luaoc.lua", + "cocos/scripting/lua-bindings/proj.win32/libluacocos2d.vcxproj", + "cocos/scripting/lua-bindings/proj.win32/libluacocos2d.vcxproj.filters", + "cocos/scripting/lua-bindings/proj.win32/libluacocos3d.vcxproj", + "cocos/scripting/lua-bindings/proj.win32/libluacocos3d.vcxproj.filters", + "cocos/scripting/lua-bindings/proj.win32/libluacocos3d.vcxproj.user", + "cocos/scripting/lua-bindings/proj.win32/libluacocosbuilder.vcxproj", + "cocos/scripting/lua-bindings/proj.win32/libluacocosbuilder.vcxproj.filters", + "cocos/scripting/lua-bindings/proj.win32/libluacocosdenshion.vcxproj", + "cocos/scripting/lua-bindings/proj.win32/libluacocosdenshion.vcxproj.filters", + "cocos/scripting/lua-bindings/proj.win32/libluacocostudio.vcxproj", + "cocos/scripting/lua-bindings/proj.win32/libluacocostudio.vcxproj.filters", + "cocos/scripting/lua-bindings/proj.win32/libluaextension.vcxproj", + "cocos/scripting/lua-bindings/proj.win32/libluaextension.vcxproj.filters", + "cocos/scripting/lua-bindings/proj.win32/libluanetwork.vcxproj", + "cocos/scripting/lua-bindings/proj.win32/libluanetwork.vcxproj.filters", + "cocos/scripting/lua-bindings/proj.win32/libluaspine.vcxproj", + "cocos/scripting/lua-bindings/proj.win32/libluaspine.vcxproj.filters", + "cocos/scripting/lua-bindings/proj.win32/libluaui.vcxproj", + "cocos/scripting/lua-bindings/proj.win32/libluaui.vcxproj.filters", + "cocos/scripting/lua-bindings/script/cocos2d/Cocos2d.lua", + "cocos/scripting/lua-bindings/script/cocos2d/Cocos2dConstants.lua", + "cocos/scripting/lua-bindings/script/cocos2d/DeprecatedCocos2dClass.lua", + "cocos/scripting/lua-bindings/script/cocos2d/DeprecatedCocos2dEnum.lua", + "cocos/scripting/lua-bindings/script/cocos2d/DeprecatedCocos2dFunc.lua", + "cocos/scripting/lua-bindings/script/cocos2d/DeprecatedOpenglEnum.lua", + "cocos/scripting/lua-bindings/script/cocos2d/DrawPrimitives.lua", + "cocos/scripting/lua-bindings/script/cocos2d/Opengl.lua", + "cocos/scripting/lua-bindings/script/cocos2d/OpenglConstants.lua", + "cocos/scripting/lua-bindings/script/cocos2d/bitExtend.lua", + "cocos/scripting/lua-bindings/script/cocos2d/extern.lua", + "cocos/scripting/lua-bindings/script/cocos2d/json.lua", + "cocos/scripting/lua-bindings/script/cocos2d/luaj.lua", + "cocos/scripting/lua-bindings/script/cocos2d/luaoc.lua", + "cocos/scripting/lua-bindings/script/cocosbuilder/CCBReaderLoad.lua", + "cocos/scripting/lua-bindings/script/cocosbuilder/DeprecatedCocosBuilderClass.lua", + "cocos/scripting/lua-bindings/script/cocosdenshion/AudioEngine.lua", + "cocos/scripting/lua-bindings/script/cocosdenshion/DeprecatedCocosDenshionClass.lua", + "cocos/scripting/lua-bindings/script/cocosdenshion/DeprecatedCocosDenshionFunc.lua", + "cocos/scripting/lua-bindings/script/cocostudio/CocoStudio.lua", + "cocos/scripting/lua-bindings/script/cocostudio/DeprecatedCocoStudioClass.lua", + "cocos/scripting/lua-bindings/script/cocostudio/DeprecatedCocoStudioFunc.lua", + "cocos/scripting/lua-bindings/script/cocostudio/StudioConstants.lua", + "cocos/scripting/lua-bindings/script/controller/ControllerConstants.lua", + "cocos/scripting/lua-bindings/script/extension/DeprecatedExtensionClass.lua", + "cocos/scripting/lua-bindings/script/extension/DeprecatedExtensionEnum.lua", + "cocos/scripting/lua-bindings/script/extension/DeprecatedExtensionFunc.lua", + "cocos/scripting/lua-bindings/script/extension/ExtensionConstants.lua", + "cocos/scripting/lua-bindings/script/network/DeprecatedNetworkClass.lua", + "cocos/scripting/lua-bindings/script/network/DeprecatedNetworkEnum.lua", + "cocos/scripting/lua-bindings/script/network/DeprecatedNetworkFunc.lua", + "cocos/scripting/lua-bindings/script/network/NetworkConstants.lua", + "cocos/scripting/lua-bindings/script/ui/DeprecatedUIEnum.lua", + "cocos/scripting/lua-bindings/script/ui/DeprecatedUIFunc.lua", + "cocos/scripting/lua-bindings/script/ui/GuiConstants.lua", + "cocos/scripting/lua-bindings/script/ui/experimentalUIConstants.lua", "external/lua/lua/CMakeLists.txt", "external/lua/lua/lapi.c", "external/lua/lua/lapi.h", @@ -4420,6 +4522,9 @@ "tools/bindings-generator/tools/win32/cygwin1.dll", "tools/tolua/README.mdown", "tools/tolua/cocos2dx.ini", + "tools/tolua/cocos2dx_3d.ini", + "tools/tolua/cocos2dx_cocosbuilder.ini", + "tools/tolua/cocos2dx_cocosdenshion.ini", "tools/tolua/cocos2dx_controller.ini", "tools/tolua/cocos2dx_experimental.ini", "tools/tolua/cocos2dx_experimental_video.ini", diff --git a/templates/cpp-template-default/CMakeLists.txt b/templates/cpp-template-default/CMakeLists.txt index cfc1fb578e..1f709e0d8f 100644 --- a/templates/cpp-template-default/CMakeLists.txt +++ b/templates/cpp-template-default/CMakeLists.txt @@ -57,16 +57,16 @@ endif() if( UNIX ) #assume linux set(GAME_SRC proj.linux/main.cpp - Classes/AppDelegate.cpp - Classes/HelloWorldScene.cpp + src/AppDelegate.cpp + src/HelloWorldScene.cpp ) elseif ( WIN32 ) set(GAME_SRC proj.win32/main.cpp proj.win32/main.h proj.win32/resource.h - Classes/AppDelegate.cpp - Classes/HelloWorldScene.cpp + src/AppDelegate.cpp + src/HelloWorldScene.cpp ) endif() @@ -189,6 +189,18 @@ add_subdirectory(${COCOS2D_ROOT}/external/xxhash) # cocos2d add_subdirectory(${COCOS2D_ROOT}/cocos) +# cocos3d library +add_subdirectory(${COCOS2D_ROOT}/cocos/3d) + +# network library +add_subdirectory(${COCOS2D_ROOT}/cocos/network) + +# ui library +add_subdirectory(${COCOS2D_ROOT}/cocos/ui) + +# sqlite3 library +add_subdirectory(${COCOS2D_ROOT}/cocos/storage) + # extensions add_subdirectory(${COCOS2D_ROOT}/extensions) @@ -223,11 +235,6 @@ set(FMOD_LIB "fmodex") endif() target_link_libraries(${APP_NAME} - spine - cocostudio - cocosbuilder - extensions - audio cocos2d ) @@ -240,14 +247,14 @@ if ( WIN32 ) #also copying dlls to binary directory for the executable to run pre_build(${APP_NAME} COMMAND ${CMAKE_COMMAND} -E remove_directory ${APP_BIN_DIR}/Resources - COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/Resources ${APP_BIN_DIR}/Resources + COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/res ${APP_BIN_DIR}/Resources COMMAND ${CMAKE_COMMAND} -E copy ${COCOS2D_ROOT}/external/win32-specific/gles/prebuilt/glew32.dll ${APP_BIN_DIR}/${CMAKE_BUILD_TYPE} COMMAND ${CMAKE_COMMAND} -E copy ${COCOS2D_ROOT}/external/win32-specific/zlib/prebuilt/zlib1.dll ${APP_BIN_DIR}/${CMAKE_BUILD_TYPE} ) else() pre_build(${APP_NAME} COMMAND ${CMAKE_COMMAND} -E remove_directory ${APP_BIN_DIR}/Resources - COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/Resources ${APP_BIN_DIR}/Resources + COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/res ${APP_BIN_DIR}/Resources ) endif() diff --git a/templates/cpp-template-default/cocos-project-template.json b/templates/cpp-template-default/cocos-project-template.json index 9d4ee7d291..6002d95fd4 100644 --- a/templates/cpp-template-default/cocos-project-template.json +++ b/templates/cpp-template-default/cocos-project-template.json @@ -27,6 +27,7 @@ "proj.win32/PROJECT_NAME.sln", "proj.win32/main.cpp", "proj.wp8-xaml/App/PROJECT_NAME.csproj", + "proj.wp8-xaml/App/Properties/WMAppManifest.xml", "proj.wp8-xaml/PROJECT_NAME.sln", "proj.android/.project", "proj.android/.cproject", diff --git a/templates/cpp-template-default/proj.android/.project b/templates/cpp-template-default/proj.android/.project index 13490a653a..5b37f94afb 100644 --- a/templates/cpp-template-default/proj.android/.project +++ b/templates/cpp-template-default/proj.android/.project @@ -121,7 +121,7 @@ libcocos2d 2 - PARENT-1-PROJECT_LOC/cocos2d/cocos/2d/platform/android/java/src + PARENT-1-PROJECT_LOC/cocos2d/cocos/platform/android/java/src diff --git a/templates/cpp-template-default/proj.android/build-cfg.json b/templates/cpp-template-default/proj.android/build-cfg.json index 611f232c30..c719dc3cf2 100644 --- a/templates/cpp-template-default/proj.android/build-cfg.json +++ b/templates/cpp-template-default/proj.android/build-cfg.json @@ -6,7 +6,7 @@ ], "copy_resources": [ { - "from": "../Resources", + "from": "../res", "to": "" } ] diff --git a/templates/cpp-template-default/proj.android/build_native.py b/templates/cpp-template-default/proj.android/build_native.py index 97c9f89991..8f231b2478 100755 --- a/templates/cpp-template-default/proj.android/build_native.py +++ b/templates/cpp-template-default/proj.android/build_native.py @@ -114,7 +114,7 @@ def copy_resources(app_android_root): # copy resources os.mkdir(assets_dir) - resources_dir = os.path.join(app_android_root, "../Resources") + resources_dir = os.path.join(app_android_root, "../res") if os.path.isdir(resources_dir): copy_files(resources_dir, assets_dir) diff --git a/templates/cpp-template-default/proj.android/jni/Android.mk b/templates/cpp-template-default/proj.android/jni/Android.mk index cddef45aa8..41be6783d9 100644 --- a/templates/cpp-template-default/proj.android/jni/Android.mk +++ b/templates/cpp-template-default/proj.android/jni/Android.mk @@ -11,13 +11,14 @@ LOCAL_MODULE := cocos2dcpp_shared LOCAL_MODULE_FILENAME := libcocos2dcpp LOCAL_SRC_FILES := hellocpp/main.cpp \ - ../../Classes/AppDelegate.cpp \ - ../../Classes/HelloWorldScene.cpp + ../../src/AppDelegate.cpp \ + ../../src/HelloWorldScene.cpp -LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../Classes +LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../src LOCAL_WHOLE_STATIC_LIBRARIES := cocos2dx_static LOCAL_WHOLE_STATIC_LIBRARIES += cocosdenshion_static +LOCAL_WHOLE_STATIC_LIBRARIES += cocos3d_static # LOCAL_WHOLE_STATIC_LIBRARIES += box2d_static # LOCAL_WHOLE_STATIC_LIBRARIES += cocosbuilder_static @@ -31,6 +32,7 @@ include $(BUILD_SHARED_LIBRARY) $(call import-module,.) $(call import-module,audio/android) +$(call import-module,3d) # $(call import-module,Box2D) # $(call import-module,editor-support/cocosbuilder) 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 15fe6d6f6b..8e2481f6fe 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 @@ -7,21 +7,28 @@ objects = { /* Begin PBXBuildFile section */ + 158C12AB19A1E4DF00781A76 /* libcocos3d iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 158C12AA19A1E4C800781A76 /* libcocos3d iOS.a */; }; + 158C12AE19A1E4FE00781A76 /* libcocos3d Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 158C12A819A1E4C800781A76 /* libcocos3d Mac.a */; }; + 15A6DA93199CFB1100B56DBF /* AppDelegate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15A6DA8F199CFB1100B56DBF /* AppDelegate.cpp */; }; + 15A6DA94199CFB1100B56DBF /* AppDelegate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15A6DA8F199CFB1100B56DBF /* AppDelegate.cpp */; }; + 15A6DA95199CFB1100B56DBF /* HelloWorldScene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15A6DA91199CFB1100B56DBF /* HelloWorldScene.cpp */; }; + 15A6DA96199CFB1100B56DBF /* HelloWorldScene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15A6DA91199CFB1100B56DBF /* HelloWorldScene.cpp */; }; + 15A6DA9B199CFB9800B56DBF /* CloseNormal.png in Resources */ = {isa = PBXBuildFile; fileRef = 15A6DA98199CFB9800B56DBF /* CloseNormal.png */; }; + 15A6DA9C199CFB9800B56DBF /* CloseNormal.png in Resources */ = {isa = PBXBuildFile; fileRef = 15A6DA98199CFB9800B56DBF /* CloseNormal.png */; }; + 15A6DA9D199CFB9800B56DBF /* CloseSelected.png in Resources */ = {isa = PBXBuildFile; fileRef = 15A6DA99199CFB9800B56DBF /* CloseSelected.png */; }; + 15A6DA9E199CFB9800B56DBF /* CloseSelected.png in Resources */ = {isa = PBXBuildFile; fileRef = 15A6DA99199CFB9800B56DBF /* CloseSelected.png */; }; + 15A6DA9F199CFB9800B56DBF /* HelloWorld.png in Resources */ = {isa = PBXBuildFile; fileRef = 15A6DA9A199CFB9800B56DBF /* HelloWorld.png */; }; + 15A6DAA0199CFB9800B56DBF /* HelloWorld.png in Resources */ = {isa = PBXBuildFile; fileRef = 15A6DA9A199CFB9800B56DBF /* HelloWorld.png */; }; 1AC6FB1F180E996B004C840B /* libbox2d Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AC6FAFF180E9839004C840B /* libbox2d Mac.a */; }; 1AC6FB20180E996B004C840B /* libchipmunk Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AC6FAFD180E9839004C840B /* libchipmunk Mac.a */; }; - 1AC6FB21180E996B004C840B /* libcocos2dx Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AC6FAF9180E9839004C840B /* libcocos2dx Mac.a */; }; - 1AC6FB22180E996B004C840B /* libcocos2dx-extensions Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AC6FAFB180E9839004C840B /* libcocos2dx-extensions Mac.a */; }; - 1AC6FB23180E996B004C840B /* libCocosDenshion Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AC6FB01180E9839004C840B /* libCocosDenshion Mac.a */; }; + 1AC6FB21180E996B004C840B /* libcocos2d Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AC6FAF9180E9839004C840B /* libcocos2d Mac.a */; }; + 1AC6FB22180E996B004C840B /* libextension Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AC6FAFB180E9839004C840B /* libextension Mac.a */; }; + 1AC6FB23180E996B004C840B /* libcocosdenshion Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AC6FB01180E9839004C840B /* libcocosdenshion Mac.a */; }; 1AC6FB2E180E99EB004C840B /* libbox2d iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AC6FB0D180E9839004C840B /* libbox2d iOS.a */; }; 1AC6FB2F180E99EB004C840B /* libchipmunk iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AC6FB0B180E9839004C840B /* libchipmunk iOS.a */; }; - 1AC6FB30180E99EB004C840B /* libcocos2dx iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AC6FB07180E9839004C840B /* libcocos2dx iOS.a */; }; - 1AC6FB31180E99EB004C840B /* libcocos2dx-extensions iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AC6FB09180E9839004C840B /* libcocos2dx-extensions iOS.a */; }; - 1AC6FB32180E99EB004C840B /* libCocosDenshion iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AC6FB0F180E9839004C840B /* libCocosDenshion iOS.a */; }; - 1AFAF8B716D35DE700DB1158 /* AppDelegate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AFAF8B316D35DE700DB1158 /* AppDelegate.cpp */; }; - 1AFAF8B816D35DE700DB1158 /* HelloWorldScene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AFAF8B516D35DE700DB1158 /* HelloWorldScene.cpp */; }; - 1AFAF8BC16D35E4900DB1158 /* CloseNormal.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AFAF8B916D35E4900DB1158 /* CloseNormal.png */; }; - 1AFAF8BD16D35E4900DB1158 /* CloseSelected.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AFAF8BA16D35E4900DB1158 /* CloseSelected.png */; }; - 1AFAF8BE16D35E4900DB1158 /* HelloWorld.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AFAF8BB16D35E4900DB1158 /* HelloWorld.png */; }; + 1AC6FB30180E99EB004C840B /* libcocos2d iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AC6FB07180E9839004C840B /* libcocos2d iOS.a */; }; + 1AC6FB31180E99EB004C840B /* libextension iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AC6FB09180E9839004C840B /* libextension iOS.a */; }; + 1AC6FB32180E99EB004C840B /* libcocosdenshion iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AC6FB0F180E9839004C840B /* libcocosdenshion iOS.a */; }; 1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; }; 1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */; }; 288765A50DF7441C002DB57D /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 288765A40DF7441C002DB57D /* CoreGraphics.framework */; }; @@ -32,11 +39,6 @@ 503AE10517EB98FF00D1A890 /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 503AE10317EB98FF00D1A890 /* main.cpp */; }; 503AE11217EB99EE00D1A890 /* libcurl.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 503AE11117EB99EE00D1A890 /* libcurl.dylib */; }; 503AE11B17EB9C5A00D1A890 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 503AE11A17EB9C5A00D1A890 /* IOKit.framework */; }; - 5087E75317EB910900C73F5D /* CloseNormal.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AFAF8B916D35E4900DB1158 /* CloseNormal.png */; }; - 5087E75417EB910900C73F5D /* CloseSelected.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AFAF8BA16D35E4900DB1158 /* CloseSelected.png */; }; - 5087E75517EB910900C73F5D /* HelloWorld.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AFAF8BB16D35E4900DB1158 /* HelloWorld.png */; }; - 5087E75717EB910900C73F5D /* AppDelegate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AFAF8B316D35DE700DB1158 /* AppDelegate.cpp */; }; - 5087E75817EB910900C73F5D /* HelloWorldScene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AFAF8B516D35DE700DB1158 /* HelloWorldScene.cpp */; }; 5087E76317EB910900C73F5D /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; }; 5087E76517EB910900C73F5D /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 288765A40DF7441C002DB57D /* CoreGraphics.framework */; }; 5087E76717EB910900C73F5D /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = BF170DB412928DE900B8313A /* libz.dylib */; }; @@ -72,6 +74,104 @@ /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ + 158C129719A1E4C800781A76 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AC6FAE5180E9839004C840B /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 15162030199E7810006099B8; + remoteInfo = "libcocos3d iOS"; + }; + 158C12A719A1E4C800781A76 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AC6FAE5180E9839004C840B /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 1516200B199E7363006099B8; + remoteInfo = "libcocos3d Mac"; + }; + 158C12A919A1E4C800781A76 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AC6FAE5180E9839004C840B /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 15162201199E7810006099B8; + remoteInfo = "libcocos3d iOS"; + }; + 158C12AC19A1E4EB00781A76 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AC6FAE5180E9839004C840B /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 15161E42199E7362006099B8; + remoteInfo = "libcocos3d Mac"; + }; + 15A6DA7A199CFAFD00B56DBF /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AC6FAE5180E9839004C840B /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = B245F13A19766132001920FD; + remoteInfo = "libui Mac"; + }; + 15A6DA7C199CFAFD00B56DBF /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AC6FAE5180E9839004C840B /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = B2DB484D1976716E00411E16; + remoteInfo = "libcocostudio Mac"; + }; + 15A6DA7E199CFAFD00B56DBF /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AC6FAE5180E9839004C840B /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = B2DB47D2197669A100411E16; + remoteInfo = "libcocosbuilder Mac"; + }; + 15A6DA80199CFAFD00B56DBF /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AC6FAE5180E9839004C840B /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = B2DB490119767F1F00411E16; + remoteInfo = "libspine Mac"; + }; + 15A6DA82199CFAFD00B56DBF /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AC6FAE5180E9839004C840B /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = B2DB49C4197686CB00411E16; + remoteInfo = "libnetwork Mac"; + }; + 15A6DA84199CFAFD00B56DBF /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AC6FAE5180E9839004C840B /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = B24EEA6619775E92004493CC; + remoteInfo = "libui iOS"; + }; + 15A6DA86199CFAFD00B56DBF /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AC6FAE5180E9839004C840B /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = B24EEA6E19775EBB004493CC; + remoteInfo = "libcocostudio iOS"; + }; + 15A6DA88199CFAFD00B56DBF /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AC6FAE5180E9839004C840B /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = B24EEA7619775ECE004493CC; + remoteInfo = "libcocosbuilder iOS"; + }; + 15A6DA8A199CFAFD00B56DBF /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AC6FAE5180E9839004C840B /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = B24EEA7E19775EE1004493CC; + remoteInfo = "libspine iOS"; + }; + 15A6DA8C199CFAFD00B56DBF /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AC6FAE5180E9839004C840B /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = B24EEA8619775EF3004493CC; + remoteInfo = "libnetwork iOS"; + }; 1AC6FAF8180E9839004C840B /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 1AC6FAE5180E9839004C840B /* cocos2d_libs.xcodeproj */; @@ -107,20 +207,6 @@ remoteGlobalIDString = A03F2ED617814268006731B9; remoteInfo = "CocosDenshion Mac"; }; - 1AC6FB02180E9839004C840B /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 1AC6FAE5180E9839004C840B /* cocos2d_libs.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = A03F31FD1781479B006731B9; - remoteInfo = "jsbindings Mac"; - }; - 1AC6FB04180E9839004C840B /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 1AC6FAE5180E9839004C840B /* cocos2d_libs.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 1A6FB53017854BC300CDF010; - remoteInfo = "luabindings Mac"; - }; 1AC6FB06180E9839004C840B /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 1AC6FAE5180E9839004C840B /* cocos2d_libs.xcodeproj */; @@ -156,20 +242,6 @@ remoteGlobalIDString = A07A4FB4178387730073F6A7; remoteInfo = "CocosDenshion iOS"; }; - 1AC6FB10180E9839004C840B /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 1AC6FAE5180E9839004C840B /* cocos2d_libs.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = A07A5030178387750073F6A7; - remoteInfo = "jsbindings iOS"; - }; - 1AC6FB12180E9839004C840B /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 1AC6FAE5180E9839004C840B /* cocos2d_libs.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 1A119791178526AA00D62A44; - remoteInfo = "luabindings iOS"; - }; 1AC6FB15180E9959004C840B /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 1AC6FAE5180E9839004C840B /* cocos2d_libs.xcodeproj */; @@ -243,15 +315,15 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ + 15A6DA8F199CFB1100B56DBF /* AppDelegate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AppDelegate.cpp; path = ../src/AppDelegate.cpp; sourceTree = ""; }; + 15A6DA90199CFB1100B56DBF /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = ../src/AppDelegate.h; sourceTree = ""; }; + 15A6DA91199CFB1100B56DBF /* HelloWorldScene.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = HelloWorldScene.cpp; path = ../src/HelloWorldScene.cpp; sourceTree = ""; }; + 15A6DA92199CFB1100B56DBF /* HelloWorldScene.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HelloWorldScene.h; path = ../src/HelloWorldScene.h; sourceTree = ""; }; + 15A6DA98199CFB9800B56DBF /* CloseNormal.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = CloseNormal.png; path = ../res/CloseNormal.png; sourceTree = ""; }; + 15A6DA99199CFB9800B56DBF /* CloseSelected.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = CloseSelected.png; path = ../res/CloseSelected.png; sourceTree = ""; }; + 15A6DA9A199CFB9800B56DBF /* HelloWorld.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = HelloWorld.png; path = ../res/HelloWorld.png; sourceTree = ""; }; 1AC6FAE5180E9839004C840B /* cocos2d_libs.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = cocos2d_libs.xcodeproj; path = ../cocos2d/build/cocos2d_libs.xcodeproj; sourceTree = ""; }; 1ACB3243164770DE00914215 /* libcurl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcurl.a; path = ../../cocos2dx/platform/third_party/ios/libraries/libcurl.a; sourceTree = ""; }; - 1AFAF8B316D35DE700DB1158 /* AppDelegate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AppDelegate.cpp; path = ../Classes/AppDelegate.cpp; sourceTree = ""; }; - 1AFAF8B416D35DE700DB1158 /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = ../Classes/AppDelegate.h; sourceTree = ""; }; - 1AFAF8B516D35DE700DB1158 /* HelloWorldScene.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = HelloWorldScene.cpp; path = ../Classes/HelloWorldScene.cpp; sourceTree = ""; }; - 1AFAF8B616D35DE700DB1158 /* HelloWorldScene.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HelloWorldScene.h; path = ../Classes/HelloWorldScene.h; sourceTree = ""; }; - 1AFAF8B916D35E4900DB1158 /* CloseNormal.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = CloseNormal.png; sourceTree = ""; }; - 1AFAF8BA16D35E4900DB1158 /* CloseSelected.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = CloseSelected.png; sourceTree = ""; }; - 1AFAF8BB16D35E4900DB1158 /* HelloWorld.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = HelloWorld.png; sourceTree = ""; }; 1D30AB110D05D00D00671497 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; 1D6058910D05DD3D006BFB54 /* HelloCpp iOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "HelloCpp iOS.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; @@ -302,11 +374,12 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 158C12AB19A1E4DF00781A76 /* libcocos3d iOS.a in Frameworks */, 1AC6FB2E180E99EB004C840B /* libbox2d iOS.a in Frameworks */, 1AC6FB2F180E99EB004C840B /* libchipmunk iOS.a in Frameworks */, - 1AC6FB30180E99EB004C840B /* libcocos2dx iOS.a in Frameworks */, - 1AC6FB31180E99EB004C840B /* libcocos2dx-extensions iOS.a in Frameworks */, - 1AC6FB32180E99EB004C840B /* libCocosDenshion iOS.a in Frameworks */, + 1AC6FB30180E99EB004C840B /* libcocos2d iOS.a in Frameworks */, + 1AC6FB31180E99EB004C840B /* libextension iOS.a in Frameworks */, + 1AC6FB32180E99EB004C840B /* libcocosdenshion iOS.a in Frameworks */, D6B0611B1803AB670077942B /* CoreMotion.framework in Frameworks */, 1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */, 1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */, @@ -324,11 +397,12 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 158C12AE19A1E4FE00781A76 /* libcocos3d Mac.a in Frameworks */, 1AC6FB1F180E996B004C840B /* libbox2d Mac.a in Frameworks */, 1AC6FB20180E996B004C840B /* libchipmunk Mac.a in Frameworks */, - 1AC6FB21180E996B004C840B /* libcocos2dx Mac.a in Frameworks */, - 1AC6FB22180E996B004C840B /* libcocos2dx-extensions Mac.a in Frameworks */, - 1AC6FB23180E996B004C840B /* libCocosDenshion Mac.a in Frameworks */, + 1AC6FB21180E996B004C840B /* libcocos2d Mac.a in Frameworks */, + 1AC6FB22180E996B004C840B /* libextension Mac.a in Frameworks */, + 1AC6FB23180E996B004C840B /* libcocosdenshion Mac.a in Frameworks */, 503AE11217EB99EE00D1A890 /* libcurl.dylib in Frameworks */, 5087E76717EB910900C73F5D /* libz.dylib in Frameworks */, 503AE11B17EB9C5A00D1A890 /* IOKit.framework in Frameworks */, @@ -361,16 +435,25 @@ path = Classes; sourceTree = ""; }; - 15AA9C4015B7EC450033D6C2 /* Classes */ = { + 15A6DA8E199CFB0100B56DBF /* src */ = { isa = PBXGroup; children = ( - 1AFAF8B316D35DE700DB1158 /* AppDelegate.cpp */, - 1AFAF8B416D35DE700DB1158 /* AppDelegate.h */, - 1AFAF8B516D35DE700DB1158 /* HelloWorldScene.cpp */, - 1AFAF8B616D35DE700DB1158 /* HelloWorldScene.h */, + 15A6DA8F199CFB1100B56DBF /* AppDelegate.cpp */, + 15A6DA90199CFB1100B56DBF /* AppDelegate.h */, + 15A6DA91199CFB1100B56DBF /* HelloWorldScene.cpp */, + 15A6DA92199CFB1100B56DBF /* HelloWorldScene.h */, ); - name = Classes; - path = ../classes; + name = src; + sourceTree = ""; + }; + 15A6DA97199CFB8700B56DBF /* res */ = { + isa = PBXGroup; + children = ( + 15A6DA98199CFB9800B56DBF /* CloseNormal.png */, + 15A6DA99199CFB9800B56DBF /* CloseSelected.png */, + 15A6DA9A199CFB9800B56DBF /* HelloWorld.png */, + ); + name = res; sourceTree = ""; }; 19C28FACFE9D520D11CA2CBB /* Products */ = { @@ -385,20 +468,28 @@ 1AC6FAE6180E9839004C840B /* Products */ = { isa = PBXGroup; children = ( - 1AC6FAF9180E9839004C840B /* libcocos2dx Mac.a */, - 1AC6FAFB180E9839004C840B /* libcocos2dx-extensions Mac.a */, + 1AC6FAF9180E9839004C840B /* libcocos2d Mac.a */, + 1AC6FAFB180E9839004C840B /* libextension Mac.a */, + 15A6DA7B199CFAFD00B56DBF /* libui Mac.a */, + 15A6DA7D199CFAFD00B56DBF /* libcocostudio Mac.a */, + 15A6DA7F199CFAFD00B56DBF /* libcocosbuilder Mac.a */, + 15A6DA81199CFAFD00B56DBF /* libspine Mac.a */, + 15A6DA83199CFAFD00B56DBF /* libnetwork Mac.a */, 1AC6FAFD180E9839004C840B /* libchipmunk Mac.a */, 1AC6FAFF180E9839004C840B /* libbox2d Mac.a */, - 1AC6FB01180E9839004C840B /* libCocosDenshion Mac.a */, - 1AC6FB03180E9839004C840B /* libjsbindings Mac.a */, - 1AC6FB05180E9839004C840B /* libluabindings Mac.a */, - 1AC6FB07180E9839004C840B /* libcocos2dx iOS.a */, - 1AC6FB09180E9839004C840B /* libcocos2dx-extensions iOS.a */, + 1AC6FB01180E9839004C840B /* libcocosdenshion Mac.a */, + 158C12A819A1E4C800781A76 /* libcocos3d Mac.a */, + 1AC6FB07180E9839004C840B /* libcocos2d iOS.a */, + 1AC6FB09180E9839004C840B /* libextension iOS.a */, 1AC6FB0B180E9839004C840B /* libchipmunk iOS.a */, 1AC6FB0D180E9839004C840B /* libbox2d iOS.a */, - 1AC6FB0F180E9839004C840B /* libCocosDenshion iOS.a */, - 1AC6FB11180E9839004C840B /* libjsbindings iOS.a */, - 1AC6FB13180E9839004C840B /* libluabindings iOS.a */, + 1AC6FB0F180E9839004C840B /* libcocosdenshion iOS.a */, + 15A6DA85199CFAFD00B56DBF /* libui iOS.a */, + 15A6DA87199CFAFD00B56DBF /* libcocostudio iOS.a */, + 15A6DA89199CFAFD00B56DBF /* libcocosbuilder iOS.a */, + 15A6DA8B199CFAFD00B56DBF /* libspine iOS.a */, + 15A6DA8D199CFAFD00B56DBF /* libnetwork iOS.a */, + 158C12AA19A1E4C800781A76 /* libcocos3d iOS.a */, ); name = Products; sourceTree = ""; @@ -407,12 +498,12 @@ isa = PBXGroup; children = ( 1AC6FAE5180E9839004C840B /* cocos2d_libs.xcodeproj */, - 15AA9C4015B7EC450033D6C2 /* Classes */, + 15A6DA8E199CFB0100B56DBF /* src */, 29B97323FDCFA39411CA2CEA /* Frameworks */, 080E96DDFE201D6D7F000001 /* ios */, 503AE10617EB990700D1A890 /* mac */, 19C28FACFE9D520D11CA2CBB /* Products */, - 78C7DDAA14EBA5050085D0C2 /* Resources */, + 15A6DA97199CFB8700B56DBF /* res */, ); name = CustomTemplate; sourceTree = ""; @@ -484,17 +575,6 @@ path = ios; sourceTree = SOURCE_ROOT; }; - 78C7DDAA14EBA5050085D0C2 /* Resources */ = { - isa = PBXGroup; - children = ( - 1AFAF8B916D35E4900DB1158 /* CloseNormal.png */, - 1AFAF8BA16D35E4900DB1158 /* CloseSelected.png */, - 1AFAF8BB16D35E4900DB1158 /* HelloWorld.png */, - ); - name = Resources; - path = ../Resources; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -509,6 +589,7 @@ buildRules = ( ); dependencies = ( + 158C129819A1E4C800781A76 /* PBXTargetDependency */, 1AC6FB25180E99E1004C840B /* PBXTargetDependency */, 1AC6FB27180E99E1004C840B /* PBXTargetDependency */, 1AC6FB29180E99E1004C840B /* PBXTargetDependency */, @@ -531,6 +612,7 @@ buildRules = ( ); dependencies = ( + 158C12AD19A1E4EB00781A76 /* PBXTargetDependency */, 1AC6FB1E180E9963004C840B /* PBXTargetDependency */, 1AC6FB16180E9959004C840B /* PBXTargetDependency */, 1AC6FB18180E9959004C840B /* PBXTargetDependency */, @@ -582,17 +664,101 @@ /* End PBXProject section */ /* Begin PBXReferenceProxy section */ - 1AC6FAF9180E9839004C840B /* libcocos2dx Mac.a */ = { + 158C12A819A1E4C800781A76 /* libcocos3d Mac.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; - path = "libcocos2dx Mac.a"; + path = "libcocos3d Mac.a"; + remoteRef = 158C12A719A1E4C800781A76 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 158C12AA19A1E4C800781A76 /* libcocos3d iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libcocos3d iOS.a"; + remoteRef = 158C12A919A1E4C800781A76 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15A6DA7B199CFAFD00B56DBF /* libui Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libui Mac.a"; + remoteRef = 15A6DA7A199CFAFD00B56DBF /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15A6DA7D199CFAFD00B56DBF /* libcocostudio Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libcocostudio Mac.a"; + remoteRef = 15A6DA7C199CFAFD00B56DBF /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15A6DA7F199CFAFD00B56DBF /* libcocosbuilder Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libcocosbuilder Mac.a"; + remoteRef = 15A6DA7E199CFAFD00B56DBF /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15A6DA81199CFAFD00B56DBF /* libspine Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libspine Mac.a"; + remoteRef = 15A6DA80199CFAFD00B56DBF /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15A6DA83199CFAFD00B56DBF /* libnetwork Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libnetwork Mac.a"; + remoteRef = 15A6DA82199CFAFD00B56DBF /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15A6DA85199CFAFD00B56DBF /* libui iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libui iOS.a"; + remoteRef = 15A6DA84199CFAFD00B56DBF /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15A6DA87199CFAFD00B56DBF /* libcocostudio iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libcocostudio iOS.a"; + remoteRef = 15A6DA86199CFAFD00B56DBF /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15A6DA89199CFAFD00B56DBF /* libcocosbuilder iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libcocosbuilder iOS.a"; + remoteRef = 15A6DA88199CFAFD00B56DBF /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15A6DA8B199CFAFD00B56DBF /* libspine iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libspine iOS.a"; + remoteRef = 15A6DA8A199CFAFD00B56DBF /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15A6DA8D199CFAFD00B56DBF /* libnetwork iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libnetwork iOS.a"; + remoteRef = 15A6DA8C199CFAFD00B56DBF /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 1AC6FAF9180E9839004C840B /* libcocos2d Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libcocos2d Mac.a"; remoteRef = 1AC6FAF8180E9839004C840B /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 1AC6FAFB180E9839004C840B /* libcocos2dx-extensions Mac.a */ = { + 1AC6FAFB180E9839004C840B /* libextension Mac.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; - path = "libcocos2dx-extensions Mac.a"; + path = "libextension Mac.a"; remoteRef = 1AC6FAFA180E9839004C840B /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -610,38 +776,24 @@ remoteRef = 1AC6FAFE180E9839004C840B /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 1AC6FB01180E9839004C840B /* libCocosDenshion Mac.a */ = { + 1AC6FB01180E9839004C840B /* libcocosdenshion Mac.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; - path = "libCocosDenshion Mac.a"; + path = "libcocosdenshion Mac.a"; remoteRef = 1AC6FB00180E9839004C840B /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 1AC6FB03180E9839004C840B /* libjsbindings Mac.a */ = { + 1AC6FB07180E9839004C840B /* libcocos2d iOS.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; - path = "libjsbindings Mac.a"; - remoteRef = 1AC6FB02180E9839004C840B /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 1AC6FB05180E9839004C840B /* libluabindings Mac.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libluabindings Mac.a"; - remoteRef = 1AC6FB04180E9839004C840B /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 1AC6FB07180E9839004C840B /* libcocos2dx iOS.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libcocos2dx iOS.a"; + path = "libcocos2d iOS.a"; remoteRef = 1AC6FB06180E9839004C840B /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 1AC6FB09180E9839004C840B /* libcocos2dx-extensions iOS.a */ = { + 1AC6FB09180E9839004C840B /* libextension iOS.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; - path = "libcocos2dx-extensions iOS.a"; + path = "libextension iOS.a"; remoteRef = 1AC6FB08180E9839004C840B /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -659,27 +811,13 @@ remoteRef = 1AC6FB0C180E9839004C840B /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 1AC6FB0F180E9839004C840B /* libCocosDenshion iOS.a */ = { + 1AC6FB0F180E9839004C840B /* libcocosdenshion iOS.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; - path = "libCocosDenshion iOS.a"; + path = "libcocosdenshion iOS.a"; remoteRef = 1AC6FB0E180E9839004C840B /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 1AC6FB11180E9839004C840B /* libjsbindings iOS.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libjsbindings iOS.a"; - remoteRef = 1AC6FB10180E9839004C840B /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 1AC6FB13180E9839004C840B /* libluabindings iOS.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libluabindings iOS.a"; - remoteRef = 1AC6FB12180E9839004C840B /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; /* End PBXReferenceProxy section */ /* Begin PBXResourcesBuildPhase section */ @@ -688,23 +826,23 @@ buildActionMask = 2147483647; files = ( 5087E78117EB970100C73F5D /* Icon-120.png in Resources */, + 15A6DA9F199CFB9800B56DBF /* HelloWorld.png in Resources */, 5087E78617EB970100C73F5D /* Icon-76.png in Resources */, 5087E77F17EB970100C73F5D /* Default@2x.png in Resources */, 50EF629917ECD46A001EB2F8 /* Icon-100.png in Resources */, - 1AFAF8BC16D35E4900DB1158 /* CloseNormal.png in Resources */, 5087E78317EB970100C73F5D /* Icon-152.png in Resources */, + 15A6DA9D199CFB9800B56DBF /* CloseSelected.png in Resources */, 5087E77D17EB970100C73F5D /* Default-568h@2x.png in Resources */, 5087E78517EB970100C73F5D /* Icon-72.png in Resources */, - 1AFAF8BD16D35E4900DB1158 /* CloseSelected.png in Resources */, 50EF62A317ECD613001EB2F8 /* Icon-50.png in Resources */, 5087E78017EB970100C73F5D /* Icon-114.png in Resources */, - 1AFAF8BE16D35E4900DB1158 /* HelloWorld.png in Resources */, 50EF62A217ECD613001EB2F8 /* Icon-29.png in Resources */, 50EF629617ECD46A001EB2F8 /* Icon-40.png in Resources */, 5087E78217EB970100C73F5D /* Icon-144.png in Resources */, 50EF629817ECD46A001EB2F8 /* Icon-80.png in Resources */, 5087E78417EB970100C73F5D /* Icon-57.png in Resources */, 5087E77E17EB970100C73F5D /* Default.png in Resources */, + 15A6DA9B199CFB9800B56DBF /* CloseNormal.png in Resources */, 50EF629717ECD46A001EB2F8 /* Icon-58.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -713,10 +851,10 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 5087E75317EB910900C73F5D /* CloseNormal.png in Resources */, 503AE0F817EB97AB00D1A890 /* Icon.icns in Resources */, - 5087E75417EB910900C73F5D /* CloseSelected.png in Resources */, - 5087E75517EB910900C73F5D /* HelloWorld.png in Resources */, + 15A6DAA0199CFB9800B56DBF /* HelloWorld.png in Resources */, + 15A6DA9C199CFB9800B56DBF /* CloseNormal.png in Resources */, + 15A6DA9E199CFB9800B56DBF /* CloseSelected.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -727,11 +865,11 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + 15A6DA93199CFB1100B56DBF /* AppDelegate.cpp in Sources */, + 15A6DA95199CFB1100B56DBF /* HelloWorldScene.cpp in Sources */, 503AE10017EB989F00D1A890 /* AppController.mm in Sources */, 503AE10217EB989F00D1A890 /* RootViewController.mm in Sources */, - 1AFAF8B716D35DE700DB1158 /* AppDelegate.cpp in Sources */, 503AE10117EB989F00D1A890 /* main.m in Sources */, - 1AFAF8B816D35DE700DB1158 /* HelloWorldScene.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -739,15 +877,25 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 5087E75717EB910900C73F5D /* AppDelegate.cpp in Sources */, - 5087E75817EB910900C73F5D /* HelloWorldScene.cpp in Sources */, + 15A6DA94199CFB1100B56DBF /* AppDelegate.cpp in Sources */, 503AE10517EB98FF00D1A890 /* main.cpp in Sources */, + 15A6DA96199CFB1100B56DBF /* HelloWorldScene.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ + 158C129819A1E4C800781A76 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libcocos3d iOS"; + targetProxy = 158C129719A1E4C800781A76 /* PBXContainerItemProxy */; + }; + 158C12AD19A1E4EB00781A76 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libcocos3d Mac"; + targetProxy = 158C12AC19A1E4EB00781A76 /* PBXContainerItemProxy */; + }; 1AC6FB16180E9959004C840B /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = "cocos2dx Mac"; diff --git a/templates/cpp-template-default/proj.ios_mac/ios/AppController.mm b/templates/cpp-template-default/proj.ios_mac/ios/AppController.mm index 94f112f4ca..897519c84c 100644 --- a/templates/cpp-template-default/proj.ios_mac/ios/AppController.mm +++ b/templates/cpp-template-default/proj.ios_mac/ios/AppController.mm @@ -74,7 +74,7 @@ static AppDelegate s_sharedApplication; [[UIApplication sharedApplication] setStatusBarHidden:true]; // IMPORTANT: Setting the GLView should be done after creating the RootViewController - cocos2d::GLView *glview = cocos2d::GLView::createWithEAGLView(eaglView); + cocos2d::GLView *glview = cocos2d::GLViewImpl::createWithEAGLView(eaglView); cocos2d::Director::getInstance()->setOpenGLView(glview); cocos2d::Application::getInstance()->run(); diff --git a/templates/cpp-template-default/proj.ios_mac/ios/RootViewController.mm b/templates/cpp-template-default/proj.ios_mac/ios/RootViewController.mm index c6e23901b4..1c56c06631 100644 --- a/templates/cpp-template-default/proj.ios_mac/ios/RootViewController.mm +++ b/templates/cpp-template-default/proj.ios_mac/ios/RootViewController.mm @@ -72,7 +72,7 @@ - (void)didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation { [super didRotateFromInterfaceOrientation:fromInterfaceOrientation]; - cocos2d::GLView *glview = cocos2d::Director::getInstance()->getOpenGLView(); + auto glview = cocos2d::Director::getInstance()->getOpenGLView(); if (glview) { diff --git a/templates/cpp-template-default/proj.linux/main.cpp b/templates/cpp-template-default/proj.linux/main.cpp index c5b735da78..529445638b 100644 --- a/templates/cpp-template-default/proj.linux/main.cpp +++ b/templates/cpp-template-default/proj.linux/main.cpp @@ -1,4 +1,4 @@ -#include "../Classes/AppDelegate.h" +#include "../src/AppDelegate.h" #include #include diff --git a/templates/cpp-template-default/proj.win32/HelloCpp.sln b/templates/cpp-template-default/proj.win32/HelloCpp.sln index b4dca4c0f5..7aafa75920 100644 --- a/templates/cpp-template-default/proj.win32/HelloCpp.sln +++ b/templates/cpp-template-default/proj.win32/HelloCpp.sln @@ -5,14 +5,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HelloCpp", "HelloCpp.vcxpro ProjectSection(ProjectDependencies) = postProject {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E} = {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E} {207BC7A9-CCF1-4F2F-A04D-45F72242AE25} = {207BC7A9-CCF1-4F2F-A04D-45F72242AE25} - {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6} = {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos2d", "..\cocos2d\cocos\2d\cocos2d.vcxproj", "{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos2d", "..\cocos2d\cocos\2d\libcocos2d.vcxproj", "{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libchipmunk", "..\cocos2d\external\chipmunk\proj.win32\chipmunk.vcxproj", "{207BC7A9-CCF1-4F2F-A04D-45F72242AE25}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libAudio", "..\cocos2d\cocos\audio\proj.win32\CocosDenshion.vcxproj", "{F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos3d", "..\cocos2d\cocos\3d\proj.win32\libcocos3d.vcxproj", "{E24950FA-5BC1-4AEE-A900-4F0259354BF0}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -32,10 +31,10 @@ Global {207BC7A9-CCF1-4F2F-A04D-45F72242AE25}.Debug|Win32.Build.0 = Debug|Win32 {207BC7A9-CCF1-4F2F-A04D-45F72242AE25}.Release|Win32.ActiveCfg = Release|Win32 {207BC7A9-CCF1-4F2F-A04D-45F72242AE25}.Release|Win32.Build.0 = Release|Win32 - {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}.Debug|Win32.ActiveCfg = Debug|Win32 - {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}.Debug|Win32.Build.0 = Debug|Win32 - {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}.Release|Win32.ActiveCfg = Release|Win32 - {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}.Release|Win32.Build.0 = Release|Win32 + {E24950FA-5BC1-4AEE-A900-4F0259354BF0}.Debug|Win32.ActiveCfg = Debug|Win32 + {E24950FA-5BC1-4AEE-A900-4F0259354BF0}.Debug|Win32.Build.0 = Debug|Win32 + {E24950FA-5BC1-4AEE-A900-4F0259354BF0}.Release|Win32.ActiveCfg = Release|Win32 + {E24950FA-5BC1-4AEE-A900-4F0259354BF0}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/templates/cpp-template-default/proj.win32/HelloCpp.vcxproj b/templates/cpp-template-default/proj.win32/HelloCpp.vcxproj index e29153ca14..d1e3d869a2 100644 --- a/templates/cpp-template-default/proj.win32/HelloCpp.vcxproj +++ b/templates/cpp-template-default/proj.win32/HelloCpp.vcxproj @@ -23,6 +23,8 @@ v100 v110 v110_xp + v120 + v120_xp Application @@ -30,6 +32,8 @@ v100 v110 v110_xp + v120 + v120_xp @@ -69,7 +73,7 @@ Disabled - $(EngineRoot)cocos\audio\include;$(EngineRoot)external;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;..\Classes;..;%(AdditionalIncludeDirectories) + $(EngineRoot)cocos\audio\include;$(EngineRoot)external;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;..\src;..;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USE_MATH_DEFINES;GL_GLEXT_PROTOTYPES;CC_ENABLE_CHIPMUNK_INTEGRATION=1;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) false EnableFastChecks @@ -102,7 +106,7 @@ xcopy /Y /Q "$(EngineRoot)external\websockets\prebuilt\win32\*.*" "$(OutDir)" MaxSpeed true - $(EngineRoot)cocos\audio\include;$(EngineRoot)external;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;..\Classes;..;%(AdditionalIncludeDirectories) + $(EngineRoot)cocos\audio\include;$(EngineRoot)external;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;..\src;..;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USE_MATH_DEFINES;GL_GLEXT_PROTOTYPES;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreadedDLL true @@ -133,22 +137,22 @@ xcopy /Y /Q "$(EngineRoot)external\websockets\prebuilt\win32\*.*" "$(OutDir)" - - + + - - + + - + {98a51ba8-fc3a-415b-ac8f-8c7bd464e93e} false - - {f8edd7fa-9a51-4e80-baeb-860825d2eac6} + + {e24950fa-5bc1-4aee-a900-4f0259354bf0} {207bc7a9-ccf1-4f2f-a04d-45f72242ae25} diff --git a/templates/cpp-template-default/proj.win32/HelloCpp.vcxproj.filters b/templates/cpp-template-default/proj.win32/HelloCpp.vcxproj.filters index 0afd6b671a..4b0292cd30 100644 --- a/templates/cpp-template-default/proj.win32/HelloCpp.vcxproj.filters +++ b/templates/cpp-template-default/proj.win32/HelloCpp.vcxproj.filters @@ -4,33 +4,33 @@ {84a8ebd7-7cf0-47f6-b75e-d441df67da40} - - {bb6c862e-70e9-49d9-81b7-3829a6f50471} - {715254bc-d70b-4ec5-bf29-467dd3ace079} + + {bb6c862e-70e9-49d9-81b7-3829a6f50471} + win32 - - Classes + + src - - Classes + + src win32 - - Classes + + src - - Classes + + src diff --git a/templates/cpp-template-default/proj.win32/HelloCpp.vcxproj.user b/templates/cpp-template-default/proj.win32/HelloCpp.vcxproj.user index 32a6296820..57d3d8f797 100644 --- a/templates/cpp-template-default/proj.win32/HelloCpp.vcxproj.user +++ b/templates/cpp-template-default/proj.win32/HelloCpp.vcxproj.user @@ -1,11 +1,11 @@  - $(ProjectDir)..\Resources + $(ProjectDir)..\res WindowsLocalDebugger - $(ProjectDir)..\Resources + $(ProjectDir)..\res WindowsLocalDebugger \ No newline at end of file diff --git a/templates/cpp-template-default/proj.wp8-xaml/App/HelloCpp.csproj b/templates/cpp-template-default/proj.wp8-xaml/App/HelloCpp.csproj index 8d686b7879..19d93505a5 100644 --- a/templates/cpp-template-default/proj.wp8-xaml/App/HelloCpp.csproj +++ b/templates/cpp-template-default/proj.wp8-xaml/App/HelloCpp.csproj @@ -156,8 +156,8 @@ - - Assets\Resources\%(RecursiveDir)%(FileName)%(Extension) + + Assets\res\%(RecursiveDir)%(FileName)%(Extension) PreserveNewest diff --git a/templates/cpp-template-default/proj.wp8-xaml/App/Properties/WMAppManifest.xml b/templates/cpp-template-default/proj.wp8-xaml/App/Properties/WMAppManifest.xml index 8437827d62..8622bf45fc 100644 --- a/templates/cpp-template-default/proj.wp8-xaml/App/Properties/WMAppManifest.xml +++ b/templates/cpp-template-default/proj.wp8-xaml/App/Properties/WMAppManifest.xml @@ -1,7 +1,7 @@  - + Assets\ApplicationIcon.png diff --git a/templates/cpp-template-default/proj.wp8-xaml/AppComponent/HelloCppComponent.vcxproj b/templates/cpp-template-default/proj.wp8-xaml/AppComponent/HelloCppComponent.vcxproj index e325b74d52..bbe7540816 100644 --- a/templates/cpp-template-default/proj.wp8-xaml/AppComponent/HelloCppComponent.vcxproj +++ b/templates/cpp-template-default/proj.wp8-xaml/AppComponent/HelloCppComponent.vcxproj @@ -90,7 +90,7 @@ true pch.h /Zm200 %(AdditionalOptions) - $(ProjectDir)..\..\Classes;%(AdditionalIncludeDirectories) + $(ProjectDir)..\..\src;%(AdditionalIncludeDirectories) Console @@ -110,7 +110,7 @@ true pch.h /Zm200 %(AdditionalOptions) - $(ProjectDir)..\..\Classes;%(AdditionalIncludeDirectories) + $(ProjectDir)..\..\src;%(AdditionalIncludeDirectories) Console @@ -130,7 +130,7 @@ true pch.h /Zm200 %(AdditionalOptions) - $(ProjectDir)..\..\Classes;%(AdditionalIncludeDirectories) + $(ProjectDir)..\..\src;%(AdditionalIncludeDirectories) Console @@ -150,7 +150,7 @@ true pch.h /Zm200 %(AdditionalOptions) - $(ProjectDir)..\..\Classes;%(AdditionalIncludeDirectories) + $(ProjectDir)..\..\src;%(AdditionalIncludeDirectories) Console @@ -203,8 +203,8 @@ - - + + Create Create @@ -218,8 +218,8 @@ - - + + diff --git a/templates/cpp-template-default/proj.wp8-xaml/AppComponent/HelloCppComponent.vcxproj.filters b/templates/cpp-template-default/proj.wp8-xaml/AppComponent/HelloCppComponent.vcxproj.filters index 04b763cb76..58d94a3a9a 100644 --- a/templates/cpp-template-default/proj.wp8-xaml/AppComponent/HelloCppComponent.vcxproj.filters +++ b/templates/cpp-template-default/proj.wp8-xaml/AppComponent/HelloCppComponent.vcxproj.filters @@ -2,61 +2,61 @@ - - Classes - - - Classes - - src + platform_src - src + platform_src - src + platform_src - src + platform_src + platform_src + + + src + + src - - Classes - - - Classes - - src + platform_src - src + platform_src - src + platform_src - src + platform_src - src + platform_src + platform_src + + + src + + src - - {facbd0ff-d271-46ef-8324-beff0cbcb424} + + {6fcff44b-bb9f-4ed9-8553-558855bc91e3} - {6fcff44b-bb9f-4ed9-8553-558855bc91e3} + {6e41adf9-1cf5-4085-ae27-accb4c9eab3d} diff --git a/templates/cpp-template-default/proj.wp8-xaml/AppComponent/src/Cocos2dRenderer.cpp b/templates/cpp-template-default/proj.wp8-xaml/AppComponent/src/Cocos2dRenderer.cpp index 4e74c6f298..d70ac5c2fb 100644 --- a/templates/cpp-template-default/proj.wp8-xaml/AppComponent/src/Cocos2dRenderer.cpp +++ b/templates/cpp-template-default/proj.wp8-xaml/AppComponent/src/Cocos2dRenderer.cpp @@ -53,7 +53,7 @@ void Cocos2dRenderer::CreateGLResources() if(!mInitialized) { mInitialized = true; - GLView* glview = GLView::create("Test Cpp"); + GLViewImpl* glview = GLViewImpl::create("Test Cpp"); glview->Create(m_eglDisplay, m_eglContext, m_eglSurface, m_renderTargetSize.Width, m_renderTargetSize.Height,m_orientation); director->setOpenGLView(glview); CCApplication::getInstance()->run(); @@ -102,14 +102,14 @@ IAsyncAction^ Cocos2dRenderer::OnSuspending() void Cocos2dRenderer::OnUpdateDevice() { - GLView* glview = GLView::sharedOpenGLView(); - glview->UpdateDevice(m_eglDisplay, m_eglContext, m_eglSurface); + //GLView* glview = GLView::sharedOpenGLView(); + GLViewImpl::sharedOpenGLView()->UpdateDevice(m_eglDisplay, m_eglContext, m_eglSurface); } void Cocos2dRenderer::OnOrientationChanged(Windows::Graphics::Display::DisplayOrientations orientation) { DirectXBase::OnOrientationChanged(orientation); - GLView::sharedOpenGLView()->UpdateOrientation(orientation); + GLViewImpl::sharedOpenGLView()->UpdateOrientation(orientation); } // return true if eglSwapBuffers was called by OnRender() @@ -117,8 +117,8 @@ bool Cocos2dRenderer::OnRender() { if(m_loadingComplete) { - GLView* glview = GLView::sharedOpenGLView(); - glview->Render(); + //GLView* glview = GLView::sharedOpenGLView(); + GLViewImpl::sharedOpenGLView()->Render(); return true; // eglSwapBuffers was called by glview->Render(); } return false; @@ -154,7 +154,7 @@ void Cocos2dRenderer::OnCocos2dKeyEvent(Cocos2dKeyEvent event) void Cocos2dRenderer::SetXamlEventDelegate(PhoneDirect3DXamlAppComponent::Cocos2dEventDelegate^ delegate) { m_delegate = delegate; - GLView* eglView = GLView::sharedOpenGLView(); + GLViewImpl* eglView = GLViewImpl::sharedOpenGLView(); if(eglView) { eglView->SetXamlEventDelegate(delegate); @@ -164,7 +164,7 @@ void Cocos2dRenderer::SetXamlEventDelegate(PhoneDirect3DXamlAppComponent::Cocos2 void Cocos2dRenderer::SetXamlMessageBoxDelegate(PhoneDirect3DXamlAppComponent::Cocos2dMessageBoxDelegate^ delegate) { m_messageBoxDelegate = delegate; - GLView* eglView = GLView::sharedOpenGLView(); + GLViewImpl* eglView = GLViewImpl::sharedOpenGLView(); if(eglView) { eglView->SetXamlMessageBoxDelegate(delegate); @@ -174,7 +174,7 @@ void Cocos2dRenderer::SetXamlMessageBoxDelegate(PhoneDirect3DXamlAppComponent::C void Cocos2dRenderer::SetXamlEditBoxDelegate(PhoneDirect3DXamlAppComponent::Cocos2dEditBoxDelegate^ delegate) { m_editBoxDelegate = delegate; - GLView* eglView = GLView::sharedOpenGLView(); + GLViewImpl* eglView = GLViewImpl::sharedOpenGLView(); if(eglView) { eglView->SetXamlEditBoxDelegate(delegate); diff --git a/templates/cpp-template-default/proj.wp8-xaml/AppComponent/src/Direct3DInterop.cpp b/templates/cpp-template-default/proj.wp8-xaml/AppComponent/src/Direct3DInterop.cpp index b01ab9f2be..e14858b33d 100644 --- a/templates/cpp-template-default/proj.wp8-xaml/AppComponent/src/Direct3DInterop.cpp +++ b/templates/cpp-template-default/proj.wp8-xaml/AppComponent/src/Direct3DInterop.cpp @@ -90,43 +90,43 @@ IAsyncAction^ Direct3DInterop::OnSuspending() void Direct3DInterop::OnBackKeyPress() { - cocos2d::GLView::sharedOpenGLView()->QueueBackKeyPress(); + cocos2d::GLViewImpl::sharedOpenGLView()->QueueBackKeyPress(); } // Pointer Event Handlers. We need to queue up pointer events to pass them to the drawing thread void Direct3DInterop::OnPointerPressed(DrawingSurfaceManipulationHost^ sender, PointerEventArgs^ args) { - cocos2d::GLView::sharedOpenGLView()->QueuePointerEvent(cocos2d::PointerEventType::PointerPressed, args); + cocos2d::GLViewImpl::sharedOpenGLView()->QueuePointerEvent(cocos2d::PointerEventType::PointerPressed, args); } void Direct3DInterop::OnPointerMoved(DrawingSurfaceManipulationHost^ sender, PointerEventArgs^ args) { - cocos2d::GLView::sharedOpenGLView()->QueuePointerEvent(cocos2d::PointerEventType::PointerMoved, args); + cocos2d::GLViewImpl::sharedOpenGLView()->QueuePointerEvent(cocos2d::PointerEventType::PointerMoved, args); } void Direct3DInterop::OnPointerReleased(DrawingSurfaceManipulationHost^ sender, PointerEventArgs^ args) { - cocos2d::GLView::sharedOpenGLView()->QueuePointerEvent(cocos2d::PointerEventType::PointerReleased, args); + cocos2d::GLViewImpl::sharedOpenGLView()->QueuePointerEvent(cocos2d::PointerEventType::PointerReleased, args); } void Direct3DInterop::OnCocos2dKeyEvent(Cocos2dKeyEvent key) { std::shared_ptr e(new cocos2d::KeyboardEvent(key)); - cocos2d::GLView::sharedOpenGLView()->QueueEvent(e); + cocos2d::GLViewImpl::sharedOpenGLView()->QueueEvent(e); } void Direct3DInterop::OnCocos2dKeyEvent(Cocos2dKeyEvent key, Platform::String^ text) { std::shared_ptr e(new cocos2d::KeyboardEvent(key,text)); - cocos2d::GLView::sharedOpenGLView()->QueueEvent(e); + cocos2d::GLViewImpl::sharedOpenGLView()->QueueEvent(e); } void Direct3DInterop::OnCocos2dEditboxEvent(Object^ sender, Platform::String^ args, Windows::Foundation::EventHandler^ handler) { std::shared_ptr e(new EditBoxEvent(sender, args, handler)); - cocos2d::GLView::sharedOpenGLView()->QueueEvent(e); + cocos2d::GLViewImpl::sharedOpenGLView()->QueueEvent(e); } @@ -150,7 +150,7 @@ HRESULT Direct3DInterop::Draw(_In_ ID3D11Device1* device, _In_ ID3D11DeviceConte } #endif // 0 - cocos2d::GLView::sharedOpenGLView()->ProcessEvents(); + cocos2d::GLViewImpl::sharedOpenGLView()->ProcessEvents(); m_renderer->Render(); RequestAdditionalFrame(); return S_OK; diff --git a/templates/cpp-template-default/Resources/CloseNormal.png b/templates/cpp-template-default/res/CloseNormal.png similarity index 100% rename from templates/cpp-template-default/Resources/CloseNormal.png rename to templates/cpp-template-default/res/CloseNormal.png diff --git a/templates/cpp-template-default/Resources/CloseSelected.png b/templates/cpp-template-default/res/CloseSelected.png similarity index 100% rename from templates/cpp-template-default/Resources/CloseSelected.png rename to templates/cpp-template-default/res/CloseSelected.png diff --git a/templates/cpp-template-default/Resources/HelloWorld.png b/templates/cpp-template-default/res/HelloWorld.png similarity index 100% rename from templates/cpp-template-default/Resources/HelloWorld.png rename to templates/cpp-template-default/res/HelloWorld.png diff --git a/templates/cpp-template-default/Resources/fonts/Marker Felt.ttf b/templates/cpp-template-default/res/fonts/Marker Felt.ttf similarity index 100% rename from templates/cpp-template-default/Resources/fonts/Marker Felt.ttf rename to templates/cpp-template-default/res/fonts/Marker Felt.ttf diff --git a/templates/cpp-template-default/Classes/AppDelegate.cpp b/templates/cpp-template-default/src/AppDelegate.cpp similarity index 96% rename from templates/cpp-template-default/Classes/AppDelegate.cpp rename to templates/cpp-template-default/src/AppDelegate.cpp index c0f7c567b4..beb7bc9e7a 100644 --- a/templates/cpp-template-default/Classes/AppDelegate.cpp +++ b/templates/cpp-template-default/src/AppDelegate.cpp @@ -16,7 +16,7 @@ bool AppDelegate::applicationDidFinishLaunching() { auto director = Director::getInstance(); auto glview = director->getOpenGLView(); if(!glview) { - glview = GLView::create("My Game"); + glview = GLViewImpl::create("My Game"); director->setOpenGLView(glview); } diff --git a/templates/cpp-template-default/Classes/AppDelegate.h b/templates/cpp-template-default/src/AppDelegate.h similarity index 100% rename from templates/cpp-template-default/Classes/AppDelegate.h rename to templates/cpp-template-default/src/AppDelegate.h diff --git a/templates/cpp-template-default/Classes/HelloWorldScene.cpp b/templates/cpp-template-default/src/HelloWorldScene.cpp similarity index 100% rename from templates/cpp-template-default/Classes/HelloWorldScene.cpp rename to templates/cpp-template-default/src/HelloWorldScene.cpp diff --git a/templates/cpp-template-default/Classes/HelloWorldScene.h b/templates/cpp-template-default/src/HelloWorldScene.h similarity index 100% rename from templates/cpp-template-default/Classes/HelloWorldScene.h rename to templates/cpp-template-default/src/HelloWorldScene.h diff --git a/templates/lua-template-default/frameworks/CMakeLists.txt b/templates/lua-template-default/frameworks/CMakeLists.txt index c55979fd3d..90b1390537 100644 --- a/templates/lua-template-default/frameworks/CMakeLists.txt +++ b/templates/lua-template-default/frameworks/CMakeLists.txt @@ -109,6 +109,18 @@ add_subdirectory(${COCOS2D_ROOT}/external/xxhash) # cocos 2d library add_subdirectory(${COCOS2D_ROOT}/cocos) +# cocos 3d library +add_subdirectory(${COCOS2D_ROOT}/cocos/3d) + +# network library +add_subdirectory(${COCOS2D_ROOT}/cocos/network) + +# ui library +add_subdirectory(${COCOS2D_ROOT}/cocos/ui) + +# sqlite3 library +add_subdirectory(${COCOS2D_ROOT}/cocos/storage) + # extensions add_subdirectory(${COCOS2D_ROOT}/extensions) @@ -148,14 +160,24 @@ set(FMOD_LIB "fmodex") endif() target_link_libraries(${APP_NAME} - luabinding - spine + luacocos2d + luacocos3d + luacocosdenshion + luanetwork + luacocosbuilder + luacocostudio + luaspine + luaextension + luaui + cocos2d + cocos3d + audio cocostudio + spine cocosbuilder extensions - audio - cocos2d - xxtea + ui + network ) set(APP_BIN_DIR "${CMAKE_BINARY_DIR}/bin") @@ -167,6 +189,12 @@ pre_build(${APP_NAME} COMMAND ${CMAKE_COMMAND} -E remove_directory ${APP_BIN_DIR}/Resources COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/../res ${APP_BIN_DIR}/Resources/res COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/../src ${APP_BIN_DIR}/Resources/src - COMMAND ${CMAKE_COMMAND} -E copy_directory ${COCOS2D_ROOT}/cocos/scripting/lua-bindings/script ${APP_BIN_DIR}/Resources + COMMAND ${CMAKE_COMMAND} -E copy_directory ${COCOS2D_ROOT}/cocos/scripting/lua-bindings/script/cocos2d ${APP_BIN_DIR}/Resources + COMMAND ${CMAKE_COMMAND} -E copy_directory ${COCOS2D_ROOT}/cocos/scripting/lua-bindings/script/cocosdenshion ${APP_BIN_DIR}/Resources + COMMAND ${CMAKE_COMMAND} -E copy_directory ${COCOS2D_ROOT}/cocos/scripting/lua-bindings/script/cocosbuilder ${APP_BIN_DIR}/Resources + COMMAND ${CMAKE_COMMAND} -E copy_directory ${COCOS2D_ROOT}/cocos/scripting/lua-bindings/script/cocostudio ${APP_BIN_DIR}/Resources + COMMAND ${CMAKE_COMMAND} -E copy_directory ${COCOS2D_ROOT}/cocos/scripting/lua-bindings/script/extension ${APP_BIN_DIR}/Resources + COMMAND ${CMAKE_COMMAND} -E copy_directory ${COCOS2D_ROOT}/cocos/scripting/lua-bindings/script/network ${APP_BIN_DIR}/Resources + COMMAND ${CMAKE_COMMAND} -E copy_directory ${COCOS2D_ROOT}/cocos/scripting/lua-bindings/script/ui ${APP_BIN_DIR}/Resources ) diff --git a/templates/lua-template-default/frameworks/runtime-src/Classes/AppDelegate.cpp b/templates/lua-template-default/frameworks/runtime-src/Classes/AppDelegate.cpp index 7e99c14a37..8a84f29444 100644 --- a/templates/lua-template-default/frameworks/runtime-src/Classes/AppDelegate.cpp +++ b/templates/lua-template-default/frameworks/runtime-src/Classes/AppDelegate.cpp @@ -2,6 +2,7 @@ #include "CCLuaEngine.h" #include "SimpleAudioEngine.h" #include "cocos2d.h" +#include "lua_module_register.h" using namespace CocosDenshion; @@ -21,6 +22,8 @@ bool AppDelegate::applicationDidFinishLaunching() { auto engine = LuaEngine::getInstance(); ScriptEngineManager::getInstance()->setScriptEngine(engine); + lua_State* L = engine->getLuaStack()->getLuaState(); + lua_module_register(L); if (engine->executeScriptFile("src/main.lua")) { return false; } diff --git a/templates/lua-template-default/frameworks/runtime-src/Classes/lua_module_register.h b/templates/lua-template-default/frameworks/runtime-src/Classes/lua_module_register.h new file mode 100644 index 0000000000..7e0ca6169e --- /dev/null +++ b/templates/lua-template-default/frameworks/runtime-src/Classes/lua_module_register.h @@ -0,0 +1,28 @@ +#ifndef __LUA_TEMPLATE_DEFAULT_FRAMEWORKS_RUNTIME_SRC_CLASSES_LUA_MODULE_REGISTER_H__ +#define __LUA_TEMPLATE_DEFAULT_FRAMEWORKS_RUNTIME_SRC_CLASSES_LUA_MODULE_REGISTER_H__ + +#include "cocosdenshion/lua_cocos2dx_cocosdenshion_manual.h" +#include "network/lua_cocos2dx_network_manual.h" +#include "cocosbuilder/lua_cocos2dx_cocosbuilder_manual.h" +#include "cocostudio/lua_cocos2dx_coco_studio_manual.hpp" +#include "extension/lua_cocos2dx_extension_manual.h" +#include "ui/lua_cocos2dx_ui_manual.hpp" +#include "spine/lua_cocos2dx_spine_manual.hpp" +#include "3d/lua_cocos2dx_3d_manual.h" + + +int lua_module_register(lua_State* L) +{ + register_cocosdenshion_module(L); + register_network_module(L); + register_cocosbuilder_module(L); + register_cocostudio_module(L); + register_extension_module(L); + register_ui_moudle(L); + register_spine_module(L); + register_cocos3d_module(L); + return 1; +} + +#endif // __LUA_TEMPLATE_DEFAULT_FRAMEWORKS_RUNTIME_SRC_CLASSES_LUA_MODULE_REGISTER_H__ + diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.android/build-cfg.json b/templates/lua-template-default/frameworks/runtime-src/proj.android/build-cfg.json index 6d0cbfc4fc..82ee655658 100644 --- a/templates/lua-template-default/frameworks/runtime-src/proj.android/build-cfg.json +++ b/templates/lua-template-default/frameworks/runtime-src/proj.android/build-cfg.json @@ -15,8 +15,39 @@ "to": "res" }, { - "from": "../../cocos2d-x/cocos/scripting/lua-bindings/script", + "from": "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocos2d", "to": "" + }, + { + "from": "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocosdenshion", + "to": "" + }, + { + "from": "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocosbuilder", + "to": "" + }, + { + "from": "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocostudio", + "to": "" + }, + { + "from": "../../cocos2d-x/cocos/scripting/lua-bindings/script/extension", + "to": "" + }, + { + "from": "../../cocos2d-x/cocos/scripting/lua-bindings/script/network", + "to": "" + }, + { + "from": "../../cocos2d-x/cocos/scripting/lua-bindings/script/ui", + "to": "" + }, + { + "from": "../../cocos2d-x/external/lua/luasocket", + "to": "", + "include": [ + "*.lua" + ] } ] } diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.android/jni/Android.mk b/templates/lua-template-default/frameworks/runtime-src/proj.android/jni/Android.mk index ac0e7ddd56..8515d2a334 100644 --- a/templates/lua-template-default/frameworks/runtime-src/proj.android/jni/Android.mk +++ b/templates/lua-template-default/frameworks/runtime-src/proj.android/jni/Android.mk @@ -12,10 +12,16 @@ LOCAL_SRC_FILES := hellolua/main.cpp \ LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../Classes -LOCAL_STATIC_LIBRARIES := curl_static_prebuilt - -LOCAL_WHOLE_STATIC_LIBRARIES := cocos_lua_static +LOCAL_WHOLE_STATIC_LIBRARIES := cocos2d_lua_static +LOCAL_WHOLE_STATIC_LIBRARIES += cocosdenshion_lua_static +LOCAL_WHOLE_STATIC_LIBRARIES += network_lua_static +LOCAL_WHOLE_STATIC_LIBRARIES += cocosbuilder_lua_static +LOCAL_WHOLE_STATIC_LIBRARIES += cocostudio_lua_static +LOCAL_WHOLE_STATIC_LIBRARIES += spine_lua_static +LOCAL_WHOLE_STATIC_LIBRARIES += extension_lua_static +LOCAL_WHOLE_STATIC_LIBRARIES += ui_lua_static +LOCAL_WHOLE_STATIC_LIBRARIES += cocos3d_lua_static include $(BUILD_SHARED_LIBRARY) -$(call import-module,scripting/lua-bindings) +$(call import-module,scripting/lua-bindings/proj.android) 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 bdde18eec0..a40809f76f 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 @@ -7,17 +7,115 @@ objects = { /* Begin PBXBuildFile section */ - 15A8A4441834C43700142BE0 /* libchipmunk iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15A8A4291834BDA200142BE0 /* libchipmunk iOS.a */; }; - 15A8A4451834C43700142BE0 /* libcocos2dx iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15A8A4251834BDA200142BE0 /* libcocos2dx iOS.a */; }; - 15A8A4461834C43700142BE0 /* libcocos2dx-extensions iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15A8A4271834BDA200142BE0 /* libcocos2dx-extensions iOS.a */; }; - 15A8A4471834C43700142BE0 /* libCocosDenshion iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15A8A42D1834BDA200142BE0 /* libCocosDenshion iOS.a */; }; + 15427C5A198F1DF000DC375D /* libcocos2d iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15A8A4251834BDA200142BE0 /* libcocos2d iOS.a */; }; + 15427C5B198F1E0100DC375D /* libluacocos2d iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427C59198F1DE400DC375D /* libluacocos2d iOS.a */; }; + 15427C5C198F1E1400DC375D /* libcocosdenshion iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15A8A42D1834BDA200142BE0 /* libcocosdenshion iOS.a */; }; + 15427C5D198F1E2100DC375D /* libluacocosdenshion iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427C57198F1DE400DC375D /* libluacocosdenshion iOS.a */; }; + 15427C5E198F1E2B00DC375D /* libnetwork iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427C29198F1DE400DC375D /* libnetwork iOS.a */; }; + 15427C5F198F1E3300DC375D /* libluanetwork iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427C55198F1DE400DC375D /* libluanetwork iOS.a */; }; + 15427C78198F1F9900DC375D /* libcocos2d Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15A8A4171834BDA200142BE0 /* libcocos2d Mac.a */; }; + 15427C79198F1FA200DC375D /* libluacocos2d Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427C49198F1DE400DC375D /* libluacocos2d Mac.a */; }; + 15427C7A198F1FB600DC375D /* libcocosdenshion Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15A8A41F1834BDA200142BE0 /* libcocosdenshion Mac.a */; }; + 15427C7B198F1FC100DC375D /* libluacocosdenshion Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427C47198F1DE400DC375D /* libluacocosdenshion Mac.a */; }; + 15427C7C198F1FCB00DC375D /* libnetwork Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427C1F198F1DE400DC375D /* libnetwork Mac.a */; }; + 15427C7D198F1FD800DC375D /* libluanetwork Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427C45198F1DE400DC375D /* libluanetwork Mac.a */; }; + 156B43D419A1F224002CBF18 /* libcocos3d iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 156B43C919A1F1EF002CBF18 /* libcocos3d iOS.a */; }; + 156B43D519A1F236002CBF18 /* libluacocos3d iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 156B43D119A1F1EF002CBF18 /* libluacocos3d iOS.a */; }; + 156B43DA19A1F256002CBF18 /* libcocos3d Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 156B43C719A1F1EF002CBF18 /* libcocos3d Mac.a */; }; + 156B43DB19A1F262002CBF18 /* libluacocos3d Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 156B43CF19A1F1EF002CBF18 /* libluacocos3d Mac.a */; }; 15A8A4491834C64F00142BE0 /* Icon-114.png in Resources */ = {isa = PBXBuildFile; fileRef = 5023810C17EBBCAC00990C9B /* Icon-114.png */; }; - 15A8A4821834C73500142BE0 /* libchipmunk Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15A8A41B1834BDA200142BE0 /* libchipmunk Mac.a */; }; - 15A8A4831834C73500142BE0 /* libcocos2dx Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15A8A4171834BDA200142BE0 /* libcocos2dx Mac.a */; }; - 15A8A4841834C73500142BE0 /* libcocos2dx-extensions Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15A8A4191834BDA200142BE0 /* libcocos2dx-extensions Mac.a */; }; - 15A8A4851834C73500142BE0 /* libCocosDenshion Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15A8A41F1834BDA200142BE0 /* libCocosDenshion Mac.a */; }; 15A8A4881834C90F00142BE0 /* libcurl.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 15A8A4871834C90E00142BE0 /* libcurl.dylib */; }; + 15AA968E199C627C00725633 /* libluaextension iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427C4B198F1DE400DC375D /* libluaextension iOS.a */; }; + 15AA969F199C628500725633 /* libextension iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15A8A4271834BDA200142BE0 /* libextension iOS.a */; }; + 15AA96A0199C628F00725633 /* libluacocosbuilder iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427C51198F1DE400DC375D /* libluacocosbuilder iOS.a */; }; + 15AA96A1199C629B00725633 /* libcocosbuilder iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427C25198F1DE400DC375D /* libcocosbuilder iOS.a */; }; + 15AA96A2199C62AE00725633 /* libcocostudio iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427C23198F1DE400DC375D /* libcocostudio iOS.a */; }; + 15AA96A3199C62B900725633 /* libluacocostudio iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427C4F198F1DE400DC375D /* libluacocostudio iOS.a */; }; + 15AA96A4199C62C500725633 /* libluaspine iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427C53198F1DE400DC375D /* libluaspine iOS.a */; }; + 15AA96A5199C62CF00725633 /* libspine iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427C27198F1DE400DC375D /* libspine iOS.a */; }; + 15AA96A6199C62F500725633 /* libluaui iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427C4D198F1DE400DC375D /* libluaui iOS.a */; }; + 15AA96A7199C62FE00725633 /* libui iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427C21198F1DE400DC375D /* libui iOS.a */; }; + 15AA96A8199C633700725633 /* libcocosbuilder Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427C1B198F1DE400DC375D /* libcocosbuilder Mac.a */; }; + 15AA96A9199C634600725633 /* libluacocosbuilder Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427C41198F1DE400DC375D /* libluacocosbuilder Mac.a */; }; + 15AA96AA199C64DF00725633 /* libcocostudio Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427C19198F1DE400DC375D /* libcocostudio Mac.a */; }; + 15AA96AB199C64F400725633 /* libluacocostudio Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427C3F198F1DE400DC375D /* libluacocostudio Mac.a */; }; + 15AA96AC199C64FD00725633 /* libspine Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427C1D198F1DE400DC375D /* libspine Mac.a */; }; + 15AA96AD199C650C00725633 /* libluaspine Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427C43198F1DE400DC375D /* libluaspine Mac.a */; }; + 15AA96AE199C652A00725633 /* libextension Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15A8A4191834BDA200142BE0 /* libextension Mac.a */; }; + 15AA96AF199C653300725633 /* libluaextension Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427C3B198F1DE400DC375D /* libluaextension Mac.a */; }; + 15AA96B0199C655200725633 /* libui Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427C17198F1DE400DC375D /* libui Mac.a */; }; + 15AA96B1199C655A00725633 /* libluaui Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427C3D198F1DE400DC375D /* libluaui Mac.a */; }; + 15AA96B6199C668400725633 /* CCBReaderLoad.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15AA96B4199C668400725633 /* CCBReaderLoad.lua */; }; + 15AA96B7199C668400725633 /* CCBReaderLoad.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15AA96B4199C668400725633 /* CCBReaderLoad.lua */; }; + 15AA96B8199C668400725633 /* DeprecatedCocosBuilderClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15AA96B5199C668400725633 /* DeprecatedCocosBuilderClass.lua */; }; + 15AA96B9199C668400725633 /* DeprecatedCocosBuilderClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15AA96B5199C668400725633 /* DeprecatedCocosBuilderClass.lua */; }; + 15AA96BE199C66A100725633 /* CocoStudio.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15AA96BA199C66A100725633 /* CocoStudio.lua */; }; + 15AA96BF199C66A100725633 /* CocoStudio.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15AA96BA199C66A100725633 /* CocoStudio.lua */; }; + 15AA96C0199C66A100725633 /* DeprecatedCocoStudioClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15AA96BB199C66A100725633 /* DeprecatedCocoStudioClass.lua */; }; + 15AA96C1199C66A100725633 /* DeprecatedCocoStudioClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15AA96BB199C66A100725633 /* DeprecatedCocoStudioClass.lua */; }; + 15AA96C2199C66A100725633 /* DeprecatedCocoStudioFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15AA96BC199C66A100725633 /* DeprecatedCocoStudioFunc.lua */; }; + 15AA96C3199C66A100725633 /* DeprecatedCocoStudioFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15AA96BC199C66A100725633 /* DeprecatedCocoStudioFunc.lua */; }; + 15AA96C4199C66A100725633 /* StudioConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15AA96BD199C66A100725633 /* StudioConstants.lua */; }; + 15AA96C5199C66A100725633 /* StudioConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15AA96BD199C66A100725633 /* StudioConstants.lua */; }; + 15AA96CA199C66B500725633 /* DeprecatedExtensionClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15AA96C6199C66B500725633 /* DeprecatedExtensionClass.lua */; }; + 15AA96CB199C66B500725633 /* DeprecatedExtensionClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15AA96C6199C66B500725633 /* DeprecatedExtensionClass.lua */; }; + 15AA96CC199C66B500725633 /* DeprecatedExtensionEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15AA96C7199C66B500725633 /* DeprecatedExtensionEnum.lua */; }; + 15AA96CD199C66B500725633 /* DeprecatedExtensionEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15AA96C7199C66B500725633 /* DeprecatedExtensionEnum.lua */; }; + 15AA96CE199C66B500725633 /* DeprecatedExtensionFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15AA96C8199C66B500725633 /* DeprecatedExtensionFunc.lua */; }; + 15AA96CF199C66B500725633 /* DeprecatedExtensionFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15AA96C8199C66B500725633 /* DeprecatedExtensionFunc.lua */; }; + 15AA96D0199C66B500725633 /* ExtensionConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15AA96C9199C66B500725633 /* ExtensionConstants.lua */; }; + 15AA96D1199C66B500725633 /* ExtensionConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15AA96C9199C66B500725633 /* ExtensionConstants.lua */; }; + 15AA96D6199C66D500725633 /* DeprecatedNetworkClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15AA96D2199C66D500725633 /* DeprecatedNetworkClass.lua */; }; + 15AA96D7199C66D500725633 /* DeprecatedNetworkClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15AA96D2199C66D500725633 /* DeprecatedNetworkClass.lua */; }; + 15AA96D8199C66D500725633 /* DeprecatedNetworkEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15AA96D3199C66D500725633 /* DeprecatedNetworkEnum.lua */; }; + 15AA96D9199C66D500725633 /* DeprecatedNetworkEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15AA96D3199C66D500725633 /* DeprecatedNetworkEnum.lua */; }; + 15AA96DA199C66D500725633 /* DeprecatedNetworkFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15AA96D4199C66D500725633 /* DeprecatedNetworkFunc.lua */; }; + 15AA96DB199C66D500725633 /* DeprecatedNetworkFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15AA96D4199C66D500725633 /* DeprecatedNetworkFunc.lua */; }; + 15AA96DC199C66D500725633 /* NetworkConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15AA96D5199C66D500725633 /* NetworkConstants.lua */; }; + 15AA96DD199C66D500725633 /* NetworkConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15AA96D5199C66D500725633 /* NetworkConstants.lua */; }; + 15AA96E2199C66E600725633 /* DeprecatedUIEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15AA96DE199C66E600725633 /* DeprecatedUIEnum.lua */; }; + 15AA96E3199C66E600725633 /* DeprecatedUIEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15AA96DE199C66E600725633 /* DeprecatedUIEnum.lua */; }; + 15AA96E4199C66E600725633 /* DeprecatedUIFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15AA96DF199C66E600725633 /* DeprecatedUIFunc.lua */; }; + 15AA96E5199C66E600725633 /* DeprecatedUIFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15AA96DF199C66E600725633 /* DeprecatedUIFunc.lua */; }; + 15AA96E6199C66E600725633 /* experimentalUIConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15AA96E0199C66E600725633 /* experimentalUIConstants.lua */; }; + 15AA96E7199C66E600725633 /* experimentalUIConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15AA96E0199C66E600725633 /* experimentalUIConstants.lua */; }; + 15AA96E8199C66E600725633 /* GuiConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15AA96E1199C66E600725633 /* GuiConstants.lua */; }; + 15AA96E9199C66E600725633 /* GuiConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15AA96E1199C66E600725633 /* GuiConstants.lua */; }; 15AECE29195D482800907DB0 /* MediaPlayer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15AECE28195D482800907DB0 /* MediaPlayer.framework */; }; + 15D1FE491998730800302043 /* bitExtend.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FE3B1998730800302043 /* bitExtend.lua */; }; + 15D1FE4A1998730800302043 /* bitExtend.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FE3B1998730800302043 /* bitExtend.lua */; }; + 15D1FE4B1998730800302043 /* Cocos2d.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FE3C1998730800302043 /* Cocos2d.lua */; }; + 15D1FE4C1998730800302043 /* Cocos2d.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FE3C1998730800302043 /* Cocos2d.lua */; }; + 15D1FE4D1998730800302043 /* Cocos2dConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FE3D1998730800302043 /* Cocos2dConstants.lua */; }; + 15D1FE4E1998730800302043 /* Cocos2dConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FE3D1998730800302043 /* Cocos2dConstants.lua */; }; + 15D1FE4F1998730800302043 /* DeprecatedCocos2dClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FE3E1998730800302043 /* DeprecatedCocos2dClass.lua */; }; + 15D1FE501998730800302043 /* DeprecatedCocos2dClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FE3E1998730800302043 /* DeprecatedCocos2dClass.lua */; }; + 15D1FE511998730800302043 /* DeprecatedCocos2dEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FE3F1998730800302043 /* DeprecatedCocos2dEnum.lua */; }; + 15D1FE521998730800302043 /* DeprecatedCocos2dEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FE3F1998730800302043 /* DeprecatedCocos2dEnum.lua */; }; + 15D1FE531998730800302043 /* DeprecatedCocos2dFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FE401998730800302043 /* DeprecatedCocos2dFunc.lua */; }; + 15D1FE541998730800302043 /* DeprecatedCocos2dFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FE401998730800302043 /* DeprecatedCocos2dFunc.lua */; }; + 15D1FE551998730800302043 /* DeprecatedOpenglEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FE411998730800302043 /* DeprecatedOpenglEnum.lua */; }; + 15D1FE561998730800302043 /* DeprecatedOpenglEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FE411998730800302043 /* DeprecatedOpenglEnum.lua */; }; + 15D1FE571998730800302043 /* DrawPrimitives.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FE421998730800302043 /* DrawPrimitives.lua */; }; + 15D1FE581998730800302043 /* DrawPrimitives.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FE421998730800302043 /* DrawPrimitives.lua */; }; + 15D1FE591998730800302043 /* extern.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FE431998730800302043 /* extern.lua */; }; + 15D1FE5A1998730800302043 /* extern.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FE431998730800302043 /* extern.lua */; }; + 15D1FE5B1998730800302043 /* json.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FE441998730800302043 /* json.lua */; }; + 15D1FE5C1998730800302043 /* json.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FE441998730800302043 /* json.lua */; }; + 15D1FE5D1998730800302043 /* luaj.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FE451998730800302043 /* luaj.lua */; }; + 15D1FE5E1998730800302043 /* luaj.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FE451998730800302043 /* luaj.lua */; }; + 15D1FE5F1998730800302043 /* luaoc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FE461998730800302043 /* luaoc.lua */; }; + 15D1FE601998730800302043 /* luaoc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FE461998730800302043 /* luaoc.lua */; }; + 15D1FE611998730800302043 /* Opengl.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FE471998730800302043 /* Opengl.lua */; }; + 15D1FE621998730800302043 /* Opengl.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FE471998730800302043 /* Opengl.lua */; }; + 15D1FE631998730800302043 /* OpenglConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FE481998730800302043 /* OpenglConstants.lua */; }; + 15D1FE641998730800302043 /* OpenglConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FE481998730800302043 /* OpenglConstants.lua */; }; + 15D1FE681998732700302043 /* AudioEngine.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FE651998732700302043 /* AudioEngine.lua */; }; + 15D1FE691998732700302043 /* AudioEngine.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FE651998732700302043 /* AudioEngine.lua */; }; + 15D1FE6A1998732700302043 /* DeprecatedCocosDenshionClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FE661998732700302043 /* DeprecatedCocosDenshionClass.lua */; }; + 15D1FE6B1998732700302043 /* DeprecatedCocosDenshionClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FE661998732700302043 /* DeprecatedCocosDenshionClass.lua */; }; + 15D1FE6C1998732700302043 /* DeprecatedCocosDenshionFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FE671998732700302043 /* DeprecatedCocosDenshionFunc.lua */; }; + 15D1FE6D1998732700302043 /* DeprecatedCocosDenshionFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FE671998732700302043 /* DeprecatedCocosDenshionFunc.lua */; }; 1AF4C403178663F200122817 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AF4C402178663F200122817 /* libz.dylib */; }; 5023811817EBBCAC00990C9B /* AppController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5023810817EBBCAC00990C9B /* AppController.mm */; }; 5023811917EBBCAC00990C9B /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 5023810917EBBCAC00990C9B /* Default-568h@2x.png */; }; @@ -55,44 +153,6 @@ C03781BA18BF655400FE4F13 /* res in Resources */ = {isa = PBXBuildFile; fileRef = C03781B718BF655400FE4F13 /* res */; }; C03781BB18BF655400FE4F13 /* src in Resources */ = {isa = PBXBuildFile; fileRef = C03781B818BF655400FE4F13 /* src */; }; C03781BC18BF655400FE4F13 /* src in Resources */ = {isa = PBXBuildFile; fileRef = C03781B818BF655400FE4F13 /* src */; }; - C03781CF18BF656A00FE4F13 /* AudioEngine.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781BD18BF656900FE4F13 /* AudioEngine.lua */; }; - C03781D018BF656A00FE4F13 /* AudioEngine.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781BD18BF656900FE4F13 /* AudioEngine.lua */; }; - C03781D118BF656A00FE4F13 /* CCBReaderLoad.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781BE18BF656900FE4F13 /* CCBReaderLoad.lua */; }; - C03781D218BF656A00FE4F13 /* CCBReaderLoad.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781BE18BF656900FE4F13 /* CCBReaderLoad.lua */; }; - C03781D318BF656A00FE4F13 /* Cocos2d.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781BF18BF656900FE4F13 /* Cocos2d.lua */; }; - C03781D418BF656A00FE4F13 /* Cocos2d.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781BF18BF656900FE4F13 /* Cocos2d.lua */; }; - C03781D518BF656A00FE4F13 /* Cocos2dConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781C018BF656900FE4F13 /* Cocos2dConstants.lua */; }; - C03781D618BF656A00FE4F13 /* Cocos2dConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781C018BF656900FE4F13 /* Cocos2dConstants.lua */; }; - C03781D718BF656A00FE4F13 /* CocoStudio.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781C118BF656900FE4F13 /* CocoStudio.lua */; }; - C03781D818BF656A00FE4F13 /* CocoStudio.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781C118BF656900FE4F13 /* CocoStudio.lua */; }; - C03781D918BF656A00FE4F13 /* Deprecated.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781C218BF656900FE4F13 /* Deprecated.lua */; }; - C03781DA18BF656A00FE4F13 /* Deprecated.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781C218BF656900FE4F13 /* Deprecated.lua */; }; - C03781DB18BF656A00FE4F13 /* DeprecatedClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781C318BF656900FE4F13 /* DeprecatedClass.lua */; }; - C03781DC18BF656A00FE4F13 /* DeprecatedClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781C318BF656900FE4F13 /* DeprecatedClass.lua */; }; - C03781DD18BF656A00FE4F13 /* DeprecatedEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781C418BF656A00FE4F13 /* DeprecatedEnum.lua */; }; - C03781DE18BF656A00FE4F13 /* DeprecatedEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781C418BF656A00FE4F13 /* DeprecatedEnum.lua */; }; - C03781DF18BF656A00FE4F13 /* DeprecatedOpenglEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781C518BF656A00FE4F13 /* DeprecatedOpenglEnum.lua */; }; - C03781E018BF656A00FE4F13 /* DeprecatedOpenglEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781C518BF656A00FE4F13 /* DeprecatedOpenglEnum.lua */; }; - C03781E118BF656A00FE4F13 /* DrawPrimitives.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781C618BF656A00FE4F13 /* DrawPrimitives.lua */; }; - C03781E218BF656A00FE4F13 /* DrawPrimitives.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781C618BF656A00FE4F13 /* DrawPrimitives.lua */; }; - C03781E318BF656A00FE4F13 /* extern.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781C718BF656A00FE4F13 /* extern.lua */; }; - C03781E418BF656A00FE4F13 /* extern.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781C718BF656A00FE4F13 /* extern.lua */; }; - C03781E518BF656A00FE4F13 /* GuiConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781C818BF656A00FE4F13 /* GuiConstants.lua */; }; - C03781E618BF656A00FE4F13 /* GuiConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781C818BF656A00FE4F13 /* GuiConstants.lua */; }; - C03781E718BF656A00FE4F13 /* json.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781C918BF656A00FE4F13 /* json.lua */; }; - C03781E818BF656A00FE4F13 /* json.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781C918BF656A00FE4F13 /* json.lua */; }; - C03781E918BF656A00FE4F13 /* luaj.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781CA18BF656A00FE4F13 /* luaj.lua */; }; - C03781EA18BF656A00FE4F13 /* luaj.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781CA18BF656A00FE4F13 /* luaj.lua */; }; - C03781EB18BF656A00FE4F13 /* luaoc.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781CB18BF656A00FE4F13 /* luaoc.lua */; }; - C03781EC18BF656A00FE4F13 /* luaoc.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781CB18BF656A00FE4F13 /* luaoc.lua */; }; - C03781ED18BF656A00FE4F13 /* Opengl.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781CC18BF656A00FE4F13 /* Opengl.lua */; }; - C03781EE18BF656A00FE4F13 /* Opengl.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781CC18BF656A00FE4F13 /* Opengl.lua */; }; - C03781EF18BF656A00FE4F13 /* OpenglConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781CD18BF656A00FE4F13 /* OpenglConstants.lua */; }; - C03781F018BF656A00FE4F13 /* OpenglConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781CD18BF656A00FE4F13 /* OpenglConstants.lua */; }; - C03781F118BF656A00FE4F13 /* StudioConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781CE18BF656A00FE4F13 /* StudioConstants.lua */; }; - 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 */; }; C06E23C418CEF9740093C81A /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C06E23C318CEF9740093C81A /* main.cpp */; }; D6B061351803AC000077942B /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D6B061341803AC000077942B /* CoreMotion.framework */; }; F293B3CD15EB7BE500256477 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F293B3CC15EB7BE500256477 /* QuartzCore.framework */; }; @@ -105,6 +165,468 @@ /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ + 152A33CC199C93BF004B68DC /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 155CA2C71988C494006E0A08; + remoteInfo = "libluaextension iOS"; + }; + 152A33CE199C93BF004B68DC /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 15EFA300198B28A8000C57D3; + remoteInfo = "libluaui iOS"; + }; + 152A33D0199C93BF004B68DC /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 15EFA381198B2934000C57D3; + remoteInfo = "libluacocostudio iOS"; + }; + 152A33D2199C93BF004B68DC /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 15EFA27F198B2791000C57D3; + remoteInfo = "libluacocosbuilder iOS"; + }; + 152A33D4199C93BF004B68DC /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 15EFA407198B2AFD000C57D3; + remoteInfo = "libluaspine iOS"; + }; + 152A33F2199C93CD004B68DC /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = A07A4E111783867C0073F6A7; + remoteInfo = "libextension iOS"; + }; + 152A33F4199C93CD004B68DC /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = B24EEA2C19775E92004493CC; + remoteInfo = "libui iOS"; + }; + 152A33F6199C93CD004B68DC /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = B24EEA6719775EBB004493CC; + remoteInfo = "libcocostudio iOS"; + }; + 152A33F8199C93CD004B68DC /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = B24EEA6F19775ECE004493CC; + remoteInfo = "libcocosbuilder iOS"; + }; + 152A33FA199C93CD004B68DC /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = B24EEA7719775EE1004493CC; + remoteInfo = "libspine iOS"; + }; + 152A33FC199C93E7004B68DC /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 15C1BD5F1986538000A46ACC; + remoteInfo = "libluaextension Mac"; + }; + 152A33FE199C93E7004B68DC /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 15C1C0801987328E00A46ACC; + remoteInfo = "libluaui Mac"; + }; + 152A3400199C93E7004B68DC /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 15C1BF7219865C2000A46ACC; + remoteInfo = "libluacocostudio Mac"; + }; + 152A3402199C93E7004B68DC /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 15C1BE66198654BE00A46ACC; + remoteInfo = "libluacocosbuilder Mac"; + }; + 152A3404199C93E7004B68DC /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 15C1BFF819865E5F00A46ACC; + remoteInfo = "libluaspine Mac"; + }; + 152A3406199C93F4004B68DC /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = A03F2FC117814595006731B9; + remoteInfo = "libextension Mac"; + }; + 152A3408199C93F4004B68DC /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = B245F10019766132001920FD; + remoteInfo = "libui Mac"; + }; + 152A340A199C93F4004B68DC /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = B2DB48161976716E00411E16; + remoteInfo = "libcocostudio Mac"; + }; + 152A340C199C93F4004B68DC /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = B2DB479B197669A100411E16; + remoteInfo = "libcocosbuilder Mac"; + }; + 152A340E199C93F4004B68DC /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = B2DB48CA19767F1F00411E16; + remoteInfo = "libspine Mac"; + }; + 15427C16198F1DE400DC375D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = B245F13A19766132001920FD; + remoteInfo = "libui Mac"; + }; + 15427C18198F1DE400DC375D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = B2DB484D1976716E00411E16; + remoteInfo = "libcocostudio Mac"; + }; + 15427C1A198F1DE400DC375D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = B2DB47D2197669A100411E16; + remoteInfo = "libcocosbuilder Mac"; + }; + 15427C1C198F1DE400DC375D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = B2DB490119767F1F00411E16; + remoteInfo = "libspine Mac"; + }; + 15427C1E198F1DE400DC375D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = B2DB49C4197686CB00411E16; + remoteInfo = "libnetwork Mac"; + }; + 15427C20198F1DE400DC375D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = B24EEA6619775E92004493CC; + remoteInfo = "libui iOS"; + }; + 15427C22198F1DE400DC375D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = B24EEA6E19775EBB004493CC; + remoteInfo = "libcocostudio iOS"; + }; + 15427C24198F1DE400DC375D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = B24EEA7619775ECE004493CC; + remoteInfo = "libcocosbuilder iOS"; + }; + 15427C26198F1DE400DC375D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = B24EEA7E19775EE1004493CC; + remoteInfo = "libspine iOS"; + }; + 15427C28198F1DE400DC375D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = B24EEA8619775EF3004493CC; + remoteInfo = "libnetwork iOS"; + }; + 15427C3A198F1DE400DC375D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 15C1BDDA1986538000A46ACC; + remoteInfo = "libluaextension Mac"; + }; + 15427C3C198F1DE400DC375D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 15C1C0FB1987328E00A46ACC; + remoteInfo = "libluaui Mac"; + }; + 15427C3E198F1DE400DC375D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 15C1BFED19865C2000A46ACC; + remoteInfo = "libluacocostudio Mac"; + }; + 15427C40198F1DE400DC375D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 15C1BEE1198654BE00A46ACC; + remoteInfo = "libluacocosbuilder Mac"; + }; + 15427C42198F1DE400DC375D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 15C1C07319865E5F00A46ACC; + remoteInfo = "libluaspine Mac"; + }; + 15427C44198F1DE400DC375D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 15C1C1811987340C00A46ACC; + remoteInfo = "libluanetwork Mac"; + }; + 15427C46198F1DE400DC375D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 15C1BF6919865A0600A46ACC; + remoteInfo = "libluacocosdenshion Mac"; + }; + 15427C48198F1DE400DC375D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 15C1C2CC198748D200A46ACC; + remoteInfo = "libluacocos2d Mac"; + }; + 15427C4A198F1DE400DC375D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 155CA3431988C494006E0A08; + remoteInfo = "libluaextension iOS"; + }; + 15427C4C198F1DE400DC375D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 15EFA37A198B28A8000C57D3; + remoteInfo = "libluaui iOS"; + }; + 15427C4E198F1DE400DC375D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 15EFA3FB198B2934000C57D3; + remoteInfo = "libluacocostudio iOS"; + }; + 15427C50198F1DE400DC375D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 15EFA2F9198B2791000C57D3; + remoteInfo = "libluacocosbuilder iOS"; + }; + 15427C52198F1DE400DC375D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 15EFA47F198B2AFD000C57D3; + remoteInfo = "libluaspine iOS"; + }; + 15427C54198F1DE400DC375D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 15EFA4FE198B2B9B000C57D3; + remoteInfo = "libluanetwork iOS"; + }; + 15427C56198F1DE400DC375D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 15EFA59B198B2D13000C57D3; + remoteInfo = "libluacocosdenshion iOS"; + }; + 15427C58198F1DE400DC375D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 15EFA616198B2DAA000C57D3; + remoteInfo = "libluacocos2d iOS"; + }; + 15427C60198F1E7400DC375D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 15EFA486198B2B9B000C57D3; + remoteInfo = "libluanetwork iOS"; + }; + 15427C62198F1E7400DC375D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 15EFA523198B2D13000C57D3; + remoteInfo = "libluacocosdenshion iOS"; + }; + 15427C64198F1E7400DC375D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 15EFA59E198B2DAA000C57D3; + remoteInfo = "libluacocos2d iOS"; + }; + 15427C66198F1E7400DC375D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = A07A4C241783777C0073F6A7; + remoteInfo = "libcocos2d iOS"; + }; + 15427C68198F1E7400DC375D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = A07A4F9F178387730073F6A7; + remoteInfo = "libcocosdenshion iOS"; + }; + 15427C6A198F1E7400DC375D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = B24EEA7F19775EF3004493CC; + remoteInfo = "libnetwork iOS"; + }; + 15427C6C198F1F4D00DC375D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 15C1C1061987340C00A46ACC; + remoteInfo = "libluanetwork Mac"; + }; + 15427C6E198F1F4D00DC375D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 15C1BEEE19865A0600A46ACC; + remoteInfo = "libluacocosdenshion Mac"; + }; + 15427C70198F1F4D00DC375D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 15C1C255198748D200A46ACC; + remoteInfo = "libluacocos2d Mac"; + }; + 15427C72198F1F4D00DC375D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 1551A33E158F2AB200E66CFE; + remoteInfo = "libcocos2d Mac"; + }; + 15427C74198F1F4D00DC375D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = B2DB498D197686CB00411E16; + remoteInfo = "libnetwork Mac"; + }; + 15427C76198F1F4D00DC375D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = A03F2E9817814268006731B9; + remoteInfo = "libcocosdenshion Mac"; + }; + 156B43BC19A1F1EF002CBF18 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 1516228319A0F45E006099B8; + remoteInfo = "libluacocos3d iOS"; + }; + 156B43C619A1F1EF002CBF18 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 1516200B199E7363006099B8; + remoteInfo = "libcocos3d Mac"; + }; + 156B43C819A1F1EF002CBF18 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 15162201199E7810006099B8; + remoteInfo = "libcocos3d iOS"; + }; + 156B43CE19A1F1EF002CBF18 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 1516227C19A0F32D006099B8; + remoteInfo = "libluacocos3d Mac"; + }; + 156B43D019A1F1EF002CBF18 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 151622BB19A0F45E006099B8; + remoteInfo = "libluacocos3d iOS"; + }; + 156B43D219A1F1FD002CBF18 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 15162030199E7810006099B8; + remoteInfo = "libcocos3d iOS"; + }; + 156B43D619A1F243002CBF18 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 1516224519A0F32D006099B8; + remoteInfo = "libluacocos3d Mac"; + }; + 156B43D819A1F249002CBF18 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 15161E42199E7362006099B8; + remoteInfo = "libcocos3d Mac"; + }; 15A8A4161834BDA200142BE0 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; @@ -175,111 +697,49 @@ remoteGlobalIDString = A07A4FB4178387730073F6A7; remoteInfo = "CocosDenshion iOS"; }; - C03781B318BF654500FE4F13 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 1AACE74618BC45A000215002; - remoteInfo = "luabindings Mac"; - }; - C03781B518BF654500FE4F13 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 1AACE74718BC45A000215002; - remoteInfo = "luabindings iOS"; - }; - C03781F318BF659D00FE4F13 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 1A6FB50417854BC200CDF010; - remoteInfo = "luabindings Mac"; - }; - C03781F718BF65B500FE4F13 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 1A119716178526AA00D62A44; - remoteInfo = "luabindings iOS"; - }; - C0A2F02618975FD30072A7AB /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = A03F2B781780BD04006731B9; - remoteInfo = "chipmunk Mac"; - }; - C0A2F03818975FDA0072A7AB /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = A03F2D5D1780BDF7006731B9; - remoteInfo = "box2d Mac"; - }; - C0A2F03A18975FE20072A7AB /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = A03F2FC117814595006731B9; - remoteInfo = "cocos2dx-extensions Mac"; - }; - C0A2F03C18975FEB0072A7AB /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = A03F2E9817814268006731B9; - remoteInfo = "CocosDenshion Mac"; - }; - C0A2F04018975FF80072A7AB /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 1551A33E158F2AB200E66CFE; - remoteInfo = "cocos2dx Mac"; - }; - C0A2F0421897600E0072A7AB /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = A07A4C241783777C0073F6A7; - remoteInfo = "cocos2dx iOS"; - }; - C0A2F0441897600E0072A7AB /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = A07A4E111783867C0073F6A7; - remoteInfo = "cocos2dx-extensions iOS"; - }; - C0A2F0461897600E0072A7AB /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = A07A4EFD178387670073F6A7; - remoteInfo = "chipmunk iOS"; - }; - C0A2F0481897600E0072A7AB /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = A07A4F3C1783876B0073F6A7; - remoteInfo = "box2d iOS"; - }; - C0A2F04A1897600E0072A7AB /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = A07A4F9F178387730073F6A7; - remoteInfo = "CocosDenshion iOS"; - }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ + 15427C7E198F201A00DC375D /* lua_module_register.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lua_module_register.h; path = ../Classes/lua_module_register.h; sourceTree = ""; }; 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = cocos2d_libs.xcodeproj; path = "../../cocos2d-x/build/cocos2d_libs.xcodeproj"; sourceTree = ""; }; 15A8A4871834C90E00142BE0 /* libcurl.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcurl.dylib; path = usr/lib/libcurl.dylib; sourceTree = SDKROOT; }; + 15AA96B4199C668400725633 /* CCBReaderLoad.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CCBReaderLoad.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocosbuilder/CCBReaderLoad.lua"; sourceTree = ""; }; + 15AA96B5199C668400725633 /* DeprecatedCocosBuilderClass.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedCocosBuilderClass.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocosbuilder/DeprecatedCocosBuilderClass.lua"; sourceTree = ""; }; + 15AA96BA199C66A100725633 /* CocoStudio.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CocoStudio.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocostudio/CocoStudio.lua"; sourceTree = ""; }; + 15AA96BB199C66A100725633 /* DeprecatedCocoStudioClass.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedCocoStudioClass.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocostudio/DeprecatedCocoStudioClass.lua"; sourceTree = ""; }; + 15AA96BC199C66A100725633 /* DeprecatedCocoStudioFunc.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedCocoStudioFunc.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocostudio/DeprecatedCocoStudioFunc.lua"; sourceTree = ""; }; + 15AA96BD199C66A100725633 /* StudioConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = StudioConstants.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocostudio/StudioConstants.lua"; sourceTree = ""; }; + 15AA96C6199C66B500725633 /* DeprecatedExtensionClass.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedExtensionClass.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/extension/DeprecatedExtensionClass.lua"; sourceTree = ""; }; + 15AA96C7199C66B500725633 /* DeprecatedExtensionEnum.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedExtensionEnum.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/extension/DeprecatedExtensionEnum.lua"; sourceTree = ""; }; + 15AA96C8199C66B500725633 /* DeprecatedExtensionFunc.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedExtensionFunc.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/extension/DeprecatedExtensionFunc.lua"; sourceTree = ""; }; + 15AA96C9199C66B500725633 /* ExtensionConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = ExtensionConstants.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/extension/ExtensionConstants.lua"; sourceTree = ""; }; + 15AA96D2199C66D500725633 /* DeprecatedNetworkClass.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedNetworkClass.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/network/DeprecatedNetworkClass.lua"; sourceTree = ""; }; + 15AA96D3199C66D500725633 /* DeprecatedNetworkEnum.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedNetworkEnum.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/network/DeprecatedNetworkEnum.lua"; sourceTree = ""; }; + 15AA96D4199C66D500725633 /* DeprecatedNetworkFunc.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedNetworkFunc.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/network/DeprecatedNetworkFunc.lua"; sourceTree = ""; }; + 15AA96D5199C66D500725633 /* NetworkConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = NetworkConstants.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/network/NetworkConstants.lua"; sourceTree = ""; }; + 15AA96DE199C66E600725633 /* DeprecatedUIEnum.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedUIEnum.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/ui/DeprecatedUIEnum.lua"; sourceTree = ""; }; + 15AA96DF199C66E600725633 /* DeprecatedUIFunc.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedUIFunc.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/ui/DeprecatedUIFunc.lua"; sourceTree = ""; }; + 15AA96E0199C66E600725633 /* experimentalUIConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = experimentalUIConstants.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/ui/experimentalUIConstants.lua"; sourceTree = ""; }; + 15AA96E1199C66E600725633 /* GuiConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = GuiConstants.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/ui/GuiConstants.lua"; sourceTree = ""; }; 15AECE28195D482800907DB0 /* 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; }; 15C1568D1683131500D239F2 /* libcurl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcurl.a; path = "../../cocos2d-x/cocos2dx/platform/third_party/ios/libraries/libcurl.a"; sourceTree = ""; }; + 15D1FE3B1998730800302043 /* bitExtend.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = bitExtend.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocos2d/bitExtend.lua"; sourceTree = ""; }; + 15D1FE3C1998730800302043 /* Cocos2d.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Cocos2d.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocos2d/Cocos2d.lua"; sourceTree = ""; }; + 15D1FE3D1998730800302043 /* Cocos2dConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Cocos2dConstants.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocos2d/Cocos2dConstants.lua"; sourceTree = ""; }; + 15D1FE3E1998730800302043 /* DeprecatedCocos2dClass.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedCocos2dClass.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocos2d/DeprecatedCocos2dClass.lua"; sourceTree = ""; }; + 15D1FE3F1998730800302043 /* DeprecatedCocos2dEnum.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedCocos2dEnum.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocos2d/DeprecatedCocos2dEnum.lua"; sourceTree = ""; }; + 15D1FE401998730800302043 /* DeprecatedCocos2dFunc.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedCocos2dFunc.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocos2d/DeprecatedCocos2dFunc.lua"; sourceTree = ""; }; + 15D1FE411998730800302043 /* DeprecatedOpenglEnum.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedOpenglEnum.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocos2d/DeprecatedOpenglEnum.lua"; sourceTree = ""; }; + 15D1FE421998730800302043 /* DrawPrimitives.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DrawPrimitives.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocos2d/DrawPrimitives.lua"; sourceTree = ""; }; + 15D1FE431998730800302043 /* extern.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = extern.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocos2d/extern.lua"; sourceTree = ""; }; + 15D1FE441998730800302043 /* json.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = json.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocos2d/json.lua"; sourceTree = ""; }; + 15D1FE451998730800302043 /* luaj.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = luaj.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocos2d/luaj.lua"; sourceTree = ""; }; + 15D1FE461998730800302043 /* luaoc.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = luaoc.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocos2d/luaoc.lua"; sourceTree = ""; }; + 15D1FE471998730800302043 /* Opengl.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Opengl.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocos2d/Opengl.lua"; sourceTree = ""; }; + 15D1FE481998730800302043 /* OpenglConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = OpenglConstants.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocos2d/OpenglConstants.lua"; sourceTree = ""; }; + 15D1FE651998732700302043 /* AudioEngine.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = AudioEngine.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocosdenshion/AudioEngine.lua"; sourceTree = ""; }; + 15D1FE661998732700302043 /* DeprecatedCocosDenshionClass.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedCocosDenshionClass.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocosdenshion/DeprecatedCocosDenshionClass.lua"; sourceTree = ""; }; + 15D1FE671998732700302043 /* DeprecatedCocosDenshionFunc.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedCocosDenshionFunc.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocosdenshion/DeprecatedCocosDenshionFunc.lua"; sourceTree = ""; }; 1AF4C402178663F200122817 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; }; 5023810717EBBCAC00990C9B /* AppController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppController.h; sourceTree = ""; }; 5023810817EBBCAC00990C9B /* AppController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AppController.mm; sourceTree = ""; }; @@ -316,24 +776,6 @@ 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 = ""; }; - C03781BD18BF656900FE4F13 /* AudioEngine.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = AudioEngine.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/AudioEngine.lua"; sourceTree = ""; }; - C03781BE18BF656900FE4F13 /* CCBReaderLoad.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CCBReaderLoad.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/CCBReaderLoad.lua"; sourceTree = ""; }; - C03781BF18BF656900FE4F13 /* Cocos2d.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Cocos2d.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/Cocos2d.lua"; sourceTree = ""; }; - C03781C018BF656900FE4F13 /* Cocos2dConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Cocos2dConstants.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/Cocos2dConstants.lua"; sourceTree = ""; }; - C03781C118BF656900FE4F13 /* CocoStudio.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CocoStudio.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/CocoStudio.lua"; sourceTree = ""; }; - C03781C218BF656900FE4F13 /* Deprecated.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Deprecated.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/Deprecated.lua"; sourceTree = ""; }; - C03781C318BF656900FE4F13 /* DeprecatedClass.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedClass.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/DeprecatedClass.lua"; sourceTree = ""; }; - C03781C418BF656A00FE4F13 /* DeprecatedEnum.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedEnum.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/DeprecatedEnum.lua"; sourceTree = ""; }; - C03781C518BF656A00FE4F13 /* DeprecatedOpenglEnum.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedOpenglEnum.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/DeprecatedOpenglEnum.lua"; sourceTree = ""; }; - C03781C618BF656A00FE4F13 /* DrawPrimitives.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DrawPrimitives.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/DrawPrimitives.lua"; sourceTree = ""; }; - C03781C718BF656A00FE4F13 /* extern.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = extern.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/extern.lua"; sourceTree = ""; }; - C03781C818BF656A00FE4F13 /* GuiConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = GuiConstants.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/GuiConstants.lua"; sourceTree = ""; }; - C03781C918BF656A00FE4F13 /* json.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = json.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/json.lua"; sourceTree = ""; }; - C03781CA18BF656A00FE4F13 /* luaj.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = luaj.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/luaj.lua"; sourceTree = ""; }; - C03781CB18BF656A00FE4F13 /* luaoc.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = luaoc.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/luaoc.lua"; sourceTree = ""; }; - 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 = ""; }; C06E23C318CEF9740093C81A /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = main.cpp; sourceTree = ""; }; D6B061341803AC000077942B /* 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; }; F293B3C815EB7BE500256477 /* HelloLua iOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "HelloLua iOS.app"; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -354,12 +796,25 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - C03781F518BF65A900FE4F13 /* libluabindings Mac.a in Frameworks */, + 156B43DB19A1F262002CBF18 /* libluacocos3d Mac.a in Frameworks */, + 156B43DA19A1F256002CBF18 /* libcocos3d Mac.a in Frameworks */, + 15AA96B1199C655A00725633 /* libluaui Mac.a in Frameworks */, + 15AA96B0199C655200725633 /* libui Mac.a in Frameworks */, + 15AA96AF199C653300725633 /* libluaextension Mac.a in Frameworks */, + 15AA96AE199C652A00725633 /* libextension Mac.a in Frameworks */, + 15AA96AD199C650C00725633 /* libluaspine Mac.a in Frameworks */, + 15AA96AC199C64FD00725633 /* libspine Mac.a in Frameworks */, + 15AA96AB199C64F400725633 /* libluacocostudio Mac.a in Frameworks */, + 15AA96AA199C64DF00725633 /* libcocostudio Mac.a in Frameworks */, + 15AA96A9199C634600725633 /* libluacocosbuilder Mac.a in Frameworks */, + 15AA96A8199C633700725633 /* libcocosbuilder Mac.a in Frameworks */, + 15427C7D198F1FD800DC375D /* libluanetwork Mac.a in Frameworks */, + 15427C7C198F1FCB00DC375D /* libnetwork Mac.a in Frameworks */, + 15427C7B198F1FC100DC375D /* libluacocosdenshion Mac.a in Frameworks */, + 15427C7A198F1FB600DC375D /* libcocosdenshion Mac.a in Frameworks */, + 15427C79198F1FA200DC375D /* libluacocos2d Mac.a in Frameworks */, + 15427C78198F1F9900DC375D /* libcocos2d Mac.a in Frameworks */, 15A8A4881834C90F00142BE0 /* libcurl.dylib in Frameworks */, - 15A8A4821834C73500142BE0 /* libchipmunk Mac.a in Frameworks */, - 15A8A4831834C73500142BE0 /* libcocos2dx Mac.a in Frameworks */, - 15A8A4841834C73500142BE0 /* libcocos2dx-extensions Mac.a in Frameworks */, - 15A8A4851834C73500142BE0 /* libCocosDenshion Mac.a in Frameworks */, 50D7C97017EBBEEC005D0B91 /* IOKit.framework in Frameworks */, 50D7C96E17EBBEE6005D0B91 /* AppKit.framework in Frameworks */, 50D7C96C17EBBEDF005D0B91 /* OpenGL.framework in Frameworks */, @@ -377,12 +832,25 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 156B43D519A1F236002CBF18 /* libluacocos3d iOS.a in Frameworks */, + 156B43D419A1F224002CBF18 /* libcocos3d iOS.a in Frameworks */, + 15AA96A7199C62FE00725633 /* libui iOS.a in Frameworks */, + 15AA96A6199C62F500725633 /* libluaui iOS.a in Frameworks */, + 15AA96A5199C62CF00725633 /* libspine iOS.a in Frameworks */, + 15AA96A4199C62C500725633 /* libluaspine iOS.a in Frameworks */, + 15AA96A3199C62B900725633 /* libluacocostudio iOS.a in Frameworks */, + 15AA96A2199C62AE00725633 /* libcocostudio iOS.a in Frameworks */, + 15AA96A1199C629B00725633 /* libcocosbuilder iOS.a in Frameworks */, + 15AA96A0199C628F00725633 /* libluacocosbuilder iOS.a in Frameworks */, + 15AA969F199C628500725633 /* libextension iOS.a in Frameworks */, + 15AA968E199C627C00725633 /* libluaextension iOS.a in Frameworks */, + 15427C5F198F1E3300DC375D /* libluanetwork iOS.a in Frameworks */, + 15427C5E198F1E2B00DC375D /* libnetwork iOS.a in Frameworks */, + 15427C5D198F1E2100DC375D /* libluacocosdenshion iOS.a in Frameworks */, + 15427C5C198F1E1400DC375D /* libcocosdenshion iOS.a in Frameworks */, + 15427C5B198F1E0100DC375D /* libluacocos2d iOS.a in Frameworks */, + 15427C5A198F1DF000DC375D /* libcocos2d iOS.a in Frameworks */, 15AECE29195D482800907DB0 /* MediaPlayer.framework in Frameworks */, - C03781F618BF65B100FE4F13 /* libluabindings iOS.a in Frameworks */, - 15A8A4441834C43700142BE0 /* libchipmunk iOS.a in Frameworks */, - 15A8A4451834C43700142BE0 /* libcocos2dx iOS.a in Frameworks */, - 15A8A4461834C43700142BE0 /* libcocos2dx-extensions iOS.a in Frameworks */, - 15A8A4471834C43700142BE0 /* libCocosDenshion iOS.a in Frameworks */, D6B061351803AC000077942B /* CoreMotion.framework in Frameworks */, 1AF4C403178663F200122817 /* libz.dylib in Frameworks */, 50805AAF17EBBEAA004CFAD3 /* UIKit.framework in Frameworks */, @@ -402,16 +870,28 @@ 15A8A4041834BDA200142BE0 /* Products */ = { isa = PBXGroup; children = ( - 15A8A4171834BDA200142BE0 /* libcocos2dx Mac.a */, - 15A8A4191834BDA200142BE0 /* libcocos2dx-extensions Mac.a */, + 15A8A4171834BDA200142BE0 /* libcocos2d Mac.a */, + 15A8A4191834BDA200142BE0 /* libextension Mac.a */, + 15427C17198F1DE400DC375D /* libui Mac.a */, + 15427C19198F1DE400DC375D /* libcocostudio Mac.a */, + 15427C1B198F1DE400DC375D /* libcocosbuilder Mac.a */, + 15427C1D198F1DE400DC375D /* libspine Mac.a */, + 15427C1F198F1DE400DC375D /* libnetwork Mac.a */, 15A8A41B1834BDA200142BE0 /* libchipmunk Mac.a */, 15A8A41D1834BDA200142BE0 /* libbox2d Mac.a */, - 15A8A41F1834BDA200142BE0 /* libCocosDenshion Mac.a */, - 15A8A4251834BDA200142BE0 /* libcocos2dx iOS.a */, - 15A8A4271834BDA200142BE0 /* libcocos2dx-extensions iOS.a */, + 15A8A41F1834BDA200142BE0 /* libcocosdenshion Mac.a */, + 156B43C719A1F1EF002CBF18 /* libcocos3d Mac.a */, + 15A8A4251834BDA200142BE0 /* libcocos2d iOS.a */, + 15A8A4271834BDA200142BE0 /* libextension iOS.a */, 15A8A4291834BDA200142BE0 /* libchipmunk iOS.a */, 15A8A42B1834BDA200142BE0 /* libbox2d iOS.a */, - 15A8A42D1834BDA200142BE0 /* libCocosDenshion iOS.a */, + 15A8A42D1834BDA200142BE0 /* libcocosdenshion iOS.a */, + 15427C21198F1DE400DC375D /* libui iOS.a */, + 15427C23198F1DE400DC375D /* libcocostudio iOS.a */, + 15427C25198F1DE400DC375D /* libcocosbuilder iOS.a */, + 15427C27198F1DE400DC375D /* libspine iOS.a */, + 15427C29198F1DE400DC375D /* libnetwork iOS.a */, + 156B43C919A1F1EF002CBF18 /* libcocos3d iOS.a */, ); name = Products; sourceTree = ""; @@ -419,24 +899,41 @@ 1A0227A417A3AA1A00B867AD /* Lua Common */ = { isa = PBXGroup; children = ( - C03781BD18BF656900FE4F13 /* AudioEngine.lua */, - C03781BE18BF656900FE4F13 /* CCBReaderLoad.lua */, - C03781BF18BF656900FE4F13 /* Cocos2d.lua */, - C03781C018BF656900FE4F13 /* Cocos2dConstants.lua */, - C03781C118BF656900FE4F13 /* CocoStudio.lua */, - C03781C218BF656900FE4F13 /* Deprecated.lua */, - C03781C318BF656900FE4F13 /* DeprecatedClass.lua */, - C03781C418BF656A00FE4F13 /* DeprecatedEnum.lua */, - C03781C518BF656A00FE4F13 /* DeprecatedOpenglEnum.lua */, - C03781C618BF656A00FE4F13 /* DrawPrimitives.lua */, - C03781C718BF656A00FE4F13 /* extern.lua */, - C03781C818BF656A00FE4F13 /* GuiConstants.lua */, - C03781C918BF656A00FE4F13 /* json.lua */, - C03781CA18BF656A00FE4F13 /* luaj.lua */, - C03781CB18BF656A00FE4F13 /* luaoc.lua */, - C03781CC18BF656A00FE4F13 /* Opengl.lua */, - C03781CD18BF656A00FE4F13 /* OpenglConstants.lua */, - C03781CE18BF656A00FE4F13 /* StudioConstants.lua */, + 15AA96DE199C66E600725633 /* DeprecatedUIEnum.lua */, + 15AA96DF199C66E600725633 /* DeprecatedUIFunc.lua */, + 15AA96E0199C66E600725633 /* experimentalUIConstants.lua */, + 15AA96E1199C66E600725633 /* GuiConstants.lua */, + 15AA96D2199C66D500725633 /* DeprecatedNetworkClass.lua */, + 15AA96D3199C66D500725633 /* DeprecatedNetworkEnum.lua */, + 15AA96D4199C66D500725633 /* DeprecatedNetworkFunc.lua */, + 15AA96D5199C66D500725633 /* NetworkConstants.lua */, + 15AA96C6199C66B500725633 /* DeprecatedExtensionClass.lua */, + 15AA96C7199C66B500725633 /* DeprecatedExtensionEnum.lua */, + 15AA96C8199C66B500725633 /* DeprecatedExtensionFunc.lua */, + 15AA96C9199C66B500725633 /* ExtensionConstants.lua */, + 15AA96BA199C66A100725633 /* CocoStudio.lua */, + 15AA96BB199C66A100725633 /* DeprecatedCocoStudioClass.lua */, + 15AA96BC199C66A100725633 /* DeprecatedCocoStudioFunc.lua */, + 15AA96BD199C66A100725633 /* StudioConstants.lua */, + 15AA96B4199C668400725633 /* CCBReaderLoad.lua */, + 15AA96B5199C668400725633 /* DeprecatedCocosBuilderClass.lua */, + 15D1FE651998732700302043 /* AudioEngine.lua */, + 15D1FE661998732700302043 /* DeprecatedCocosDenshionClass.lua */, + 15D1FE671998732700302043 /* DeprecatedCocosDenshionFunc.lua */, + 15D1FE3B1998730800302043 /* bitExtend.lua */, + 15D1FE3C1998730800302043 /* Cocos2d.lua */, + 15D1FE3D1998730800302043 /* Cocos2dConstants.lua */, + 15D1FE3E1998730800302043 /* DeprecatedCocos2dClass.lua */, + 15D1FE3F1998730800302043 /* DeprecatedCocos2dEnum.lua */, + 15D1FE401998730800302043 /* DeprecatedCocos2dFunc.lua */, + 15D1FE411998730800302043 /* DeprecatedOpenglEnum.lua */, + 15D1FE421998730800302043 /* DrawPrimitives.lua */, + 15D1FE431998730800302043 /* extern.lua */, + 15D1FE441998730800302043 /* json.lua */, + 15D1FE451998730800302043 /* luaj.lua */, + 15D1FE461998730800302043 /* luaoc.lua */, + 15D1FE471998730800302043 /* Opengl.lua */, + 15D1FE481998730800302043 /* OpenglConstants.lua */, ); name = "Lua Common"; sourceTree = ""; @@ -493,8 +990,24 @@ C03781AF18BF654500FE4F13 /* Products */ = { isa = PBXGroup; children = ( - C03781B418BF654500FE4F13 /* libluabindings Mac.a */, - C03781B618BF654500FE4F13 /* libluabindings iOS.a */, + 15427C3B198F1DE400DC375D /* libluaextension Mac.a */, + 15427C3D198F1DE400DC375D /* libluaui Mac.a */, + 15427C3F198F1DE400DC375D /* libluacocostudio Mac.a */, + 15427C41198F1DE400DC375D /* libluacocosbuilder Mac.a */, + 15427C43198F1DE400DC375D /* libluaspine Mac.a */, + 15427C45198F1DE400DC375D /* libluanetwork Mac.a */, + 15427C47198F1DE400DC375D /* libluacocosdenshion Mac.a */, + 156B43CF19A1F1EF002CBF18 /* libluacocos3d Mac.a */, + 15427C49198F1DE400DC375D /* libluacocos2d Mac.a */, + 15427C4B198F1DE400DC375D /* libluaextension iOS.a */, + 15427C4D198F1DE400DC375D /* libluaui iOS.a */, + 15427C4F198F1DE400DC375D /* libluacocostudio iOS.a */, + 15427C51198F1DE400DC375D /* libluacocosbuilder iOS.a */, + 15427C53198F1DE400DC375D /* libluaspine iOS.a */, + 15427C55198F1DE400DC375D /* libluanetwork iOS.a */, + 15427C57198F1DE400DC375D /* libluacocosdenshion iOS.a */, + 156B43D119A1F1EF002CBF18 /* libluacocos3d iOS.a */, + 15427C59198F1DE400DC375D /* libluacocos2d iOS.a */, ); name = Products; sourceTree = ""; @@ -551,6 +1064,7 @@ F293BB7C15EB830F00256477 /* Classes */ = { isa = PBXGroup; children = ( + 15427C7E198F201A00DC375D /* lua_module_register.h */, F293BB7E15EB831F00256477 /* AppDelegate.cpp */, F293BB7F15EB831F00256477 /* AppDelegate.h */, ); @@ -582,12 +1096,24 @@ buildRules = ( ); dependencies = ( - C03781F418BF659D00FE4F13 /* PBXTargetDependency */, - C0A2F04118975FF80072A7AB /* PBXTargetDependency */, - C0A2F03D18975FEB0072A7AB /* PBXTargetDependency */, - C0A2F03B18975FE20072A7AB /* PBXTargetDependency */, - C0A2F03918975FDA0072A7AB /* PBXTargetDependency */, - C0A2F02718975FD30072A7AB /* PBXTargetDependency */, + 156B43D919A1F249002CBF18 /* PBXTargetDependency */, + 156B43D719A1F243002CBF18 /* PBXTargetDependency */, + 152A3407199C93F4004B68DC /* PBXTargetDependency */, + 152A3409199C93F4004B68DC /* PBXTargetDependency */, + 152A340B199C93F4004B68DC /* PBXTargetDependency */, + 152A340D199C93F4004B68DC /* PBXTargetDependency */, + 152A340F199C93F4004B68DC /* PBXTargetDependency */, + 152A33FD199C93E7004B68DC /* PBXTargetDependency */, + 152A33FF199C93E7004B68DC /* PBXTargetDependency */, + 152A3401199C93E7004B68DC /* PBXTargetDependency */, + 152A3403199C93E7004B68DC /* PBXTargetDependency */, + 152A3405199C93E7004B68DC /* PBXTargetDependency */, + 15427C6D198F1F4D00DC375D /* PBXTargetDependency */, + 15427C6F198F1F4D00DC375D /* PBXTargetDependency */, + 15427C71198F1F4D00DC375D /* PBXTargetDependency */, + 15427C73198F1F4D00DC375D /* PBXTargetDependency */, + 15427C75198F1F4D00DC375D /* PBXTargetDependency */, + 15427C77198F1F4D00DC375D /* PBXTargetDependency */, ); name = "HelloLua Mac"; productName = HelloLua; @@ -606,12 +1132,24 @@ buildRules = ( ); dependencies = ( - C03781F818BF65B500FE4F13 /* PBXTargetDependency */, - C0A2F0431897600E0072A7AB /* PBXTargetDependency */, - C0A2F0451897600E0072A7AB /* PBXTargetDependency */, - C0A2F0471897600E0072A7AB /* PBXTargetDependency */, - C0A2F0491897600E0072A7AB /* PBXTargetDependency */, - C0A2F04B1897600E0072A7AB /* PBXTargetDependency */, + 156B43D319A1F1FD002CBF18 /* PBXTargetDependency */, + 156B43BD19A1F1EF002CBF18 /* PBXTargetDependency */, + 152A33F3199C93CD004B68DC /* PBXTargetDependency */, + 152A33F5199C93CD004B68DC /* PBXTargetDependency */, + 152A33F7199C93CD004B68DC /* PBXTargetDependency */, + 152A33F9199C93CD004B68DC /* PBXTargetDependency */, + 152A33FB199C93CD004B68DC /* PBXTargetDependency */, + 152A33CD199C93BF004B68DC /* PBXTargetDependency */, + 152A33CF199C93BF004B68DC /* PBXTargetDependency */, + 152A33D1199C93BF004B68DC /* PBXTargetDependency */, + 152A33D3199C93BF004B68DC /* PBXTargetDependency */, + 152A33D5199C93BF004B68DC /* PBXTargetDependency */, + 15427C61198F1E7400DC375D /* PBXTargetDependency */, + 15427C63198F1E7400DC375D /* PBXTargetDependency */, + 15427C65198F1E7400DC375D /* PBXTargetDependency */, + 15427C67198F1E7400DC375D /* PBXTargetDependency */, + 15427C69198F1E7400DC375D /* PBXTargetDependency */, + 15427C6B198F1E7400DC375D /* PBXTargetDependency */, ); name = "HelloLua iOS"; productName = HelloLua; @@ -660,17 +1198,227 @@ /* End PBXProject section */ /* Begin PBXReferenceProxy section */ - 15A8A4171834BDA200142BE0 /* libcocos2dx Mac.a */ = { + 15427C17198F1DE400DC375D /* libui Mac.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; - path = "libcocos2dx Mac.a"; + path = "libui Mac.a"; + remoteRef = 15427C16198F1DE400DC375D /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15427C19198F1DE400DC375D /* libcocostudio Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libcocostudio Mac.a"; + remoteRef = 15427C18198F1DE400DC375D /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15427C1B198F1DE400DC375D /* libcocosbuilder Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libcocosbuilder Mac.a"; + remoteRef = 15427C1A198F1DE400DC375D /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15427C1D198F1DE400DC375D /* libspine Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libspine Mac.a"; + remoteRef = 15427C1C198F1DE400DC375D /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15427C1F198F1DE400DC375D /* libnetwork Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libnetwork Mac.a"; + remoteRef = 15427C1E198F1DE400DC375D /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15427C21198F1DE400DC375D /* libui iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libui iOS.a"; + remoteRef = 15427C20198F1DE400DC375D /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15427C23198F1DE400DC375D /* libcocostudio iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libcocostudio iOS.a"; + remoteRef = 15427C22198F1DE400DC375D /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15427C25198F1DE400DC375D /* libcocosbuilder iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libcocosbuilder iOS.a"; + remoteRef = 15427C24198F1DE400DC375D /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15427C27198F1DE400DC375D /* libspine iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libspine iOS.a"; + remoteRef = 15427C26198F1DE400DC375D /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15427C29198F1DE400DC375D /* libnetwork iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libnetwork iOS.a"; + remoteRef = 15427C28198F1DE400DC375D /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15427C3B198F1DE400DC375D /* libluaextension Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libluaextension Mac.a"; + remoteRef = 15427C3A198F1DE400DC375D /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15427C3D198F1DE400DC375D /* libluaui Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libluaui Mac.a"; + remoteRef = 15427C3C198F1DE400DC375D /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15427C3F198F1DE400DC375D /* libluacocostudio Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libluacocostudio Mac.a"; + remoteRef = 15427C3E198F1DE400DC375D /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15427C41198F1DE400DC375D /* libluacocosbuilder Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libluacocosbuilder Mac.a"; + remoteRef = 15427C40198F1DE400DC375D /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15427C43198F1DE400DC375D /* libluaspine Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libluaspine Mac.a"; + remoteRef = 15427C42198F1DE400DC375D /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15427C45198F1DE400DC375D /* libluanetwork Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libluanetwork Mac.a"; + remoteRef = 15427C44198F1DE400DC375D /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15427C47198F1DE400DC375D /* libluacocosdenshion Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libluacocosdenshion Mac.a"; + remoteRef = 15427C46198F1DE400DC375D /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15427C49198F1DE400DC375D /* libluacocos2d Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libluacocos2d Mac.a"; + remoteRef = 15427C48198F1DE400DC375D /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15427C4B198F1DE400DC375D /* libluaextension iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libluaextension iOS.a"; + remoteRef = 15427C4A198F1DE400DC375D /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15427C4D198F1DE400DC375D /* libluaui iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libluaui iOS.a"; + remoteRef = 15427C4C198F1DE400DC375D /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15427C4F198F1DE400DC375D /* libluacocostudio iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libluacocostudio iOS.a"; + remoteRef = 15427C4E198F1DE400DC375D /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15427C51198F1DE400DC375D /* libluacocosbuilder iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libluacocosbuilder iOS.a"; + remoteRef = 15427C50198F1DE400DC375D /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15427C53198F1DE400DC375D /* libluaspine iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libluaspine iOS.a"; + remoteRef = 15427C52198F1DE400DC375D /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15427C55198F1DE400DC375D /* libluanetwork iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libluanetwork iOS.a"; + remoteRef = 15427C54198F1DE400DC375D /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15427C57198F1DE400DC375D /* libluacocosdenshion iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libluacocosdenshion iOS.a"; + remoteRef = 15427C56198F1DE400DC375D /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15427C59198F1DE400DC375D /* libluacocos2d iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libluacocos2d iOS.a"; + remoteRef = 15427C58198F1DE400DC375D /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 156B43C719A1F1EF002CBF18 /* libcocos3d Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libcocos3d Mac.a"; + remoteRef = 156B43C619A1F1EF002CBF18 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 156B43C919A1F1EF002CBF18 /* libcocos3d iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libcocos3d iOS.a"; + remoteRef = 156B43C819A1F1EF002CBF18 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 156B43CF19A1F1EF002CBF18 /* libluacocos3d Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libluacocos3d Mac.a"; + remoteRef = 156B43CE19A1F1EF002CBF18 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 156B43D119A1F1EF002CBF18 /* libluacocos3d iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libluacocos3d iOS.a"; + remoteRef = 156B43D019A1F1EF002CBF18 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15A8A4171834BDA200142BE0 /* libcocos2d Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libcocos2d Mac.a"; remoteRef = 15A8A4161834BDA200142BE0 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 15A8A4191834BDA200142BE0 /* libcocos2dx-extensions Mac.a */ = { + 15A8A4191834BDA200142BE0 /* libextension Mac.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; - path = "libcocos2dx-extensions Mac.a"; + path = "libextension Mac.a"; remoteRef = 15A8A4181834BDA200142BE0 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -688,24 +1436,24 @@ remoteRef = 15A8A41C1834BDA200142BE0 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 15A8A41F1834BDA200142BE0 /* libCocosDenshion Mac.a */ = { + 15A8A41F1834BDA200142BE0 /* libcocosdenshion Mac.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; - path = "libCocosDenshion Mac.a"; + path = "libcocosdenshion Mac.a"; remoteRef = 15A8A41E1834BDA200142BE0 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 15A8A4251834BDA200142BE0 /* libcocos2dx iOS.a */ = { + 15A8A4251834BDA200142BE0 /* libcocos2d iOS.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; - path = "libcocos2dx iOS.a"; + path = "libcocos2d iOS.a"; remoteRef = 15A8A4241834BDA200142BE0 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 15A8A4271834BDA200142BE0 /* libcocos2dx-extensions iOS.a */ = { + 15A8A4271834BDA200142BE0 /* libextension iOS.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; - path = "libcocos2dx-extensions iOS.a"; + path = "libextension iOS.a"; remoteRef = 15A8A4261834BDA200142BE0 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -723,27 +1471,13 @@ remoteRef = 15A8A42A1834BDA200142BE0 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 15A8A42D1834BDA200142BE0 /* libCocosDenshion iOS.a */ = { + 15A8A42D1834BDA200142BE0 /* libcocosdenshion iOS.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; - path = "libCocosDenshion iOS.a"; + path = "libcocosdenshion iOS.a"; remoteRef = 15A8A42C1834BDA200142BE0 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - C03781B418BF654500FE4F13 /* libluabindings Mac.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libluabindings Mac.a"; - remoteRef = C03781B318BF654500FE4F13 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - C03781B618BF654500FE4F13 /* libluabindings iOS.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libluabindings iOS.a"; - remoteRef = C03781B518BF654500FE4F13 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; /* End PBXReferenceProxy section */ /* Begin PBXResourcesBuildPhase section */ @@ -751,27 +1485,44 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - C03781EE18BF656A00FE4F13 /* Opengl.lua in Resources */, - C03781F018BF656A00FE4F13 /* OpenglConstants.lua in Resources */, - C03781E418BF656A00FE4F13 /* extern.lua in Resources */, - C03781E618BF656A00FE4F13 /* GuiConstants.lua in Resources */, - C03781D418BF656A00FE4F13 /* Cocos2d.lua in Resources */, + 15D1FE4A1998730800302043 /* bitExtend.lua in Resources */, + 15D1FE561998730800302043 /* DeprecatedOpenglEnum.lua in Resources */, + 15D1FE641998730800302043 /* OpenglConstants.lua in Resources */, + 15D1FE541998730800302043 /* DeprecatedCocos2dFunc.lua in Resources */, C03781BA18BF655400FE4F13 /* res in Resources */, + 15D1FE691998732700302043 /* AudioEngine.lua in Resources */, + 15AA96C5199C66A100725633 /* StudioConstants.lua in Resources */, + 15D1FE601998730800302043 /* luaoc.lua in Resources */, + 15AA96D1199C66B500725633 /* ExtensionConstants.lua in Resources */, + 15D1FE5E1998730800302043 /* luaj.lua in Resources */, + 15D1FE6B1998732700302043 /* DeprecatedCocosDenshionClass.lua in Resources */, + 15D1FE5A1998730800302043 /* extern.lua in Resources */, + 15D1FE501998730800302043 /* DeprecatedCocos2dClass.lua in Resources */, + 15D1FE581998730800302043 /* DrawPrimitives.lua in Resources */, + 15AA96CF199C66B500725633 /* DeprecatedExtensionFunc.lua in Resources */, + 15AA96E7199C66E600725633 /* experimentalUIConstants.lua in Resources */, + 15AA96CB199C66B500725633 /* DeprecatedExtensionClass.lua in Resources */, + 15AA96E3199C66E600725633 /* DeprecatedUIEnum.lua in Resources */, + 15AA96B7199C668400725633 /* CCBReaderLoad.lua in Resources */, + 15D1FE5C1998730800302043 /* json.lua in Resources */, + 15AA96E5199C66E600725633 /* DeprecatedUIFunc.lua in Resources */, + 15D1FE4E1998730800302043 /* Cocos2dConstants.lua in Resources */, + 15D1FE521998730800302043 /* DeprecatedCocos2dEnum.lua in Resources */, + 15AA96C1199C66A100725633 /* DeprecatedCocoStudioClass.lua in Resources */, + 15AA96C3199C66A100725633 /* DeprecatedCocoStudioFunc.lua in Resources */, + 15D1FE6D1998732700302043 /* DeprecatedCocosDenshionFunc.lua in Resources */, + 15D1FE4C1998730800302043 /* Cocos2d.lua in Resources */, + 15AA96CD199C66B500725633 /* DeprecatedExtensionEnum.lua in Resources */, + 15AA96DD199C66D500725633 /* NetworkConstants.lua in Resources */, + 15AA96D9199C66D500725633 /* DeprecatedNetworkEnum.lua in Resources */, + 15AA96E9199C66E600725633 /* GuiConstants.lua in Resources */, + 15AA96D7199C66D500725633 /* DeprecatedNetworkClass.lua in Resources */, C03781BC18BF655400FE4F13 /* src in Resources */, - C03781E218BF656A00FE4F13 /* DrawPrimitives.lua in Resources */, - C03781DA18BF656A00FE4F13 /* Deprecated.lua in Resources */, - C03781E018BF656A00FE4F13 /* DeprecatedOpenglEnum.lua in Resources */, - C03781EC18BF656A00FE4F13 /* luaoc.lua in Resources */, 5023817617EBBE3400990C9B /* Icon.icns in Resources */, - C03781D218BF656A00FE4F13 /* CCBReaderLoad.lua in Resources */, - C03781D018BF656A00FE4F13 /* AudioEngine.lua in Resources */, - C03781D818BF656A00FE4F13 /* CocoStudio.lua in Resources */, - C03781DC18BF656A00FE4F13 /* DeprecatedClass.lua in Resources */, - C03781F218BF656A00FE4F13 /* StudioConstants.lua in Resources */, - C03781EA18BF656A00FE4F13 /* luaj.lua in Resources */, - C03781DE18BF656A00FE4F13 /* DeprecatedEnum.lua in Resources */, - C03781E818BF656A00FE4F13 /* json.lua in Resources */, - C03781D618BF656A00FE4F13 /* Cocos2dConstants.lua in Resources */, + 15AA96BF199C66A100725633 /* CocoStudio.lua in Resources */, + 15AA96B9199C668400725633 /* DeprecatedCocosBuilderClass.lua in Resources */, + 15D1FE621998730800302043 /* Opengl.lua in Resources */, + 15AA96DB199C66D500725633 /* DeprecatedNetworkFunc.lua in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -779,42 +1530,59 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + 15AA96E6199C66E600725633 /* experimentalUIConstants.lua in Resources */, 15A8A4491834C64F00142BE0 /* Icon-114.png in Resources */, - C03781DB18BF656A00FE4F13 /* DeprecatedClass.lua in Resources */, 5023811D17EBBCAC00990C9B /* Icon-120.png in Resources */, 5091733B17ECE17A00D62437 /* Icon-100.png in Resources */, - C03781E918BF656A00FE4F13 /* luaj.lua in Resources */, 5023811B17EBBCAC00990C9B /* Default@2x.png in Resources */, + 15AA96BE199C66A100725633 /* CocoStudio.lua in Resources */, 5091733617ECE17A00D62437 /* Icon-29.png in Resources */, - C03781E718BF656A00FE4F13 /* json.lua in Resources */, + 15D1FE631998730800302043 /* OpenglConstants.lua in Resources */, + 15D1FE5D1998730800302043 /* luaj.lua in Resources */, + 15AA96D0199C66B500725633 /* ExtensionConstants.lua in Resources */, 5023811917EBBCAC00990C9B /* Default-568h@2x.png in Resources */, - C03781D318BF656A00FE4F13 /* Cocos2d.lua in Resources */, 5091733917ECE17A00D62437 /* Icon-58.png in Resources */, - C03781ED18BF656A00FE4F13 /* Opengl.lua in Resources */, - C03781F118BF656A00FE4F13 /* StudioConstants.lua in Resources */, 5023811F17EBBCAC00990C9B /* Icon-152.png in Resources */, - C03781D118BF656A00FE4F13 /* CCBReaderLoad.lua in Resources */, 5023812017EBBCAC00990C9B /* Icon-57.png in Resources */, - C03781CF18BF656A00FE4F13 /* AudioEngine.lua in Resources */, C03781B918BF655400FE4F13 /* res in Resources */, - C03781EF18BF656A00FE4F13 /* OpenglConstants.lua in Resources */, - C03781E518BF656A00FE4F13 /* GuiConstants.lua in Resources */, + 15D1FE5B1998730800302043 /* json.lua in Resources */, 5023812217EBBCAC00990C9B /* Icon-76.png in Resources */, - C03781DF18BF656A00FE4F13 /* DeprecatedOpenglEnum.lua in Resources */, + 15AA96E2199C66E600725633 /* DeprecatedUIEnum.lua in Resources */, + 15D1FE681998732700302043 /* AudioEngine.lua in Resources */, + 15AA96E8199C66E600725633 /* GuiConstants.lua in Resources */, + 15AA96CA199C66B500725633 /* DeprecatedExtensionClass.lua in Resources */, + 15D1FE4D1998730800302043 /* Cocos2dConstants.lua in Resources */, + 15D1FE4F1998730800302043 /* DeprecatedCocos2dClass.lua in Resources */, 5091733A17ECE17A00D62437 /* Icon-80.png in Resources */, + 15D1FE6A1998732700302043 /* DeprecatedCocosDenshionClass.lua in Resources */, + 15AA96CC199C66B500725633 /* DeprecatedExtensionEnum.lua in Resources */, + 15D1FE571998730800302043 /* DrawPrimitives.lua in Resources */, + 15D1FE4B1998730800302043 /* Cocos2d.lua in Resources */, 5091733717ECE17A00D62437 /* Icon-40.png in Resources */, + 15D1FE5F1998730800302043 /* luaoc.lua in Resources */, 5023811E17EBBCAC00990C9B /* Icon-144.png in Resources */, + 15AA96B6199C668400725633 /* CCBReaderLoad.lua in Resources */, 5023811A17EBBCAC00990C9B /* Default.png in Resources */, - C03781E118BF656A00FE4F13 /* DrawPrimitives.lua in Resources */, + 15D1FE511998730800302043 /* DeprecatedCocos2dEnum.lua in Resources */, + 15D1FE531998730800302043 /* DeprecatedCocos2dFunc.lua in Resources */, + 15AA96DA199C66D500725633 /* DeprecatedNetworkFunc.lua in Resources */, + 15AA96D8199C66D500725633 /* DeprecatedNetworkEnum.lua in Resources */, + 15AA96B8199C668400725633 /* DeprecatedCocosBuilderClass.lua in Resources */, C03781BB18BF655400FE4F13 /* src in Resources */, - C03781EB18BF656A00FE4F13 /* luaoc.lua in Resources */, + 15AA96C0199C66A100725633 /* DeprecatedCocoStudioClass.lua in Resources */, + 15D1FE591998730800302043 /* extern.lua in Resources */, + 15D1FE551998730800302043 /* DeprecatedOpenglEnum.lua in Resources */, + 15AA96E4199C66E600725633 /* DeprecatedUIFunc.lua in Resources */, + 15D1FE6C1998732700302043 /* DeprecatedCocosDenshionFunc.lua in Resources */, + 15AA96CE199C66B500725633 /* DeprecatedExtensionFunc.lua in Resources */, + 15D1FE611998730800302043 /* Opengl.lua in Resources */, 5091733817ECE17A00D62437 /* Icon-50.png in Resources */, - C03781D718BF656A00FE4F13 /* CocoStudio.lua in Resources */, - C03781D518BF656A00FE4F13 /* Cocos2dConstants.lua in Resources */, + 15AA96C2199C66A100725633 /* DeprecatedCocoStudioFunc.lua in Resources */, + 15AA96C4199C66A100725633 /* StudioConstants.lua in Resources */, + 15D1FE491998730800302043 /* bitExtend.lua in Resources */, + 15AA96DC199C66D500725633 /* NetworkConstants.lua in Resources */, 5023812117EBBCAC00990C9B /* Icon-72.png in Resources */, - C03781DD18BF656A00FE4F13 /* DeprecatedEnum.lua in Resources */, - C03781E318BF656A00FE4F13 /* extern.lua in Resources */, - C03781D918BF656A00FE4F13 /* Deprecated.lua in Resources */, + 15AA96D6199C66D500725633 /* DeprecatedNetworkClass.lua in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -873,65 +1641,185 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - C03781F418BF659D00FE4F13 /* PBXTargetDependency */ = { + 152A33CD199C93BF004B68DC /* PBXTargetDependency */ = { isa = PBXTargetDependency; - name = "luabindings Mac"; - targetProxy = C03781F318BF659D00FE4F13 /* PBXContainerItemProxy */; + name = "libluaextension iOS"; + targetProxy = 152A33CC199C93BF004B68DC /* PBXContainerItemProxy */; }; - C03781F818BF65B500FE4F13 /* PBXTargetDependency */ = { + 152A33CF199C93BF004B68DC /* PBXTargetDependency */ = { isa = PBXTargetDependency; - name = "luabindings iOS"; - targetProxy = C03781F718BF65B500FE4F13 /* PBXContainerItemProxy */; + name = "libluaui iOS"; + targetProxy = 152A33CE199C93BF004B68DC /* PBXContainerItemProxy */; }; - C0A2F02718975FD30072A7AB /* PBXTargetDependency */ = { + 152A33D1199C93BF004B68DC /* PBXTargetDependency */ = { isa = PBXTargetDependency; - name = "chipmunk Mac"; - targetProxy = C0A2F02618975FD30072A7AB /* PBXContainerItemProxy */; + name = "libluacocostudio iOS"; + targetProxy = 152A33D0199C93BF004B68DC /* PBXContainerItemProxy */; }; - C0A2F03918975FDA0072A7AB /* PBXTargetDependency */ = { + 152A33D3199C93BF004B68DC /* PBXTargetDependency */ = { isa = PBXTargetDependency; - name = "box2d Mac"; - targetProxy = C0A2F03818975FDA0072A7AB /* PBXContainerItemProxy */; + name = "libluacocosbuilder iOS"; + targetProxy = 152A33D2199C93BF004B68DC /* PBXContainerItemProxy */; }; - C0A2F03B18975FE20072A7AB /* PBXTargetDependency */ = { + 152A33D5199C93BF004B68DC /* PBXTargetDependency */ = { isa = PBXTargetDependency; - name = "cocos2dx-extensions Mac"; - targetProxy = C0A2F03A18975FE20072A7AB /* PBXContainerItemProxy */; + name = "libluaspine iOS"; + targetProxy = 152A33D4199C93BF004B68DC /* PBXContainerItemProxy */; }; - C0A2F03D18975FEB0072A7AB /* PBXTargetDependency */ = { + 152A33F3199C93CD004B68DC /* PBXTargetDependency */ = { isa = PBXTargetDependency; - name = "CocosDenshion Mac"; - targetProxy = C0A2F03C18975FEB0072A7AB /* PBXContainerItemProxy */; + name = "libextension iOS"; + targetProxy = 152A33F2199C93CD004B68DC /* PBXContainerItemProxy */; }; - C0A2F04118975FF80072A7AB /* PBXTargetDependency */ = { + 152A33F5199C93CD004B68DC /* PBXTargetDependency */ = { isa = PBXTargetDependency; - name = "cocos2dx Mac"; - targetProxy = C0A2F04018975FF80072A7AB /* PBXContainerItemProxy */; + name = "libui iOS"; + targetProxy = 152A33F4199C93CD004B68DC /* PBXContainerItemProxy */; }; - C0A2F0431897600E0072A7AB /* PBXTargetDependency */ = { + 152A33F7199C93CD004B68DC /* PBXTargetDependency */ = { isa = PBXTargetDependency; - name = "cocos2dx iOS"; - targetProxy = C0A2F0421897600E0072A7AB /* PBXContainerItemProxy */; + name = "libcocostudio iOS"; + targetProxy = 152A33F6199C93CD004B68DC /* PBXContainerItemProxy */; }; - C0A2F0451897600E0072A7AB /* PBXTargetDependency */ = { + 152A33F9199C93CD004B68DC /* PBXTargetDependency */ = { isa = PBXTargetDependency; - name = "cocos2dx-extensions iOS"; - targetProxy = C0A2F0441897600E0072A7AB /* PBXContainerItemProxy */; + name = "libcocosbuilder iOS"; + targetProxy = 152A33F8199C93CD004B68DC /* PBXContainerItemProxy */; }; - C0A2F0471897600E0072A7AB /* PBXTargetDependency */ = { + 152A33FB199C93CD004B68DC /* PBXTargetDependency */ = { isa = PBXTargetDependency; - name = "chipmunk iOS"; - targetProxy = C0A2F0461897600E0072A7AB /* PBXContainerItemProxy */; + name = "libspine iOS"; + targetProxy = 152A33FA199C93CD004B68DC /* PBXContainerItemProxy */; }; - C0A2F0491897600E0072A7AB /* PBXTargetDependency */ = { + 152A33FD199C93E7004B68DC /* PBXTargetDependency */ = { isa = PBXTargetDependency; - name = "box2d iOS"; - targetProxy = C0A2F0481897600E0072A7AB /* PBXContainerItemProxy */; + name = "libluaextension Mac"; + targetProxy = 152A33FC199C93E7004B68DC /* PBXContainerItemProxy */; }; - C0A2F04B1897600E0072A7AB /* PBXTargetDependency */ = { + 152A33FF199C93E7004B68DC /* PBXTargetDependency */ = { isa = PBXTargetDependency; - name = "CocosDenshion iOS"; - targetProxy = C0A2F04A1897600E0072A7AB /* PBXContainerItemProxy */; + name = "libluaui Mac"; + targetProxy = 152A33FE199C93E7004B68DC /* PBXContainerItemProxy */; + }; + 152A3401199C93E7004B68DC /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libluacocostudio Mac"; + targetProxy = 152A3400199C93E7004B68DC /* PBXContainerItemProxy */; + }; + 152A3403199C93E7004B68DC /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libluacocosbuilder Mac"; + targetProxy = 152A3402199C93E7004B68DC /* PBXContainerItemProxy */; + }; + 152A3405199C93E7004B68DC /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libluaspine Mac"; + targetProxy = 152A3404199C93E7004B68DC /* PBXContainerItemProxy */; + }; + 152A3407199C93F4004B68DC /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libextension Mac"; + targetProxy = 152A3406199C93F4004B68DC /* PBXContainerItemProxy */; + }; + 152A3409199C93F4004B68DC /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libui Mac"; + targetProxy = 152A3408199C93F4004B68DC /* PBXContainerItemProxy */; + }; + 152A340B199C93F4004B68DC /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libcocostudio Mac"; + targetProxy = 152A340A199C93F4004B68DC /* PBXContainerItemProxy */; + }; + 152A340D199C93F4004B68DC /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libcocosbuilder Mac"; + targetProxy = 152A340C199C93F4004B68DC /* PBXContainerItemProxy */; + }; + 152A340F199C93F4004B68DC /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libspine Mac"; + targetProxy = 152A340E199C93F4004B68DC /* PBXContainerItemProxy */; + }; + 15427C61198F1E7400DC375D /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libluanetwork iOS"; + targetProxy = 15427C60198F1E7400DC375D /* PBXContainerItemProxy */; + }; + 15427C63198F1E7400DC375D /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libluacocosdenshion iOS"; + targetProxy = 15427C62198F1E7400DC375D /* PBXContainerItemProxy */; + }; + 15427C65198F1E7400DC375D /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libluacocos2d iOS"; + targetProxy = 15427C64198F1E7400DC375D /* PBXContainerItemProxy */; + }; + 15427C67198F1E7400DC375D /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libcocos2d iOS"; + targetProxy = 15427C66198F1E7400DC375D /* PBXContainerItemProxy */; + }; + 15427C69198F1E7400DC375D /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libcocosdenshion iOS"; + targetProxy = 15427C68198F1E7400DC375D /* PBXContainerItemProxy */; + }; + 15427C6B198F1E7400DC375D /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libnetwork iOS"; + targetProxy = 15427C6A198F1E7400DC375D /* PBXContainerItemProxy */; + }; + 15427C6D198F1F4D00DC375D /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libluanetwork Mac"; + targetProxy = 15427C6C198F1F4D00DC375D /* PBXContainerItemProxy */; + }; + 15427C6F198F1F4D00DC375D /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libluacocosdenshion Mac"; + targetProxy = 15427C6E198F1F4D00DC375D /* PBXContainerItemProxy */; + }; + 15427C71198F1F4D00DC375D /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libluacocos2d Mac"; + targetProxy = 15427C70198F1F4D00DC375D /* PBXContainerItemProxy */; + }; + 15427C73198F1F4D00DC375D /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libcocos2d Mac"; + targetProxy = 15427C72198F1F4D00DC375D /* PBXContainerItemProxy */; + }; + 15427C75198F1F4D00DC375D /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libnetwork Mac"; + targetProxy = 15427C74198F1F4D00DC375D /* PBXContainerItemProxy */; + }; + 15427C77198F1F4D00DC375D /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libcocosdenshion Mac"; + targetProxy = 15427C76198F1F4D00DC375D /* PBXContainerItemProxy */; + }; + 156B43BD19A1F1EF002CBF18 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libluacocos3d iOS"; + targetProxy = 156B43BC19A1F1EF002CBF18 /* PBXContainerItemProxy */; + }; + 156B43D319A1F1FD002CBF18 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libcocos3d iOS"; + targetProxy = 156B43D219A1F1FD002CBF18 /* PBXContainerItemProxy */; + }; + 156B43D719A1F243002CBF18 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libluacocos3d Mac"; + targetProxy = 156B43D619A1F243002CBF18 /* PBXContainerItemProxy */; + }; + 156B43D919A1F249002CBF18 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libcocos3d Mac"; + targetProxy = 156B43D819A1F249002CBF18 /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/AppController.mm b/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/AppController.mm index 6e1d42e9c0..897124a251 100644 --- a/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/AppController.mm +++ b/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/AppController.mm @@ -78,7 +78,7 @@ static AppDelegate s_sharedApplication; [[UIApplication sharedApplication] setStatusBarHidden: YES]; // IMPORTANT: Setting the GLView should be done after creating the RootViewController - cocos2d::GLView *glview = cocos2d::GLView::createWithEAGLView(eaglView); + cocos2d::GLView *glview = cocos2d::GLViewImpl::createWithEAGLView(eaglView); cocos2d::Director::getInstance()->setOpenGLView(glview); cocos2d::Application::getInstance()->run(); diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.sln b/templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.sln index 47be636d6c..c88e087e51 100644 --- a/templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.sln +++ b/templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.sln @@ -2,16 +2,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2012 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HelloLua", "HelloLua.vcxproj", "{4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}" - ProjectSection(ProjectDependencies) = postProject - {21B2C324-891F-48EA-AD1A-5AE13DE12E28} = {21B2C324-891F-48EA-AD1A-5AE13DE12E28} - {B7C2A162-DEC9-4418-972E-240AB3CBFCAE} = {B7C2A162-DEC9-4418-972E-240AB3CBFCAE} - {DDC3E27F-004D-4DD4-9DD3-931A013D2159} = {DDC3E27F-004D-4DD4-9DD3-931A013D2159} - {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E} = {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E} - {207BC7A9-CCF1-4F2F-A04D-45F72242AE25} = {207BC7A9-CCF1-4F2F-A04D-45F72242AE25} - {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6} = {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libExtensions", "..\..\cocos2d-x\extensions\proj.win32\libExtensions.vcxproj", "{21B2C324-891F-48EA-AD1A-5AE13DE12E28}" ProjectSection(ProjectDependencies) = postProject {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E} = {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E} {207BC7A9-CCF1-4F2F-A04D-45F72242AE25} = {207BC7A9-CCF1-4F2F-A04D-45F72242AE25} @@ -20,23 +10,43 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libExtensions", "..\..\coco EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libchipmunk", "..\..\cocos2d-x\external\chipmunk\proj.win32\chipmunk.vcxproj", "{207BC7A9-CCF1-4F2F-A04D-45F72242AE25}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos2d", "..\..\cocos2d-x\cocos\2d\cocos2d.vcxproj", "{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocosdenshion", "..\..\cocos2d-x\cocos\audio\proj.win32\libcocosdenshion.vcxproj", "{F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libAudio", "..\..\cocos2d-x\cocos\audio\proj.win32\CocosDenshion.vcxproj", "{F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos2d", "..\..\cocos2d-x\cocos\2d\libcocos2d.vcxproj", "{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libNetwork", "..\..\cocos2d-x\cocos\network\proj.win32\libNetwork.vcxproj", "{DF2638C0-8128-4847-867C-6EAFE3DEE7B5}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libluacocos2d", "..\..\cocos2d-x\cocos\scripting\lua-bindings\proj.win32\libluacocos2d.vcxproj", "{9F2D6CE6-C893-4400-B50C-6DB70CC2562F}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libCocosBuilder", "..\..\cocos2d-x\cocos\editor-support\cocosbuilder\proj.win32\libCocosBuilder.vcxproj", "{811C0DAB-7B96-4BD3-A154-B7572B58E4AB}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libluacocosdenshion", "..\..\cocos2d-x\cocos\scripting\lua-bindings\proj.win32\libluacocosdenshion.vcxproj", "{46A7D57A-7F25-4F52-823B-FFAC4FF3A624}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libCocosStudio", "..\..\cocos2d-x\cocos\editor-support\cocostudio\proj.win32\libCocosStudio.vcxproj", "{B57CF53F-2E49-4031-9822-047CC0E6BDE2}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocosbuilder", "..\..\cocos2d-x\cocos\editor-support\cocosbuilder\proj.win32\libcocosbuilder.vcxproj", "{811C0DAB-7B96-4BD3-A154-B7572B58E4AB}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGUI", "..\..\cocos2d-x\cocos\ui\proj.win32\libGUI.vcxproj", "{7E06E92C-537A-442B-9E4A-4761C84F8A1A}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocostudio", "..\..\cocos2d-x\cocos\editor-support\cocostudio\proj.win32\libcocostudio.vcxproj", "{B57CF53F-2E49-4031-9822-047CC0E6BDE2}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libSpine", "..\..\cocos2d-x\cocos\editor-support\spine\proj.win32\libSpine.vcxproj", "{B7C2A162-DEC9-4418-972E-240AB3CBFCAE}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblua", "..\..\cocos2d-x\cocos\scripting\lua-bindings\proj.win32\liblua.vcxproj", "{DDC3E27F-004D-4DD4-9DD3-931A013D2159}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libnetwork", "..\..\cocos2d-x\cocos\network\proj.win32\libnetwork.vcxproj", "{DF2638C0-8128-4847-867C-6EAFE3DEE7B5}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libLocalStorage", "..\..\cocos2d-x\cocos\storage\local-storage\proj.win32\libLocalStorage.vcxproj", "{632A8F38-D0F0-4D22-86B3-D69F5E6BF63A}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libextension", "..\..\cocos2d-x\extensions\proj.win32\libextension.vcxproj", "{21B2C324-891F-48EA-AD1A-5AE13DE12E28}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libui", "..\..\cocos2d-x\cocos\ui\proj.win32\libui.vcxproj", "{7E06E92C-537A-442B-9E4A-4761C84F8A1A}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libluacocosbuilder", "..\..\cocos2d-x\cocos\scripting\lua-bindings\proj.win32\libluacocosbuilder.vcxproj", "{F8198014-F4F3-49F0-88AB-C1969A5829AF}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libluacocostudio", "..\..\cocos2d-x\cocos\scripting\lua-bindings\proj.win32\libluacocostudio.vcxproj", "{9640951E-C5D0-47B5-9C42-0BCADA261C50}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libluaextension", "..\..\cocos2d-x\cocos\scripting\lua-bindings\proj.win32\libluaextension.vcxproj", "{7068296E-38A4-4BCA-85DB-3A09BD014847}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libluanetwork", "..\..\cocos2d-x\cocos\scripting\lua-bindings\proj.win32\libluanetwork.vcxproj", "{65E52F4B-703F-419E-AD67-926241A10042}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libluaspine", "..\..\cocos2d-x\cocos\scripting\lua-bindings\proj.win32\libluaspine.vcxproj", "{31EF6AB1-0D9A-4BC6-99B8-2C482EA373C4}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libluaui", "..\..\cocos2d-x\cocos\scripting\lua-bindings\proj.win32\libluaui.vcxproj", "{FE78EEBB-3DBB-4713-8CBF-63D742C5BD82}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbox2d", "..\..\cocos2d-x\external\Box2D\proj.win32\libbox2d.vcxproj", "{929480E7-23C0-4DF6-8456-096D71547116}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos3d", "..\..\cocos2d-x\cocos\3d\proj.win32\libcocos3d.vcxproj", "{E24950FA-5BC1-4AEE-A900-4F0259354BF0}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libluacocos3d", "..\..\cocos2d-x\cocos\scripting\lua-bindings\proj.win32\libluacocos3d.vcxproj", "{06840490-14A4-43D6-88BC-AAFA44D043EB}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -48,26 +58,26 @@ Global {4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}.Debug|Win32.Build.0 = Debug|Win32 {4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}.Release|Win32.ActiveCfg = Release|Win32 {4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}.Release|Win32.Build.0 = Release|Win32 - {21B2C324-891F-48EA-AD1A-5AE13DE12E28}.Debug|Win32.ActiveCfg = Debug|Win32 - {21B2C324-891F-48EA-AD1A-5AE13DE12E28}.Debug|Win32.Build.0 = Debug|Win32 - {21B2C324-891F-48EA-AD1A-5AE13DE12E28}.Release|Win32.ActiveCfg = Release|Win32 - {21B2C324-891F-48EA-AD1A-5AE13DE12E28}.Release|Win32.Build.0 = Release|Win32 {207BC7A9-CCF1-4F2F-A04D-45F72242AE25}.Debug|Win32.ActiveCfg = Debug|Win32 {207BC7A9-CCF1-4F2F-A04D-45F72242AE25}.Debug|Win32.Build.0 = Debug|Win32 {207BC7A9-CCF1-4F2F-A04D-45F72242AE25}.Release|Win32.ActiveCfg = Release|Win32 {207BC7A9-CCF1-4F2F-A04D-45F72242AE25}.Release|Win32.Build.0 = Release|Win32 - {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Debug|Win32.ActiveCfg = Debug|Win32 - {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Debug|Win32.Build.0 = Debug|Win32 - {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Release|Win32.ActiveCfg = Release|Win32 - {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Release|Win32.Build.0 = Release|Win32 {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}.Debug|Win32.ActiveCfg = Debug|Win32 {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}.Debug|Win32.Build.0 = Debug|Win32 {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}.Release|Win32.ActiveCfg = Release|Win32 {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}.Release|Win32.Build.0 = Release|Win32 - {DF2638C0-8128-4847-867C-6EAFE3DEE7B5}.Debug|Win32.ActiveCfg = Debug|Win32 - {DF2638C0-8128-4847-867C-6EAFE3DEE7B5}.Debug|Win32.Build.0 = Debug|Win32 - {DF2638C0-8128-4847-867C-6EAFE3DEE7B5}.Release|Win32.ActiveCfg = Release|Win32 - {DF2638C0-8128-4847-867C-6EAFE3DEE7B5}.Release|Win32.Build.0 = Release|Win32 + {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Debug|Win32.ActiveCfg = Debug|Win32 + {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Debug|Win32.Build.0 = Debug|Win32 + {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Release|Win32.ActiveCfg = Release|Win32 + {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Release|Win32.Build.0 = Release|Win32 + {9F2D6CE6-C893-4400-B50C-6DB70CC2562F}.Debug|Win32.ActiveCfg = Debug|Win32 + {9F2D6CE6-C893-4400-B50C-6DB70CC2562F}.Debug|Win32.Build.0 = Debug|Win32 + {9F2D6CE6-C893-4400-B50C-6DB70CC2562F}.Release|Win32.ActiveCfg = Release|Win32 + {9F2D6CE6-C893-4400-B50C-6DB70CC2562F}.Release|Win32.Build.0 = Release|Win32 + {46A7D57A-7F25-4F52-823B-FFAC4FF3A624}.Debug|Win32.ActiveCfg = Debug|Win32 + {46A7D57A-7F25-4F52-823B-FFAC4FF3A624}.Debug|Win32.Build.0 = Debug|Win32 + {46A7D57A-7F25-4F52-823B-FFAC4FF3A624}.Release|Win32.ActiveCfg = Release|Win32 + {46A7D57A-7F25-4F52-823B-FFAC4FF3A624}.Release|Win32.Build.0 = Release|Win32 {811C0DAB-7B96-4BD3-A154-B7572B58E4AB}.Debug|Win32.ActiveCfg = Debug|Win32 {811C0DAB-7B96-4BD3-A154-B7572B58E4AB}.Debug|Win32.Build.0 = Debug|Win32 {811C0DAB-7B96-4BD3-A154-B7572B58E4AB}.Release|Win32.ActiveCfg = Release|Win32 @@ -76,22 +86,58 @@ Global {B57CF53F-2E49-4031-9822-047CC0E6BDE2}.Debug|Win32.Build.0 = Debug|Win32 {B57CF53F-2E49-4031-9822-047CC0E6BDE2}.Release|Win32.ActiveCfg = Release|Win32 {B57CF53F-2E49-4031-9822-047CC0E6BDE2}.Release|Win32.Build.0 = Release|Win32 - {7E06E92C-537A-442B-9E4A-4761C84F8A1A}.Debug|Win32.ActiveCfg = Debug|Win32 - {7E06E92C-537A-442B-9E4A-4761C84F8A1A}.Debug|Win32.Build.0 = Debug|Win32 - {7E06E92C-537A-442B-9E4A-4761C84F8A1A}.Release|Win32.ActiveCfg = Release|Win32 - {7E06E92C-537A-442B-9E4A-4761C84F8A1A}.Release|Win32.Build.0 = Release|Win32 {B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Debug|Win32.ActiveCfg = Debug|Win32 {B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Debug|Win32.Build.0 = Debug|Win32 {B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Release|Win32.ActiveCfg = Release|Win32 {B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Release|Win32.Build.0 = Release|Win32 - {DDC3E27F-004D-4DD4-9DD3-931A013D2159}.Debug|Win32.ActiveCfg = Debug|Win32 - {DDC3E27F-004D-4DD4-9DD3-931A013D2159}.Debug|Win32.Build.0 = Debug|Win32 - {DDC3E27F-004D-4DD4-9DD3-931A013D2159}.Release|Win32.ActiveCfg = Release|Win32 - {DDC3E27F-004D-4DD4-9DD3-931A013D2159}.Release|Win32.Build.0 = Release|Win32 - {632A8F38-D0F0-4D22-86B3-D69F5E6BF63A}.Debug|Win32.ActiveCfg = Debug|Win32 - {632A8F38-D0F0-4D22-86B3-D69F5E6BF63A}.Debug|Win32.Build.0 = Debug|Win32 - {632A8F38-D0F0-4D22-86B3-D69F5E6BF63A}.Release|Win32.ActiveCfg = Release|Win32 - {632A8F38-D0F0-4D22-86B3-D69F5E6BF63A}.Release|Win32.Build.0 = Release|Win32 + {DF2638C0-8128-4847-867C-6EAFE3DEE7B5}.Debug|Win32.ActiveCfg = Debug|Win32 + {DF2638C0-8128-4847-867C-6EAFE3DEE7B5}.Debug|Win32.Build.0 = Debug|Win32 + {DF2638C0-8128-4847-867C-6EAFE3DEE7B5}.Release|Win32.ActiveCfg = Release|Win32 + {DF2638C0-8128-4847-867C-6EAFE3DEE7B5}.Release|Win32.Build.0 = Release|Win32 + {21B2C324-891F-48EA-AD1A-5AE13DE12E28}.Debug|Win32.ActiveCfg = Debug|Win32 + {21B2C324-891F-48EA-AD1A-5AE13DE12E28}.Debug|Win32.Build.0 = Debug|Win32 + {21B2C324-891F-48EA-AD1A-5AE13DE12E28}.Release|Win32.ActiveCfg = Release|Win32 + {21B2C324-891F-48EA-AD1A-5AE13DE12E28}.Release|Win32.Build.0 = Release|Win32 + {7E06E92C-537A-442B-9E4A-4761C84F8A1A}.Debug|Win32.ActiveCfg = Debug|Win32 + {7E06E92C-537A-442B-9E4A-4761C84F8A1A}.Debug|Win32.Build.0 = Debug|Win32 + {7E06E92C-537A-442B-9E4A-4761C84F8A1A}.Release|Win32.ActiveCfg = Release|Win32 + {7E06E92C-537A-442B-9E4A-4761C84F8A1A}.Release|Win32.Build.0 = Release|Win32 + {F8198014-F4F3-49F0-88AB-C1969A5829AF}.Debug|Win32.ActiveCfg = Debug|Win32 + {F8198014-F4F3-49F0-88AB-C1969A5829AF}.Debug|Win32.Build.0 = Debug|Win32 + {F8198014-F4F3-49F0-88AB-C1969A5829AF}.Release|Win32.ActiveCfg = Release|Win32 + {F8198014-F4F3-49F0-88AB-C1969A5829AF}.Release|Win32.Build.0 = Release|Win32 + {9640951E-C5D0-47B5-9C42-0BCADA261C50}.Debug|Win32.ActiveCfg = Debug|Win32 + {9640951E-C5D0-47B5-9C42-0BCADA261C50}.Debug|Win32.Build.0 = Debug|Win32 + {9640951E-C5D0-47B5-9C42-0BCADA261C50}.Release|Win32.ActiveCfg = Release|Win32 + {9640951E-C5D0-47B5-9C42-0BCADA261C50}.Release|Win32.Build.0 = Release|Win32 + {7068296E-38A4-4BCA-85DB-3A09BD014847}.Debug|Win32.ActiveCfg = Debug|Win32 + {7068296E-38A4-4BCA-85DB-3A09BD014847}.Debug|Win32.Build.0 = Debug|Win32 + {7068296E-38A4-4BCA-85DB-3A09BD014847}.Release|Win32.ActiveCfg = Release|Win32 + {7068296E-38A4-4BCA-85DB-3A09BD014847}.Release|Win32.Build.0 = Release|Win32 + {65E52F4B-703F-419E-AD67-926241A10042}.Debug|Win32.ActiveCfg = Debug|Win32 + {65E52F4B-703F-419E-AD67-926241A10042}.Debug|Win32.Build.0 = Debug|Win32 + {65E52F4B-703F-419E-AD67-926241A10042}.Release|Win32.ActiveCfg = Release|Win32 + {65E52F4B-703F-419E-AD67-926241A10042}.Release|Win32.Build.0 = Release|Win32 + {31EF6AB1-0D9A-4BC6-99B8-2C482EA373C4}.Debug|Win32.ActiveCfg = Debug|Win32 + {31EF6AB1-0D9A-4BC6-99B8-2C482EA373C4}.Debug|Win32.Build.0 = Debug|Win32 + {31EF6AB1-0D9A-4BC6-99B8-2C482EA373C4}.Release|Win32.ActiveCfg = Release|Win32 + {31EF6AB1-0D9A-4BC6-99B8-2C482EA373C4}.Release|Win32.Build.0 = Release|Win32 + {FE78EEBB-3DBB-4713-8CBF-63D742C5BD82}.Debug|Win32.ActiveCfg = Debug|Win32 + {FE78EEBB-3DBB-4713-8CBF-63D742C5BD82}.Debug|Win32.Build.0 = Debug|Win32 + {FE78EEBB-3DBB-4713-8CBF-63D742C5BD82}.Release|Win32.ActiveCfg = Release|Win32 + {FE78EEBB-3DBB-4713-8CBF-63D742C5BD82}.Release|Win32.Build.0 = Release|Win32 + {929480E7-23C0-4DF6-8456-096D71547116}.Debug|Win32.ActiveCfg = Debug|Win32 + {929480E7-23C0-4DF6-8456-096D71547116}.Debug|Win32.Build.0 = Debug|Win32 + {929480E7-23C0-4DF6-8456-096D71547116}.Release|Win32.ActiveCfg = Release|Win32 + {929480E7-23C0-4DF6-8456-096D71547116}.Release|Win32.Build.0 = Release|Win32 + {E24950FA-5BC1-4AEE-A900-4F0259354BF0}.Debug|Win32.ActiveCfg = Debug|Win32 + {E24950FA-5BC1-4AEE-A900-4F0259354BF0}.Debug|Win32.Build.0 = Debug|Win32 + {E24950FA-5BC1-4AEE-A900-4F0259354BF0}.Release|Win32.ActiveCfg = Release|Win32 + {E24950FA-5BC1-4AEE-A900-4F0259354BF0}.Release|Win32.Build.0 = Release|Win32 + {06840490-14A4-43D6-88BC-AAFA44D043EB}.Debug|Win32.ActiveCfg = Debug|Win32 + {06840490-14A4-43D6-88BC-AAFA44D043EB}.Debug|Win32.Build.0 = Debug|Win32 + {06840490-14A4-43D6-88BC-AAFA44D043EB}.Release|Win32.ActiveCfg = Release|Win32 + {06840490-14A4-43D6-88BC-AAFA44D043EB}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.vcxproj b/templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.vcxproj index fc144ea9a9..11a3924224 100644 --- a/templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.vcxproj +++ b/templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.vcxproj @@ -104,12 +104,18 @@ - xcopy "$(ProjectDir)..\..\cocos2d-x\cocos\scripting\lua-bindings\script" "$(ProjectDir)..\..\..\" /e /Y + xcopy "$(ProjectDir)..\..\cocos2d-x\cocos\scripting\lua-bindings\script\cocos2d" "$(ProjectDir)..\..\..\" /e /Y +xcopy "$(ProjectDir)..\..\cocos2d-x\cocos\scripting\lua-bindings\script\cocosdenshion" "$(ProjectDir)..\..\..\" /e /Y +xcopy "$(ProjectDir)..\..\cocos2d-x\cocos\scripting\lua-bindings\script\cocosbuilder" "$(ProjectDir)..\..\..\" /e /Y +xcopy "$(ProjectDir)..\..\cocos2d-x\cocos\scripting\lua-bindings\script\cocostudio" "$(ProjectDir)..\..\..\" /e /Y +xcopy "$(ProjectDir)..\..\cocos2d-x\cocos\scripting\lua-bindings\script\extension" "$(ProjectDir)..\..\..\" /e /Y +xcopy "$(ProjectDir)..\..\cocos2d-x\cocos\scripting\lua-bindings\script\network" "$(ProjectDir)..\..\..\" /e /Y +xcopy "$(ProjectDir)..\..\cocos2d-x\cocos\scripting\lua-bindings\script\ui" "$(ProjectDir)..\..\..\" /e /Y copy files - if not exist "$(OutDir)" mkdir "$(OutDir)" -xcopy /Y /Q "$(EngineRoot)external\websockets\prebuilt\win32\*.*" "$(OutDir)" + + @@ -151,12 +157,18 @@ xcopy /Y /Q "$(EngineRoot)external\websockets\prebuilt\win32\*.*" "$(OutDir)" - xcopy "$(ProjectDir)..\..\cocos2d-x\cocos\scripting\lua-bindings\script" "$(ProjectDir)..\..\..\" /e /Y + xcopy "$(ProjectDir)..\..\cocos2d-x\cocos\scripting\lua-bindings\script\cocos2d" "$(ProjectDir)..\..\..\" /e /Y +xcopy "$(ProjectDir)..\..\cocos2d-x\cocos\scripting\lua-bindings\script\cocosdenshion" "$(ProjectDir)..\..\..\" /e /Y +xcopy "$(ProjectDir)..\..\cocos2d-x\cocos\scripting\lua-bindings\script\cocosbuilder" "$(ProjectDir)..\..\..\" /e /Y +xcopy "$(ProjectDir)..\..\cocos2d-x\cocos\scripting\lua-bindings\script\cocostudio" "$(ProjectDir)..\..\..\" /e /Y +xcopy "$(ProjectDir)..\..\cocos2d-x\cocos\scripting\lua-bindings\script\extension" "$(ProjectDir)..\..\..\" /e /Y +xcopy "$(ProjectDir)..\..\cocos2d-x\cocos\scripting\lua-bindings\script\network" "$(ProjectDir)..\..\..\" /e /Y +xcopy "$(ProjectDir)..\..\cocos2d-x\cocos\scripting\lua-bindings\script\ui" "$(ProjectDir)..\..\..\" /e /Y copy files - if not exist "$(OutDir)" mkdir "$(OutDir)" -xcopy /Y /Q "$(EngineRoot)external\websockets\prebuilt\win32\*.*" "$(OutDir)" + + @@ -172,42 +184,36 @@ xcopy /Y /Q "$(EngineRoot)external\websockets\prebuilt\win32\*.*" "$(OutDir)" - - {98a51ba8-fc3a-415b-ac8f-8c7bd464e93e} - - - {f8edd7fa-9a51-4e80-baeb-860825d2eac6} - - - {811c0dab-7b96-4bd3-a154-b7572b58e4ab} - - - {b57cf53f-2e49-4031-9822-047cc0e6bde2} - - - {b7c2a162-dec9-4418-972e-240ab3cbfcae} - - - {7e06e92c-537a-442b-9e4a-4761c84f8a1a} - - - {df2638c0-8128-4847-867c-6eafe3dee7b5} - - - {ddc3e27f-004d-4dd4-9dd3-931a013d2159} - - - {632a8f38-d0f0-4d22-86b3-d69f5e6bf63a} - - - {21b2c324-891f-48ea-ad1a-5ae13de12e28} - - - {207bc7a9-ccf1-4f2f-a04d-45f72242ae25} - + - + + {9f2d6ce6-c893-4400-b50c-6db70cc2562f} + + + {06840490-14a4-43d6-88bc-aafa44d043eb} + + + {f8198014-f4f3-49f0-88ab-c1969a5829af} + + + {46a7d57a-7f25-4f52-823b-ffac4ff3a624} + + + {9640951e-c5d0-47b5-9c42-0bcada261c50} + + + {7068296e-38a4-4bca-85db-3a09bd014847} + + + {65e52f4b-703f-419e-ad67-926241a10042} + + + {31ef6ab1-0d9a-4bc6-99b8-2c482ea373c4} + + + {fe78eebb-3dbb-4713-8cbf-63d742c5bd82} + diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.win32/build-cfg.json b/templates/lua-template-default/frameworks/runtime-src/proj.win32/build-cfg.json index 48d47e369f..051f1647e3 100644 --- a/templates/lua-template-default/frameworks/runtime-src/proj.win32/build-cfg.json +++ b/templates/lua-template-default/frameworks/runtime-src/proj.win32/build-cfg.json @@ -9,7 +9,11 @@ "to": "res" }, { - "from": "../../cocos2d-x/cocos/scripting/lua-bindings/script", + "from": "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocos2d", + "to": "" + }, + { + "from": "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocosdenshion", "to": "" } ] diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.win32/main.cpp b/templates/lua-template-default/frameworks/runtime-src/proj.win32/main.cpp index d9b2ddaa2e..8c97c7c8ef 100644 --- a/templates/lua-template-default/frameworks/runtime-src/proj.win32/main.cpp +++ b/templates/lua-template-default/frameworks/runtime-src/proj.win32/main.cpp @@ -27,6 +27,10 @@ int APIENTRY _tWinMain(HINSTANCE hInstance, int ret = Application::getInstance()->run(); #ifdef USE_WIN32_CONSOLE + if (!ret) + { + system("pause"); + } FreeConsole(); #endif diff --git a/templates/lua-template-default/src/main.lua b/templates/lua-template-default/src/main.lua index b33be1cbca..30ef917c36 100644 --- a/templates/lua-template-default/src/main.lua +++ b/templates/lua-template-default/src/main.lua @@ -25,7 +25,7 @@ local function main() local director = cc.Director:getInstance() local glview = director:getOpenGLView() if nil == glview then - glview = cc.GLView:createWithRect("HelloLua", cc.rect(0,0,900,640)) + glview = cc.GLViewImpl:createWithRect("HelloLua", cc.rect(0,0,900,640)) director:setOpenGLView(glview) end @@ -58,7 +58,7 @@ local function main() local origin = cc.Director:getInstance():getVisibleOrigin() -- add the moving dog - local function creatDog() + local function createDog() local frameWidth = 105 local frameHeight = 95 @@ -130,7 +130,7 @@ local function main() end -- add moving dog - local spriteDog = creatDog() + local spriteDog = createDog() layerFarm:addChild(spriteDog) -- handing touch events diff --git a/templates/lua-template-runtime/cocos-project-template.json b/templates/lua-template-runtime/cocos-project-template.json index fe5231abd3..070e2e8b45 100644 --- a/templates/lua-template-runtime/cocos-project-template.json +++ b/templates/lua-template-runtime/cocos-project-template.json @@ -14,17 +14,47 @@ }, "append_dir": [ { - "from": "cocos/scripting/lua-bindings/script", + "from": "cocos/scripting/lua-bindings/script/cocos2d", "to": "runtime/mac/PrebuiltRuntimeLua.app/Contents/Resources", "exclude": [] }, { - "from": "cocos/scripting/lua-bindings/script", + "from": "cocos/scripting/lua-bindings/script/cocos2d", "to": "runtime/ios/PrebuiltRuntimeLua.app", "exclude": [] }, { - "from": "cocos/scripting/lua-bindings/script", + "from": "cocos/scripting/lua-bindings/script/cocos2d", + "to": "runtime/win32", + "exclude": [] + }, + { + "from": "cocos/scripting/lua-bindings/script/cocosdenshion", + "to": "runtime/mac/PrebuiltRuntimeLua.app/Contents/Resources", + "exclude": [] + }, + { + "from": "cocos/scripting/lua-bindings/script/cocosdenshion", + "to": "runtime/ios/PrebuiltRuntimeLua.app", + "exclude": [] + }, + { + "from": "cocos/scripting/lua-bindings/script/cocosdenshion", + "to": "runtime/win32", + "exclude": [] + }, + { + "from": "cocos/scripting/lua-bindings/script/network", + "to": "runtime/mac/PrebuiltRuntimeLua.app/Contents/Resources", + "exclude": [] + }, + { + "from": "cocos/scripting/lua-bindings/script/network", + "to": "runtime/ios/PrebuiltRuntimeLua.app", + "exclude": [] + }, + { + "from": "cocos/scripting/lua-bindings/script/network", "to": "runtime/win32", "exclude": [] }, @@ -49,6 +79,81 @@ "*.lua" ] }, + { + "from": "cocos/scripting/lua-bindings/script/cocosbuilder", + "to": "runtime/mac/PrebuiltRuntimeLua.app/Contents/Resources", + "exclude": [] + }, + { + "from": "cocos/scripting/lua-bindings/script/cocosbuilder", + "to": "runtime/ios/PrebuiltRuntimeLua.app", + "exclude": [] + }, + { + "from": "cocos/scripting/lua-bindings/script/cocosbuilder", + "to": "runtime/win32", + "exclude": [] + }, + { + "from": "cocos/scripting/lua-bindings/script/cocostudio", + "to": "runtime/mac/PrebuiltRuntimeLua.app/Contents/Resources", + "exclude": [] + }, + { + "from": "cocos/scripting/lua-bindings/script/cocostudio", + "to": "runtime/ios/PrebuiltRuntimeLua.app", + "exclude": [] + }, + { + "from": "cocos/scripting/lua-bindings/script/cocostudio", + "to": "runtime/win32", + "exclude": [] + }, + { + "from": "cocos/scripting/lua-bindings/script/extension", + "to": "runtime/mac/PrebuiltRuntimeLua.app/Contents/Resources", + "exclude": [] + }, + { + "from": "cocos/scripting/lua-bindings/script/extension", + "to": "runtime/ios/PrebuiltRuntimeLua.app", + "exclude": [] + }, + { + "from": "cocos/scripting/lua-bindings/script/extension", + "to": "runtime/win32", + "exclude": [] + }, + { + "from": "cocos/scripting/lua-bindings/script/network", + "to": "runtime/mac/PrebuiltRuntimeLua.app/Contents/Resources", + "exclude": [] + }, + { + "from": "cocos/scripting/lua-bindings/script/network", + "to": "runtime/ios/PrebuiltRuntimeLua.app", + "exclude": [] + }, + { + "from": "cocos/scripting/lua-bindings/script/network", + "to": "runtime/win32", + "exclude": [] + }, + { + "from": "cocos/scripting/lua-bindings/script/ui", + "to": "runtime/mac/PrebuiltRuntimeLua.app/Contents/Resources", + "exclude": [] + }, + { + "from": "cocos/scripting/lua-bindings/script/ui", + "to": "runtime/ios/PrebuiltRuntimeLua.app", + "exclude": [] + }, + { + "from": "cocos/scripting/lua-bindings/script/ui", + "to": "runtime/win32", + "exclude": [] + }, { "from": "external/win32-specific/gles/prebuilt", "to": "runtime/win32", 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 515cfdc6b0..fecd659c0d 100644 --- a/templates/lua-template-runtime/frameworks/runtime-src/Classes/AppDelegate.cpp +++ b/templates/lua-template-runtime/frameworks/runtime-src/Classes/AppDelegate.cpp @@ -4,6 +4,7 @@ #include "cocos2d.h" #include "Runtime.h" #include "ConfigParser.h" +#include "lua_module_register.h" using namespace CocosDenshion; @@ -41,7 +42,7 @@ bool AppDelegate::applicationDidFinishLaunching() 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)); + glview = cocos2d::GLViewImpl::createWithRect(title.c_str(), Rect(0,0,viewSize.width,viewSize.height)); director->setOpenGLView(glview); #endif } @@ -52,6 +53,13 @@ bool AppDelegate::applicationDidFinishLaunching() auto engine = LuaEngine::getInstance(); ScriptEngineManager::getInstance()->setScriptEngine(engine); + lua_State* L = engine->getLuaStack()->getLuaState(); + lua_getglobal(L, "_G"); + if (lua_istable(L,-1))//stack:...,_G, + { + lua_module_register(L); + } + lua_pop(L, 1);//statck:... LuaStack* stack = engine->getLuaStack(); stack->setXXTEAKeyAndSign("2dxLua", strlen("2dxLua"), "XXTEA", strlen("XXTEA")); diff --git a/templates/lua-template-runtime/frameworks/runtime-src/Classes/lua_module_register.h b/templates/lua-template-runtime/frameworks/runtime-src/Classes/lua_module_register.h new file mode 100644 index 0000000000..a69dba2671 --- /dev/null +++ b/templates/lua-template-runtime/frameworks/runtime-src/Classes/lua_module_register.h @@ -0,0 +1,28 @@ +#ifndef __LUA_TEMPLATE_RUNTIME_FRAMEWORKS_RUNTIME_SRC_CLASSES_LUA_MODULE_REGISTER_H__ +#define __LUA_TEMPLATE_RUNTIME_FRAMEWORKS_RUNTIME_SRC_CLASSES_LUA_MODULE_REGISTER_H__ + +#include "network/lua_cocos2dx_network_manual.h" +#include "cocosdenshion/lua_cocos2dx_cocosdenshion_manual.h" +#include "cocosbuilder/lua_cocos2dx_cocosbuilder_manual.h" +#include "cocostudio/lua_cocos2dx_coco_studio_manual.hpp" +#include "extension/lua_cocos2dx_extension_manual.h" +#include "ui/lua_cocos2dx_ui_manual.hpp" +#include "spine/lua_cocos2dx_spine_manual.hpp" +#include "3d/lua_cocos2dx_3d_manual.h" + + +int lua_module_register(lua_State* L) +{ + register_network_module(L); + register_cocosdenshion_module(L); + register_cocosbuilder_module(L); + register_cocostudio_module(L); + register_extension_module(L); + register_ui_moudle(L); + register_spine_module(L); + register_cocos3d_module(L); + return 1; +} + +#endif // __LUA_TEMPLATE_RUNTIME_FRAMEWORKS_RUNTIME_SRC_CLASSES_LUA_MODULE_REGISTER_H__ + diff --git a/templates/lua-template-runtime/frameworks/runtime-src/Classes/runtime/Runtime.cpp b/templates/lua-template-runtime/frameworks/runtime-src/Classes/runtime/Runtime.cpp index 07bb6906bb..065219dd92 100644 --- a/templates/lua-template-runtime/frameworks/runtime-src/Classes/runtime/Runtime.cpp +++ b/templates/lua-template-runtime/frameworks/runtime-src/Classes/runtime/Runtime.cpp @@ -51,6 +51,9 @@ using namespace cocos2d; std::string g_resourcePath; +namespace cocos2d { + extern const char* cocos2dVersion(); +}; //1M size #define MAXPROTOLENGTH 1048576 @@ -69,11 +72,14 @@ const char* getRuntimeVersion() static string& replaceAll(string& str,const string& old_value,const string& new_value) { + int start = 0; while(true) { int pos=0; - if((pos=str.find(old_value,0))!=string::npos) + if((pos=str.find(old_value,start))!=string::npos) { str.replace(pos,old_value.length(),new_value); + start = pos + new_value.length(); + } else break; } return str; @@ -733,6 +739,7 @@ public: } char szVersion[1024]={0}; + sprintf(szVersion,"runtimeVersion:%s \ncocos2dVersion:%s",getRuntimeVersion(),cocos2dVersion()); Label* verLable = Label::createWithSystemFont(szVersion,"",24); verLable->setAnchorPoint(Vec2(0,0)); diff --git a/cocos/scripting/lua-bindings/manual/lua_debugger.c b/templates/lua-template-runtime/frameworks/runtime-src/Classes/runtime/lua_debugger.c similarity index 99% rename from cocos/scripting/lua-bindings/manual/lua_debugger.c rename to templates/lua-template-runtime/frameworks/runtime-src/Classes/runtime/lua_debugger.c index e0acc689b0..c85809fb4d 100644 --- a/cocos/scripting/lua-bindings/manual/lua_debugger.c +++ b/templates/lua-template-runtime/frameworks/runtime-src/Classes/runtime/lua_debugger.c @@ -1,9 +1,14 @@ /* debugger.c */ - +#if __cplusplus +extern "C"{ +#endif #include "lua.h" #include "lauxlib.h" #include "lua_debugger.h" +#if __cplusplus +} +#endif /* ldt_debugger */ static const char lua_m_ldt_debugger[] = { diff --git a/cocos/scripting/lua-bindings/manual/lua_debugger.h b/templates/lua-template-runtime/frameworks/runtime-src/Classes/runtime/lua_debugger.h similarity index 100% rename from cocos/scripting/lua-bindings/manual/lua_debugger.h rename to templates/lua-template-runtime/frameworks/runtime-src/Classes/runtime/lua_debugger.h 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 ad111cc1f2..4de0e4d168 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 @@ -23,11 +23,31 @@ ], "must_copy_resources": [ { - "from": "../../cocos2d-x/cocos/scripting/lua-bindings/script", + "from": "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocos2d", "to": "" }, { - "from": "../../../config.json", + "from": "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocosdenshion", + "to": "" + }, + { + "from": "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocosbuilder", + "to": "" + }, + { + "from": "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocostudio", + "to": "" + }, + { + "from": "../../cocos2d-x/cocos/scripting/lua-bindings/script/extension", + "to": "" + }, + { + "from": "../../cocos2d-x/cocos/scripting/lua-bindings/script/network", + "to": "" + }, + { + "from": "../../cocos2d-x/cocos/scripting/lua-bindings/script/ui", "to": "" }, { @@ -36,6 +56,10 @@ "include": [ "*.lua" ] + }, + { + "from": "../../../config.json", + "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 c86a999470..15ac1b1602 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 @@ -26,6 +26,7 @@ LOCAL_SRC_FILES := \ ../../Classes/runtime/Shine_png.cpp \ ../../Classes/runtime/Runtime.cpp \ ../../Classes/runtime/Protos.pb.cc \ +../../Classes/runtime/lua_debugger.c \ ../../Classes/VisibleRect.cpp \ ../../Classes/AppDelegate.cpp \ ../../Classes/ConfigParser.cpp \ @@ -36,13 +37,20 @@ lua/main.cpp LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/../../Classes/protobuf-lite \ $(LOCAL_PATH)/../../Classes/runtime \ -$(LOCAL_PATH)/../../Classes +$(LOCAL_PATH)/../../Classes \ +$(LOCAL_PATH)/../../../cocos2d-x/external -LOCAL_STATIC_LIBRARIES := curl_static_prebuilt - -LOCAL_WHOLE_STATIC_LIBRARIES := cocos_lua_static +LOCAL_WHOLE_STATIC_LIBRARIES := cocos2d_lua_static +LOCAL_WHOLE_STATIC_LIBRARIES += cocosdenshion_lua_static +LOCAL_WHOLE_STATIC_LIBRARIES += network_lua_static +LOCAL_WHOLE_STATIC_LIBRARIES += cocosbuilder_lua_static +LOCAL_WHOLE_STATIC_LIBRARIES += cocostudio_lua_static +LOCAL_WHOLE_STATIC_LIBRARIES += spine_lua_static +LOCAL_WHOLE_STATIC_LIBRARIES += extension_lua_static +LOCAL_WHOLE_STATIC_LIBRARIES += ui_lua_static +LOCAL_WHOLE_STATIC_LIBRARIES += cocos3d_lua_static include $(BUILD_SHARED_LIBRARY) -$(call import-module,scripting/lua-bindings) +$(call import-module,scripting/lua-bindings/proj.android) 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 e3f1928ef5..e18faea777 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 @@ -7,16 +7,136 @@ objects = { /* Begin PBXBuildFile section */ - 15A8A4441834C43700142BE0 /* libchipmunk iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15A8A4291834BDA200142BE0 /* libchipmunk iOS.a */; }; - 15A8A4451834C43700142BE0 /* libcocos2dx iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15A8A4251834BDA200142BE0 /* libcocos2dx iOS.a */; }; - 15A8A4461834C43700142BE0 /* libcocos2dx-extensions iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15A8A4271834BDA200142BE0 /* libcocos2dx-extensions iOS.a */; }; - 15A8A4471834C43700142BE0 /* libCocosDenshion iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15A8A42D1834BDA200142BE0 /* libCocosDenshion iOS.a */; }; + 152A3432199CE585004B68DC /* CCBReaderLoad.lua in Resources */ = {isa = PBXBuildFile; fileRef = 152A3430199CE585004B68DC /* CCBReaderLoad.lua */; }; + 152A3433199CE585004B68DC /* CCBReaderLoad.lua in Resources */ = {isa = PBXBuildFile; fileRef = 152A3430199CE585004B68DC /* CCBReaderLoad.lua */; }; + 152A3434199CE585004B68DC /* DeprecatedCocosBuilderClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 152A3431199CE585004B68DC /* DeprecatedCocosBuilderClass.lua */; }; + 152A3435199CE585004B68DC /* DeprecatedCocosBuilderClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 152A3431199CE585004B68DC /* DeprecatedCocosBuilderClass.lua */; }; + 152A345C199CE5A7004B68DC /* CocoStudio.lua in Resources */ = {isa = PBXBuildFile; fileRef = 152A3458199CE5A7004B68DC /* CocoStudio.lua */; }; + 152A345D199CE5A7004B68DC /* CocoStudio.lua in Resources */ = {isa = PBXBuildFile; fileRef = 152A3458199CE5A7004B68DC /* CocoStudio.lua */; }; + 152A345E199CE5A7004B68DC /* DeprecatedCocoStudioClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 152A3459199CE5A7004B68DC /* DeprecatedCocoStudioClass.lua */; }; + 152A345F199CE5A7004B68DC /* DeprecatedCocoStudioClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 152A3459199CE5A7004B68DC /* DeprecatedCocoStudioClass.lua */; }; + 152A3460199CE5A7004B68DC /* DeprecatedCocoStudioFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 152A345A199CE5A7004B68DC /* DeprecatedCocoStudioFunc.lua */; }; + 152A3461199CE5A7004B68DC /* DeprecatedCocoStudioFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 152A345A199CE5A7004B68DC /* DeprecatedCocoStudioFunc.lua */; }; + 152A3462199CE5A7004B68DC /* StudioConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 152A345B199CE5A7004B68DC /* StudioConstants.lua */; }; + 152A3463199CE5A7004B68DC /* StudioConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 152A345B199CE5A7004B68DC /* StudioConstants.lua */; }; + 152A3468199CE5B9004B68DC /* DeprecatedExtensionClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 152A3464199CE5B9004B68DC /* DeprecatedExtensionClass.lua */; }; + 152A3469199CE5B9004B68DC /* DeprecatedExtensionClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 152A3464199CE5B9004B68DC /* DeprecatedExtensionClass.lua */; }; + 152A346A199CE5B9004B68DC /* DeprecatedExtensionEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 152A3465199CE5B9004B68DC /* DeprecatedExtensionEnum.lua */; }; + 152A346B199CE5B9004B68DC /* DeprecatedExtensionEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 152A3465199CE5B9004B68DC /* DeprecatedExtensionEnum.lua */; }; + 152A346C199CE5B9004B68DC /* DeprecatedExtensionFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 152A3466199CE5B9004B68DC /* DeprecatedExtensionFunc.lua */; }; + 152A346D199CE5B9004B68DC /* DeprecatedExtensionFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 152A3466199CE5B9004B68DC /* DeprecatedExtensionFunc.lua */; }; + 152A346E199CE5B9004B68DC /* ExtensionConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 152A3467199CE5B9004B68DC /* ExtensionConstants.lua */; }; + 152A346F199CE5B9004B68DC /* ExtensionConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 152A3467199CE5B9004B68DC /* ExtensionConstants.lua */; }; + 152A3474199CE5CE004B68DC /* DeprecatedUIEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 152A3470199CE5CE004B68DC /* DeprecatedUIEnum.lua */; }; + 152A3475199CE5CE004B68DC /* DeprecatedUIEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 152A3470199CE5CE004B68DC /* DeprecatedUIEnum.lua */; }; + 152A3476199CE5CE004B68DC /* DeprecatedUIFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 152A3471199CE5CE004B68DC /* DeprecatedUIFunc.lua */; }; + 152A3477199CE5CE004B68DC /* DeprecatedUIFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 152A3471199CE5CE004B68DC /* DeprecatedUIFunc.lua */; }; + 152A3478199CE5CE004B68DC /* experimentalUIConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 152A3472199CE5CE004B68DC /* experimentalUIConstants.lua */; }; + 152A3479199CE5CE004B68DC /* experimentalUIConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 152A3472199CE5CE004B68DC /* experimentalUIConstants.lua */; }; + 152A347A199CE5CE004B68DC /* GuiConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 152A3473199CE5CE004B68DC /* GuiConstants.lua */; }; + 152A347B199CE5CE004B68DC /* GuiConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 152A3473199CE5CE004B68DC /* GuiConstants.lua */; }; + 152A347C199CE60E004B68DC /* libluacocosbuilder iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427CCA198F220600DC375D /* libluacocosbuilder iOS.a */; }; + 152A347D199CE60E004B68DC /* libluacocostudio iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427CC8198F220600DC375D /* libluacocostudio iOS.a */; }; + 152A347E199CE60E004B68DC /* libluaextension iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427CC4198F220600DC375D /* libluaextension iOS.a */; }; + 152A347F199CE60E004B68DC /* libluaspine iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427CCC198F220600DC375D /* libluaspine iOS.a */; }; + 152A3480199CE60E004B68DC /* libluaui iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427CC6198F220600DC375D /* libluaui iOS.a */; }; + 152A3481199CE624004B68DC /* libcocosbuilder iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427C9E198F220600DC375D /* libcocosbuilder iOS.a */; }; + 152A3482199CE62F004B68DC /* libcocostudio iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427C9C198F220600DC375D /* libcocostudio iOS.a */; }; + 152A3483199CE63A004B68DC /* libextension iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15A8A4271834BDA200142BE0 /* libextension iOS.a */; }; + 152A3484199CE64A004B68DC /* libspine iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427CA0198F220600DC375D /* libspine iOS.a */; }; + 152A3485199CE64A004B68DC /* libui iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427C9A198F220600DC375D /* libui iOS.a */; }; + 152A3486199CE6B4004B68DC /* libcocosbuilder Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427C94198F220600DC375D /* libcocosbuilder Mac.a */; }; + 152A3487199CE6B4004B68DC /* libcocostudio Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427C92198F220600DC375D /* libcocostudio Mac.a */; }; + 152A3488199CE6B4004B68DC /* libextension Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15A8A4191834BDA200142BE0 /* libextension Mac.a */; }; + 152A3489199CE6B4004B68DC /* libluacocosbuilder Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427CBA198F220600DC375D /* libluacocosbuilder Mac.a */; }; + 152A348A199CE6B4004B68DC /* libluacocostudio Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427CB8198F220600DC375D /* libluacocostudio Mac.a */; }; + 152A348B199CE6B4004B68DC /* libluaextension Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427CB4198F220600DC375D /* libluaextension Mac.a */; }; + 152A348C199CE6B4004B68DC /* libluaspine Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427CBC198F220600DC375D /* libluaspine Mac.a */; }; + 152A348D199CE6B4004B68DC /* libluaui Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427CB6198F220600DC375D /* libluaui Mac.a */; }; + 152A348E199CE6B4004B68DC /* libspine Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427C96198F220600DC375D /* libspine Mac.a */; }; + 152A348F199CE6B4004B68DC /* libui Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427C90198F220600DC375D /* libui Mac.a */; }; + 15427CD3198F221400DC375D /* libcocos2d iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15A8A4251834BDA200142BE0 /* libcocos2d iOS.a */; }; + 15427CD4198F221400DC375D /* libcocosdenshion iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15A8A42D1834BDA200142BE0 /* libcocosdenshion iOS.a */; }; + 15427CD5198F222200DC375D /* libluacocos2d iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427CD2198F220600DC375D /* libluacocos2d iOS.a */; }; + 15427CD6198F222200DC375D /* libluacocosdenshion iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427CD0198F220600DC375D /* libluacocosdenshion iOS.a */; }; + 15427CE3198F23A100DC375D /* libnetwork iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427CA2198F220600DC375D /* libnetwork iOS.a */; }; + 15427CEC198F24A600DC375D /* libluacocos2d Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427CC2198F220600DC375D /* libluacocos2d Mac.a */; }; + 15427CED198F24A600DC375D /* libluacocosdenshion Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427CC0198F220600DC375D /* libluacocosdenshion Mac.a */; }; + 15427CEE198F24AF00DC375D /* libcocos2d Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15A8A4171834BDA200142BE0 /* libcocos2d Mac.a */; }; + 15427CEF198F24BD00DC375D /* libcocosdenshion Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15A8A41F1834BDA200142BE0 /* libcocosdenshion Mac.a */; }; + 15427CF0198F24C400DC375D /* libnetwork Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427C98198F220600DC375D /* libnetwork Mac.a */; }; + 1571D9C219A1F733005A1DC2 /* libcocos3d iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1571D9B919A1F714005A1DC2 /* libcocos3d iOS.a */; }; + 1571D9C319A1F733005A1DC2 /* libluacocos3d iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1571D9C119A1F714005A1DC2 /* libluacocos3d iOS.a */; }; + 1571D9C419A1F74B005A1DC2 /* libcocos3d Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1571D9B719A1F714005A1DC2 /* libcocos3d Mac.a */; }; + 1571D9C519A1F74B005A1DC2 /* libluacocos3d Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1571D9BF19A1F714005A1DC2 /* libluacocos3d Mac.a */; }; 15A8A4491834C64F00142BE0 /* Icon-114.png in Resources */ = {isa = PBXBuildFile; fileRef = 5023810C17EBBCAC00990C9B /* Icon-114.png */; }; - 15A8A4821834C73500142BE0 /* libchipmunk Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15A8A41B1834BDA200142BE0 /* libchipmunk Mac.a */; }; - 15A8A4831834C73500142BE0 /* libcocos2dx Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15A8A4171834BDA200142BE0 /* libcocos2dx Mac.a */; }; - 15A8A4841834C73500142BE0 /* libcocos2dx-extensions Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15A8A4191834BDA200142BE0 /* libcocos2dx-extensions Mac.a */; }; - 15A8A4851834C73500142BE0 /* libCocosDenshion Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15A8A41F1834BDA200142BE0 /* libCocosDenshion Mac.a */; }; 15A8A4881834C90F00142BE0 /* libcurl.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 15A8A4871834C90E00142BE0 /* libcurl.dylib */; }; + 15AA7D36199B513100725633 /* libluanetwork iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427CCE198F220600DC375D /* libluanetwork iOS.a */; }; + 15AA7D47199B514300725633 /* libluanetwork Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427CBE198F220600DC375D /* libluanetwork Mac.a */; }; + 15AA7D52199B51F000725633 /* ftp.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15AA7D48199B51F000725633 /* ftp.lua */; }; + 15AA7D53199B51F000725633 /* ftp.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15AA7D48199B51F000725633 /* ftp.lua */; }; + 15AA7D54199B51F000725633 /* headers.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15AA7D49199B51F000725633 /* headers.lua */; }; + 15AA7D55199B51F000725633 /* headers.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15AA7D49199B51F000725633 /* headers.lua */; }; + 15AA7D56199B51F000725633 /* http.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15AA7D4A199B51F000725633 /* http.lua */; }; + 15AA7D57199B51F000725633 /* http.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15AA7D4A199B51F000725633 /* http.lua */; }; + 15AA7D58199B51F000725633 /* ltn12.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15AA7D4B199B51F000725633 /* ltn12.lua */; }; + 15AA7D59199B51F000725633 /* ltn12.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15AA7D4B199B51F000725633 /* ltn12.lua */; }; + 15AA7D5A199B51F000725633 /* mbox.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15AA7D4C199B51F000725633 /* mbox.lua */; }; + 15AA7D5B199B51F000725633 /* mbox.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15AA7D4C199B51F000725633 /* mbox.lua */; }; + 15AA7D5C199B51F000725633 /* mime.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15AA7D4D199B51F000725633 /* mime.lua */; }; + 15AA7D5D199B51F000725633 /* mime.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15AA7D4D199B51F000725633 /* mime.lua */; }; + 15AA7D5E199B51F000725633 /* smtp.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15AA7D4E199B51F000725633 /* smtp.lua */; }; + 15AA7D5F199B51F000725633 /* smtp.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15AA7D4E199B51F000725633 /* smtp.lua */; }; + 15AA7D60199B51F000725633 /* socket.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15AA7D4F199B51F000725633 /* socket.lua */; }; + 15AA7D61199B51F000725633 /* socket.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15AA7D4F199B51F000725633 /* socket.lua */; }; + 15AA7D62199B51F000725633 /* tp.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15AA7D50199B51F000725633 /* tp.lua */; }; + 15AA7D63199B51F000725633 /* tp.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15AA7D50199B51F000725633 /* tp.lua */; }; + 15AA7D64199B51F000725633 /* url.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15AA7D51199B51F000725633 /* url.lua */; }; + 15AA7D65199B51F000725633 /* url.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15AA7D51199B51F000725633 /* url.lua */; }; + 15AA9632199B525400725633 /* DeprecatedNetworkClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15AA962E199B525400725633 /* DeprecatedNetworkClass.lua */; }; + 15AA9633199B525400725633 /* DeprecatedNetworkClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15AA962E199B525400725633 /* DeprecatedNetworkClass.lua */; }; + 15AA9634199B525400725633 /* DeprecatedNetworkEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15AA962F199B525400725633 /* DeprecatedNetworkEnum.lua */; }; + 15AA9635199B525400725633 /* DeprecatedNetworkEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15AA962F199B525400725633 /* DeprecatedNetworkEnum.lua */; }; + 15AA9636199B525400725633 /* DeprecatedNetworkFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15AA9630199B525400725633 /* DeprecatedNetworkFunc.lua */; }; + 15AA9637199B525400725633 /* DeprecatedNetworkFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15AA9630199B525400725633 /* DeprecatedNetworkFunc.lua */; }; + 15AA9638199B525400725633 /* NetworkConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15AA9631199B525400725633 /* NetworkConstants.lua */; }; + 15AA9639199B525400725633 /* NetworkConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15AA9631199B525400725633 /* NetworkConstants.lua */; }; + 15AA9648199B6D4600725633 /* lua_debugger.c in Sources */ = {isa = PBXBuildFile; fileRef = 15AA9646199B6D4600725633 /* lua_debugger.c */; }; + 15AA9649199B6D4600725633 /* lua_debugger.c in Sources */ = {isa = PBXBuildFile; fileRef = 15AA9646199B6D4600725633 /* lua_debugger.c */; }; + 15D1FDF81998714100302043 /* bitExtend.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FDEA1998714100302043 /* bitExtend.lua */; }; + 15D1FDF91998714100302043 /* bitExtend.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FDEA1998714100302043 /* bitExtend.lua */; }; + 15D1FDFA1998714100302043 /* Cocos2d.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FDEB1998714100302043 /* Cocos2d.lua */; }; + 15D1FDFB1998714100302043 /* Cocos2d.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FDEB1998714100302043 /* Cocos2d.lua */; }; + 15D1FDFC1998714100302043 /* Cocos2dConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FDEC1998714100302043 /* Cocos2dConstants.lua */; }; + 15D1FDFD1998714100302043 /* Cocos2dConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FDEC1998714100302043 /* Cocos2dConstants.lua */; }; + 15D1FDFE1998714100302043 /* DeprecatedCocos2dClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FDED1998714100302043 /* DeprecatedCocos2dClass.lua */; }; + 15D1FDFF1998714100302043 /* DeprecatedCocos2dClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FDED1998714100302043 /* DeprecatedCocos2dClass.lua */; }; + 15D1FE001998714100302043 /* DeprecatedCocos2dEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FDEE1998714100302043 /* DeprecatedCocos2dEnum.lua */; }; + 15D1FE011998714100302043 /* DeprecatedCocos2dEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FDEE1998714100302043 /* DeprecatedCocos2dEnum.lua */; }; + 15D1FE021998714100302043 /* DeprecatedCocos2dFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FDEF1998714100302043 /* DeprecatedCocos2dFunc.lua */; }; + 15D1FE031998714100302043 /* DeprecatedCocos2dFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FDEF1998714100302043 /* DeprecatedCocos2dFunc.lua */; }; + 15D1FE041998714100302043 /* DeprecatedOpenglEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FDF01998714100302043 /* DeprecatedOpenglEnum.lua */; }; + 15D1FE051998714100302043 /* DeprecatedOpenglEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FDF01998714100302043 /* DeprecatedOpenglEnum.lua */; }; + 15D1FE061998714100302043 /* DrawPrimitives.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FDF11998714100302043 /* DrawPrimitives.lua */; }; + 15D1FE071998714100302043 /* DrawPrimitives.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FDF11998714100302043 /* DrawPrimitives.lua */; }; + 15D1FE081998714100302043 /* extern.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FDF21998714100302043 /* extern.lua */; }; + 15D1FE091998714100302043 /* extern.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FDF21998714100302043 /* extern.lua */; }; + 15D1FE0A1998714100302043 /* json.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FDF31998714100302043 /* json.lua */; }; + 15D1FE0B1998714100302043 /* json.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FDF31998714100302043 /* json.lua */; }; + 15D1FE0C1998714100302043 /* luaj.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FDF41998714100302043 /* luaj.lua */; }; + 15D1FE0D1998714100302043 /* luaj.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FDF41998714100302043 /* luaj.lua */; }; + 15D1FE0E1998714100302043 /* luaoc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FDF51998714100302043 /* luaoc.lua */; }; + 15D1FE0F1998714100302043 /* luaoc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FDF51998714100302043 /* luaoc.lua */; }; + 15D1FE101998714100302043 /* Opengl.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FDF61998714100302043 /* Opengl.lua */; }; + 15D1FE111998714100302043 /* Opengl.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FDF61998714100302043 /* Opengl.lua */; }; + 15D1FE121998714100302043 /* OpenglConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FDF71998714100302043 /* OpenglConstants.lua */; }; + 15D1FE131998714100302043 /* OpenglConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FDF71998714100302043 /* OpenglConstants.lua */; }; + 15D1FE171998715500302043 /* AudioEngine.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FE141998715500302043 /* AudioEngine.lua */; }; + 15D1FE181998715500302043 /* AudioEngine.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FE141998715500302043 /* AudioEngine.lua */; }; + 15D1FE191998715500302043 /* DeprecatedCocosDenshionClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FE151998715500302043 /* DeprecatedCocosDenshionClass.lua */; }; + 15D1FE1A1998715500302043 /* DeprecatedCocosDenshionClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FE151998715500302043 /* DeprecatedCocosDenshionClass.lua */; }; + 15D1FE1B1998715500302043 /* DeprecatedCocosDenshionFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FE161998715500302043 /* DeprecatedCocosDenshionFunc.lua */; }; + 15D1FE1C1998715500302043 /* DeprecatedCocosDenshionFunc.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15D1FE161998715500302043 /* DeprecatedCocosDenshionFunc.lua */; }; 1AF4C403178663F200122817 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AF4C402178663F200122817 /* libz.dylib */; }; 3EB5152C19528284006966AA /* Protos.pb.cc in Sources */ = {isa = PBXBuildFile; fileRef = 3EB5152A19528284006966AA /* Protos.pb.cc */; }; 3EB5152D19528284006966AA /* Protos.pb.cc in Sources */ = {isa = PBXBuildFile; fileRef = 3EB5152A19528284006966AA /* Protos.pb.cc */; }; @@ -95,44 +215,6 @@ C03781BA18BF655400FE4F13 /* res in Resources */ = {isa = PBXBuildFile; fileRef = C03781B718BF655400FE4F13 /* res */; }; C03781BB18BF655400FE4F13 /* src in Resources */ = {isa = PBXBuildFile; fileRef = C03781B818BF655400FE4F13 /* src */; }; C03781BC18BF655400FE4F13 /* src in Resources */ = {isa = PBXBuildFile; fileRef = C03781B818BF655400FE4F13 /* src */; }; - C03781CF18BF656A00FE4F13 /* AudioEngine.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781BD18BF656900FE4F13 /* AudioEngine.lua */; }; - C03781D018BF656A00FE4F13 /* AudioEngine.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781BD18BF656900FE4F13 /* AudioEngine.lua */; }; - C03781D118BF656A00FE4F13 /* CCBReaderLoad.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781BE18BF656900FE4F13 /* CCBReaderLoad.lua */; }; - C03781D218BF656A00FE4F13 /* CCBReaderLoad.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781BE18BF656900FE4F13 /* CCBReaderLoad.lua */; }; - C03781D318BF656A00FE4F13 /* Cocos2d.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781BF18BF656900FE4F13 /* Cocos2d.lua */; }; - C03781D418BF656A00FE4F13 /* Cocos2d.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781BF18BF656900FE4F13 /* Cocos2d.lua */; }; - C03781D518BF656A00FE4F13 /* Cocos2dConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781C018BF656900FE4F13 /* Cocos2dConstants.lua */; }; - C03781D618BF656A00FE4F13 /* Cocos2dConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781C018BF656900FE4F13 /* Cocos2dConstants.lua */; }; - C03781D718BF656A00FE4F13 /* CocoStudio.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781C118BF656900FE4F13 /* CocoStudio.lua */; }; - C03781D818BF656A00FE4F13 /* CocoStudio.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781C118BF656900FE4F13 /* CocoStudio.lua */; }; - C03781D918BF656A00FE4F13 /* Deprecated.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781C218BF656900FE4F13 /* Deprecated.lua */; }; - C03781DA18BF656A00FE4F13 /* Deprecated.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781C218BF656900FE4F13 /* Deprecated.lua */; }; - C03781DB18BF656A00FE4F13 /* DeprecatedClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781C318BF656900FE4F13 /* DeprecatedClass.lua */; }; - C03781DC18BF656A00FE4F13 /* DeprecatedClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781C318BF656900FE4F13 /* DeprecatedClass.lua */; }; - C03781DD18BF656A00FE4F13 /* DeprecatedEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781C418BF656A00FE4F13 /* DeprecatedEnum.lua */; }; - C03781DE18BF656A00FE4F13 /* DeprecatedEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781C418BF656A00FE4F13 /* DeprecatedEnum.lua */; }; - C03781DF18BF656A00FE4F13 /* DeprecatedOpenglEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781C518BF656A00FE4F13 /* DeprecatedOpenglEnum.lua */; }; - C03781E018BF656A00FE4F13 /* DeprecatedOpenglEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781C518BF656A00FE4F13 /* DeprecatedOpenglEnum.lua */; }; - C03781E118BF656A00FE4F13 /* DrawPrimitives.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781C618BF656A00FE4F13 /* DrawPrimitives.lua */; }; - C03781E218BF656A00FE4F13 /* DrawPrimitives.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781C618BF656A00FE4F13 /* DrawPrimitives.lua */; }; - C03781E318BF656A00FE4F13 /* extern.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781C718BF656A00FE4F13 /* extern.lua */; }; - C03781E418BF656A00FE4F13 /* extern.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781C718BF656A00FE4F13 /* extern.lua */; }; - C03781E518BF656A00FE4F13 /* GuiConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781C818BF656A00FE4F13 /* GuiConstants.lua */; }; - C03781E618BF656A00FE4F13 /* GuiConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781C818BF656A00FE4F13 /* GuiConstants.lua */; }; - C03781E718BF656A00FE4F13 /* json.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781C918BF656A00FE4F13 /* json.lua */; }; - C03781E818BF656A00FE4F13 /* json.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781C918BF656A00FE4F13 /* json.lua */; }; - C03781E918BF656A00FE4F13 /* luaj.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781CA18BF656A00FE4F13 /* luaj.lua */; }; - C03781EA18BF656A00FE4F13 /* luaj.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781CA18BF656A00FE4F13 /* luaj.lua */; }; - C03781EB18BF656A00FE4F13 /* luaoc.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781CB18BF656A00FE4F13 /* luaoc.lua */; }; - C03781EC18BF656A00FE4F13 /* luaoc.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781CB18BF656A00FE4F13 /* luaoc.lua */; }; - C03781ED18BF656A00FE4F13 /* Opengl.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781CC18BF656A00FE4F13 /* Opengl.lua */; }; - C03781EE18BF656A00FE4F13 /* Opengl.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781CC18BF656A00FE4F13 /* Opengl.lua */; }; - C03781EF18BF656A00FE4F13 /* OpenglConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781CD18BF656A00FE4F13 /* OpenglConstants.lua */; }; - C03781F018BF656A00FE4F13 /* OpenglConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781CD18BF656A00FE4F13 /* OpenglConstants.lua */; }; - C03781F118BF656A00FE4F13 /* StudioConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = C03781CE18BF656A00FE4F13 /* StudioConstants.lua */; }; - 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 */; }; @@ -142,26 +224,6 @@ 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 */; }; - C08D5D5618E567C6009071A4 /* ftp.lua in Resources */ = {isa = PBXBuildFile; fileRef = C08D5D4C18E567C6009071A4 /* ftp.lua */; }; - C08D5D5718E567C6009071A4 /* ftp.lua in Resources */ = {isa = PBXBuildFile; fileRef = C08D5D4C18E567C6009071A4 /* ftp.lua */; }; - C08D5D5818E567C6009071A4 /* headers.lua in Resources */ = {isa = PBXBuildFile; fileRef = C08D5D4D18E567C6009071A4 /* headers.lua */; }; - C08D5D5918E567C6009071A4 /* headers.lua in Resources */ = {isa = PBXBuildFile; fileRef = C08D5D4D18E567C6009071A4 /* headers.lua */; }; - C08D5D5A18E567C6009071A4 /* http.lua in Resources */ = {isa = PBXBuildFile; fileRef = C08D5D4E18E567C6009071A4 /* http.lua */; }; - C08D5D5B18E567C6009071A4 /* http.lua in Resources */ = {isa = PBXBuildFile; fileRef = C08D5D4E18E567C6009071A4 /* http.lua */; }; - C08D5D5C18E567C6009071A4 /* ltn12.lua in Resources */ = {isa = PBXBuildFile; fileRef = C08D5D4F18E567C6009071A4 /* ltn12.lua */; }; - C08D5D5D18E567C6009071A4 /* ltn12.lua in Resources */ = {isa = PBXBuildFile; fileRef = C08D5D4F18E567C6009071A4 /* ltn12.lua */; }; - C08D5D5E18E567C6009071A4 /* mbox.lua in Resources */ = {isa = PBXBuildFile; fileRef = C08D5D5018E567C6009071A4 /* mbox.lua */; }; - C08D5D5F18E567C6009071A4 /* mbox.lua in Resources */ = {isa = PBXBuildFile; fileRef = C08D5D5018E567C6009071A4 /* mbox.lua */; }; - C08D5D6018E567C6009071A4 /* mime.lua in Resources */ = {isa = PBXBuildFile; fileRef = C08D5D5118E567C6009071A4 /* mime.lua */; }; - C08D5D6118E567C6009071A4 /* mime.lua in Resources */ = {isa = PBXBuildFile; fileRef = C08D5D5118E567C6009071A4 /* mime.lua */; }; - C08D5D6218E567C6009071A4 /* smtp.lua in Resources */ = {isa = PBXBuildFile; fileRef = C08D5D5218E567C6009071A4 /* smtp.lua */; }; - C08D5D6318E567C6009071A4 /* smtp.lua in Resources */ = {isa = PBXBuildFile; fileRef = C08D5D5218E567C6009071A4 /* smtp.lua */; }; - C08D5D6418E567C6009071A4 /* socket.lua in Resources */ = {isa = PBXBuildFile; fileRef = C08D5D5318E567C6009071A4 /* socket.lua */; }; - C08D5D6518E567C6009071A4 /* socket.lua in Resources */ = {isa = PBXBuildFile; fileRef = C08D5D5318E567C6009071A4 /* socket.lua */; }; - C08D5D6618E567C6009071A4 /* tp.lua in Resources */ = {isa = PBXBuildFile; fileRef = C08D5D5418E567C6009071A4 /* tp.lua */; }; - C08D5D6718E567C6009071A4 /* tp.lua in Resources */ = {isa = PBXBuildFile; fileRef = C08D5D5418E567C6009071A4 /* tp.lua */; }; - C08D5D6818E567C6009071A4 /* url.lua in Resources */ = {isa = PBXBuildFile; fileRef = C08D5D5518E567C6009071A4 /* url.lua */; }; - C08D5D6918E567C6009071A4 /* url.lua in Resources */ = {isa = PBXBuildFile; fileRef = C08D5D5518E567C6009071A4 /* url.lua */; }; D6B061351803AC000077942B /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D6B061341803AC000077942B /* CoreMotion.framework */; }; F293B3CD15EB7BE500256477 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F293B3CC15EB7BE500256477 /* QuartzCore.framework */; }; F293B3D115EB7BE500256477 /* OpenAL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F293B3D015EB7BE500256477 /* OpenAL.framework */; }; @@ -173,6 +235,426 @@ /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ + 152A3490199CE727004B68DC /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 155CA2C71988C494006E0A08; + remoteInfo = "libluaextension iOS"; + }; + 152A3492199CE727004B68DC /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 15EFA300198B28A8000C57D3; + remoteInfo = "libluaui iOS"; + }; + 152A3494199CE727004B68DC /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 15EFA381198B2934000C57D3; + remoteInfo = "libluacocostudio iOS"; + }; + 152A3496199CE727004B68DC /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 15EFA27F198B2791000C57D3; + remoteInfo = "libluacocosbuilder iOS"; + }; + 152A3498199CE727004B68DC /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 15EFA407198B2AFD000C57D3; + remoteInfo = "libluaspine iOS"; + }; + 152A349A199CE72E004B68DC /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 15EFA486198B2B9B000C57D3; + remoteInfo = "libluanetwork iOS"; + }; + 152A349C199CE72E004B68DC /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 15EFA523198B2D13000C57D3; + remoteInfo = "libluacocosdenshion iOS"; + }; + 152A349E199CE72E004B68DC /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 15EFA59E198B2DAA000C57D3; + remoteInfo = "libluacocos2d iOS"; + }; + 152A34A0199CE741004B68DC /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = A07A4E111783867C0073F6A7; + remoteInfo = "libextension iOS"; + }; + 152A34A2199CE741004B68DC /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = B24EEA2C19775E92004493CC; + remoteInfo = "libui iOS"; + }; + 152A34A4199CE741004B68DC /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = B24EEA6719775EBB004493CC; + remoteInfo = "libcocostudio iOS"; + }; + 152A34A6199CE741004B68DC /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = B24EEA6F19775ECE004493CC; + remoteInfo = "libcocosbuilder iOS"; + }; + 152A34A8199CE741004B68DC /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = B24EEA7719775EE1004493CC; + remoteInfo = "libspine iOS"; + }; + 152A34AA199CE758004B68DC /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 15C1BD5F1986538000A46ACC; + remoteInfo = "libluaextension Mac"; + }; + 152A34AC199CE758004B68DC /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 15C1C0801987328E00A46ACC; + remoteInfo = "libluaui Mac"; + }; + 152A34AE199CE758004B68DC /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 15C1BF7219865C2000A46ACC; + remoteInfo = "libluacocostudio Mac"; + }; + 152A34B0199CE758004B68DC /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 15C1BE66198654BE00A46ACC; + remoteInfo = "libluacocosbuilder Mac"; + }; + 152A34B2199CE758004B68DC /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 15C1BFF819865E5F00A46ACC; + remoteInfo = "libluaspine Mac"; + }; + 152A34B4199CE758004B68DC /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 15C1C1061987340C00A46ACC; + remoteInfo = "libluanetwork Mac"; + }; + 152A34B6199CE758004B68DC /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 15C1BEEE19865A0600A46ACC; + remoteInfo = "libluacocosdenshion Mac"; + }; + 152A34B8199CE758004B68DC /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 15C1C255198748D200A46ACC; + remoteInfo = "libluacocos2d Mac"; + }; + 152A34BA199CE766004B68DC /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = A03F2FC117814595006731B9; + remoteInfo = "libextension Mac"; + }; + 152A34BC199CE766004B68DC /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = B245F10019766132001920FD; + remoteInfo = "libui Mac"; + }; + 152A34BE199CE766004B68DC /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = B2DB48161976716E00411E16; + remoteInfo = "libcocostudio Mac"; + }; + 152A34C0199CE766004B68DC /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = B2DB479B197669A100411E16; + remoteInfo = "libcocosbuilder Mac"; + }; + 152A34C2199CE766004B68DC /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = B2DB48CA19767F1F00411E16; + remoteInfo = "libspine Mac"; + }; + 15427C8F198F220600DC375D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = B245F13A19766132001920FD; + remoteInfo = "libui Mac"; + }; + 15427C91198F220600DC375D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = B2DB484D1976716E00411E16; + remoteInfo = "libcocostudio Mac"; + }; + 15427C93198F220600DC375D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = B2DB47D2197669A100411E16; + remoteInfo = "libcocosbuilder Mac"; + }; + 15427C95198F220600DC375D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = B2DB490119767F1F00411E16; + remoteInfo = "libspine Mac"; + }; + 15427C97198F220600DC375D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = B2DB49C4197686CB00411E16; + remoteInfo = "libnetwork Mac"; + }; + 15427C99198F220600DC375D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = B24EEA6619775E92004493CC; + remoteInfo = "libui iOS"; + }; + 15427C9B198F220600DC375D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = B24EEA6E19775EBB004493CC; + remoteInfo = "libcocostudio iOS"; + }; + 15427C9D198F220600DC375D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = B24EEA7619775ECE004493CC; + remoteInfo = "libcocosbuilder iOS"; + }; + 15427C9F198F220600DC375D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = B24EEA7E19775EE1004493CC; + remoteInfo = "libspine iOS"; + }; + 15427CA1198F220600DC375D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = B24EEA8619775EF3004493CC; + remoteInfo = "libnetwork iOS"; + }; + 15427CB3198F220600DC375D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 15C1BDDA1986538000A46ACC; + remoteInfo = "libluaextension Mac"; + }; + 15427CB5198F220600DC375D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 15C1C0FB1987328E00A46ACC; + remoteInfo = "libluaui Mac"; + }; + 15427CB7198F220600DC375D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 15C1BFED19865C2000A46ACC; + remoteInfo = "libluacocostudio Mac"; + }; + 15427CB9198F220600DC375D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 15C1BEE1198654BE00A46ACC; + remoteInfo = "libluacocosbuilder Mac"; + }; + 15427CBB198F220600DC375D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 15C1C07319865E5F00A46ACC; + remoteInfo = "libluaspine Mac"; + }; + 15427CBD198F220600DC375D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 15C1C1811987340C00A46ACC; + remoteInfo = "libluanetwork Mac"; + }; + 15427CBF198F220600DC375D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 15C1BF6919865A0600A46ACC; + remoteInfo = "libluacocosdenshion Mac"; + }; + 15427CC1198F220600DC375D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 15C1C2CC198748D200A46ACC; + remoteInfo = "libluacocos2d Mac"; + }; + 15427CC3198F220600DC375D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 155CA3431988C494006E0A08; + remoteInfo = "libluaextension iOS"; + }; + 15427CC5198F220600DC375D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 15EFA37A198B28A8000C57D3; + remoteInfo = "libluaui iOS"; + }; + 15427CC7198F220600DC375D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 15EFA3FB198B2934000C57D3; + remoteInfo = "libluacocostudio iOS"; + }; + 15427CC9198F220600DC375D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 15EFA2F9198B2791000C57D3; + remoteInfo = "libluacocosbuilder iOS"; + }; + 15427CCB198F220600DC375D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 15EFA47F198B2AFD000C57D3; + remoteInfo = "libluaspine iOS"; + }; + 15427CCD198F220600DC375D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 15EFA4FE198B2B9B000C57D3; + remoteInfo = "libluanetwork iOS"; + }; + 15427CCF198F220600DC375D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 15EFA59B198B2D13000C57D3; + remoteInfo = "libluacocosdenshion iOS"; + }; + 15427CD1198F220600DC375D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 15EFA616198B2DAA000C57D3; + remoteInfo = "libluacocos2d iOS"; + }; + 15427CE4198F23B300DC375D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = B24EEA7F19775EF3004493CC; + remoteInfo = "libnetwork iOS"; + }; + 15427CE6198F23E600DC375D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = B2DB498D197686CB00411E16; + remoteInfo = "libnetwork Mac"; + }; + 1571D9AA19A1F714005A1DC2 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 1516228319A0F45E006099B8; + remoteInfo = "libluacocos3d iOS"; + }; + 1571D9AC19A1F714005A1DC2 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 15162030199E7810006099B8; + remoteInfo = "libcocos3d iOS"; + }; + 1571D9B619A1F714005A1DC2 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 1516200B199E7363006099B8; + remoteInfo = "libcocos3d Mac"; + }; + 1571D9B819A1F714005A1DC2 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 15162201199E7810006099B8; + remoteInfo = "libcocos3d iOS"; + }; + 1571D9BE19A1F714005A1DC2 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 1516227C19A0F32D006099B8; + remoteInfo = "libluacocos3d Mac"; + }; + 1571D9C019A1F714005A1DC2 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 151622BB19A0F45E006099B8; + remoteInfo = "libluacocos3d iOS"; + }; 15A8A4161834BDA200142BE0 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; @@ -243,54 +725,19 @@ remoteGlobalIDString = A07A4FB4178387730073F6A7; remoteInfo = "CocosDenshion iOS"; }; - C03781B318BF654500FE4F13 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 1AACE74618BC45A000215002; - remoteInfo = "luabindings Mac"; - }; - C03781B518BF654500FE4F13 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 1AACE74718BC45A000215002; - remoteInfo = "luabindings iOS"; - }; - C03781F318BF659D00FE4F13 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 1A6FB50417854BC200CDF010; - remoteInfo = "luabindings Mac"; - }; - C03781F718BF65B500FE4F13 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 1A119716178526AA00D62A44; - remoteInfo = "luabindings iOS"; - }; - C0A2F02618975FD30072A7AB /* PBXContainerItemProxy */ = { + 15D1F3081994BBCA00302043 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; proxyType = 1; - remoteGlobalIDString = A03F2B781780BD04006731B9; - remoteInfo = "chipmunk Mac"; + remoteGlobalIDString = A07A4C241783777C0073F6A7; + remoteInfo = "libcocos2d iOS"; }; - C0A2F03818975FDA0072A7AB /* PBXContainerItemProxy */ = { + 15D1F30A1994BBE500302043 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; proxyType = 1; - remoteGlobalIDString = A03F2D5D1780BDF7006731B9; - remoteInfo = "box2d Mac"; - }; - C0A2F03A18975FE20072A7AB /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = A03F2FC117814595006731B9; - remoteInfo = "cocos2dx-extensions Mac"; + remoteGlobalIDString = A07A4F9F178387730073F6A7; + remoteInfo = "libcocosdenshion iOS"; }; C0A2F03C18975FEB0072A7AB /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; @@ -306,47 +753,60 @@ remoteGlobalIDString = 1551A33E158F2AB200E66CFE; remoteInfo = "cocos2dx Mac"; }; - C0A2F0421897600E0072A7AB /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = A07A4C241783777C0073F6A7; - remoteInfo = "cocos2dx iOS"; - }; - C0A2F0441897600E0072A7AB /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = A07A4E111783867C0073F6A7; - remoteInfo = "cocos2dx-extensions iOS"; - }; - C0A2F0461897600E0072A7AB /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = A07A4EFD178387670073F6A7; - remoteInfo = "chipmunk iOS"; - }; - C0A2F0481897600E0072A7AB /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = A07A4F3C1783876B0073F6A7; - remoteInfo = "box2d iOS"; - }; - C0A2F04A1897600E0072A7AB /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = A07A4F9F178387730073F6A7; - remoteInfo = "CocosDenshion iOS"; - }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ + 152A3430199CE585004B68DC /* CCBReaderLoad.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CCBReaderLoad.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocosbuilder/CCBReaderLoad.lua"; sourceTree = ""; }; + 152A3431199CE585004B68DC /* DeprecatedCocosBuilderClass.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedCocosBuilderClass.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocosbuilder/DeprecatedCocosBuilderClass.lua"; sourceTree = ""; }; + 152A3458199CE5A7004B68DC /* CocoStudio.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CocoStudio.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocostudio/CocoStudio.lua"; sourceTree = ""; }; + 152A3459199CE5A7004B68DC /* DeprecatedCocoStudioClass.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedCocoStudioClass.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocostudio/DeprecatedCocoStudioClass.lua"; sourceTree = ""; }; + 152A345A199CE5A7004B68DC /* DeprecatedCocoStudioFunc.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedCocoStudioFunc.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocostudio/DeprecatedCocoStudioFunc.lua"; sourceTree = ""; }; + 152A345B199CE5A7004B68DC /* StudioConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = StudioConstants.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocostudio/StudioConstants.lua"; sourceTree = ""; }; + 152A3464199CE5B9004B68DC /* DeprecatedExtensionClass.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedExtensionClass.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/extension/DeprecatedExtensionClass.lua"; sourceTree = ""; }; + 152A3465199CE5B9004B68DC /* DeprecatedExtensionEnum.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedExtensionEnum.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/extension/DeprecatedExtensionEnum.lua"; sourceTree = ""; }; + 152A3466199CE5B9004B68DC /* DeprecatedExtensionFunc.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedExtensionFunc.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/extension/DeprecatedExtensionFunc.lua"; sourceTree = ""; }; + 152A3467199CE5B9004B68DC /* ExtensionConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = ExtensionConstants.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/extension/ExtensionConstants.lua"; sourceTree = ""; }; + 152A3470199CE5CE004B68DC /* DeprecatedUIEnum.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedUIEnum.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/ui/DeprecatedUIEnum.lua"; sourceTree = ""; }; + 152A3471199CE5CE004B68DC /* DeprecatedUIFunc.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedUIFunc.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/ui/DeprecatedUIFunc.lua"; sourceTree = ""; }; + 152A3472199CE5CE004B68DC /* experimentalUIConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = experimentalUIConstants.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/ui/experimentalUIConstants.lua"; sourceTree = ""; }; + 152A3473199CE5CE004B68DC /* GuiConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = GuiConstants.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/ui/GuiConstants.lua"; sourceTree = ""; }; + 15427CE2198F237300DC375D /* lua_module_register.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lua_module_register.h; path = ../Classes/lua_module_register.h; sourceTree = ""; }; 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = cocos2d_libs.xcodeproj; path = "../../cocos2d-x/build/cocos2d_libs.xcodeproj"; sourceTree = ""; }; 15A8A4871834C90E00142BE0 /* libcurl.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcurl.dylib; path = usr/lib/libcurl.dylib; sourceTree = SDKROOT; }; + 15AA7D48199B51F000725633 /* ftp.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = ftp.lua; path = "../../cocos2d-x/external/lua/luasocket/ftp.lua"; sourceTree = ""; }; + 15AA7D49199B51F000725633 /* headers.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = headers.lua; path = "../../cocos2d-x/external/lua/luasocket/headers.lua"; sourceTree = ""; }; + 15AA7D4A199B51F000725633 /* http.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = http.lua; path = "../../cocos2d-x/external/lua/luasocket/http.lua"; sourceTree = ""; }; + 15AA7D4B199B51F000725633 /* ltn12.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = ltn12.lua; path = "../../cocos2d-x/external/lua/luasocket/ltn12.lua"; sourceTree = ""; }; + 15AA7D4C199B51F000725633 /* mbox.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = mbox.lua; path = "../../cocos2d-x/external/lua/luasocket/mbox.lua"; sourceTree = ""; }; + 15AA7D4D199B51F000725633 /* mime.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = mime.lua; path = "../../cocos2d-x/external/lua/luasocket/mime.lua"; sourceTree = ""; }; + 15AA7D4E199B51F000725633 /* smtp.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = smtp.lua; path = "../../cocos2d-x/external/lua/luasocket/smtp.lua"; sourceTree = ""; }; + 15AA7D4F199B51F000725633 /* socket.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = socket.lua; path = "../../cocos2d-x/external/lua/luasocket/socket.lua"; sourceTree = ""; }; + 15AA7D50199B51F000725633 /* tp.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = tp.lua; path = "../../cocos2d-x/external/lua/luasocket/tp.lua"; sourceTree = ""; }; + 15AA7D51199B51F000725633 /* url.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = url.lua; path = "../../cocos2d-x/external/lua/luasocket/url.lua"; sourceTree = ""; }; + 15AA962E199B525400725633 /* DeprecatedNetworkClass.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedNetworkClass.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/network/DeprecatedNetworkClass.lua"; sourceTree = ""; }; + 15AA962F199B525400725633 /* DeprecatedNetworkEnum.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedNetworkEnum.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/network/DeprecatedNetworkEnum.lua"; sourceTree = ""; }; + 15AA9630199B525400725633 /* DeprecatedNetworkFunc.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedNetworkFunc.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/network/DeprecatedNetworkFunc.lua"; sourceTree = ""; }; + 15AA9631199B525400725633 /* NetworkConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = NetworkConstants.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/network/NetworkConstants.lua"; sourceTree = ""; }; + 15AA9646199B6D4600725633 /* lua_debugger.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = lua_debugger.c; sourceTree = ""; }; + 15AA9647199B6D4600725633 /* lua_debugger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lua_debugger.h; sourceTree = ""; }; 15C1568D1683131500D239F2 /* libcurl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcurl.a; path = "../../cocos2d-x/cocos2dx/platform/third_party/ios/libraries/libcurl.a"; sourceTree = ""; }; + 15D1FDEA1998714100302043 /* bitExtend.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = bitExtend.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocos2d/bitExtend.lua"; sourceTree = ""; }; + 15D1FDEB1998714100302043 /* Cocos2d.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Cocos2d.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocos2d/Cocos2d.lua"; sourceTree = ""; }; + 15D1FDEC1998714100302043 /* Cocos2dConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Cocos2dConstants.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocos2d/Cocos2dConstants.lua"; sourceTree = ""; }; + 15D1FDED1998714100302043 /* DeprecatedCocos2dClass.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedCocos2dClass.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocos2d/DeprecatedCocos2dClass.lua"; sourceTree = ""; }; + 15D1FDEE1998714100302043 /* DeprecatedCocos2dEnum.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedCocos2dEnum.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocos2d/DeprecatedCocos2dEnum.lua"; sourceTree = ""; }; + 15D1FDEF1998714100302043 /* DeprecatedCocos2dFunc.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedCocos2dFunc.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocos2d/DeprecatedCocos2dFunc.lua"; sourceTree = ""; }; + 15D1FDF01998714100302043 /* DeprecatedOpenglEnum.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedOpenglEnum.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocos2d/DeprecatedOpenglEnum.lua"; sourceTree = ""; }; + 15D1FDF11998714100302043 /* DrawPrimitives.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DrawPrimitives.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocos2d/DrawPrimitives.lua"; sourceTree = ""; }; + 15D1FDF21998714100302043 /* extern.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = extern.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocos2d/extern.lua"; sourceTree = ""; }; + 15D1FDF31998714100302043 /* json.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = json.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocos2d/json.lua"; sourceTree = ""; }; + 15D1FDF41998714100302043 /* luaj.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = luaj.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocos2d/luaj.lua"; sourceTree = ""; }; + 15D1FDF51998714100302043 /* luaoc.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = luaoc.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocos2d/luaoc.lua"; sourceTree = ""; }; + 15D1FDF61998714100302043 /* Opengl.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Opengl.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocos2d/Opengl.lua"; sourceTree = ""; }; + 15D1FDF71998714100302043 /* OpenglConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = OpenglConstants.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocos2d/OpenglConstants.lua"; sourceTree = ""; }; + 15D1FE141998715500302043 /* AudioEngine.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = AudioEngine.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocosdenshion/AudioEngine.lua"; sourceTree = ""; }; + 15D1FE151998715500302043 /* DeprecatedCocosDenshionClass.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedCocosDenshionClass.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocosdenshion/DeprecatedCocosDenshionClass.lua"; sourceTree = ""; }; + 15D1FE161998715500302043 /* DeprecatedCocosDenshionFunc.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedCocosDenshionFunc.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocosdenshion/DeprecatedCocosDenshionFunc.lua"; sourceTree = ""; }; 1AF4C402178663F200122817 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; }; 3EB51526195187AF006966AA /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = System/Library/Frameworks/CFNetwork.framework; sourceTree = SDKROOT; }; 3EB5152A19528284006966AA /* Protos.pb.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Protos.pb.cc; sourceTree = ""; }; @@ -434,24 +894,6 @@ 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 = ""; }; - C03781BD18BF656900FE4F13 /* AudioEngine.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = AudioEngine.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/AudioEngine.lua"; sourceTree = ""; }; - C03781BE18BF656900FE4F13 /* CCBReaderLoad.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CCBReaderLoad.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/CCBReaderLoad.lua"; sourceTree = ""; }; - C03781BF18BF656900FE4F13 /* Cocos2d.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Cocos2d.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/Cocos2d.lua"; sourceTree = ""; }; - C03781C018BF656900FE4F13 /* Cocos2dConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Cocos2dConstants.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/Cocos2dConstants.lua"; sourceTree = ""; }; - C03781C118BF656900FE4F13 /* CocoStudio.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CocoStudio.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/CocoStudio.lua"; sourceTree = ""; }; - C03781C218BF656900FE4F13 /* Deprecated.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Deprecated.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/Deprecated.lua"; sourceTree = ""; }; - C03781C318BF656900FE4F13 /* DeprecatedClass.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedClass.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/DeprecatedClass.lua"; sourceTree = ""; }; - C03781C418BF656A00FE4F13 /* DeprecatedEnum.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedEnum.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/DeprecatedEnum.lua"; sourceTree = ""; }; - C03781C518BF656A00FE4F13 /* DeprecatedOpenglEnum.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedOpenglEnum.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/DeprecatedOpenglEnum.lua"; sourceTree = ""; }; - C03781C618BF656A00FE4F13 /* DrawPrimitives.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DrawPrimitives.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/DrawPrimitives.lua"; sourceTree = ""; }; - C03781C718BF656A00FE4F13 /* extern.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = extern.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/extern.lua"; sourceTree = ""; }; - C03781C818BF656A00FE4F13 /* GuiConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = GuiConstants.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/GuiConstants.lua"; sourceTree = ""; }; - C03781C918BF656A00FE4F13 /* json.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = json.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/json.lua"; sourceTree = ""; }; - C03781CA18BF656A00FE4F13 /* luaj.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = luaj.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/luaj.lua"; sourceTree = ""; }; - C03781CB18BF656A00FE4F13 /* luaoc.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = luaoc.lua; path = "../../cocos2d-x/cocos/scripting/lua-bindings/script/luaoc.lua"; sourceTree = ""; }; - 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 = ""; }; @@ -460,16 +902,6 @@ 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 = ""; }; C07828F718B4D72E00BD2287 /* SimulatorApp.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SimulatorApp.mm; sourceTree = ""; }; - C08D5D4C18E567C6009071A4 /* ftp.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = ftp.lua; path = "../../cocos2d-x/external/lua/luasocket/ftp.lua"; sourceTree = ""; }; - C08D5D4D18E567C6009071A4 /* headers.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = headers.lua; path = "../../cocos2d-x/external/lua/luasocket/headers.lua"; sourceTree = ""; }; - C08D5D4E18E567C6009071A4 /* http.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = http.lua; path = "../../cocos2d-x/external/lua/luasocket/http.lua"; sourceTree = ""; }; - C08D5D4F18E567C6009071A4 /* ltn12.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = ltn12.lua; path = "../../cocos2d-x/external/lua/luasocket/ltn12.lua"; sourceTree = ""; }; - C08D5D5018E567C6009071A4 /* mbox.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = mbox.lua; path = "../../cocos2d-x/external/lua/luasocket/mbox.lua"; sourceTree = ""; }; - C08D5D5118E567C6009071A4 /* mime.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = mime.lua; path = "../../cocos2d-x/external/lua/luasocket/mime.lua"; sourceTree = ""; }; - C08D5D5218E567C6009071A4 /* smtp.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = smtp.lua; path = "../../cocos2d-x/external/lua/luasocket/smtp.lua"; sourceTree = ""; }; - C08D5D5318E567C6009071A4 /* socket.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = socket.lua; path = "../../cocos2d-x/external/lua/luasocket/socket.lua"; sourceTree = ""; }; - C08D5D5418E567C6009071A4 /* tp.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = tp.lua; path = "../../cocos2d-x/external/lua/luasocket/tp.lua"; sourceTree = ""; }; - C08D5D5518E567C6009071A4 /* url.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = url.lua; path = "../../cocos2d-x/external/lua/luasocket/url.lua"; sourceTree = ""; }; D6B061341803AC000077942B /* 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; }; F293B3C815EB7BE500256477 /* HelloLua iOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "HelloLua iOS.app"; sourceTree = BUILT_PRODUCTS_DIR; }; F293B3CC15EB7BE500256477 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; }; @@ -489,12 +921,25 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - C03781F518BF65A900FE4F13 /* libluabindings Mac.a in Frameworks */, + 1571D9C419A1F74B005A1DC2 /* libcocos3d Mac.a in Frameworks */, + 1571D9C519A1F74B005A1DC2 /* libluacocos3d Mac.a in Frameworks */, + 152A3486199CE6B4004B68DC /* libcocosbuilder Mac.a in Frameworks */, + 152A3487199CE6B4004B68DC /* libcocostudio Mac.a in Frameworks */, + 152A3488199CE6B4004B68DC /* libextension Mac.a in Frameworks */, + 152A348C199CE6B4004B68DC /* libluaspine Mac.a in Frameworks */, + 152A348F199CE6B4004B68DC /* libui Mac.a in Frameworks */, + 15427CF0198F24C400DC375D /* libnetwork Mac.a in Frameworks */, + 15427CEF198F24BD00DC375D /* libcocosdenshion Mac.a in Frameworks */, + 15427CEE198F24AF00DC375D /* libcocos2d Mac.a in Frameworks */, + 152A348E199CE6B4004B68DC /* libspine Mac.a in Frameworks */, + 152A3489199CE6B4004B68DC /* libluacocosbuilder Mac.a in Frameworks */, + 152A348B199CE6B4004B68DC /* libluaextension Mac.a in Frameworks */, + 152A348A199CE6B4004B68DC /* libluacocostudio Mac.a in Frameworks */, + 152A348D199CE6B4004B68DC /* libluaui Mac.a in Frameworks */, + 15AA7D47199B514300725633 /* libluanetwork Mac.a in Frameworks */, + 15427CEC198F24A600DC375D /* libluacocos2d Mac.a in Frameworks */, + 15427CED198F24A600DC375D /* libluacocosdenshion Mac.a in Frameworks */, 15A8A4881834C90F00142BE0 /* libcurl.dylib in Frameworks */, - 15A8A4821834C73500142BE0 /* libchipmunk Mac.a in Frameworks */, - 15A8A4831834C73500142BE0 /* libcocos2dx Mac.a in Frameworks */, - 15A8A4841834C73500142BE0 /* libcocos2dx-extensions Mac.a in Frameworks */, - 15A8A4851834C73500142BE0 /* libCocosDenshion Mac.a in Frameworks */, 50D7C97017EBBEEC005D0B91 /* IOKit.framework in Frameworks */, 50D7C96E17EBBEE6005D0B91 /* AppKit.framework in Frameworks */, 50D7C96C17EBBEDF005D0B91 /* OpenGL.framework in Frameworks */, @@ -512,12 +957,25 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 1571D9C219A1F733005A1DC2 /* libcocos3d iOS.a in Frameworks */, + 1571D9C319A1F733005A1DC2 /* libluacocos3d iOS.a in Frameworks */, + 152A3484199CE64A004B68DC /* libspine iOS.a in Frameworks */, + 152A3485199CE64A004B68DC /* libui iOS.a in Frameworks */, + 152A3483199CE63A004B68DC /* libextension iOS.a in Frameworks */, + 152A3482199CE62F004B68DC /* libcocostudio iOS.a in Frameworks */, + 152A3481199CE624004B68DC /* libcocosbuilder iOS.a in Frameworks */, + 152A347C199CE60E004B68DC /* libluacocosbuilder iOS.a in Frameworks */, + 152A347D199CE60E004B68DC /* libluacocostudio iOS.a in Frameworks */, + 152A347E199CE60E004B68DC /* libluaextension iOS.a in Frameworks */, + 152A347F199CE60E004B68DC /* libluaspine iOS.a in Frameworks */, + 152A3480199CE60E004B68DC /* libluaui iOS.a in Frameworks */, + 15AA7D36199B513100725633 /* libluanetwork iOS.a in Frameworks */, + 15427CE3198F23A100DC375D /* libnetwork iOS.a in Frameworks */, + 15427CD5198F222200DC375D /* libluacocos2d iOS.a in Frameworks */, + 15427CD6198F222200DC375D /* libluacocosdenshion iOS.a in Frameworks */, + 15427CD3198F221400DC375D /* libcocos2d iOS.a in Frameworks */, + 15427CD4198F221400DC375D /* libcocosdenshion iOS.a in Frameworks */, 3EEEDB61197107C0006A9FF8 /* MediaPlayer.framework in Frameworks */, - C03781F618BF65B100FE4F13 /* libluabindings iOS.a in Frameworks */, - 15A8A4441834C43700142BE0 /* libchipmunk iOS.a in Frameworks */, - 15A8A4451834C43700142BE0 /* libcocos2dx iOS.a in Frameworks */, - 15A8A4461834C43700142BE0 /* libcocos2dx-extensions iOS.a in Frameworks */, - 15A8A4471834C43700142BE0 /* libCocosDenshion iOS.a in Frameworks */, D6B061351803AC000077942B /* CoreMotion.framework in Frameworks */, 1AF4C403178663F200122817 /* libz.dylib in Frameworks */, 50805AAF17EBBEAA004CFAD3 /* UIKit.framework in Frameworks */, @@ -537,16 +995,28 @@ 15A8A4041834BDA200142BE0 /* Products */ = { isa = PBXGroup; children = ( - 15A8A4171834BDA200142BE0 /* libcocos2dx Mac.a */, - 15A8A4191834BDA200142BE0 /* libcocos2dx-extensions Mac.a */, + 15A8A4171834BDA200142BE0 /* libcocos2d Mac.a */, + 15A8A4191834BDA200142BE0 /* libextension Mac.a */, + 15427C90198F220600DC375D /* libui Mac.a */, + 15427C92198F220600DC375D /* libcocostudio Mac.a */, + 15427C94198F220600DC375D /* libcocosbuilder Mac.a */, + 15427C96198F220600DC375D /* libspine Mac.a */, + 15427C98198F220600DC375D /* libnetwork Mac.a */, 15A8A41B1834BDA200142BE0 /* libchipmunk Mac.a */, 15A8A41D1834BDA200142BE0 /* libbox2d Mac.a */, - 15A8A41F1834BDA200142BE0 /* libCocosDenshion Mac.a */, - 15A8A4251834BDA200142BE0 /* libcocos2dx iOS.a */, - 15A8A4271834BDA200142BE0 /* libcocos2dx-extensions iOS.a */, + 15A8A41F1834BDA200142BE0 /* libcocosdenshion Mac.a */, + 1571D9B719A1F714005A1DC2 /* libcocos3d Mac.a */, + 15A8A4251834BDA200142BE0 /* libcocos2d iOS.a */, + 15A8A4271834BDA200142BE0 /* libextension iOS.a */, 15A8A4291834BDA200142BE0 /* libchipmunk iOS.a */, 15A8A42B1834BDA200142BE0 /* libbox2d iOS.a */, - 15A8A42D1834BDA200142BE0 /* libCocosDenshion iOS.a */, + 15A8A42D1834BDA200142BE0 /* libcocosdenshion iOS.a */, + 15427C9A198F220600DC375D /* libui iOS.a */, + 15427C9C198F220600DC375D /* libcocostudio iOS.a */, + 15427C9E198F220600DC375D /* libcocosbuilder iOS.a */, + 15427CA0198F220600DC375D /* libspine iOS.a */, + 15427CA2198F220600DC375D /* libnetwork iOS.a */, + 1571D9B919A1F714005A1DC2 /* libcocos3d iOS.a */, ); name = Products; sourceTree = ""; @@ -554,34 +1024,51 @@ 1A0227A417A3AA1A00B867AD /* Lua Common */ = { isa = PBXGroup; children = ( - C08D5D4C18E567C6009071A4 /* ftp.lua */, - C08D5D4D18E567C6009071A4 /* headers.lua */, - C08D5D4E18E567C6009071A4 /* http.lua */, - C08D5D4F18E567C6009071A4 /* ltn12.lua */, - C08D5D5018E567C6009071A4 /* mbox.lua */, - C08D5D5118E567C6009071A4 /* mime.lua */, - C08D5D5218E567C6009071A4 /* smtp.lua */, - C08D5D5318E567C6009071A4 /* socket.lua */, - C08D5D5418E567C6009071A4 /* tp.lua */, - C08D5D5518E567C6009071A4 /* url.lua */, - C03781BD18BF656900FE4F13 /* AudioEngine.lua */, - C03781BE18BF656900FE4F13 /* CCBReaderLoad.lua */, - C03781BF18BF656900FE4F13 /* Cocos2d.lua */, - C03781C018BF656900FE4F13 /* Cocos2dConstants.lua */, - C03781C118BF656900FE4F13 /* CocoStudio.lua */, - C03781C218BF656900FE4F13 /* Deprecated.lua */, - C03781C318BF656900FE4F13 /* DeprecatedClass.lua */, - C03781C418BF656A00FE4F13 /* DeprecatedEnum.lua */, - C03781C518BF656A00FE4F13 /* DeprecatedOpenglEnum.lua */, - C03781C618BF656A00FE4F13 /* DrawPrimitives.lua */, - C03781C718BF656A00FE4F13 /* extern.lua */, - C03781C818BF656A00FE4F13 /* GuiConstants.lua */, - C03781C918BF656A00FE4F13 /* json.lua */, - C03781CA18BF656A00FE4F13 /* luaj.lua */, - C03781CB18BF656A00FE4F13 /* luaoc.lua */, - C03781CC18BF656A00FE4F13 /* Opengl.lua */, - C03781CD18BF656A00FE4F13 /* OpenglConstants.lua */, - C03781CE18BF656A00FE4F13 /* StudioConstants.lua */, + 152A3470199CE5CE004B68DC /* DeprecatedUIEnum.lua */, + 152A3471199CE5CE004B68DC /* DeprecatedUIFunc.lua */, + 152A3472199CE5CE004B68DC /* experimentalUIConstants.lua */, + 152A3473199CE5CE004B68DC /* GuiConstants.lua */, + 152A3464199CE5B9004B68DC /* DeprecatedExtensionClass.lua */, + 152A3465199CE5B9004B68DC /* DeprecatedExtensionEnum.lua */, + 152A3466199CE5B9004B68DC /* DeprecatedExtensionFunc.lua */, + 152A3467199CE5B9004B68DC /* ExtensionConstants.lua */, + 152A3458199CE5A7004B68DC /* CocoStudio.lua */, + 152A3459199CE5A7004B68DC /* DeprecatedCocoStudioClass.lua */, + 152A345A199CE5A7004B68DC /* DeprecatedCocoStudioFunc.lua */, + 152A345B199CE5A7004B68DC /* StudioConstants.lua */, + 152A3430199CE585004B68DC /* CCBReaderLoad.lua */, + 152A3431199CE585004B68DC /* DeprecatedCocosBuilderClass.lua */, + 15AA962E199B525400725633 /* DeprecatedNetworkClass.lua */, + 15AA962F199B525400725633 /* DeprecatedNetworkEnum.lua */, + 15AA9630199B525400725633 /* DeprecatedNetworkFunc.lua */, + 15AA9631199B525400725633 /* NetworkConstants.lua */, + 15AA7D48199B51F000725633 /* ftp.lua */, + 15AA7D49199B51F000725633 /* headers.lua */, + 15AA7D4A199B51F000725633 /* http.lua */, + 15AA7D4B199B51F000725633 /* ltn12.lua */, + 15AA7D4C199B51F000725633 /* mbox.lua */, + 15AA7D4D199B51F000725633 /* mime.lua */, + 15AA7D4E199B51F000725633 /* smtp.lua */, + 15AA7D4F199B51F000725633 /* socket.lua */, + 15AA7D50199B51F000725633 /* tp.lua */, + 15AA7D51199B51F000725633 /* url.lua */, + 15D1FE141998715500302043 /* AudioEngine.lua */, + 15D1FE151998715500302043 /* DeprecatedCocosDenshionClass.lua */, + 15D1FE161998715500302043 /* DeprecatedCocosDenshionFunc.lua */, + 15D1FDEA1998714100302043 /* bitExtend.lua */, + 15D1FDEB1998714100302043 /* Cocos2d.lua */, + 15D1FDEC1998714100302043 /* Cocos2dConstants.lua */, + 15D1FDED1998714100302043 /* DeprecatedCocos2dClass.lua */, + 15D1FDEE1998714100302043 /* DeprecatedCocos2dEnum.lua */, + 15D1FDEF1998714100302043 /* DeprecatedCocos2dFunc.lua */, + 15D1FDF01998714100302043 /* DeprecatedOpenglEnum.lua */, + 15D1FDF11998714100302043 /* DrawPrimitives.lua */, + 15D1FDF21998714100302043 /* extern.lua */, + 15D1FDF31998714100302043 /* json.lua */, + 15D1FDF41998714100302043 /* luaj.lua */, + 15D1FDF51998714100302043 /* luaoc.lua */, + 15D1FDF61998714100302043 /* Opengl.lua */, + 15D1FDF71998714100302043 /* OpenglConstants.lua */, ); name = "Lua Common"; sourceTree = ""; @@ -718,6 +1205,8 @@ C00FD4891938512100C6382D /* runtime */ = { isa = PBXGroup; children = ( + 15AA9646199B6D4600725633 /* lua_debugger.c */, + 15AA9647199B6D4600725633 /* lua_debugger.h */, 3EB5152E1952865D006966AA /* protobuf-lite */, 3EB5152A19528284006966AA /* Protos.pb.cc */, 3EB5152B19528284006966AA /* Protos.pb.h */, @@ -737,8 +1226,24 @@ C03781AF18BF654500FE4F13 /* Products */ = { isa = PBXGroup; children = ( - C03781B418BF654500FE4F13 /* libluabindings Mac.a */, - C03781B618BF654500FE4F13 /* libluabindings iOS.a */, + 15427CB4198F220600DC375D /* libluaextension Mac.a */, + 15427CB6198F220600DC375D /* libluaui Mac.a */, + 15427CB8198F220600DC375D /* libluacocostudio Mac.a */, + 15427CBA198F220600DC375D /* libluacocosbuilder Mac.a */, + 15427CBC198F220600DC375D /* libluaspine Mac.a */, + 15427CBE198F220600DC375D /* libluanetwork Mac.a */, + 15427CC0198F220600DC375D /* libluacocosdenshion Mac.a */, + 1571D9BF19A1F714005A1DC2 /* libluacocos3d Mac.a */, + 15427CC2198F220600DC375D /* libluacocos2d Mac.a */, + 15427CC4198F220600DC375D /* libluaextension iOS.a */, + 15427CC6198F220600DC375D /* libluaui iOS.a */, + 15427CC8198F220600DC375D /* libluacocostudio iOS.a */, + 15427CCA198F220600DC375D /* libluacocosbuilder iOS.a */, + 15427CCC198F220600DC375D /* libluaspine iOS.a */, + 15427CCE198F220600DC375D /* libluanetwork iOS.a */, + 15427CD0198F220600DC375D /* libluacocosdenshion iOS.a */, + 1571D9C119A1F714005A1DC2 /* libluacocos3d iOS.a */, + 15427CD2198F220600DC375D /* libluacocos2d iOS.a */, ); name = Products; sourceTree = ""; @@ -796,6 +1301,7 @@ F293BB7C15EB830F00256477 /* Classes */ = { isa = PBXGroup; children = ( + 15427CE2198F237300DC375D /* lua_module_register.h */, C00FD4891938512100C6382D /* runtime */, C033B51A191B337200D06937 /* VisibleRect.cpp */, C033B51B191B337200D06937 /* VisibleRect.h */, @@ -834,12 +1340,22 @@ buildRules = ( ); dependencies = ( - C03781F418BF659D00FE4F13 /* PBXTargetDependency */, + 152A34BB199CE766004B68DC /* PBXTargetDependency */, + 152A34BD199CE766004B68DC /* PBXTargetDependency */, + 152A34BF199CE766004B68DC /* PBXTargetDependency */, + 152A34C1199CE766004B68DC /* PBXTargetDependency */, + 152A34C3199CE766004B68DC /* PBXTargetDependency */, + 152A34AB199CE758004B68DC /* PBXTargetDependency */, + 152A34AD199CE758004B68DC /* PBXTargetDependency */, + 152A34AF199CE758004B68DC /* PBXTargetDependency */, + 152A34B1199CE758004B68DC /* PBXTargetDependency */, + 152A34B3199CE758004B68DC /* PBXTargetDependency */, + 152A34B5199CE758004B68DC /* PBXTargetDependency */, + 152A34B7199CE758004B68DC /* PBXTargetDependency */, + 152A34B9199CE758004B68DC /* PBXTargetDependency */, + 15427CE7198F23E600DC375D /* PBXTargetDependency */, C0A2F04118975FF80072A7AB /* PBXTargetDependency */, C0A2F03D18975FEB0072A7AB /* PBXTargetDependency */, - C0A2F03B18975FE20072A7AB /* PBXTargetDependency */, - C0A2F03918975FDA0072A7AB /* PBXTargetDependency */, - C0A2F02718975FD30072A7AB /* PBXTargetDependency */, ); name = "HelloLua Mac"; productName = HelloLua; @@ -858,12 +1374,24 @@ buildRules = ( ); dependencies = ( - C03781F818BF65B500FE4F13 /* PBXTargetDependency */, - C0A2F0431897600E0072A7AB /* PBXTargetDependency */, - C0A2F0451897600E0072A7AB /* PBXTargetDependency */, - C0A2F0471897600E0072A7AB /* PBXTargetDependency */, - C0A2F0491897600E0072A7AB /* PBXTargetDependency */, - C0A2F04B1897600E0072A7AB /* PBXTargetDependency */, + 1571D9AB19A1F714005A1DC2 /* PBXTargetDependency */, + 1571D9AD19A1F714005A1DC2 /* PBXTargetDependency */, + 152A349B199CE72E004B68DC /* PBXTargetDependency */, + 152A349D199CE72E004B68DC /* PBXTargetDependency */, + 152A349F199CE72E004B68DC /* PBXTargetDependency */, + 152A3491199CE727004B68DC /* PBXTargetDependency */, + 152A3493199CE727004B68DC /* PBXTargetDependency */, + 152A3495199CE727004B68DC /* PBXTargetDependency */, + 152A3497199CE727004B68DC /* PBXTargetDependency */, + 152A3499199CE727004B68DC /* PBXTargetDependency */, + 152A34A1199CE741004B68DC /* PBXTargetDependency */, + 152A34A3199CE741004B68DC /* PBXTargetDependency */, + 152A34A5199CE741004B68DC /* PBXTargetDependency */, + 152A34A7199CE741004B68DC /* PBXTargetDependency */, + 152A34A9199CE741004B68DC /* PBXTargetDependency */, + 15D1F30B1994BBE500302043 /* PBXTargetDependency */, + 15D1F3091994BBCA00302043 /* PBXTargetDependency */, + 15427CE5198F23B300DC375D /* PBXTargetDependency */, ); name = "HelloLua iOS"; productName = HelloLua; @@ -912,17 +1440,227 @@ /* End PBXProject section */ /* Begin PBXReferenceProxy section */ - 15A8A4171834BDA200142BE0 /* libcocos2dx Mac.a */ = { + 15427C90198F220600DC375D /* libui Mac.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; - path = "libcocos2dx Mac.a"; + path = "libui Mac.a"; + remoteRef = 15427C8F198F220600DC375D /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15427C92198F220600DC375D /* libcocostudio Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libcocostudio Mac.a"; + remoteRef = 15427C91198F220600DC375D /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15427C94198F220600DC375D /* libcocosbuilder Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libcocosbuilder Mac.a"; + remoteRef = 15427C93198F220600DC375D /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15427C96198F220600DC375D /* libspine Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libspine Mac.a"; + remoteRef = 15427C95198F220600DC375D /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15427C98198F220600DC375D /* libnetwork Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libnetwork Mac.a"; + remoteRef = 15427C97198F220600DC375D /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15427C9A198F220600DC375D /* libui iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libui iOS.a"; + remoteRef = 15427C99198F220600DC375D /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15427C9C198F220600DC375D /* libcocostudio iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libcocostudio iOS.a"; + remoteRef = 15427C9B198F220600DC375D /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15427C9E198F220600DC375D /* libcocosbuilder iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libcocosbuilder iOS.a"; + remoteRef = 15427C9D198F220600DC375D /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15427CA0198F220600DC375D /* libspine iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libspine iOS.a"; + remoteRef = 15427C9F198F220600DC375D /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15427CA2198F220600DC375D /* libnetwork iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libnetwork iOS.a"; + remoteRef = 15427CA1198F220600DC375D /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15427CB4198F220600DC375D /* libluaextension Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libluaextension Mac.a"; + remoteRef = 15427CB3198F220600DC375D /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15427CB6198F220600DC375D /* libluaui Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libluaui Mac.a"; + remoteRef = 15427CB5198F220600DC375D /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15427CB8198F220600DC375D /* libluacocostudio Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libluacocostudio Mac.a"; + remoteRef = 15427CB7198F220600DC375D /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15427CBA198F220600DC375D /* libluacocosbuilder Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libluacocosbuilder Mac.a"; + remoteRef = 15427CB9198F220600DC375D /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15427CBC198F220600DC375D /* libluaspine Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libluaspine Mac.a"; + remoteRef = 15427CBB198F220600DC375D /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15427CBE198F220600DC375D /* libluanetwork Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libluanetwork Mac.a"; + remoteRef = 15427CBD198F220600DC375D /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15427CC0198F220600DC375D /* libluacocosdenshion Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libluacocosdenshion Mac.a"; + remoteRef = 15427CBF198F220600DC375D /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15427CC2198F220600DC375D /* libluacocos2d Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libluacocos2d Mac.a"; + remoteRef = 15427CC1198F220600DC375D /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15427CC4198F220600DC375D /* libluaextension iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libluaextension iOS.a"; + remoteRef = 15427CC3198F220600DC375D /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15427CC6198F220600DC375D /* libluaui iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libluaui iOS.a"; + remoteRef = 15427CC5198F220600DC375D /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15427CC8198F220600DC375D /* libluacocostudio iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libluacocostudio iOS.a"; + remoteRef = 15427CC7198F220600DC375D /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15427CCA198F220600DC375D /* libluacocosbuilder iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libluacocosbuilder iOS.a"; + remoteRef = 15427CC9198F220600DC375D /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15427CCC198F220600DC375D /* libluaspine iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libluaspine iOS.a"; + remoteRef = 15427CCB198F220600DC375D /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15427CCE198F220600DC375D /* libluanetwork iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libluanetwork iOS.a"; + remoteRef = 15427CCD198F220600DC375D /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15427CD0198F220600DC375D /* libluacocosdenshion iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libluacocosdenshion iOS.a"; + remoteRef = 15427CCF198F220600DC375D /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15427CD2198F220600DC375D /* libluacocos2d iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libluacocos2d iOS.a"; + remoteRef = 15427CD1198F220600DC375D /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 1571D9B719A1F714005A1DC2 /* libcocos3d Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libcocos3d Mac.a"; + remoteRef = 1571D9B619A1F714005A1DC2 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 1571D9B919A1F714005A1DC2 /* libcocos3d iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libcocos3d iOS.a"; + remoteRef = 1571D9B819A1F714005A1DC2 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 1571D9BF19A1F714005A1DC2 /* libluacocos3d Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libluacocos3d Mac.a"; + remoteRef = 1571D9BE19A1F714005A1DC2 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 1571D9C119A1F714005A1DC2 /* libluacocos3d iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libluacocos3d iOS.a"; + remoteRef = 1571D9C019A1F714005A1DC2 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 15A8A4171834BDA200142BE0 /* libcocos2d Mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libcocos2d Mac.a"; remoteRef = 15A8A4161834BDA200142BE0 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 15A8A4191834BDA200142BE0 /* libcocos2dx-extensions Mac.a */ = { + 15A8A4191834BDA200142BE0 /* libextension Mac.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; - path = "libcocos2dx-extensions Mac.a"; + path = "libextension Mac.a"; remoteRef = 15A8A4181834BDA200142BE0 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -940,24 +1678,24 @@ remoteRef = 15A8A41C1834BDA200142BE0 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 15A8A41F1834BDA200142BE0 /* libCocosDenshion Mac.a */ = { + 15A8A41F1834BDA200142BE0 /* libcocosdenshion Mac.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; - path = "libCocosDenshion Mac.a"; + path = "libcocosdenshion Mac.a"; remoteRef = 15A8A41E1834BDA200142BE0 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 15A8A4251834BDA200142BE0 /* libcocos2dx iOS.a */ = { + 15A8A4251834BDA200142BE0 /* libcocos2d iOS.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; - path = "libcocos2dx iOS.a"; + path = "libcocos2d iOS.a"; remoteRef = 15A8A4241834BDA200142BE0 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 15A8A4271834BDA200142BE0 /* libcocos2dx-extensions iOS.a */ = { + 15A8A4271834BDA200142BE0 /* libextension iOS.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; - path = "libcocos2dx-extensions iOS.a"; + path = "libextension iOS.a"; remoteRef = 15A8A4261834BDA200142BE0 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -975,27 +1713,13 @@ remoteRef = 15A8A42A1834BDA200142BE0 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 15A8A42D1834BDA200142BE0 /* libCocosDenshion iOS.a */ = { + 15A8A42D1834BDA200142BE0 /* libcocosdenshion iOS.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; - path = "libCocosDenshion iOS.a"; + path = "libcocosdenshion iOS.a"; remoteRef = 15A8A42C1834BDA200142BE0 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - C03781B418BF654500FE4F13 /* libluabindings Mac.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libluabindings Mac.a"; - remoteRef = C03781B318BF654500FE4F13 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - C03781B618BF654500FE4F13 /* libluabindings iOS.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libluabindings iOS.a"; - remoteRef = C03781B518BF654500FE4F13 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; /* End PBXReferenceProxy section */ /* Begin PBXResourcesBuildPhase section */ @@ -1003,39 +1727,56 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - C03781EE18BF656A00FE4F13 /* Opengl.lua in Resources */, - C03781F018BF656A00FE4F13 /* OpenglConstants.lua in Resources */, - C03781E418BF656A00FE4F13 /* extern.lua in Resources */, - C03781E618BF656A00FE4F13 /* GuiConstants.lua in Resources */, - C08D5D6118E567C6009071A4 /* mime.lua in Resources */, - C03781D418BF656A00FE4F13 /* Cocos2d.lua in Resources */, + 152A3469199CE5B9004B68DC /* DeprecatedExtensionClass.lua in Resources */, + 152A345F199CE5A7004B68DC /* DeprecatedCocoStudioClass.lua in Resources */, + 15AA7D5F199B51F000725633 /* smtp.lua in Resources */, + 15AA7D63199B51F000725633 /* tp.lua in Resources */, + 15AA7D5D199B51F000725633 /* mime.lua in Resources */, + 15AA9635199B525400725633 /* DeprecatedNetworkEnum.lua in Resources */, + 152A346B199CE5B9004B68DC /* DeprecatedExtensionEnum.lua in Resources */, + 152A3475199CE5CE004B68DC /* DeprecatedUIEnum.lua in Resources */, + 152A3435199CE585004B68DC /* DeprecatedCocosBuilderClass.lua in Resources */, C03781BA18BF655400FE4F13 /* res in Resources */, + 15D1FE131998714100302043 /* OpenglConstants.lua in Resources */, + 15D1FE071998714100302043 /* DrawPrimitives.lua in Resources */, C03781BC18BF655400FE4F13 /* src in Resources */, - C08D5D6918E567C6009071A4 /* url.lua in Resources */, - C03781E218BF656A00FE4F13 /* DrawPrimitives.lua in Resources */, - C08D5D6318E567C6009071A4 /* smtp.lua in Resources */, - C08D5D5718E567C6009071A4 /* ftp.lua in Resources */, - C08D5D5B18E567C6009071A4 /* http.lua in Resources */, - C03781DA18BF656A00FE4F13 /* Deprecated.lua in Resources */, - C03781E018BF656A00FE4F13 /* DeprecatedOpenglEnum.lua in Resources */, - C08D5D6518E567C6009071A4 /* socket.lua in Resources */, - C08D5D5D18E567C6009071A4 /* ltn12.lua in Resources */, - C03781EC18BF656A00FE4F13 /* luaoc.lua in Resources */, + 15D1FE111998714100302043 /* Opengl.lua in Resources */, C07828F918B4D72E00BD2287 /* MainMenu.xib in Resources */, + 152A345D199CE5A7004B68DC /* CocoStudio.lua in Resources */, + 15D1FE0D1998714100302043 /* luaj.lua in Resources */, + 15AA7D65199B51F000725633 /* url.lua in Resources */, + 15AA7D5B199B51F000725633 /* mbox.lua in Resources */, + 15D1FE051998714100302043 /* DeprecatedOpenglEnum.lua in Resources */, + 152A3479199CE5CE004B68DC /* experimentalUIConstants.lua in Resources */, 5023817617EBBE3400990C9B /* Icon.icns in Resources */, - C03781D218BF656A00FE4F13 /* CCBReaderLoad.lua in Resources */, - C08D5D5F18E567C6009071A4 /* mbox.lua in Resources */, - C03781D018BF656A00FE4F13 /* AudioEngine.lua in Resources */, - C03781D818BF656A00FE4F13 /* CocoStudio.lua in Resources */, - C08D5D5918E567C6009071A4 /* headers.lua in Resources */, - C03781DC18BF656A00FE4F13 /* DeprecatedClass.lua in Resources */, - C08D5D6718E567C6009071A4 /* tp.lua in Resources */, - C03781F218BF656A00FE4F13 /* StudioConstants.lua in Resources */, - C03781EA18BF656A00FE4F13 /* luaj.lua in Resources */, - C03781DE18BF656A00FE4F13 /* DeprecatedEnum.lua in Resources */, - C03781E818BF656A00FE4F13 /* json.lua in Resources */, - C03781D618BF656A00FE4F13 /* Cocos2dConstants.lua in Resources */, + 152A3463199CE5A7004B68DC /* StudioConstants.lua in Resources */, + 15D1FE031998714100302043 /* DeprecatedCocos2dFunc.lua in Resources */, + 15AA7D59199B51F000725633 /* ltn12.lua in Resources */, + 15D1FDFF1998714100302043 /* DeprecatedCocos2dClass.lua in Resources */, + 15AA7D53199B51F000725633 /* ftp.lua in Resources */, + 152A346D199CE5B9004B68DC /* DeprecatedExtensionFunc.lua in Resources */, + 15D1FE1C1998715500302043 /* DeprecatedCocosDenshionFunc.lua in Resources */, + 15D1FDF91998714100302043 /* bitExtend.lua in Resources */, + 15D1FE011998714100302043 /* DeprecatedCocos2dEnum.lua in Resources */, + 152A3461199CE5A7004B68DC /* DeprecatedCocoStudioFunc.lua in Resources */, + 152A3477199CE5CE004B68DC /* DeprecatedUIFunc.lua in Resources */, + 15D1FE0B1998714100302043 /* json.lua in Resources */, + 15AA9639199B525400725633 /* NetworkConstants.lua in Resources */, + 15D1FE091998714100302043 /* extern.lua in Resources */, + 15AA7D61199B51F000725633 /* socket.lua in Resources */, + 15AA9637199B525400725633 /* DeprecatedNetworkFunc.lua in Resources */, + 15D1FE1A1998715500302043 /* DeprecatedCocosDenshionClass.lua in Resources */, C05D1C131923449100B808A4 /* config.json in Resources */, + 15AA9633199B525400725633 /* DeprecatedNetworkClass.lua in Resources */, + 152A346F199CE5B9004B68DC /* ExtensionConstants.lua in Resources */, + 15D1FE0F1998714100302043 /* luaoc.lua in Resources */, + 15AA7D57199B51F000725633 /* http.lua in Resources */, + 152A347B199CE5CE004B68DC /* GuiConstants.lua in Resources */, + 15D1FDFD1998714100302043 /* Cocos2dConstants.lua in Resources */, + 15D1FDFB1998714100302043 /* Cocos2d.lua in Resources */, + 15D1FE181998715500302043 /* AudioEngine.lua in Resources */, + 15AA7D55199B51F000725633 /* headers.lua in Resources */, + 152A3433199CE585004B68DC /* CCBReaderLoad.lua in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1043,53 +1784,70 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + 152A345C199CE5A7004B68DC /* CocoStudio.lua in Resources */, + 15D1FDF81998714100302043 /* bitExtend.lua in Resources */, + 15AA7D52199B51F000725633 /* ftp.lua in Resources */, + 15AA7D58199B51F000725633 /* ltn12.lua in Resources */, + 15AA7D5A199B51F000725633 /* mbox.lua in Resources */, 15A8A4491834C64F00142BE0 /* Icon-114.png in Resources */, - C08D5D5618E567C6009071A4 /* ftp.lua in Resources */, - C08D5D5C18E567C6009071A4 /* ltn12.lua in Resources */, - C08D5D5E18E567C6009071A4 /* mbox.lua in Resources */, - C03781DB18BF656A00FE4F13 /* DeprecatedClass.lua in Resources */, + 152A3478199CE5CE004B68DC /* experimentalUIConstants.lua in Resources */, 5023811D17EBBCAC00990C9B /* Icon-120.png in Resources */, 5091733B17ECE17A00D62437 /* Icon-100.png in Resources */, - C08D5D5818E567C6009071A4 /* headers.lua in Resources */, - C03781E918BF656A00FE4F13 /* luaj.lua in Resources */, + 152A346E199CE5B9004B68DC /* ExtensionConstants.lua in Resources */, + 15AA7D54199B51F000725633 /* headers.lua in Resources */, 5023811B17EBBCAC00990C9B /* Default@2x.png in Resources */, + 15D1FDFE1998714100302043 /* DeprecatedCocos2dClass.lua in Resources */, 5091733617ECE17A00D62437 /* Icon-29.png in Resources */, - C08D5D6418E567C6009071A4 /* socket.lua in Resources */, - C03781E718BF656A00FE4F13 /* json.lua in Resources */, - C08D5D5A18E567C6009071A4 /* http.lua in Resources */, + 15AA7D60199B51F000725633 /* socket.lua in Resources */, + 15D1FE061998714100302043 /* DrawPrimitives.lua in Resources */, + 15AA7D56199B51F000725633 /* http.lua in Resources */, + 15D1FE191998715500302043 /* DeprecatedCocosDenshionClass.lua in Resources */, + 152A3476199CE5CE004B68DC /* DeprecatedUIFunc.lua in Resources */, + 15D1FDFA1998714100302043 /* Cocos2d.lua in Resources */, 5023811917EBBCAC00990C9B /* Default-568h@2x.png in Resources */, - C03781D318BF656A00FE4F13 /* Cocos2d.lua in Resources */, + 15D1FE0C1998714100302043 /* luaj.lua in Resources */, 5091733917ECE17A00D62437 /* Icon-58.png in Resources */, - C03781ED18BF656A00FE4F13 /* Opengl.lua in Resources */, - C03781F118BF656A00FE4F13 /* StudioConstants.lua in Resources */, + 15D1FE121998714100302043 /* OpenglConstants.lua in Resources */, + 152A3474199CE5CE004B68DC /* DeprecatedUIEnum.lua in Resources */, + 15D1FE021998714100302043 /* DeprecatedCocos2dFunc.lua in Resources */, 5023811F17EBBCAC00990C9B /* Icon-152.png in Resources */, - C03781D118BF656A00FE4F13 /* CCBReaderLoad.lua in Resources */, 5023812017EBBCAC00990C9B /* Icon-57.png in Resources */, - C03781CF18BF656A00FE4F13 /* AudioEngine.lua in Resources */, + 15D1FE001998714100302043 /* DeprecatedCocos2dEnum.lua in Resources */, C03781B918BF655400FE4F13 /* res in Resources */, - C03781EF18BF656A00FE4F13 /* OpenglConstants.lua in Resources */, - C03781E518BF656A00FE4F13 /* GuiConstants.lua in Resources */, + 15AA9634199B525400725633 /* DeprecatedNetworkEnum.lua in Resources */, + 15D1FE1B1998715500302043 /* DeprecatedCocosDenshionFunc.lua in Resources */, 5023812217EBBCAC00990C9B /* Icon-76.png in Resources */, - C03781DF18BF656A00FE4F13 /* DeprecatedOpenglEnum.lua in Resources */, 5091733A17ECE17A00D62437 /* Icon-80.png in Resources */, - C08D5D6018E567C6009071A4 /* mime.lua in Resources */, + 152A347A199CE5CE004B68DC /* GuiConstants.lua in Resources */, + 15D1FE0A1998714100302043 /* json.lua in Resources */, + 15AA7D5C199B51F000725633 /* mime.lua in Resources */, + 152A3462199CE5A7004B68DC /* StudioConstants.lua in Resources */, + 15D1FE041998714100302043 /* DeprecatedOpenglEnum.lua in Resources */, + 152A3468199CE5B9004B68DC /* DeprecatedExtensionClass.lua in Resources */, 5091733717ECE17A00D62437 /* Icon-40.png in Resources */, 5023811E17EBBCAC00990C9B /* Icon-144.png in Resources */, 5023811A17EBBCAC00990C9B /* Default.png in Resources */, - C03781E118BF656A00FE4F13 /* DrawPrimitives.lua in Resources */, - C08D5D6218E567C6009071A4 /* smtp.lua in Resources */, + 15AA7D5E199B51F000725633 /* smtp.lua in Resources */, + 152A3434199CE585004B68DC /* DeprecatedCocosBuilderClass.lua in Resources */, + 15AA9632199B525400725633 /* DeprecatedNetworkClass.lua in Resources */, + 15D1FE171998715500302043 /* AudioEngine.lua in Resources */, C03781BB18BF655400FE4F13 /* src in Resources */, - C03781EB18BF656A00FE4F13 /* luaoc.lua in Resources */, + 15AA9636199B525400725633 /* DeprecatedNetworkFunc.lua in Resources */, 5091733817ECE17A00D62437 /* Icon-50.png in Resources */, - C03781D718BF656A00FE4F13 /* CocoStudio.lua in Resources */, - C03781D518BF656A00FE4F13 /* Cocos2dConstants.lua in Resources */, - C08D5D6618E567C6009071A4 /* tp.lua in Resources */, + 15D1FE081998714100302043 /* extern.lua in Resources */, 5023812117EBBCAC00990C9B /* Icon-72.png in Resources */, - C08D5D6818E567C6009071A4 /* url.lua in Resources */, + 15AA7D62199B51F000725633 /* tp.lua in Resources */, + 15D1FDFC1998714100302043 /* Cocos2dConstants.lua in Resources */, + 152A3432199CE585004B68DC /* CCBReaderLoad.lua in Resources */, + 15AA9638199B525400725633 /* NetworkConstants.lua in Resources */, + 15AA7D64199B51F000725633 /* url.lua in Resources */, + 152A346A199CE5B9004B68DC /* DeprecatedExtensionEnum.lua in Resources */, + 152A346C199CE5B9004B68DC /* DeprecatedExtensionFunc.lua in Resources */, C05D1C121923449100B808A4 /* config.json in Resources */, - C03781DD18BF656A00FE4F13 /* DeprecatedEnum.lua in Resources */, - C03781E318BF656A00FE4F13 /* extern.lua in Resources */, - C03781D918BF656A00FE4F13 /* Deprecated.lua in Resources */, + 15D1FE0E1998714100302043 /* luaoc.lua in Resources */, + 152A3460199CE5A7004B68DC /* DeprecatedCocoStudioFunc.lua in Resources */, + 152A345E199CE5A7004B68DC /* DeprecatedCocoStudioClass.lua in Resources */, + 15D1FE101998714100302043 /* Opengl.lua in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1136,6 +1894,7 @@ C033B51D191B337200D06937 /* VisibleRect.cpp in Sources */, C00FD49D1938512100C6382D /* Shine_png.cpp in Sources */, 3EB515691952865D006966AA /* common.cc in Sources */, + 15AA9649199B6D4600725633 /* lua_debugger.c in Sources */, 3EB515651952865D006966AA /* repeated_field.cc in Sources */, 3EB5156B1952865D006966AA /* once.cc in Sources */, 3EB5155D1952865D006966AA /* coded_stream.cc in Sources */, @@ -1161,6 +1920,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + 15AA9648199B6D4600725633 /* lua_debugger.c in Sources */, 3EB5156A1952865D006966AA /* once.cc in Sources */, C00FD4981938512100C6382D /* Portrait_png.cpp in Sources */, 5023812517EBBCAC00990C9B /* RootViewController.mm in Sources */, @@ -1193,30 +1953,165 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - C03781F418BF659D00FE4F13 /* PBXTargetDependency */ = { + 152A3491199CE727004B68DC /* PBXTargetDependency */ = { isa = PBXTargetDependency; - name = "luabindings Mac"; - targetProxy = C03781F318BF659D00FE4F13 /* PBXContainerItemProxy */; + name = "libluaextension iOS"; + targetProxy = 152A3490199CE727004B68DC /* PBXContainerItemProxy */; }; - C03781F818BF65B500FE4F13 /* PBXTargetDependency */ = { + 152A3493199CE727004B68DC /* PBXTargetDependency */ = { isa = PBXTargetDependency; - name = "luabindings iOS"; - targetProxy = C03781F718BF65B500FE4F13 /* PBXContainerItemProxy */; + name = "libluaui iOS"; + targetProxy = 152A3492199CE727004B68DC /* PBXContainerItemProxy */; }; - C0A2F02718975FD30072A7AB /* PBXTargetDependency */ = { + 152A3495199CE727004B68DC /* PBXTargetDependency */ = { isa = PBXTargetDependency; - name = "chipmunk Mac"; - targetProxy = C0A2F02618975FD30072A7AB /* PBXContainerItemProxy */; + name = "libluacocostudio iOS"; + targetProxy = 152A3494199CE727004B68DC /* PBXContainerItemProxy */; }; - C0A2F03918975FDA0072A7AB /* PBXTargetDependency */ = { + 152A3497199CE727004B68DC /* PBXTargetDependency */ = { isa = PBXTargetDependency; - name = "box2d Mac"; - targetProxy = C0A2F03818975FDA0072A7AB /* PBXContainerItemProxy */; + name = "libluacocosbuilder iOS"; + targetProxy = 152A3496199CE727004B68DC /* PBXContainerItemProxy */; }; - C0A2F03B18975FE20072A7AB /* PBXTargetDependency */ = { + 152A3499199CE727004B68DC /* PBXTargetDependency */ = { isa = PBXTargetDependency; - name = "cocos2dx-extensions Mac"; - targetProxy = C0A2F03A18975FE20072A7AB /* PBXContainerItemProxy */; + name = "libluaspine iOS"; + targetProxy = 152A3498199CE727004B68DC /* PBXContainerItemProxy */; + }; + 152A349B199CE72E004B68DC /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libluanetwork iOS"; + targetProxy = 152A349A199CE72E004B68DC /* PBXContainerItemProxy */; + }; + 152A349D199CE72E004B68DC /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libluacocosdenshion iOS"; + targetProxy = 152A349C199CE72E004B68DC /* PBXContainerItemProxy */; + }; + 152A349F199CE72E004B68DC /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libluacocos2d iOS"; + targetProxy = 152A349E199CE72E004B68DC /* PBXContainerItemProxy */; + }; + 152A34A1199CE741004B68DC /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libextension iOS"; + targetProxy = 152A34A0199CE741004B68DC /* PBXContainerItemProxy */; + }; + 152A34A3199CE741004B68DC /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libui iOS"; + targetProxy = 152A34A2199CE741004B68DC /* PBXContainerItemProxy */; + }; + 152A34A5199CE741004B68DC /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libcocostudio iOS"; + targetProxy = 152A34A4199CE741004B68DC /* PBXContainerItemProxy */; + }; + 152A34A7199CE741004B68DC /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libcocosbuilder iOS"; + targetProxy = 152A34A6199CE741004B68DC /* PBXContainerItemProxy */; + }; + 152A34A9199CE741004B68DC /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libspine iOS"; + targetProxy = 152A34A8199CE741004B68DC /* PBXContainerItemProxy */; + }; + 152A34AB199CE758004B68DC /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libluaextension Mac"; + targetProxy = 152A34AA199CE758004B68DC /* PBXContainerItemProxy */; + }; + 152A34AD199CE758004B68DC /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libluaui Mac"; + targetProxy = 152A34AC199CE758004B68DC /* PBXContainerItemProxy */; + }; + 152A34AF199CE758004B68DC /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libluacocostudio Mac"; + targetProxy = 152A34AE199CE758004B68DC /* PBXContainerItemProxy */; + }; + 152A34B1199CE758004B68DC /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libluacocosbuilder Mac"; + targetProxy = 152A34B0199CE758004B68DC /* PBXContainerItemProxy */; + }; + 152A34B3199CE758004B68DC /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libluaspine Mac"; + targetProxy = 152A34B2199CE758004B68DC /* PBXContainerItemProxy */; + }; + 152A34B5199CE758004B68DC /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libluanetwork Mac"; + targetProxy = 152A34B4199CE758004B68DC /* PBXContainerItemProxy */; + }; + 152A34B7199CE758004B68DC /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libluacocosdenshion Mac"; + targetProxy = 152A34B6199CE758004B68DC /* PBXContainerItemProxy */; + }; + 152A34B9199CE758004B68DC /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libluacocos2d Mac"; + targetProxy = 152A34B8199CE758004B68DC /* PBXContainerItemProxy */; + }; + 152A34BB199CE766004B68DC /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libextension Mac"; + targetProxy = 152A34BA199CE766004B68DC /* PBXContainerItemProxy */; + }; + 152A34BD199CE766004B68DC /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libui Mac"; + targetProxy = 152A34BC199CE766004B68DC /* PBXContainerItemProxy */; + }; + 152A34BF199CE766004B68DC /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libcocostudio Mac"; + targetProxy = 152A34BE199CE766004B68DC /* PBXContainerItemProxy */; + }; + 152A34C1199CE766004B68DC /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libcocosbuilder Mac"; + targetProxy = 152A34C0199CE766004B68DC /* PBXContainerItemProxy */; + }; + 152A34C3199CE766004B68DC /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libspine Mac"; + targetProxy = 152A34C2199CE766004B68DC /* PBXContainerItemProxy */; + }; + 15427CE5198F23B300DC375D /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libnetwork iOS"; + targetProxy = 15427CE4198F23B300DC375D /* PBXContainerItemProxy */; + }; + 15427CE7198F23E600DC375D /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libnetwork Mac"; + targetProxy = 15427CE6198F23E600DC375D /* PBXContainerItemProxy */; + }; + 1571D9AB19A1F714005A1DC2 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libluacocos3d iOS"; + targetProxy = 1571D9AA19A1F714005A1DC2 /* PBXContainerItemProxy */; + }; + 1571D9AD19A1F714005A1DC2 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libcocos3d iOS"; + targetProxy = 1571D9AC19A1F714005A1DC2 /* PBXContainerItemProxy */; + }; + 15D1F3091994BBCA00302043 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libcocos2d iOS"; + targetProxy = 15D1F3081994BBCA00302043 /* PBXContainerItemProxy */; + }; + 15D1F30B1994BBE500302043 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libcocosdenshion iOS"; + targetProxy = 15D1F30A1994BBE500302043 /* PBXContainerItemProxy */; }; C0A2F03D18975FEB0072A7AB /* PBXTargetDependency */ = { isa = PBXTargetDependency; @@ -1228,31 +2123,6 @@ name = "cocos2dx Mac"; targetProxy = C0A2F04018975FF80072A7AB /* PBXContainerItemProxy */; }; - C0A2F0431897600E0072A7AB /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "cocos2dx iOS"; - targetProxy = C0A2F0421897600E0072A7AB /* PBXContainerItemProxy */; - }; - C0A2F0451897600E0072A7AB /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "cocos2dx-extensions iOS"; - targetProxy = C0A2F0441897600E0072A7AB /* PBXContainerItemProxy */; - }; - C0A2F0471897600E0072A7AB /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "chipmunk iOS"; - targetProxy = C0A2F0461897600E0072A7AB /* PBXContainerItemProxy */; - }; - C0A2F0491897600E0072A7AB /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "box2d iOS"; - targetProxy = C0A2F0481897600E0072A7AB /* PBXContainerItemProxy */; - }; - C0A2F04B1897600E0072A7AB /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "CocosDenshion iOS"; - targetProxy = C0A2F04A1897600E0072A7AB /* PBXContainerItemProxy */; - }; /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ 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 fb3d672fe3..83c15d2ae0 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 @@ -81,7 +81,7 @@ static AppDelegate s_sharedApplication; [[UIApplication sharedApplication] setStatusBarHidden: YES]; // IMPORTANT: Setting the GLView should be done after creating the RootViewController - cocos2d::GLView *glview = cocos2d::GLView::createWithEAGLView(eaglView); + cocos2d::GLView *glview = cocos2d::GLViewImpl::createWithEAGLView(eaglView); cocos2d::Director::getInstance()->setOpenGLView(glview); cocos2d::Application::getInstance()->run(); 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 b860aac9e9..439de445a3 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 @@ -103,11 +103,11 @@ std::string getCurAppPath(void) height = tmpvalue; } g_windTop = true; - g_eglView = GLView::createWithRect([viewName cStringUsingEncoding:NSUTF8StringEncoding],cocos2d::Rect(0.0f,0.0f,width,height),frameZoomFactor); + g_eglView = cocos2d::GLViewImpl::createWithRect([viewName cStringUsingEncoding:NSUTF8StringEncoding],cocos2d::Rect(0.0f,0.0f,width,height),frameZoomFactor); auto director = Director::getInstance(); director->setOpenGLView(g_eglView); - window = glfwGetCocoaWindow(g_eglView->getWindow()); + window = g_eglView->getCocoaWindow(); [NSApp setDelegate: self]; [self createViewMenu]; @@ -336,7 +336,7 @@ void createSimulator(const char* viewName, float width, float height,bool isLand { if ([sender state] == NSOnState) return; float scale = (float)[sender tag] / 100.0f; - g_eglView->setFrameZoomFactor(scale); + (dynamic_cast(g_eglView))->setFrameZoomFactor(scale); [self updateView]; } diff --git a/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/HelloLua.sln b/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/HelloLua.sln index 47be636d6c..9951b3aa26 100644 --- a/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/HelloLua.sln +++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/HelloLua.sln @@ -2,16 +2,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2012 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HelloLua", "HelloLua.vcxproj", "{4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}" - ProjectSection(ProjectDependencies) = postProject - {21B2C324-891F-48EA-AD1A-5AE13DE12E28} = {21B2C324-891F-48EA-AD1A-5AE13DE12E28} - {B7C2A162-DEC9-4418-972E-240AB3CBFCAE} = {B7C2A162-DEC9-4418-972E-240AB3CBFCAE} - {DDC3E27F-004D-4DD4-9DD3-931A013D2159} = {DDC3E27F-004D-4DD4-9DD3-931A013D2159} - {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E} = {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E} - {207BC7A9-CCF1-4F2F-A04D-45F72242AE25} = {207BC7A9-CCF1-4F2F-A04D-45F72242AE25} - {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6} = {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libExtensions", "..\..\cocos2d-x\extensions\proj.win32\libExtensions.vcxproj", "{21B2C324-891F-48EA-AD1A-5AE13DE12E28}" ProjectSection(ProjectDependencies) = postProject {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E} = {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E} {207BC7A9-CCF1-4F2F-A04D-45F72242AE25} = {207BC7A9-CCF1-4F2F-A04D-45F72242AE25} @@ -20,23 +10,43 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libExtensions", "..\..\coco EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libchipmunk", "..\..\cocos2d-x\external\chipmunk\proj.win32\chipmunk.vcxproj", "{207BC7A9-CCF1-4F2F-A04D-45F72242AE25}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos2d", "..\..\cocos2d-x\cocos\2d\cocos2d.vcxproj", "{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libnetwork", "..\..\cocos2d-x\cocos\network\proj.win32\libNetwork.vcxproj", "{DF2638C0-8128-4847-867C-6EAFE3DEE7B5}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libAudio", "..\..\cocos2d-x\cocos\audio\proj.win32\CocosDenshion.vcxproj", "{F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos2d", "..\..\cocos2d-x\cocos\2d\libcocos2d.vcxproj", "{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libNetwork", "..\..\cocos2d-x\cocos\network\proj.win32\libNetwork.vcxproj", "{DF2638C0-8128-4847-867C-6EAFE3DEE7B5}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocosdenshion", "..\..\cocos2d-x\cocos\audio\proj.win32\libcocosdenshion.vcxproj", "{F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libCocosBuilder", "..\..\cocos2d-x\cocos\editor-support\cocosbuilder\proj.win32\libCocosBuilder.vcxproj", "{811C0DAB-7B96-4BD3-A154-B7572B58E4AB}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libluacocos2d", "..\..\cocos2d-x\cocos\scripting\lua-bindings\proj.win32\libluacocos2d.vcxproj", "{9F2D6CE6-C893-4400-B50C-6DB70CC2562F}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libCocosStudio", "..\..\cocos2d-x\cocos\editor-support\cocostudio\proj.win32\libCocosStudio.vcxproj", "{B57CF53F-2E49-4031-9822-047CC0E6BDE2}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libluacocosdenshion", "..\..\cocos2d-x\cocos\scripting\lua-bindings\proj.win32\libluacocosdenshion.vcxproj", "{46A7D57A-7F25-4F52-823B-FFAC4FF3A624}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGUI", "..\..\cocos2d-x\cocos\ui\proj.win32\libGUI.vcxproj", "{7E06E92C-537A-442B-9E4A-4761C84F8A1A}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libluanetwork", "..\..\cocos2d-x\cocos\scripting\lua-bindings\proj.win32\libluanetwork.vcxproj", "{65E52F4B-703F-419E-AD67-926241A10042}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocosbuilder", "..\..\cocos2d-x\cocos\editor-support\cocosbuilder\proj.win32\libcocosbuilder.vcxproj", "{811C0DAB-7B96-4BD3-A154-B7572B58E4AB}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocostudio", "..\..\cocos2d-x\cocos\editor-support\cocostudio\proj.win32\libcocostudio.vcxproj", "{B57CF53F-2E49-4031-9822-047CC0E6BDE2}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libSpine", "..\..\cocos2d-x\cocos\editor-support\spine\proj.win32\libSpine.vcxproj", "{B7C2A162-DEC9-4418-972E-240AB3CBFCAE}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblua", "..\..\cocos2d-x\cocos\scripting\lua-bindings\proj.win32\liblua.vcxproj", "{DDC3E27F-004D-4DD4-9DD3-931A013D2159}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libui", "..\..\cocos2d-x\cocos\ui\proj.win32\libui.vcxproj", "{7E06E92C-537A-442B-9E4A-4761C84F8A1A}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libLocalStorage", "..\..\cocos2d-x\cocos\storage\local-storage\proj.win32\libLocalStorage.vcxproj", "{632A8F38-D0F0-4D22-86B3-D69F5E6BF63A}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbox2d", "..\..\cocos2d-x\external\Box2D\proj.win32\libbox2d.vcxproj", "{929480E7-23C0-4DF6-8456-096D71547116}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libextension", "..\..\cocos2d-x\extensions\proj.win32\libextension.vcxproj", "{21B2C324-891F-48EA-AD1A-5AE13DE12E28}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libluacocosbuilder", "..\..\cocos2d-x\cocos\scripting\lua-bindings\proj.win32\libluacocosbuilder.vcxproj", "{F8198014-F4F3-49F0-88AB-C1969A5829AF}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libluacocostudio", "..\..\cocos2d-x\cocos\scripting\lua-bindings\proj.win32\libluacocostudio.vcxproj", "{9640951E-C5D0-47B5-9C42-0BCADA261C50}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libluaextension", "..\..\cocos2d-x\cocos\scripting\lua-bindings\proj.win32\libluaextension.vcxproj", "{7068296E-38A4-4BCA-85DB-3A09BD014847}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libluaspine", "..\..\cocos2d-x\cocos\scripting\lua-bindings\proj.win32\libluaspine.vcxproj", "{31EF6AB1-0D9A-4BC6-99B8-2C482EA373C4}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libluaui", "..\..\cocos2d-x\cocos\scripting\lua-bindings\proj.win32\libluaui.vcxproj", "{FE78EEBB-3DBB-4713-8CBF-63D742C5BD82}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos3d", "..\..\cocos2d-x\cocos\3d\proj.win32\libcocos3d.vcxproj", "{E24950FA-5BC1-4AEE-A900-4F0259354BF0}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libluacocos3d", "..\..\cocos2d-x\cocos\scripting\lua-bindings\proj.win32\libluacocos3d.vcxproj", "{06840490-14A4-43D6-88BC-AAFA44D043EB}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -48,14 +58,14 @@ Global {4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}.Debug|Win32.Build.0 = Debug|Win32 {4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}.Release|Win32.ActiveCfg = Release|Win32 {4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}.Release|Win32.Build.0 = Release|Win32 - {21B2C324-891F-48EA-AD1A-5AE13DE12E28}.Debug|Win32.ActiveCfg = Debug|Win32 - {21B2C324-891F-48EA-AD1A-5AE13DE12E28}.Debug|Win32.Build.0 = Debug|Win32 - {21B2C324-891F-48EA-AD1A-5AE13DE12E28}.Release|Win32.ActiveCfg = Release|Win32 - {21B2C324-891F-48EA-AD1A-5AE13DE12E28}.Release|Win32.Build.0 = Release|Win32 {207BC7A9-CCF1-4F2F-A04D-45F72242AE25}.Debug|Win32.ActiveCfg = Debug|Win32 {207BC7A9-CCF1-4F2F-A04D-45F72242AE25}.Debug|Win32.Build.0 = Debug|Win32 {207BC7A9-CCF1-4F2F-A04D-45F72242AE25}.Release|Win32.ActiveCfg = Release|Win32 {207BC7A9-CCF1-4F2F-A04D-45F72242AE25}.Release|Win32.Build.0 = Release|Win32 + {DF2638C0-8128-4847-867C-6EAFE3DEE7B5}.Debug|Win32.ActiveCfg = Debug|Win32 + {DF2638C0-8128-4847-867C-6EAFE3DEE7B5}.Debug|Win32.Build.0 = Debug|Win32 + {DF2638C0-8128-4847-867C-6EAFE3DEE7B5}.Release|Win32.ActiveCfg = Release|Win32 + {DF2638C0-8128-4847-867C-6EAFE3DEE7B5}.Release|Win32.Build.0 = Release|Win32 {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Debug|Win32.ActiveCfg = Debug|Win32 {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Debug|Win32.Build.0 = Debug|Win32 {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Release|Win32.ActiveCfg = Release|Win32 @@ -64,10 +74,18 @@ Global {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}.Debug|Win32.Build.0 = Debug|Win32 {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}.Release|Win32.ActiveCfg = Release|Win32 {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}.Release|Win32.Build.0 = Release|Win32 - {DF2638C0-8128-4847-867C-6EAFE3DEE7B5}.Debug|Win32.ActiveCfg = Debug|Win32 - {DF2638C0-8128-4847-867C-6EAFE3DEE7B5}.Debug|Win32.Build.0 = Debug|Win32 - {DF2638C0-8128-4847-867C-6EAFE3DEE7B5}.Release|Win32.ActiveCfg = Release|Win32 - {DF2638C0-8128-4847-867C-6EAFE3DEE7B5}.Release|Win32.Build.0 = Release|Win32 + {9F2D6CE6-C893-4400-B50C-6DB70CC2562F}.Debug|Win32.ActiveCfg = Debug|Win32 + {9F2D6CE6-C893-4400-B50C-6DB70CC2562F}.Debug|Win32.Build.0 = Debug|Win32 + {9F2D6CE6-C893-4400-B50C-6DB70CC2562F}.Release|Win32.ActiveCfg = Release|Win32 + {9F2D6CE6-C893-4400-B50C-6DB70CC2562F}.Release|Win32.Build.0 = Release|Win32 + {46A7D57A-7F25-4F52-823B-FFAC4FF3A624}.Debug|Win32.ActiveCfg = Debug|Win32 + {46A7D57A-7F25-4F52-823B-FFAC4FF3A624}.Debug|Win32.Build.0 = Debug|Win32 + {46A7D57A-7F25-4F52-823B-FFAC4FF3A624}.Release|Win32.ActiveCfg = Release|Win32 + {46A7D57A-7F25-4F52-823B-FFAC4FF3A624}.Release|Win32.Build.0 = Release|Win32 + {65E52F4B-703F-419E-AD67-926241A10042}.Debug|Win32.ActiveCfg = Debug|Win32 + {65E52F4B-703F-419E-AD67-926241A10042}.Debug|Win32.Build.0 = Debug|Win32 + {65E52F4B-703F-419E-AD67-926241A10042}.Release|Win32.ActiveCfg = Release|Win32 + {65E52F4B-703F-419E-AD67-926241A10042}.Release|Win32.Build.0 = Release|Win32 {811C0DAB-7B96-4BD3-A154-B7572B58E4AB}.Debug|Win32.ActiveCfg = Debug|Win32 {811C0DAB-7B96-4BD3-A154-B7572B58E4AB}.Debug|Win32.Build.0 = Debug|Win32 {811C0DAB-7B96-4BD3-A154-B7572B58E4AB}.Release|Win32.ActiveCfg = Release|Win32 @@ -76,22 +94,50 @@ Global {B57CF53F-2E49-4031-9822-047CC0E6BDE2}.Debug|Win32.Build.0 = Debug|Win32 {B57CF53F-2E49-4031-9822-047CC0E6BDE2}.Release|Win32.ActiveCfg = Release|Win32 {B57CF53F-2E49-4031-9822-047CC0E6BDE2}.Release|Win32.Build.0 = Release|Win32 - {7E06E92C-537A-442B-9E4A-4761C84F8A1A}.Debug|Win32.ActiveCfg = Debug|Win32 - {7E06E92C-537A-442B-9E4A-4761C84F8A1A}.Debug|Win32.Build.0 = Debug|Win32 - {7E06E92C-537A-442B-9E4A-4761C84F8A1A}.Release|Win32.ActiveCfg = Release|Win32 - {7E06E92C-537A-442B-9E4A-4761C84F8A1A}.Release|Win32.Build.0 = Release|Win32 {B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Debug|Win32.ActiveCfg = Debug|Win32 {B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Debug|Win32.Build.0 = Debug|Win32 {B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Release|Win32.ActiveCfg = Release|Win32 {B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Release|Win32.Build.0 = Release|Win32 - {DDC3E27F-004D-4DD4-9DD3-931A013D2159}.Debug|Win32.ActiveCfg = Debug|Win32 - {DDC3E27F-004D-4DD4-9DD3-931A013D2159}.Debug|Win32.Build.0 = Debug|Win32 - {DDC3E27F-004D-4DD4-9DD3-931A013D2159}.Release|Win32.ActiveCfg = Release|Win32 - {DDC3E27F-004D-4DD4-9DD3-931A013D2159}.Release|Win32.Build.0 = Release|Win32 - {632A8F38-D0F0-4D22-86B3-D69F5E6BF63A}.Debug|Win32.ActiveCfg = Debug|Win32 - {632A8F38-D0F0-4D22-86B3-D69F5E6BF63A}.Debug|Win32.Build.0 = Debug|Win32 - {632A8F38-D0F0-4D22-86B3-D69F5E6BF63A}.Release|Win32.ActiveCfg = Release|Win32 - {632A8F38-D0F0-4D22-86B3-D69F5E6BF63A}.Release|Win32.Build.0 = Release|Win32 + {7E06E92C-537A-442B-9E4A-4761C84F8A1A}.Debug|Win32.ActiveCfg = Debug|Win32 + {7E06E92C-537A-442B-9E4A-4761C84F8A1A}.Debug|Win32.Build.0 = Debug|Win32 + {7E06E92C-537A-442B-9E4A-4761C84F8A1A}.Release|Win32.ActiveCfg = Release|Win32 + {7E06E92C-537A-442B-9E4A-4761C84F8A1A}.Release|Win32.Build.0 = Release|Win32 + {929480E7-23C0-4DF6-8456-096D71547116}.Debug|Win32.ActiveCfg = Debug|Win32 + {929480E7-23C0-4DF6-8456-096D71547116}.Debug|Win32.Build.0 = Debug|Win32 + {929480E7-23C0-4DF6-8456-096D71547116}.Release|Win32.ActiveCfg = Release|Win32 + {929480E7-23C0-4DF6-8456-096D71547116}.Release|Win32.Build.0 = Release|Win32 + {21B2C324-891F-48EA-AD1A-5AE13DE12E28}.Debug|Win32.ActiveCfg = Debug|Win32 + {21B2C324-891F-48EA-AD1A-5AE13DE12E28}.Debug|Win32.Build.0 = Debug|Win32 + {21B2C324-891F-48EA-AD1A-5AE13DE12E28}.Release|Win32.ActiveCfg = Release|Win32 + {21B2C324-891F-48EA-AD1A-5AE13DE12E28}.Release|Win32.Build.0 = Release|Win32 + {F8198014-F4F3-49F0-88AB-C1969A5829AF}.Debug|Win32.ActiveCfg = Debug|Win32 + {F8198014-F4F3-49F0-88AB-C1969A5829AF}.Debug|Win32.Build.0 = Debug|Win32 + {F8198014-F4F3-49F0-88AB-C1969A5829AF}.Release|Win32.ActiveCfg = Release|Win32 + {F8198014-F4F3-49F0-88AB-C1969A5829AF}.Release|Win32.Build.0 = Release|Win32 + {9640951E-C5D0-47B5-9C42-0BCADA261C50}.Debug|Win32.ActiveCfg = Debug|Win32 + {9640951E-C5D0-47B5-9C42-0BCADA261C50}.Debug|Win32.Build.0 = Debug|Win32 + {9640951E-C5D0-47B5-9C42-0BCADA261C50}.Release|Win32.ActiveCfg = Release|Win32 + {9640951E-C5D0-47B5-9C42-0BCADA261C50}.Release|Win32.Build.0 = Release|Win32 + {7068296E-38A4-4BCA-85DB-3A09BD014847}.Debug|Win32.ActiveCfg = Debug|Win32 + {7068296E-38A4-4BCA-85DB-3A09BD014847}.Debug|Win32.Build.0 = Debug|Win32 + {7068296E-38A4-4BCA-85DB-3A09BD014847}.Release|Win32.ActiveCfg = Release|Win32 + {7068296E-38A4-4BCA-85DB-3A09BD014847}.Release|Win32.Build.0 = Release|Win32 + {31EF6AB1-0D9A-4BC6-99B8-2C482EA373C4}.Debug|Win32.ActiveCfg = Debug|Win32 + {31EF6AB1-0D9A-4BC6-99B8-2C482EA373C4}.Debug|Win32.Build.0 = Debug|Win32 + {31EF6AB1-0D9A-4BC6-99B8-2C482EA373C4}.Release|Win32.ActiveCfg = Release|Win32 + {31EF6AB1-0D9A-4BC6-99B8-2C482EA373C4}.Release|Win32.Build.0 = Release|Win32 + {FE78EEBB-3DBB-4713-8CBF-63D742C5BD82}.Debug|Win32.ActiveCfg = Debug|Win32 + {FE78EEBB-3DBB-4713-8CBF-63D742C5BD82}.Debug|Win32.Build.0 = Debug|Win32 + {FE78EEBB-3DBB-4713-8CBF-63D742C5BD82}.Release|Win32.ActiveCfg = Release|Win32 + {FE78EEBB-3DBB-4713-8CBF-63D742C5BD82}.Release|Win32.Build.0 = Release|Win32 + {E24950FA-5BC1-4AEE-A900-4F0259354BF0}.Debug|Win32.ActiveCfg = Debug|Win32 + {E24950FA-5BC1-4AEE-A900-4F0259354BF0}.Debug|Win32.Build.0 = Debug|Win32 + {E24950FA-5BC1-4AEE-A900-4F0259354BF0}.Release|Win32.ActiveCfg = Release|Win32 + {E24950FA-5BC1-4AEE-A900-4F0259354BF0}.Release|Win32.Build.0 = Release|Win32 + {06840490-14A4-43D6-88BC-AAFA44D043EB}.Debug|Win32.ActiveCfg = Debug|Win32 + {06840490-14A4-43D6-88BC-AAFA44D043EB}.Debug|Win32.Build.0 = Debug|Win32 + {06840490-14A4-43D6-88BC-AAFA44D043EB}.Release|Win32.ActiveCfg = Release|Win32 + {06840490-14A4-43D6-88BC-AAFA44D043EB}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE 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 57cb693bc5..86b88da24f 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 @@ -80,6 +80,7 @@ true $(IntDir)vc$(PlatformToolsetVersion).pdb algorithm + CompileAsCpp Windows @@ -108,14 +109,20 @@ - if not exist "$(OutDir)" mkdir "$(OutDir)" -xcopy "$(ProjectDir)..\..\cocos2d-x\cocos\scripting\lua-bindings\script" "$(ProjectDir)..\..\..\runtime\win32\" /e /Y -xcopy "$(ProjectDir)..\..\cocos2d-x\external\lua\luasocket\*.lua" "$(ProjectDir)..\..\..\runtime\win32\" /e /Y + if not exist "$(LocalDebuggerWorkingDirectory)" mkdir "$(LocalDebuggerWorkingDirectory)" +xcopy "$(ProjectDir)..\..\cocos2d-x\cocos\scripting\lua-bindings\script\cocos2d\*.lua" "$(LocalDebuggerWorkingDirectory)" /e /Y +xcopy "$(ProjectDir)..\..\cocos2d-x\cocos\scripting\lua-bindings\script\network\*.lua" "$(LocalDebuggerWorkingDirectory)" /e /Y +xcopy "$(ProjectDir)..\..\cocos2d-x\cocos\scripting\lua-bindings\script\cocosdenshion\*.lua" "$(LocalDebuggerWorkingDirectory)" /e /Y +xcopy "$(ProjectDir)..\..\cocos2d-x\cocos\scripting\lua-bindings\script\cocosbuilder\*.lua" "$(LocalDebuggerWorkingDirectory)" /e /Y +xcopy "$(ProjectDir)..\..\cocos2d-x\cocos\scripting\lua-bindings\script\extension\*.lua" "$(LocalDebuggerWorkingDirectory)" /e /Y +xcopy "$(ProjectDir)..\..\cocos2d-x\cocos\scripting\lua-bindings\script\ui\*.lua" "$(LocalDebuggerWorkingDirectory)" /e /Y +xcopy "$(ProjectDir)..\..\cocos2d-x\cocos\scripting\lua-bindings\script\cocostudio\*.lua" "$(LocalDebuggerWorkingDirectory)" /e /Y +xcopy "$(ProjectDir)..\..\cocos2d-x\external\lua\luasocket\*.lua" "$(LocalDebuggerWorkingDirectory)" /e /Y copy files - if not exist "$(OutDir)" mkdir "$(OutDir)" -xcopy /Y /Q "$(EngineRoot)external\websockets\prebuilt\win32\*.*" "$(OutDir)" + + xcopy /Y /Q "$(OutDir)*.dll" "$(ProjectDir)..\..\..\runtime\win32\" @@ -136,6 +143,7 @@ xcopy /Y /Q "$(EngineRoot)external\websockets\prebuilt\win32\*.*" "$(OutDir)"true $(IntDir)vc$(PlatformToolsetVersion).pdb algorithm + CompileAsCpp Windows @@ -162,21 +170,26 @@ xcopy /Y /Q "$(EngineRoot)external\websockets\prebuilt\win32\*.*" "$(OutDir)" - if not exist "$(OutDir)" mkdir "$(OutDir)" -if exist "$(OutDir)\Resource" rd /s /q "$(OutDir)\Resource" -mkdir "$(OutDir)\Resource" -mkdir "$(OutDir)\Resource\src" -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 + if exist "$(LocalDebuggerWorkingDirectory)" rd /s /q "$(LocalDebuggerWorkingDirectory)" +mkdir "$(LocalDebuggerWorkingDirectory)" +mkdir "$(LocalDebuggerWorkingDirectory)\src" +mkdir "$(LocalDebuggerWorkingDirectory)\res" +xcopy "$(ProjectDir)..\..\..\src" "$(LocalDebuggerWorkingDirectory)\src" /e /Y +xcopy "$(ProjectDir)..\..\..\res" "$(LocalDebuggerWorkingDirectory)\res" /e /Y +copy "$(ProjectDir)..\..\..\config.json" "$(LocalDebuggerWorkingDirectory)\config.json" /Y +xcopy "$(ProjectDir)..\..\cocos2d-x\external\lua\luasocket\*.lua" "$(LocalDebuggerWorkingDirectory)" /e /Y +xcopy "$(ProjectDir)..\..\cocos2d-x\cocos\scripting\lua-bindings\script\network\*.lua" "$(LocalDebuggerWorkingDirectory)" /e /Y +xcopy "$(ProjectDir)..\..\cocos2d-x\cocos\scripting\lua-bindings\script\cocos2d\*.lua" "$(LocalDebuggerWorkingDirectory)" /e /Y +xcopy "$(ProjectDir)..\..\cocos2d-x\cocos\scripting\lua-bindings\script\cocosdenshion\*.lua" "$(LocalDebuggerWorkingDirectory)" /e /Y +xcopy "$(ProjectDir)..\..\cocos2d-x\cocos\scripting\lua-bindings\script\cocosbuilder\*.lua" "$(LocalDebuggerWorkingDirectory)" /e /Y +xcopy "$(ProjectDir)..\..\cocos2d-x\cocos\scripting\lua-bindings\script\extension\*.lua" "$(LocalDebuggerWorkingDirectory)" /e /Y +xcopy "$(ProjectDir)..\..\cocos2d-x\cocos\scripting\lua-bindings\script\ui\*.lua" "$(LocalDebuggerWorkingDirectory)" /e /Y +xcopy "$(ProjectDir)..\..\cocos2d-x\cocos\scripting\lua-bindings\script\cocostudio\*.lua" "$(LocalDebuggerWorkingDirectory)" /e /Y copy files - if not exist "$(OutDir)" mkdir "$(OutDir)" -xcopy /Y /Q "$(EngineRoot)external\websockets\prebuilt\win32\*.*" "$(OutDir)" + + @@ -203,6 +216,7 @@ xcopy /Y /Q "$(EngineRoot)external\websockets\prebuilt\win32\*.*" "$(OutDir)" + @@ -227,6 +241,7 @@ xcopy /Y /Q "$(EngineRoot)external\websockets\prebuilt\win32\*.*" "$(OutDir)" + @@ -242,42 +257,33 @@ xcopy /Y /Q "$(EngineRoot)external\websockets\prebuilt\win32\*.*" "$(OutDir)" - - {98a51ba8-fc3a-415b-ac8f-8c7bd464e93e} - - - {f8edd7fa-9a51-4e80-baeb-860825d2eac6} - - - {811c0dab-7b96-4bd3-a154-b7572b58e4ab} - - - {b57cf53f-2e49-4031-9822-047cc0e6bde2} - - - {b7c2a162-dec9-4418-972e-240ab3cbfcae} - - - {7e06e92c-537a-442b-9e4a-4761c84f8a1a} - - - {df2638c0-8128-4847-867c-6eafe3dee7b5} - - - {ddc3e27f-004d-4dd4-9dd3-931a013d2159} - - - {632a8f38-d0f0-4d22-86b3-d69f5e6bf63a} - - - {21b2c324-891f-48ea-ad1a-5ae13de12e28} - - - {207bc7a9-ccf1-4f2f-a04d-45f72242ae25} - + - + + {9f2d6ce6-c893-4400-b50c-6db70cc2562f} + + + {f8198014-f4f3-49f0-88ab-c1969a5829af} + + + {46a7d57a-7f25-4f52-823b-ffac4ff3a624} + + + {9640951e-c5d0-47b5-9c42-0bcada261c50} + + + {7068296e-38a4-4bca-85db-3a09bd014847} + + + {65e52f4b-703f-419e-ad67-926241a10042} + + + {31ef6ab1-0d9a-4bc6-99b8-2c482ea373c4} + + + {fe78eebb-3dbb-4713-8cbf-63d742c5bd82} + 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 184060831e..94b25bd143 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 @@ -106,6 +106,9 @@ Classes\runtime\protobuf-lite + + Classes\runtime + @@ -183,6 +186,9 @@ Classes\runtime\protobuf-lite + + Classes\runtime + 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 8e64c3d2cb..82aa59d581 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 @@ -25,7 +25,6 @@ THE SOFTWARE. #include "SimulatorWindow.h" #include "cocos2d.h" -#include "glfw3native.h" #include "resource.h" #include "runtime/Runtime.h" #include "ConfigParser.h" @@ -46,7 +45,7 @@ INT_PTR CALLBACK AboutDialogCallback(HWND hDlg, UINT message, WPARAM wParam, LPA void createViewMenu() { - HMENU hSysMenu = GetSystemMenu(glfwGetWin32Window(g_eglView->getWindow()), FALSE); + HMENU hSysMenu = GetSystemMenu(g_eglView->getWin32Window(), FALSE); HMENU viewMenu = GetSubMenu(hSysMenu, 8); for (int i = ConfigParser::getInstance()->getScreenSizeCount() - 1; i >= 0; --i) { @@ -69,7 +68,7 @@ void createViewMenu() void updateMenu() { - HMENU hSysMenu = GetSystemMenu(glfwGetWin32Window(g_eglView->getWindow()), FALSE); + HMENU hSysMenu = GetSystemMenu(g_eglView->getWin32Window(), FALSE); HMENU viewMenu = GetSubMenu(hSysMenu, 8); HMENU viewControl = GetSubMenu(hSysMenu, 9); @@ -86,12 +85,12 @@ void updateMenu() if (g_windTop) { - ::SetWindowPos(glfwGetWin32Window(g_eglView->getWindow()),HWND_TOPMOST,0,0,0,0,SWP_NOMOVE|SWP_NOSIZE); + ::SetWindowPos(g_eglView->getWin32Window(),HWND_TOPMOST,0,0,0,0,SWP_NOMOVE|SWP_NOSIZE); CheckMenuItem(viewControl, ID_CONTROL_TOP, MF_BYCOMMAND | MF_CHECKED); }else { - ::SetWindowPos(glfwGetWin32Window(g_eglView->getWindow()),HWND_NOTOPMOST,0,0,0,0,SWP_NOMOVE|SWP_NOSIZE); + ::SetWindowPos(g_eglView->getWin32Window(),HWND_NOTOPMOST,0,0,0,0,SWP_NOMOVE|SWP_NOSIZE); CheckMenuItem(viewControl, ID_CONTROL_TOP, MF_BYCOMMAND | MF_UNCHECKED); } int width = g_screenSize.width; @@ -195,7 +194,7 @@ void onViewZoomOut(int viewMenuID) default: break; } - g_eglView->setFrameZoomFactor(scale); + dynamic_cast(g_eglView)->setFrameZoomFactor(scale); updateView(); } @@ -213,12 +212,12 @@ void onViewChangeFrameSize(int viewMenuID) void onHelpAbout() { - DialogBox(GetModuleHandle(NULL), MAKEINTRESOURCE(IDD_DIALOG_ABOUT), glfwGetWin32Window(g_eglView->getWindow()), AboutDialogCallback); + DialogBox(GetModuleHandle(NULL), MAKEINTRESOURCE(IDD_DIALOG_ABOUT), g_eglView->getWin32Window(), AboutDialogCallback); } void shutDownApp() { - HWND hWnd=glfwGetWin32Window(g_eglView->getWindow()); + HWND hWnd=g_eglView->getWin32Window(); ::SendMessage(hWnd,WM_CLOSE,NULL,NULL); } @@ -342,11 +341,11 @@ void createSimulator(const char* viewName, float width, float height, bool isLan } g_windTop = true; - g_eglView = GLView::createWithRect(viewName,Rect(0,0,width,height),frameZoomFactor); + g_eglView = GLViewImpl::createWithRect(viewName,Rect(0,0,width,height),frameZoomFactor); auto director = Director::getInstance(); director->setOpenGLView(g_eglView); - HWND hWnd=glfwGetWin32Window(g_eglView->getWindow()); + HWND hWnd=g_eglView->getWin32Window(); HMENU hMenu = LoadMenu(GetModuleHandle(NULL), MAKEINTRESOURCE(IDR_MENU_COCOS)); HMENU hSysMenu = GetSystemMenu(hWnd, FALSE); HMENU hviewMenu = GetSubMenu(hMenu,1); 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 37fecf9b02..3b2ca1cb79 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 @@ -15,7 +15,15 @@ ], "must_copy_resources": [ { - "from": "../../cocos2d-x/cocos/scripting/lua-bindings/script", + "from": "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocos2d", + "to": "" + }, + { + "from": "../../cocos2d-x/cocos/scripting/lua-bindings/script/cocosdenshion", + "to": "" + }, + { + "from": "../../cocos2d-x/cocos/scripting/lua-bindings/script/network", "to": "" }, { 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 1d0bf2e5d9..54e59a2774 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 @@ -43,6 +43,10 @@ int APIENTRY _tWinMain(HINSTANCE hInstance, int ret = Application::getInstance()->run(); #ifdef USE_WIN32_CONSOLE + if (!ret) + { + system("pause"); + } FreeConsole(); #endif diff --git a/templates/lua-template-runtime/runtime/config.json b/templates/lua-template-runtime/runtime/config.json index cf2dec8791..4f28c9624c 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.3", - "zip_file_size":"24663989", + "version":"v3-lua-runtime-1.3.1", + "zip_file_size":"24660780", "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 32f49d9378..715ebba0ff 100644 --- a/templates/lua-template-runtime/src/main.lua +++ b/templates/lua-template-runtime/src/main.lua @@ -1,5 +1,6 @@ require "Cocos2d" +require "extern" -- cclog local cclog = function(...) diff --git a/tests/cpp-empty-test/CMakeLists.txt b/tests/cpp-empty-test/CMakeLists.txt index 88ebaceb4e..8221cc32c1 100644 --- a/tests/cpp-empty-test/CMakeLists.txt +++ b/tests/cpp-empty-test/CMakeLists.txt @@ -1,34 +1,38 @@ set(APP_NAME cpp-empty-test) -if(QT) - set(PLATFORM_SRC - proj.qt/main.cpp - ) -elseif(ANDROID) +if(ANDROID) + set(PLATFORM_SRC proj.android/jni/hellocpp/main.cpp ) -elseif(WIN32) + +elseif(WINDOWS) + set(PLATFORM_SRC proj.win32/main.cpp ) -elseif(APPLE) - if(IOS) - set(PLATFORM_SRC - proj.ios/main.m - proj.ios/AppController.mm - proj.ios/RootViewController.mm - ) - else() - set(PLATFORM_SRC - proj.mac/main.m - ) - endif() -else() + +elseif(IOS) + + set(PLATFORM_SRC + proj.ios/main.m + proj.ios/AppController.mm + proj.ios/RootViewController.mm + ) + +elseif(MACOSX) + + set(PLATFORM_SRC + proj.mac/main.m + ) + +elseif(LINUX) + set(PLATFORM_SRC proj.linux/main.cpp ) - endif() + +endif() set(SAMPLE_SRC ${PLATFORM_SRC} @@ -41,7 +45,8 @@ add_executable(${APP_NAME} ${SAMPLE_SRC} ) -if(WIN32 AND MSVC) +if(MSVC) + #get our resources add_custom_command(TARGET ${APP_NAME} PRE_BUILD COMMAND ${CMAKE_COMMAND} -E copy_directory @@ -60,7 +65,9 @@ if(WIN32 AND MSVC) #Visual Studio Defaults to wrong type set_target_properties(${APP_NAME} PROPERTIES LINK_FLAGS_DEBUG "/SUBSYSTEM:WINDOWS") set_target_properties(${APP_NAME} PROPERTIES LINK_FLAGS_RELEASE "/SUBSYSTEM:WINDOWS") + else() + set(APP_BIN_DIR "${CMAKE_BINARY_DIR}/bin/${APP_NAME}") set_target_properties(${APP_NAME} PROPERTIES diff --git a/tests/cpp-empty-test/Classes/AppDelegate.cpp b/tests/cpp-empty-test/Classes/AppDelegate.cpp index 44199665a9..036c732ca7 100644 --- a/tests/cpp-empty-test/Classes/AppDelegate.cpp +++ b/tests/cpp-empty-test/Classes/AppDelegate.cpp @@ -22,7 +22,7 @@ bool AppDelegate::applicationDidFinishLaunching() { auto director = Director::getInstance(); auto glview = director->getOpenGLView(); if(!glview) { - glview = GLView::create("Cpp Empty Test"); + glview = GLViewImpl::create("Cpp Empty Test"); director->setOpenGLView(glview); } diff --git a/tests/cpp-empty-test/proj.android/jni/Android.mk b/tests/cpp-empty-test/proj.android/jni/Android.mk index 5917f78021..66788e1c7f 100644 --- a/tests/cpp-empty-test/proj.android/jni/Android.mk +++ b/tests/cpp-empty-test/proj.android/jni/Android.mk @@ -12,7 +12,7 @@ LOCAL_SRC_FILES := main.cpp \ LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../Classes -LOCAL_WHOLE_STATIC_LIBRARIES := cocos2dx_static cocosdenshion_static +LOCAL_STATIC_LIBRARIES := cocos2dx_static cocosdenshion_static include $(BUILD_SHARED_LIBRARY) diff --git a/tests/cpp-empty-test/proj.ios/AppController.mm b/tests/cpp-empty-test/proj.ios/AppController.mm index c91d512703..daa056bca0 100644 --- a/tests/cpp-empty-test/proj.ios/AppController.mm +++ b/tests/cpp-empty-test/proj.ios/AppController.mm @@ -72,7 +72,7 @@ static AppDelegate s_sharedApplication; [[UIApplication sharedApplication] setStatusBarHidden: YES]; // IMPORTANT: Setting the GLView should be done after creating the RootViewController - cocos2d::GLView *glview = cocos2d::GLView::createWithEAGLView(eaglView); + cocos2d::GLViewImpl *glview = cocos2d::GLViewImpl::createWithEAGLView(eaglView); cocos2d::Director::getInstance()->setOpenGLView(glview); cocos2d::Application *app = cocos2d::Application::getInstance(); diff --git a/tests/cpp-empty-test/proj.win32/cpp-empty-test.vcxproj b/tests/cpp-empty-test/proj.win32/cpp-empty-test.vcxproj index 0bd4855f12..cb5221ad76 100644 --- a/tests/cpp-empty-test/proj.win32/cpp-empty-test.vcxproj +++ b/tests/cpp-empty-test/proj.win32/cpp-empty-test.vcxproj @@ -23,8 +23,8 @@ v100 v110 v110_xp - v120 - v120_xp + v120 + v120_xp Application @@ -32,8 +32,8 @@ v100 v110 v110_xp - v120 - v120_xp + v120 + v120_xp @@ -89,7 +89,7 @@ true Windows MachineX86 - libcocos2d.lib;libchipmunk.lib;%(AdditionalDependencies) + %(AdditionalDependencies) @@ -111,7 +111,7 @@ 4267;4251;4244;%(DisableSpecificWarnings) - libcocos2d.lib;%(AdditionalDependencies) + %(AdditionalDependencies) $(OutDir)$(ProjectName).exe $(OutDir);%(AdditionalLibraryDirectories) true @@ -137,9 +137,8 @@ - + {98a51ba8-fc3a-415b-ac8f-8c7bd464e93e} - false {207bc7a9-ccf1-4f2f-a04d-45f72242ae25} diff --git a/tests/cpp-tests/Android.mk b/tests/cpp-tests/Android.mk index af90d53565..3fd81f2445 100644 --- a/tests/cpp-tests/Android.mk +++ b/tests/cpp-tests/Android.mk @@ -33,6 +33,7 @@ Classes/BugsTest/BugsTest.cpp \ Classes/BugsTest/Bug-Child.cpp \ Classes/BugsTest/Bug-458/Bug-458.cpp \ Classes/BugsTest/Bug-458/QuestionContainerSprite.cpp \ +Classes/Camera3DTest/Camera3DTest.cpp \ Classes/ChipmunkTest/ChipmunkTest.cpp \ Classes/ClickAndMoveTest/ClickAndMoveTest.cpp \ Classes/ClippingNodeTest/ClippingNodeTest.cpp \ @@ -68,6 +69,7 @@ Classes/UITest/CocoStudioGUITest/CocostudioParserTest.cpp \ Classes/UITest/CocoStudioGUITest/GUIEditorTest.cpp \ Classes/UITest/CocoStudioGUITest/CustomGUIScene.cpp \ Classes/UITest/CocoStudioGUITest/UIScene.cpp \ +Classes/UITest/CocoStudioGUITest/UIScale9SpriteTest.cpp \ Classes/UITest/CocoStudioGUITest/UISceneManager.cpp \ Classes/UITest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp \ Classes/UITest/CocoStudioGUITest/UIFocusTest/UIFocusTest.cpp \ @@ -166,6 +168,7 @@ Classes/ShaderTest/ShaderTest.cpp \ Classes/ShaderTest/ShaderTest2.cpp \ Classes/SpineTest/SpineTest.cpp \ Classes/SpriteTest/SpriteTest.cpp \ +Classes/Sprite3DTest/DrawNode3D.cpp \ Classes/Sprite3DTest/Sprite3DTest.cpp \ Classes/TextInputTest/TextInputTest.cpp \ Classes/Texture2dTest/Texture2dTest.cpp \ @@ -185,20 +188,24 @@ Classes/ZwoptexTest/ZwoptexTest.cpp LOCAL_C_INCLUDES := $(LOCAL_PATH)/Classes -LOCAL_WHOLE_STATIC_LIBRARIES := cocosbuilder_static -LOCAL_WHOLE_STATIC_LIBRARIES += spine_static -LOCAL_WHOLE_STATIC_LIBRARIES += cocostudio_static -LOCAL_WHOLE_STATIC_LIBRARIES += cocos_network_static -LOCAL_WHOLE_STATIC_LIBRARIES += cocos_extension_static - +LOCAL_STATIC_LIBRARIES := cocosbuilder_static +LOCAL_STATIC_LIBRARIES += cocosdenshion_static +LOCAL_STATIC_LIBRARIES += spine_static +LOCAL_STATIC_LIBRARIES += cocostudio_static +LOCAL_STATIC_LIBRARIES += cocos_network_static +LOCAL_STATIC_LIBRARIES += cocos_extension_static +LOCAL_STATIC_LIBRARIES += box2d_static +LOCAL_STATIC_LIBRARIES += cocos3d_static LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/Classes - + include $(BUILD_STATIC_LIBRARY) $(call import-module,extensions) +$(call import-module,audio/android) $(call import-module,editor-support/cocosbuilder) $(call import-module,editor-support/spine) $(call import-module,editor-support/cocostudio) $(call import-module,network) -$(call import-module,.) +$(call import-module,Box2D) +$(call import-module,3d) diff --git a/tests/cpp-tests/CMakeLists.txt b/tests/cpp-tests/CMakeLists.txt index 48267493f4..5dcfe748c8 100644 --- a/tests/cpp-tests/CMakeLists.txt +++ b/tests/cpp-tests/CMakeLists.txt @@ -35,6 +35,7 @@ set(SAMPLE_SRC Classes/BugsTest/Bug-914.cpp Classes/BugsTest/BugsTest.cpp Classes/BugsTest/Bug-Child.cpp + Classes/Camera3DTest/Camera3DTest.cpp Classes/ChipmunkTest/ChipmunkTest.cpp Classes/ClickAndMoveTest/ClickAndMoveTest.cpp Classes/ClippingNodeTest/ClippingNodeTest.cpp @@ -80,6 +81,7 @@ set(SAMPLE_SRC Classes/UITest/CocoStudioGUITest/GUIEditorTest.cpp Classes/UITest/CocoStudioGUITest/CustomGUIScene.cpp Classes/UITest/CocoStudioGUITest/UIScene.cpp + Classes/UITest/CocoStudioGUITest/UIScale9SpriteTest.cpp Classes/UITest/CocoStudioGUITest/UISceneManager.cpp Classes/UITest/CocoStudioGUITest/CocostudioParserTest/CocostudioParserJsonTest.cpp Classes/UITest/CocoStudioGUITest/CocostudioParserTest.cpp @@ -160,6 +162,7 @@ set(SAMPLE_SRC Classes/ShaderTest/ShaderTest2.cpp Classes/SpriteTest/SpriteTest.cpp Classes/Sprite3DTest/Sprite3DTest.cpp + Classes/Sprite3DTest/DrawNode3D.cpp Classes/TextInputTest/TextInputTest.cpp Classes/Texture2dTest/Texture2dTest.cpp Classes/TexturePackerEncryptionTest/TextureAtlasEncryptionTest.cpp @@ -204,7 +207,11 @@ target_link_libraries(${APP_NAME} extensions audio cocos2d + cocos3d box2d + ui + network + sqlite3 ) set(APP_BIN_DIR "${CMAKE_BINARY_DIR}/bin/${APP_NAME}") diff --git a/tests/cpp-tests/Classes/ActionsTest/ActionsTest.h b/tests/cpp-tests/Classes/ActionsTest/ActionsTest.h index 8d281e237e..a596e23cb0 100644 --- a/tests/cpp-tests/Classes/ActionsTest/ActionsTest.h +++ b/tests/cpp-tests/Classes/ActionsTest/ActionsTest.h @@ -630,7 +630,9 @@ public: virtual std::string subtitle() const override; virtual std::string title() const override; + using Layer::pause; void pause(float dt); + using Layer::resume; void resume(float dt); private: Vector _pausedTargets; diff --git a/tests/cpp-tests/Classes/AppDelegate.cpp b/tests/cpp-tests/Classes/AppDelegate.cpp index 1ca5f4ba2d..b5daf4a333 100644 --- a/tests/cpp-tests/Classes/AppDelegate.cpp +++ b/tests/cpp-tests/Classes/AppDelegate.cpp @@ -54,7 +54,7 @@ bool AppDelegate::applicationDidFinishLaunching() auto director = Director::getInstance(); auto glview = director->getOpenGLView(); if(!glview) { - glview = GLView::create("Cpp Tests"); + glview = GLViewImpl::create("Cpp Tests"); director->setOpenGLView(glview); } @@ -108,7 +108,7 @@ bool AppDelegate::applicationDidFinishLaunching() // a bug in DirectX 11 level9-x on the device prevents ResolutionPolicy::NO_BORDER from working correctly glview->setDesignResolutionSize(designSize.width, designSize.height, ResolutionPolicy::SHOW_ALL); #else - glview->setDesignResolutionSize(designSize.width, designSize.height, ResolutionPolicy::NO_BORDER); + glview->setDesignResolutionSize(designSize.width, designSize.height, ResolutionPolicy::SHOW_ALL); #endif auto scene = Scene::create(); diff --git a/tests/cpp-tests/Classes/Camera3DTest/Camera3DTest.cpp b/tests/cpp-tests/Classes/Camera3DTest/Camera3DTest.cpp new file mode 100644 index 0000000000..6f0eda505a --- /dev/null +++ b/tests/cpp-tests/Classes/Camera3DTest/Camera3DTest.cpp @@ -0,0 +1,579 @@ +/**************************************************************************** +Copyright (c) 2012 cocos2d-x.org +Copyright (c) 2013-2014 Chukong Technologies Inc. + +http://www.cocos2d-x.org + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. +****************************************************************************/ + +#include "Camera3DTest.h" +#include +#include "../testResource.h" + +#include "3d/CCAttachNode.h" +#include "3d/cocos3d.h" + +////////////DrawLine///////////////////// + +class DrawLine3D: public Node +{ +public: + /** creates and initialize a node */ + static DrawLine3D* create(); + + /** + * Draw 3D Line + */ + void drawLine(const Vec3 &from, const Vec3 &to, const Color4F &color); + + /** Clear the geometry in the node's buffer. */ + void clear() + { + _buffer.clear(); + } + + void onDraw(const Mat4 &transform, uint32_t flags); + + // Overrides + virtual void draw(Renderer *renderer, const Mat4 &transform, uint32_t flags) override; + +CC_CONSTRUCTOR_ACCESS: + DrawLine3D() + { + + } + virtual ~DrawLine3D() + { + + } + virtual bool init(); + +protected: + struct V3F_C4B + { + Vec3 vertices; + Color4B colors; + }; + + std::vector _buffer; + + CustomCommand _customCommand; + +private: + CC_DISALLOW_COPY_AND_ASSIGN(DrawLine3D); +}; + +DrawLine3D* DrawLine3D::create() +{ + auto ret = new DrawLine3D(); + if (ret && ret->init()) + return ret; + CC_SAFE_DELETE(ret); + return nullptr; +} + +bool DrawLine3D::init() +{ + setGLProgramState(GLProgramState::getOrCreateWithGLProgramName(GLProgram::SHADER_NAME_POSITION_COLOR)); + return true; +} + +void DrawLine3D::drawLine(const Vec3 &from, const Vec3 &to, const Color4F &color) +{ + Color4B col = Color4B(color); + DrawLine3D::V3F_C4B vertex; + vertex.vertices = from; + vertex.colors = col; + _buffer.push_back(vertex); + vertex.vertices = to; + _buffer.push_back(vertex); +} + +void DrawLine3D::draw(Renderer *renderer, const Mat4 &transform, uint32_t flags) +{ + _customCommand.init(_globalZOrder); + _customCommand.func = CC_CALLBACK_0(DrawLine3D::onDraw, this, transform, flags); + renderer->addCommand(&_customCommand); +} + +void DrawLine3D::onDraw(const Mat4 &transform, uint32_t flags) +{ + auto glProgram = getGLProgram(); + glProgram->use(); + glProgram->setUniformsForBuiltins(transform); + glEnable(GL_DEPTH_TEST); + glBindBuffer(GL_ARRAY_BUFFER, 0); + glEnableVertexAttribArray(GLProgram::VERTEX_ATTRIB_POSITION); + glVertexAttribPointer(GLProgram::VERTEX_ATTRIB_POSITION, 3, GL_FLOAT, GL_FALSE, sizeof(V3F_C4B), &(_buffer[0].vertices)); + + glEnableVertexAttribArray(GLProgram::VERTEX_ATTRIB_COLOR); + glVertexAttribPointer(GLProgram::VERTEX_ATTRIB_COLOR, 4, GL_UNSIGNED_BYTE, GL_TRUE, sizeof(V3F_C4B), &(_buffer[0].colors)); + glDrawArrays(GL_LINES, 0, _buffer.size()); + glDisable(GL_DEPTH_TEST); +} + +//////////////////////////////////////////////////////////////////////////////// + +enum +{ + IDC_NEXT = 100, + IDC_BACK, + IDC_RESTART +}; + +static int sceneIdx = -1; + +static std::function createFunctions[] = +{ + CL(Camera3DTestDemo), +}; +#define MAX_LAYER (sizeof(createFunctions) / sizeof(createFunctions[0])) + +static Layer* nextSpriteTestAction() +{ + sceneIdx++; + sceneIdx = sceneIdx % MAX_LAYER; + auto layer = (createFunctions[sceneIdx])(); + return layer; +} + +static Layer* backSpriteTestAction() +{ + sceneIdx--; + int total = MAX_LAYER; + if( sceneIdx < 0 ) + sceneIdx += total; + + auto layer = (createFunctions[sceneIdx])(); + return layer; +} + +static Layer* restartSpriteTestAction() +{ + auto layer = (createFunctions[sceneIdx])(); + return layer; +} + +//------------------------------------------------------------------ +// +// SpriteTestDemo +// +//------------------------------------------------------------------ + +Camera3DTestDemo::Camera3DTestDemo(void) +: BaseTest() +, _camera(nullptr) +, _incRot(nullptr) +, _decRot(nullptr) +{ +} +Camera3DTestDemo::~Camera3DTestDemo(void) +{ +} +void Camera3DTestDemo::reachEndCallBack() +{ +} +std::string Camera3DTestDemo::title() const +{ + return "Testing Camera"; +} + +std::string Camera3DTestDemo::subtitle() const +{ + return ""; +} +void Camera3DTestDemo::scaleCameraCallback(Ref* sender,float value) +{ + if(_camera&& _cameraType!=CameraType::FirstCamera) + { + Vec3 cameraPos= _camera->getPosition3D(); + cameraPos+= cameraPos.getNormalized()*value; + _camera->setPosition3D(cameraPos); + } +} +void Camera3DTestDemo::rotateCameraCallback(Ref* sender,float value) +{ + if(_cameraType==CameraType::FreeCamera || _cameraType==CameraType::FirstCamera) + { + Vec3 rotation3D= _camera->getRotation3D(); + rotation3D.y+= value; + _camera->setRotation3D(rotation3D); + } +} +void Camera3DTestDemo::SwitchViewCallback(Ref* sender, CameraType cameraType) +{ + if(_cameraType==cameraType) + { + return ; + } + _cameraType = cameraType; + if(_cameraType==CameraType::FreeCamera) + { + _camera->setPosition3D(Vec3(0, 130, 130) + _sprite3D->getPosition3D()); + _camera->lookAt(_sprite3D->getPosition3D(), Vec3(0,1,0)); + _incRot->setEnabled(true); + _decRot->setEnabled(true); + } + else if(_cameraType==CameraType::FirstCamera) + { + Vec3 newFaceDir; + _sprite3D->getWorldToNodeTransform().getForwardVector(&newFaceDir); + newFaceDir.normalize(); + _camera->setPosition3D(Vec3(0,35,0) + _sprite3D->getPosition3D()); + _camera->lookAt(_sprite3D->getPosition3D() + newFaceDir*50, Vec3(0, 1, 0)); + _incRot->setEnabled(true); + _decRot->setEnabled(true); + } + else if(_cameraType==CameraType::ThirdCamera) + { + _camera->setPosition3D(Vec3(0, 130, 130) + _sprite3D->getPosition3D()); + _camera->lookAt(_sprite3D->getPosition3D(), Vec3(0,1,0)); + _incRot->setEnabled(false); + _decRot->setEnabled(false); + } +} +void Camera3DTestDemo::onEnter() +{ + BaseTest::onEnter(); + _sprite3D=nullptr; + auto s = Director::getInstance()->getWinSize(); + auto listener = EventListenerTouchAllAtOnce::create(); + listener->onTouchesBegan = CC_CALLBACK_2(Camera3DTestDemo::onTouchesBegan, this); + listener->onTouchesMoved = CC_CALLBACK_2(Camera3DTestDemo::onTouchesMoved, this); + listener->onTouchesEnded = CC_CALLBACK_2(Camera3DTestDemo::onTouchesEnded, this); + _eventDispatcher->addEventListenerWithSceneGraphPriority(listener, this); + auto layer3D=Layer::create(); + addChild(layer3D,0); + _layer3D=layer3D; + _curState=State_None; + addNewSpriteWithCoords( Vec3(0,0,0),"Sprite3DTest/girl.c3b",true,0.2,true); + TTFConfig ttfConfig("fonts/arial.ttf", 20); + auto label1 = Label::createWithTTF(ttfConfig,"zoom out"); + auto menuItem1 = MenuItemLabel::create(label1, CC_CALLBACK_1(Camera3DTestDemo::scaleCameraCallback,this,1)); + auto label2 = Label::createWithTTF(ttfConfig,"zoom in"); + auto menuItem2 = MenuItemLabel::create(label2, CC_CALLBACK_1(Camera3DTestDemo::scaleCameraCallback,this,-1)); + auto label3 = Label::createWithTTF(ttfConfig,"rotate+"); + auto menuItem3 = MenuItemLabel::create(label3, CC_CALLBACK_1(Camera3DTestDemo::rotateCameraCallback,this,10)); + _incRot = menuItem3; + auto label4 = Label::createWithTTF(ttfConfig,"rotate-"); + auto menuItem4 = MenuItemLabel::create(label4, CC_CALLBACK_1(Camera3DTestDemo::rotateCameraCallback,this,-10)); + _decRot = menuItem4; + auto label5 = Label::createWithTTF(ttfConfig,"free "); + auto menuItem5 = MenuItemLabel::create(label5, CC_CALLBACK_1(Camera3DTestDemo::SwitchViewCallback,this,CameraType::FreeCamera)); + auto label6 = Label::createWithTTF(ttfConfig,"third person"); + auto menuItem6 = MenuItemLabel::create(label6, CC_CALLBACK_1(Camera3DTestDemo::SwitchViewCallback,this,CameraType::ThirdCamera)); + auto label7 = Label::createWithTTF(ttfConfig,"first person"); + auto menuItem7 = MenuItemLabel::create(label7, CC_CALLBACK_1(Camera3DTestDemo::SwitchViewCallback,this,CameraType::FirstCamera)); + auto menu = Menu::create(menuItem1,menuItem2,menuItem3,menuItem4,menuItem5,menuItem6,menuItem7,NULL); + + menu->setPosition(Vec2::ZERO); + menuItem1->setPosition( Vec2( s.width-50, VisibleRect::top().y-50 ) ); + menuItem2->setPosition( Vec2( s.width-50, VisibleRect::top().y-100) ); + menuItem3->setPosition( Vec2( s.width-50, VisibleRect::top().y-150) ); + menuItem4->setPosition( Vec2( s.width-50, VisibleRect::top().y-200) ); + menuItem5->setPosition( Vec2(VisibleRect::left().x+100, VisibleRect::top().y-50) ); + menuItem6->setPosition( Vec2(VisibleRect::left().x+100, VisibleRect::top().y -100)); + menuItem7->setPosition( Vec2(VisibleRect::left().x+100, VisibleRect::top().y -150)); + addChild(menu, 0); + schedule(schedule_selector(Camera3DTestDemo::updateCamera), 0.0f); + if (_camera == nullptr) + { + _camera=Camera::createPerspective(60, (GLfloat)s.width/s.height, 1, 1000); + _camera->setCameraFlag(CameraFlag::USER1); + _layer3D->addChild(_camera); + } + SwitchViewCallback(this,CameraType::ThirdCamera); + DrawLine3D* line =DrawLine3D::create(); + //draw x + for( int j =-20; j<=20 ;j++) + { + line->drawLine(Vec3(-100, 0, 5*j),Vec3(100,0,5*j),Color4F(1,0,0,1)); + } + //draw z + for( int j =-20; j<=20 ;j++) + { + line->drawLine(Vec3(5*j, 0, -100),Vec3(5*j,0,100),Color4F(0,0,1,1)); + } + //draw y + line->drawLine(Vec3(0, -50, 0),Vec3(0,0,0),Color4F(0,0.5,0,1)); + line->drawLine(Vec3(0, 0, 0),Vec3(0,50,0),Color4F(0,1,0,1)); + _layer3D->addChild(line); + _layer3D->setCameraMask(2); +} +void Camera3DTestDemo::onExit() +{ + BaseTest::onExit(); + if (_camera) + { + _camera = nullptr; + } +} + +void Camera3DTestDemo::restartCallback(Ref* sender) +{ + auto s = new Camera3DTestScene(); + s->addChild(restartSpriteTestAction()); + + Director::getInstance()->replaceScene(s); + s->release(); +} + +void Camera3DTestDemo::nextCallback(Ref* sender) +{ + auto s = new Camera3DTestScene(); + s->addChild( nextSpriteTestAction() ); + Director::getInstance()->replaceScene(s); + s->release(); +} +void Camera3DTestDemo::backCallback(Ref* sender) +{ + auto s = new Camera3DTestScene(); + s->addChild( backSpriteTestAction() ); + Director::getInstance()->replaceScene(s); + s->release(); +} +void Camera3DTestDemo::addNewSpriteWithCoords(Vec3 p,std::string fileName,bool playAnimation,float scale,bool bindCamera) +{ + + auto sprite = Sprite3D::create(fileName); + sprite->setScale(1); + _layer3D->addChild(sprite); + float globalZOrder=sprite->getGlobalZOrder(); + sprite->setPosition3D( Vec3( p.x, p.y,p.z) ); + sprite->setGlobalZOrder(globalZOrder); + if(playAnimation) + { + auto animation = Animation3D::create(fileName,"Take 001"); + if (animation) + { + auto animate = Animate3D::create(animation); + bool inverse = (std::rand() % 3 == 0); + + int rand2 = std::rand(); + float speed = 1.0f; + if(rand2 % 3 == 1) + { + speed = animate->getSpeed() + CCRANDOM_0_1(); + } + else if(rand2 % 3 == 2) + { + speed = animate->getSpeed() - 0.5 * CCRANDOM_0_1(); + } + animate->setSpeed(inverse ? -speed : speed); + sprite->runAction(RepeatForever::create(animate)); + //auto sp = Sprite3D::create("Sprite3DTest/axe.c3b"); + // sprite->getAttachNode("Bip001 R Hand")->addChild(sp); + } + } + if(bindCamera) + { + _sprite3D=sprite; + // auto sp = Sprite3D::create("Sprite3DTest/axe.c3b"); + // sp->setScale(3); + //sprite->getAttachNode("Bip001 R Hand")->addChild(sp); + //ParticleSystem3D* particleSystem3D = ParticleSystem3D::create("CameraTest/particle3Dtest1.particle"); + //particleSystem3D->start(); + //sprite->getAttachNode("Bip001 R Hand")->addChild(particleSystem3D); + + } + sprite->setScale(scale); + +} +void Camera3DTestDemo::onTouchesBegan(const std::vector& touches, cocos2d::Event *event) +{ + for ( auto &item: touches ) + { + auto touch = item; + auto location = touch->getLocation(); + + } +} +void Camera3DTestDemo::onTouchesMoved(const std::vector& touches, cocos2d::Event *event) +{ + if(touches.size()==1) + { + auto touch = touches[0]; + auto location = touch->getLocation(); + Point newPos = touch->getPreviousLocation()-location; + if(_cameraType==CameraType::FreeCamera || _cameraType==CameraType::FirstCamera) + { + Vec3 cameraDir; + Vec3 cameraRightDir; + _camera->getNodeToWorldTransform().getForwardVector(&cameraDir); + cameraDir.normalize(); + cameraDir.y=0; + _camera->getNodeToWorldTransform().getRightVector(&cameraRightDir); + cameraRightDir.normalize(); + cameraRightDir.y=0; + Vec3 cameraPos= _camera->getPosition3D(); + cameraPos+=cameraDir*newPos.y*0.1; + cameraPos+=cameraRightDir*newPos.x*0.1; + _camera->setPosition3D(cameraPos); + if(_sprite3D && _cameraType==CameraType::FirstCamera) + { + _sprite3D->setPosition3D(Vec3(_camera->getPositionX(),0,_camera->getPositionZ())); + _targetPos=_sprite3D->getPosition3D(); + } + } + } +} +void Camera3DTestDemo::move3D(float elapsedTime) +{ + if(_sprite3D) + { + Vec3 curPos= _sprite3D->getPosition3D(); + Vec3 newFaceDir = _targetPos - curPos; + newFaceDir.y = 0.0f; + newFaceDir.normalize(); + Vec3 offset = newFaceDir * 25.0f * elapsedTime; + curPos+=offset; + _sprite3D->setPosition3D(curPos); + offset.x=offset.x; + offset.z=offset.z; + if(_cameraType==CameraType::ThirdCamera) + { + Vec3 cameraPos= _camera->getPosition3D(); + cameraPos.x+=offset.x; + cameraPos.z+=offset.z; + _camera->setPosition3D(cameraPos); + } + } +} +void Camera3DTestDemo::updateState(float elapsedTime) +{ + if(_sprite3D) + { + Vec3 curPos= _sprite3D->getPosition3D(); + Vec3 curFaceDir; + _sprite3D->getNodeToWorldTransform().getForwardVector(&curFaceDir); + curFaceDir=-curFaceDir; + curFaceDir.normalize(); + Vec3 newFaceDir = _targetPos - curPos; + newFaceDir.y = 0.0f; + newFaceDir.normalize(); + float cosAngle = std::fabs(Vec3::dot(curFaceDir,newFaceDir) - 1.0f); + float dist = curPos.distanceSquared(_targetPos); + if(dist<=4.0f) + { + if(cosAngle<=0.01f) + _curState = State_Idle; + else + _curState = State_Rotate; + } + else + { + if(cosAngle>0.01f) + _curState = State_Rotate | State_Move; + else + _curState = State_Move; + } + } +} +void Camera3DTestDemo::onTouchesEnded(const std::vector& touches, cocos2d::Event *event) +{ + for ( auto &item: touches ) + { + auto touch = item; + auto location = touch->getLocationInView(); + if(_camera) + { + if(_sprite3D && _cameraType==CameraType::ThirdCamera) + { + Vec3 nearP(location.x, location.y, -1.0f), farP(location.x, location.y, 1.0f); + + auto size = Director::getInstance()->getWinSize(); + _camera->unproject(size, &nearP, &nearP); + _camera->unproject(size, &farP, &farP); + Vec3 dir(farP - nearP); + float dist=0.0f; + float ndd = Vec3::dot(Vec3(0,1,0),dir); + if(ndd == 0) + dist=0.0f; + float ndo = Vec3::dot(Vec3(0,1,0),nearP); + dist= (0 - ndo) / ndd; + Vec3 p = nearP + dist * dir; + _targetPos=p; + } + } + } +} +void onTouchesCancelled(const std::vector& touches, cocos2d::Event *event) +{ +} +void Camera3DTestDemo::updateCamera(float fDelta) +{ + if(_sprite3D) + { + if( _cameraType==CameraType::ThirdCamera) + { + updateState(fDelta); + if(isState(_curState,State_Move)) + { + move3D(fDelta); + if(isState(_curState,State_Rotate)) + { + Vec3 curPos = _sprite3D->getPosition3D(); + + Vec3 newFaceDir = _targetPos - curPos; + newFaceDir.y = 0; + newFaceDir.normalize(); + Vec3 up; + _sprite3D->getNodeToWorldTransform().getUpVector(&up); + up.normalize(); + Vec3 right; + Vec3::cross(-newFaceDir,up,&right); + right.normalize(); + Vec3 pos = Vec3(0,0,0); + Mat4 mat; + mat.m[0] = right.x; + mat.m[1] = right.y; + mat.m[2] = right.z; + mat.m[3] = 0.0f; + + mat.m[4] = up.x; + mat.m[5] = up.y; + mat.m[6] = up.z; + mat.m[7] = 0.0f; + + mat.m[8] = newFaceDir.x; + mat.m[9] = newFaceDir.y; + mat.m[10] = newFaceDir.z; + mat.m[11] = 0.0f; + + mat.m[12] = pos.x; + mat.m[13] = pos.y; + mat.m[14] = pos.z; + mat.m[15] = 1.0f; + _sprite3D->setAdditionalTransform(&mat); + } + } + } + } +} +bool Camera3DTestDemo::isState(unsigned int state,unsigned int bit) const +{ + return (state & bit) == bit; +} +void Camera3DTestScene::runThisTest() +{ + auto layer = nextSpriteTestAction(); + addChild(layer); + Director::getInstance()->replaceScene(this); +} diff --git a/tests/cpp-tests/Classes/Camera3DTest/Camera3DTest.h b/tests/cpp-tests/Classes/Camera3DTest/Camera3DTest.h new file mode 100644 index 0000000000..6c5a40099a --- /dev/null +++ b/tests/cpp-tests/Classes/Camera3DTest/Camera3DTest.h @@ -0,0 +1,97 @@ +/**************************************************************************** +Copyright (c) 2013 cocos2d-x.org + +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 _CAMERA3D_TEST_H_ +#define _CAMERA3D_TEST_H_ + +#include "../testBasic.h" +#include "../BaseTest.h" +#include +#include "base/CCCamera.h" +namespace cocos2d { + class Sprite3D; + class Delay; +} +enum State +{ + State_None = 0, + State_Idle = 0x01, + State_Move = 0x02, + State_Rotate = 0x04, + State_Speak = 0x08, + State_MeleeAttack = 0x10, + State_RemoteAttack = 0x20, + State_Attack = 0x40, +}; +enum class CameraType +{ + FreeCamera=0, + FirstCamera=1, + ThirdCamera=2, +}; +class Camera3DTestDemo : public BaseTest +{ +public: + CREATE_FUNC(Camera3DTestDemo); + Camera3DTestDemo(void); + virtual ~Camera3DTestDemo(void); + + void restartCallback(Ref* sender); + void nextCallback(Ref* sender); + void backCallback(Ref* sender); + virtual void onEnter() override; + virtual void onExit() override; + // overrides + virtual std::string title() const override; + virtual std::string subtitle() const override; + void addNewSpriteWithCoords(Vec3 p,std::string fileName,bool playAnimation=false,float scale=1.0f,bool bindCamera=false); + void onTouchesBegan(const std::vector& touches, cocos2d::Event *event); + void onTouchesMoved(const std::vector& touches, cocos2d::Event *event); + void onTouchesEnded(const std::vector& touches, cocos2d::Event *event); + void scaleCameraCallback(Ref* sender,float value); + void rotateCameraCallback(Ref* sender,float value); + void SwitchViewCallback(Ref* sender,CameraType cameraType); + void updateCamera(float fDelta); + void move3D(float elapsedTime); + void updateState(float elapsedTime); + bool isState(unsigned int state,unsigned int bit) const; + void reachEndCallBack(); +protected: + std::string _title; + Layer* _layer3D; + Sprite3D* _sprite3D; + Vec3 _targetPos; + CameraType _cameraType; + MenuItem* _incRot; + MenuItem* _decRot; + unsigned int _curState; + Camera* _camera; + MoveTo* _moveAction; +}; +class Camera3DTestScene : public TestScene +{ +public: + virtual void runThisTest(); +}; +#endif diff --git a/tests/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackTestLayer.h b/tests/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackTestLayer.h index ed55549d88..3cd549716a 100644 --- a/tests/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackTestLayer.h +++ b/tests/cpp-tests/Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackTestLayer.h @@ -2,6 +2,7 @@ #define _TIMELINE_TESTLAYER_H_ #include "cocos2d.h" +#include "audio/include/SimpleAudioEngine.h" #include "extensions/cocos-ext.h" #include "cocosbuilder/CocosBuilder.h" diff --git a/tests/cpp-tests/Classes/ExtensionsTest/NetworkTest/HttpClientTest.cpp b/tests/cpp-tests/Classes/ExtensionsTest/NetworkTest/HttpClientTest.cpp index ed957a8ef4..a05c87a6c6 100644 --- a/tests/cpp-tests/Classes/ExtensionsTest/NetworkTest/HttpClientTest.cpp +++ b/tests/cpp-tests/Classes/ExtensionsTest/NetworkTest/HttpClientTest.cpp @@ -369,12 +369,12 @@ void HttpClientTest::onHttpRequestCompleted(HttpClient *sender, HttpResponse *re // dump data std::vector *buffer = response->getResponseData(); - printf("Http Test, dump data: "); + log("Http Test, dump data: "); for (unsigned int i = 0; i < buffer->size(); i++) { - printf("%c", (*buffer)[i]); + log("%c", (*buffer)[i]); } - printf("\n"); + log("\n"); if (response->getHttpRequest()->getReferenceCount() != 2) { log("request ref count not 2, is %d", response->getHttpRequest()->getReferenceCount()); diff --git a/tests/cpp-tests/Classes/ExtensionsTest/Scale9SpriteTest/Scale9SpriteTest.cpp b/tests/cpp-tests/Classes/ExtensionsTest/Scale9SpriteTest/Scale9SpriteTest.cpp index 8f86aae1c7..cd64c3a8e3 100644 --- a/tests/cpp-tests/Classes/ExtensionsTest/Scale9SpriteTest/Scale9SpriteTest.cpp +++ b/tests/cpp-tests/Classes/ExtensionsTest/Scale9SpriteTest/Scale9SpriteTest.cpp @@ -46,7 +46,9 @@ static std::function createFunctions[] = { CL(S9_TexturePacker), CL(S9FrameNameSpriteSheetRotatedInsetsScaled), CL(S9FrameNameSpriteSheetRotatedSetCapInsetLater), - CL(S9CascadeOpacityAndColor) + CL(S9CascadeOpacityAndColor), + CL(S9ZOrder), + CL(S9Flip) }; static int sceneIdx=-1; @@ -679,3 +681,104 @@ std::string S9CascadeOpacityAndColor::subtitle() const { return "when parent change color/opacity, Scale9Sprite should also change"; } + +// +//// S9ZOrder +// + +void S9ZOrder::onEnter() +{ + S9SpriteTestDemo::onEnter(); + auto winSize = Director::getInstance()->getWinSize(); + float x = winSize.width / 2; + float y = 0 + (winSize.height / 2); + + auto blocks_scaled_with_insets = Scale9Sprite::createWithSpriteFrameName("blocks9r.png"); + + blocks_scaled_with_insets->setPosition(Vec2(x, y)); + this->addChild(blocks_scaled_with_insets); + + Sprite *normalSprite = Sprite::createWithSpriteFrameName("blocks9r.png"); + normalSprite->setColor(Color3B::RED); + blocks_scaled_with_insets->addChild(normalSprite); + + auto topLabel = Label::createWithSystemFont("I Must be On the Top", "Arial", 15); + topLabel->setPosition(Vec2(20,20)); + blocks_scaled_with_insets->addChild(topLabel); + + auto bottomLabel = Label::createWithSystemFont("I Must be On the Bottom", "Arial", 15); + bottomLabel->setPosition(Vec2(80,80)); + bottomLabel->setColor(Color3B::BLUE); + blocks_scaled_with_insets->addChild(bottomLabel,-1); + +} + +std::string S9ZOrder::title() const +{ + return "Scale9Sprite ZOrder issue"; +} + +std::string S9ZOrder::subtitle() const +{ + return "When adding nodes to Scale9Sprite, it should be added on top itself"; +} + +// +//// S9Flip +// + +void S9Flip::onEnter() +{ + S9SpriteTestDemo::onEnter(); + auto winSize = Director::getInstance()->getWinSize(); + float x = winSize.width / 2; + float y = 0 + (winSize.height / 2); + + + auto normalSprite = Scale9Sprite::createWithSpriteFrameName("blocks9r.png"); + + normalSprite->setPosition(Vec2(x, y )); + this->addChild(normalSprite); + + + auto normalLabel = Label::createWithSystemFont("Normal Sprite","Airal",10); + normalLabel->setPosition(normalSprite->getPosition() + Vec2(0, normalSprite->getContentSize().height/2 + 10)); + this->addChild(normalLabel); + + + + auto flipXSprite = Scale9Sprite::createWithSpriteFrameName("blocks9r.png"); + + flipXSprite->setPosition(Vec2(x - 120, y )); + this->addChild(flipXSprite); + + flipXSprite->setScaleX(-1); + + auto flipXLabel = Label::createWithSystemFont("Sprite FlipX","Airal",10); + flipXLabel->setPosition(flipXSprite->getPosition() + Vec2(0, flipXSprite->getContentSize().height/2 + 10)); + this->addChild(flipXLabel); + + + auto flipYSprite = Scale9Sprite::createWithSpriteFrameName("blocks9r.png"); + + flipYSprite->setPosition(Vec2(x + 120, y)); + this->addChild(flipYSprite); + + flipYSprite->setScaleY(-1); + + auto flipYLabel = Label::createWithSystemFont("Sprite FlipY","Airal",10); + flipYLabel->setPosition(flipYSprite->getPosition() + Vec2(0, flipYSprite->getContentSize().height/2 + 10)); + this->addChild(flipYLabel); + + +} + +std::string S9Flip::title() const +{ + return "Scale9Sprite Flip issue"; +} + +std::string S9Flip::subtitle() const +{ + return "When Flipped, the scale9Sprite should behavior like a normal node"; +} diff --git a/tests/cpp-tests/Classes/ExtensionsTest/Scale9SpriteTest/Scale9SpriteTest.h b/tests/cpp-tests/Classes/ExtensionsTest/Scale9SpriteTest/Scale9SpriteTest.h index edde512780..a5448fb86e 100644 --- a/tests/cpp-tests/Classes/ExtensionsTest/Scale9SpriteTest/Scale9SpriteTest.h +++ b/tests/cpp-tests/Classes/ExtensionsTest/Scale9SpriteTest/Scale9SpriteTest.h @@ -227,3 +227,29 @@ public: virtual std::string title() const override; virtual std::string subtitle() const override; }; + +// Scale9Sprite ZOrder + +class S9ZOrder : public S9SpriteTestDemo +{ +public: + CREATE_FUNC(S9ZOrder); + + virtual void onEnter() override; + + virtual std::string title() const override; + virtual std::string subtitle() const override; +}; + +// Scale9Sprite Flip + +class S9Flip : public S9SpriteTestDemo +{ +public: + CREATE_FUNC(S9Flip); + + virtual void onEnter() override; + + virtual std::string title() const override; + virtual std::string subtitle() const override; +}; diff --git a/tests/cpp-tests/Classes/FileUtilsTest/FileUtilsTest.cpp b/tests/cpp-tests/Classes/FileUtilsTest/FileUtilsTest.cpp index cec7fdc3fb..13e8d7f314 100644 --- a/tests/cpp-tests/Classes/FileUtilsTest/FileUtilsTest.cpp +++ b/tests/cpp-tests/Classes/FileUtilsTest/FileUtilsTest.cpp @@ -5,6 +5,8 @@ static std::function createFunctions[] = { CL(TestSearchPath), CL(TestFilenameLookup), CL(TestIsFileExist), + CL(TestFileFuncs), + CL(TestDirectoryFuncs), CL(TextWritePlist), }; @@ -271,19 +273,19 @@ void TestIsFileExist::onEnter() auto s = Director::getInstance()->getWinSize(); auto sharedFileUtils = FileUtils::getInstance(); - Label* pTTF = nullptr; + Label* label = nullptr; bool isExist = false; isExist = sharedFileUtils->isFileExist("Images/grossini.png"); - pTTF = Label::createWithSystemFont(isExist ? "Images/grossini.png exists" : "Images/grossini.png doesn't exist", "", 20); - pTTF->setPosition(Vec2(s.width/2, s.height/3)); - this->addChild(pTTF); + label = Label::createWithSystemFont(isExist ? "Images/grossini.png exists" : "Images/grossini.png doesn't exist", "", 20); + label->setPosition(Vec2(s.width/2, s.height/3)); + this->addChild(label); isExist = sharedFileUtils->isFileExist("Images/grossini.xcf"); - pTTF = Label::createWithSystemFont(isExist ? "Images/grossini.xcf exists" : "Images/grossini.xcf doesn't exist", "", 20); - pTTF->setPosition(Vec2(s.width/2, s.height/3*2)); - this->addChild(pTTF); + label = Label::createWithSystemFont(isExist ? "Images/grossini.xcf exists" : "Images/grossini.xcf doesn't exist", "", 20); + label->setPosition(Vec2(s.width/2, s.height/3*2)); + this->addChild(label); } void TestIsFileExist::onExit() @@ -307,6 +309,168 @@ std::string TestIsFileExist::subtitle() const return ""; } +// TestFileFuncs + +void TestFileFuncs::onEnter() +{ + FileUtilsDemo::onEnter(); + auto s = Director::getInstance()->getWinSize(); + auto sharedFileUtils = FileUtils::getInstance(); + + int x = s.width/2, + y = s.height/5; + Label* label = nullptr; + + std::string filename = "__test.test"; + std::string filename2 = "__newtest.test"; + std::string filepath = sharedFileUtils->getWritablePath() + filename; + std::string content = "Test string content to put into created file"; + std::string msg; + + FILE *out = fopen(filepath.c_str(), "w"); + fputs(content.c_str(), out); + fclose(out); + + // Check whether file can be created + if (sharedFileUtils->isFileExist(filepath)) + { + label = Label::createWithSystemFont("Test file '__test.test' created", "", 20); + label->setPosition(Vec2(x, y * 4)); + this->addChild(label); + + // getFileSize Test + long size = sharedFileUtils->getFileSize(filepath); + msg = StringUtils::format("getFileSize: Test file size equals %ld", size); + label = Label::createWithSystemFont(msg, "", 20); + label->setPosition(Vec2(x, y * 3)); + this->addChild(label); + + // renameFile Test + if (sharedFileUtils->renameFile(sharedFileUtils->getWritablePath(), filename, filename2)) + { + label = Label::createWithSystemFont("renameFile: Test file renamed to '__newtest.test'", "", 20); + label->setPosition(Vec2(x, y * 2)); + this->addChild(label); + + // removeFile Test + filepath = sharedFileUtils->getWritablePath() + filename2; + if (sharedFileUtils->removeFile(filepath)) + { + label = Label::createWithSystemFont("removeFile: Test file removed", "", 20); + label->setPosition(Vec2(x, y * 1)); + this->addChild(label); + } + else + { + label = Label::createWithSystemFont("removeFile: Failed to remove test file", "", 20); + label->setPosition(Vec2(x, y * 1)); + this->addChild(label); + } + } + else + { + label = Label::createWithSystemFont("renameFile: Failed to rename test file to '__newtest.test', further test skipped", "", 20); + label->setPosition(Vec2(x, y * 2)); + this->addChild(label); + } + } + else + { + label = Label::createWithSystemFont("Test file can not be created, test skipped", "", 20); + label->setPosition(Vec2(x, y * 4)); + this->addChild(label); + } +} + +std::string TestFileFuncs::title() const +{ + return "FileUtils: file control functions"; +} + +std::string TestFileFuncs::subtitle() const +{ + return ""; +} + +// TestDirectoryFuncs + +void TestDirectoryFuncs::onEnter() +{ + FileUtilsDemo::onEnter(); + auto s = Director::getInstance()->getWinSize(); + auto sharedFileUtils = FileUtils::getInstance(); + + int x = s.width/2, + y = s.height/4; + Label* label = nullptr; + + std::string dir = sharedFileUtils->getWritablePath() + "__test/"; + std::string subDir = "dir1/dir2"; + std::string msg; + bool ok; + + // Check whether dir can be created + ok = sharedFileUtils->createDirectory(dir); + if (ok && sharedFileUtils->isDirectoryExist(dir)) + { + msg = StringUtils::format("createDirectory: Directory '__test' created"); + label = Label::createWithSystemFont(msg, "", 20); + label->setPosition(Vec2(x, y * 3)); + this->addChild(label); + + // Create sub directories recursively + ok = sharedFileUtils->createDirectory(dir + subDir); + if (ok && sharedFileUtils->isDirectoryExist(dir + subDir)) + { + msg = StringUtils::format("createDirectory: Sub directories '%s' created", subDir.c_str()); + label = Label::createWithSystemFont(msg, "", 20); + label->setPosition(Vec2(x, y * 2)); + this->addChild(label); + } + else + { + msg = StringUtils::format("createDirectory: Failed to create sub directories '%s'", subDir.c_str()); + label = Label::createWithSystemFont(msg, "", 20); + label->setPosition(Vec2(x, y * 2)); + this->addChild(label); + } + + // Remove directory + ok = sharedFileUtils->removeDirectory(dir); + if (ok && !sharedFileUtils->isDirectoryExist(dir)) + { + msg = StringUtils::format("removeDirectory: Directory '__test' removed"); + label = Label::createWithSystemFont(msg, "", 20); + label->setPosition(Vec2(x, y)); + this->addChild(label); + } + else + { + msg = StringUtils::format("removeDirectory: Failed to remove directory '__test'"); + label = Label::createWithSystemFont(msg, "", 20); + label->setPosition(Vec2(x, y)); + this->addChild(label); + } + } + else + { + msg = StringUtils::format("createDirectory: Directory '__test' can not be created"); + label = Label::createWithSystemFont(msg, "", 20); + label->setPosition(Vec2(x, y * 2)); + this->addChild(label); + } +} + +std::string TestDirectoryFuncs::title() const +{ + return "FileUtils: directory control functions"; +} + +std::string TestDirectoryFuncs::subtitle() const +{ + return ""; +} + // TestWritePlist void TextWritePlist::onEnter() diff --git a/tests/cpp-tests/Classes/FileUtilsTest/FileUtilsTest.h b/tests/cpp-tests/Classes/FileUtilsTest/FileUtilsTest.h index 6661276449..51fd8b23f8 100644 --- a/tests/cpp-tests/Classes/FileUtilsTest/FileUtilsTest.h +++ b/tests/cpp-tests/Classes/FileUtilsTest/FileUtilsTest.h @@ -72,6 +72,26 @@ public: virtual std::string subtitle() const override; }; +class TestFileFuncs : public FileUtilsDemo +{ +public: + CREATE_FUNC(TestFileFuncs); + + virtual void onEnter() override; + virtual std::string title() const override; + virtual std::string subtitle() const override; +}; + +class TestDirectoryFuncs : public FileUtilsDemo +{ +public: + CREATE_FUNC(TestDirectoryFuncs); + + virtual void onEnter() override; + virtual std::string title() const override; + virtual std::string subtitle() const override; +}; + class TextWritePlist : public FileUtilsDemo { public: diff --git a/tests/cpp-tests/Classes/FontTest/FontTest.cpp b/tests/cpp-tests/Classes/FontTest/FontTest.cpp index dd6a1662d1..cd0da05f1f 100644 --- a/tests/cpp-tests/Classes/FontTest/FontTest.cpp +++ b/tests/cpp-tests/Classes/FontTest/FontTest.cpp @@ -14,26 +14,15 @@ enum { static int fontIdx = 0; +//you don't need any ifdef anymore static std::string fontList[] = { -#if ((CC_TARGET_PLATFORM == CC_PLATFORM_IOS) || (CC_TARGET_PLATFORM == CC_PLATFORM_MAC)) - // custom ttf files are defined in Test-info.plist - "American Typewriter", - "Marker Felt", - "A Damn Mess", - "Abberancy", - "Abduction", - "Paint Boy", - "Schwarzwald Regular", - "Scissor Cuts", -#else "fonts/A Damn Mess.ttf", "fonts/Abberancy.ttf", "fonts/Abduction.ttf", "fonts/Paint Boy.ttf", - "fonts/Schwarzwald Regular.ttf", + "fonts/Schwarzwald.ttf", "fonts/Scissor Cuts.ttf", -#endif }; static int fontCount = sizeof(fontList) / sizeof(*fontList); diff --git a/tests/cpp-tests/Classes/LabelTest/LabelTestNew.cpp b/tests/cpp-tests/Classes/LabelTest/LabelTestNew.cpp index 9dca43b4ae..5ed6bd7d2b 100644 --- a/tests/cpp-tests/Classes/LabelTest/LabelTestNew.cpp +++ b/tests/cpp-tests/Classes/LabelTest/LabelTestNew.cpp @@ -1167,7 +1167,7 @@ LabelTTFFontsTestNew::LabelTTFFontsTestNew() "fonts/Abduction.ttf", "fonts/American Typewriter.ttf", "fonts/Paint Boy.ttf", - "fonts/Schwarzwald Regular.ttf", + "fonts/Schwarzwald.ttf", "fonts/Scissor Cuts.ttf", }; #define arraysize(ar) (sizeof(ar) / sizeof(ar[0])) diff --git a/tests/cpp-tests/Classes/ParticleTest/ParticleTest.cpp b/tests/cpp-tests/Classes/ParticleTest/ParticleTest.cpp index 5f3beb9d31..b12946a99c 100644 --- a/tests/cpp-tests/Classes/ParticleTest/ParticleTest.cpp +++ b/tests/cpp-tests/Classes/ParticleTest/ParticleTest.cpp @@ -1012,13 +1012,14 @@ Layer* createParticleLayer(int nIndex) case 46: return new Issue3990(); case 47: return new ParticleAutoBatching(); case 48: return new ParticleVisibleTest(); + case 49: return new ParticleResetTotalParticles(); default: break; } return nullptr; } -#define MAX_LAYER 49 +#define MAX_LAYER 50 Layer* nextParticleAction() @@ -2005,6 +2006,52 @@ std::string ParticleAutoBatching::subtitle() const return "All 10 particles should be drawin in one batch"; } + +// +// ParticleResetTotalParticles +// +void ParticleResetTotalParticles::onEnter() +{ + ParticleDemo::onEnter(); + + _color->setColor(Color3B::BLACK); + removeChild(_background, true); + _background = nullptr; + + auto p = ParticleFire::createWithTotalParticles(10); + this->addChild(p); + + auto add = MenuItemFont::create("add 10 particles", + [p](Ref*)->void + { + p->setTotalParticles(p->getTotalParticles() + 10 ); + }); + add->setPosition(Vec2(0, 25)); + auto remove = MenuItemFont::create("remove 10 particles", + [p](Ref*)->void + { + int count = p->getTotalParticles() - 10; + if (count < 0) { count = 0; } + p->setTotalParticles(count); + }); + remove->setPosition(Vec2(0, -25)); + + auto menu = Menu::create(add, remove, nullptr); + menu->setPosition(Vec2(VisibleRect::center())); + this->addChild(menu); + +} + +std::string ParticleResetTotalParticles::title() const +{ + return "reset total particles"; +} + +std::string ParticleResetTotalParticles::subtitle() const +{ + return "it should work as well"; +} + // // main // diff --git a/tests/cpp-tests/Classes/ParticleTest/ParticleTest.h b/tests/cpp-tests/Classes/ParticleTest/ParticleTest.h index ba3adb9058..c18d00be62 100644 --- a/tests/cpp-tests/Classes/ParticleTest/ParticleTest.h +++ b/tests/cpp-tests/Classes/ParticleTest/ParticleTest.h @@ -328,4 +328,12 @@ public: virtual std::string subtitle() const override; }; +class ParticleResetTotalParticles : public ParticleDemo +{ +public: + virtual void onEnter() override; + virtual std::string title() const override; + virtual std::string subtitle() const override; +}; + #endif diff --git a/tests/cpp-tests/Classes/PerformanceTest/PerformanceAllocTest.cpp b/tests/cpp-tests/Classes/PerformanceTest/PerformanceAllocTest.cpp index 141f7c9c33..fec47cbdea 100644 --- a/tests/cpp-tests/Classes/PerformanceTest/PerformanceAllocTest.cpp +++ b/tests/cpp-tests/Classes/PerformanceTest/PerformanceAllocTest.cpp @@ -230,7 +230,7 @@ void NodeCreateTest::initWithQuantityOfNodes(unsigned int nNodes) { PerformceAllocScene::initWithQuantityOfNodes(nNodes); - printf("Size of Node: %lu\n", sizeof(Node)); + log("Size of Node: %lu\n", sizeof(Node)); scheduleUpdate(); } @@ -278,7 +278,7 @@ void NodeDeallocTest::initWithQuantityOfNodes(unsigned int nNodes) { PerformceAllocScene::initWithQuantityOfNodes(nNodes); - printf("Size of Node: %lu\n", sizeof(Node)); + log("Size of Node: %lu\n", sizeof(Node)); scheduleUpdate(); } @@ -331,7 +331,7 @@ void SpriteCreateEmptyTest::initWithQuantityOfNodes(unsigned int nNodes) { PerformceAllocScene::initWithQuantityOfNodes(nNodes); - printf("Size of Sprite: %lu\n", sizeof(Sprite)); + log("Size of Sprite: %lu\n", sizeof(Sprite)); scheduleUpdate(); } @@ -381,7 +381,7 @@ void SpriteCreateTest::initWithQuantityOfNodes(unsigned int nNodes) { PerformceAllocScene::initWithQuantityOfNodes(nNodes); - printf("Size of Sprite: %lu\n", sizeof(Sprite)); + log("Size of Sprite: %lu\n", sizeof(Sprite)); scheduleUpdate(); } @@ -431,7 +431,7 @@ void SpriteDeallocTest::initWithQuantityOfNodes(unsigned int nNodes) { PerformceAllocScene::initWithQuantityOfNodes(nNodes); - printf("Size of sprite: %lu\n", sizeof(Sprite)); + log("Size of sprite: %lu\n", sizeof(Sprite)); scheduleUpdate(); } diff --git a/tests/cpp-tests/Classes/PerformanceTest/PerformanceContainerTest.cpp b/tests/cpp-tests/Classes/PerformanceTest/PerformanceContainerTest.cpp index fd5ddf10a2..2ad8bea2d9 100644 --- a/tests/cpp-tests/Classes/PerformanceTest/PerformanceContainerTest.cpp +++ b/tests/cpp-tests/Classes/PerformanceTest/PerformanceContainerTest.cpp @@ -156,7 +156,7 @@ void PerformanceContainerScene::initWithQuantityOfNodes(unsigned int nNodes) addChild(menuLayer); menuLayer->release(); - printf("Size of Node: %lu\n", sizeof(Node)); + log("Size of Node: %d\n", (int)sizeof(Node)); int oldFontSize = MenuItemFont::getFontSize(); MenuItemFont::setFontSize(24); diff --git a/tests/cpp-tests/Classes/PhysicsTest/PhysicsTest.cpp b/tests/cpp-tests/Classes/PhysicsTest/PhysicsTest.cpp index 5826130538..1cca83cd11 100644 --- a/tests/cpp-tests/Classes/PhysicsTest/PhysicsTest.cpp +++ b/tests/cpp-tests/Classes/PhysicsTest/PhysicsTest.cpp @@ -21,6 +21,7 @@ namespace CL(PhysicsPositionRotationTest), CL(PhysicsSetGravityEnableTest), CL(Bug5482), + CL(PhysicsFixedUpdate), CL(PhysicsTransformTest), #else CL(PhysicsDemoDisabled), @@ -941,7 +942,6 @@ void PhysicsDemoActions::onEnter() sp3->getPhysicsBody()->setTag(DRAG_BODYS_TAG); sp4->getPhysicsBody()->setTag(DRAG_BODYS_TAG); - auto actionTo = JumpTo::create(2, Vec2(100,100), 50, 4); auto actionBy = JumpBy::create(2, Vec2(300,0), 50, 4); auto actionUp = JumpBy::create(2, Vec2(0,50), 80, 4); @@ -1735,6 +1735,62 @@ std::string Bug5482::subtitle() const return "change physics body to the other."; } +void PhysicsFixedUpdate::onEnter() +{ + PhysicsDemo::onEnter(); + + _scene->getPhysicsWorld()->setDebugDrawMask(PhysicsWorld::DEBUGDRAW_ALL); + _scene->getPhysicsWorld()->setGravity(Point::ZERO); + + // wall + auto wall = Node::create(); + wall->setPhysicsBody(PhysicsBody::createEdgeBox(VisibleRect::getVisibleRect().size, PhysicsMaterial(0.1f, 1, 0.0f))); + wall->setPosition(VisibleRect::center()); + this->addChild(wall); + + addBall(); + + scheduleOnce(schedule_selector(PhysicsFixedUpdate::updateStart), 2); +} + +void PhysicsFixedUpdate::addBall() +{ + auto ball = Sprite::create("Images/ball.png"); + ball->setPosition(100, 100); + ball->setPhysicsBody(PhysicsBody::createCircle(ball->getContentSize().width/2, PhysicsMaterial(0.1f, 1, 0.0f))); + ball->getPhysicsBody()->setTag(DRAG_BODYS_TAG); + ball->getPhysicsBody()->setVelocity(Point(1000, 20)); + this->addChild(ball); +} + +void PhysicsFixedUpdate::updateStart(float delta) +{ + addBall(); + + _scene->getPhysicsWorld()->setAutoStep(false); + scheduleUpdate(); +} + +void PhysicsFixedUpdate::update(float delta) +{ + + // use fixed time and calculate 3 times per frame makes physics simulate more precisely. + for (int i = 0; i < 3; ++i) + { + _scene->getPhysicsWorld()->step(1/180.0f); + } +} + +std::string PhysicsFixedUpdate::title() const +{ + return "Fixed Update Test"; +} + +std::string PhysicsFixedUpdate::subtitle() const +{ + return "The secend ball should not run across the wall"; +} + bool PhysicsTransformTest::onTouchBegan(Touch *touch, Event *event) { Node* child = this->getChildByTag(1); diff --git a/tests/cpp-tests/Classes/PhysicsTest/PhysicsTest.h b/tests/cpp-tests/Classes/PhysicsTest/PhysicsTest.h index 3ff0ca0044..3eba820180 100644 --- a/tests/cpp-tests/Classes/PhysicsTest/PhysicsTest.h +++ b/tests/cpp-tests/Classes/PhysicsTest/PhysicsTest.h @@ -255,6 +255,18 @@ private: bool _bodyInA; }; +class PhysicsFixedUpdate : public PhysicsDemo +{ +public: + CREATE_FUNC(PhysicsFixedUpdate); + void onEnter() override; + void updateStart(float delta); + void addBall(); + virtual void update(float delta) override; + virtual std::string title() const override; + virtual std::string subtitle() const override; +}; + class PhysicsTransformTest : public PhysicsDemo { public: @@ -266,7 +278,5 @@ public: bool onTouchBegan(Touch* touch, Event* event); }; - - #endif #endif diff --git a/tests/cpp-tests/Classes/RenderTextureTest/RenderTextureTest.cpp b/tests/cpp-tests/Classes/RenderTextureTest/RenderTextureTest.cpp index 334d578b79..c75eb75cd3 100644 --- a/tests/cpp-tests/Classes/RenderTextureTest/RenderTextureTest.cpp +++ b/tests/cpp-tests/Classes/RenderTextureTest/RenderTextureTest.cpp @@ -135,25 +135,19 @@ void RenderTextureSave::saveImage(cocos2d::Ref *sender) char png[20]; sprintf(png, "image-%d.png", counter); - char jpg[20]; - sprintf(jpg, "image-%d.jpg", counter); - - _target->saveToFile(png, Image::Format::PNG); - _target->saveToFile(jpg, Image::Format::JPG); - std::string fileName = FileUtils::getInstance()->getWritablePath() + jpg; - auto action1 = DelayTime::create(1); - auto func = [&,fileName]() + auto callback = [&](RenderTexture* rt, const std::string& path) { - auto sprite = Sprite::create(fileName); + auto sprite = Sprite::create(path); addChild(sprite); sprite->setScale(0.3f); sprite->setPosition(Vec2(40, 40)); sprite->setRotation(counter * 3); }; - runAction(Sequence::create(action1, CallFunc::create(func), nullptr)); + + _target->saveToFile(png, Image::Format::PNG, true, callback); - CCLOG("Image saved %s and %s", png, jpg); + CCLOG("Image saved %s", png); counter++; } diff --git a/tests/cpp-tests/Classes/SchedulerTest/SchedulerTest.h b/tests/cpp-tests/Classes/SchedulerTest/SchedulerTest.h index 5728f46a3a..09e6534bf2 100644 --- a/tests/cpp-tests/Classes/SchedulerTest/SchedulerTest.h +++ b/tests/cpp-tests/Classes/SchedulerTest/SchedulerTest.h @@ -47,6 +47,7 @@ public: void tick1(float dt); void tick2(float dt); + using SchedulerTestLayer::pause; void pause(float dt); }; @@ -65,7 +66,9 @@ public: void tick1(float dt); void tick2(float dt); + using SchedulerTestLayer::pause; void pause(float dt); + using SchedulerTestLayer::resume; void resume(float dt); private: std::set _pausedTargets; @@ -85,7 +88,9 @@ public: void tick1(float dt); void tick2(float dt); + using SchedulerTestLayer::pause; void pause(float dt); + using SchedulerTestLayer::resume; void resume(float dt); private: std::set _pausedTargets; diff --git a/tests/cpp-tests/Classes/Sprite3DTest/DrawNode3D.cpp b/tests/cpp-tests/Classes/Sprite3DTest/DrawNode3D.cpp new file mode 100644 index 0000000000..acb88b95e9 --- /dev/null +++ b/tests/cpp-tests/Classes/Sprite3DTest/DrawNode3D.cpp @@ -0,0 +1,240 @@ +/**************************************************************************** + 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 "DrawNode3D.h" +#include "CCGL.h" +#include "base/CCEventType.h" +#include "base/CCConfiguration.h" +#include "renderer/CCCustomCommand.h" +#include "renderer/CCRenderer.h" +#include "renderer/CCGLProgramState.h" +#include "base/CCDirector.h" +#include "base/CCEventListenerCustom.h" +#include "base/CCEventDispatcher.h" + +NS_CC_BEGIN + + +DrawNode3D::DrawNode3D() +: _vao(0) +, _vbo(0) +, _bufferCapacity(0) +, _bufferCount(0) +, _buffer(nullptr) +, _dirty(false) +{ + _blendFunc = BlendFunc::ALPHA_PREMULTIPLIED; +} + +DrawNode3D::~DrawNode3D() +{ + free(_buffer); + _buffer = nullptr; + + glDeleteBuffers(1, &_vbo); + _vbo = 0; + + if (Configuration::getInstance()->supportsShareableVAO()) + { + glDeleteVertexArrays(1, &_vao); + GL::bindVAO(0); + _vao = 0; + } +} + +DrawNode3D* DrawNode3D::create() +{ + DrawNode3D* ret = new DrawNode3D(); + if (ret && ret->init()) + { + ret->autorelease(); + } + else + { + CC_SAFE_DELETE(ret); + } + + return ret; +} + +void DrawNode3D::ensureCapacity(int count) +{ + CCASSERT(count>=0, "capacity must be >= 0"); + + if(_bufferCount + count > _bufferCapacity) + { + _bufferCapacity += MAX(_bufferCapacity, count); + _buffer = (V3F_C4B*)realloc(_buffer, _bufferCapacity*sizeof(V3F_C4B)); + } +} + +bool DrawNode3D::init() +{ + _blendFunc = BlendFunc::ALPHA_PREMULTIPLIED; + + setGLProgramState(GLProgramState::getOrCreateWithGLProgramName(GLProgram::SHADER_NAME_POSITION_COLOR)); + + ensureCapacity(512); + + if (Configuration::getInstance()->supportsShareableVAO()) + { + glGenVertexArrays(1, &_vao); + GL::bindVAO(_vao); + } + + glGenBuffers(1, &_vbo); + glBindBuffer(GL_ARRAY_BUFFER, _vbo); + glBufferData(GL_ARRAY_BUFFER, sizeof(V3F_C4B)* _bufferCapacity, _buffer, GL_STREAM_DRAW); + + glEnableVertexAttribArray(GLProgram::VERTEX_ATTRIB_POSITION); + glVertexAttribPointer(GLProgram::VERTEX_ATTRIB_POSITION, 3, GL_FLOAT, GL_FALSE, sizeof(V3F_C4B), (GLvoid *)offsetof(V3F_C4B, vertices)); + + glEnableVertexAttribArray(GLProgram::VERTEX_ATTRIB_COLOR); + glVertexAttribPointer(GLProgram::VERTEX_ATTRIB_COLOR, 4, GL_UNSIGNED_BYTE, GL_TRUE, sizeof(V3F_C4B), (GLvoid *)offsetof(V3F_C4B, colors)); + + glBindBuffer(GL_ARRAY_BUFFER, 0); + + if (Configuration::getInstance()->supportsShareableVAO()) + { + GL::bindVAO(0); + } + + CHECK_GL_ERROR_DEBUG(); + + _dirty = true; + +#if CC_ENABLE_CACHE_TEXTURE_DATA + // Need to listen the event only when not use batchnode, because it will use VBO + auto listener = EventListenerCustom::create(EVENT_COME_TO_FOREGROUND, [this](EventCustom* event){ + /** listen the event that coming to foreground on Android */ + this->init(); + }); + + _eventDispatcher->addEventListenerWithSceneGraphPriority(listener, this); +#endif + + return true; +} + +void DrawNode3D::draw(Renderer *renderer, const Mat4 &transform, uint32_t flags) +{ + _customCommand.init(_globalZOrder); + _customCommand.func = CC_CALLBACK_0(DrawNode3D::onDraw, this, transform, flags); + renderer->addCommand(&_customCommand); +} + +void DrawNode3D::onDraw(const Mat4 &transform, uint32_t flags) +{ + auto glProgram = getGLProgram(); + glProgram->use(); + glProgram->setUniformsForBuiltins(transform); + glEnable(GL_DEPTH_TEST); + GL::blendFunc(_blendFunc.src, _blendFunc.dst); + + if (_dirty) + { + glBindBuffer(GL_ARRAY_BUFFER, _vbo); + glBufferData(GL_ARRAY_BUFFER, sizeof(V3F_C4B)*_bufferCapacity, _buffer, GL_STREAM_DRAW); + _dirty = false; + } + if (Configuration::getInstance()->supportsShareableVAO()) + { + GL::bindVAO(_vao); + } + else + { + GL::enableVertexAttribs(GL::VERTEX_ATTRIB_FLAG_POS_COLOR_TEX); + + glBindBuffer(GL_ARRAY_BUFFER, _vbo); + // vertex + glVertexAttribPointer(GLProgram::VERTEX_ATTRIB_POSITION, 3, GL_FLOAT, GL_FALSE, sizeof(V3F_C4B), (GLvoid *)offsetof(V3F_C4B, vertices)); + + // color + glVertexAttribPointer(GLProgram::VERTEX_ATTRIB_COLOR, 4, GL_UNSIGNED_BYTE, GL_TRUE, sizeof(V3F_C4B), (GLvoid *)offsetof(V3F_C4B, colors)); + } + + glDrawArrays(GL_LINES, 0, _bufferCount); + glBindBuffer(GL_ARRAY_BUFFER, 0); + + CC_INCREMENT_GL_DRAWN_BATCHES_AND_VERTICES(1,_bufferCount); + glDisable(GL_DEPTH_TEST); + CHECK_GL_ERROR_DEBUG(); +} + +void DrawNode3D::drawLine(const Vec3 &from, const Vec3 &to, const Color4F &color) +{ + unsigned int vertex_count = 2; + ensureCapacity(vertex_count); + + Color4B col = Color4B(color); + V3F_C4B a = {Vec3(from.x, from.y, from.z), col}; + V3F_C4B b = {Vec3(to.x, to.y, to.z), col, }; + + V3F_C4B *lines = (V3F_C4B *)(_buffer + _bufferCount); + lines[0] = a; + lines[1] = b; + + _bufferCount += vertex_count; + _dirty = true; + +} + +void DrawNode3D::drawCube(Vec3* vertices, const Color4F &color) +{ + // front face + drawLine(vertices[0], vertices[1], color); + drawLine(vertices[1], vertices[2], color); + drawLine(vertices[2], vertices[3], color); + drawLine(vertices[3], vertices[0], color); + + // back face + drawLine(vertices[4], vertices[5], color); + drawLine(vertices[5], vertices[6], color); + drawLine(vertices[6], vertices[7], color); + drawLine(vertices[7], vertices[4], color); + + // edge + drawLine(vertices[0], vertices[7], color); + drawLine(vertices[1], vertices[6], color); + drawLine(vertices[2], vertices[5], color); + drawLine(vertices[3], vertices[4], color); +} + +void DrawNode3D::clear() +{ + _bufferCount = 0; + _dirty = true; +} + +const BlendFunc& DrawNode3D::getBlendFunc() const +{ + return _blendFunc; +} + +void DrawNode3D::setBlendFunc(const BlendFunc &blendFunc) +{ + _blendFunc = blendFunc; +} + +NS_CC_END diff --git a/tests/cpp-tests/Classes/Sprite3DTest/DrawNode3D.h b/tests/cpp-tests/Classes/Sprite3DTest/DrawNode3D.h new file mode 100644 index 0000000000..240bb025ee --- /dev/null +++ b/tests/cpp-tests/Classes/Sprite3DTest/DrawNode3D.h @@ -0,0 +1,117 @@ +/**************************************************************************** + 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 __DRAW_NODE_3D_H__ +#define __DRAW_NODE_3D_H__ + +#include "2d/CCNode.h" +#include "base/ccTypes.h" +#include "renderer/CCCustomCommand.h" + +NS_CC_BEGIN + +/** + * Copy DrawNode for 3D geometry drawing. + */ +class DrawNode3D: public Node +{ +public: + /** creates and initialize a DrawNode3D node */ + static DrawNode3D* create(); + + /** + * Draw 3D Line + */ + void drawLine(const Vec3 &from, const Vec3 &to, const Color4F &color); + + /** + * Draw 3D cube + * @param point to a vertex array who has 8 element. + * vertices[0]:Left-top-front, + * vertices[1]:Left-bottom-front, + * vertices[2]:Right-bottom-front, + * vertices[3]:Right-top-front, + * vertices[4]:Right-top-back, + * vertices[5]:Right-bottom-back, + * vertices[6]:Left-bottom-back, + * vertices[7]:Left-top-back. + * @param color + */ + void drawCube(Vec3* vertices, const Color4F &color); + + /** Clear the geometry in the node's buffer. */ + void clear(); + + /** + * @js NA + * @lua NA + */ + const BlendFunc& getBlendFunc() const; + + /** + * @code + * When this function bound into js or lua,the parameter will be changed + * In js: var setBlendFunc(var src, var dst) + * @endcode + * @lua NA + */ + void setBlendFunc(const BlendFunc &blendFunc); + + void onDraw(const Mat4 &transform, uint32_t flags); + + // Overrides + virtual void draw(Renderer *renderer, const Mat4 &transform, uint32_t flags) override; + +CC_CONSTRUCTOR_ACCESS: + DrawNode3D(); + virtual ~DrawNode3D(); + virtual bool init(); + +protected: + struct V3F_C4B + { + Vec3 vertices; + Color4B colors; + }; + void ensureCapacity(int count); + + GLuint _vao; + GLuint _vbo; + + int _bufferCapacity; + GLsizei _bufferCount; + V3F_C4B* _buffer; + + BlendFunc _blendFunc; + CustomCommand _customCommand; + + bool _dirty; + +private: + CC_DISALLOW_COPY_AND_ASSIGN(DrawNode3D); +}; + +NS_CC_END + +#endif // __DRAW_NODE_3D_H__ diff --git a/tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp b/tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp index e14ca0d5ab..9079785751 100644 --- a/tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp +++ b/tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp @@ -26,6 +26,11 @@ #include "Sprite3DTest.h" #include "3d/CCAnimation3D.h" #include "3d/CCAnimate3D.h" +#include "3d/CCSubMesh.h" +#include "3d/CCAttachNode.h" +#include "3d/CCRay.h" +#include "3d/CCSprite3D.h" +#include "DrawNode3D.h" #include #include "../testResource.h" @@ -43,12 +48,19 @@ static int sceneIdx = -1; static std::function createFunctions[] = { CL(Sprite3DBasicTest), + CL(Sprite3DHitTest), #if (CC_TARGET_PLATFORM != CC_PLATFORM_WP8) && (CC_TARGET_PLATFORM != CC_PLATFORM_WINRT) // 3DEffect use custom shader which is not supported on WP8/WinRT yet. CL(Sprite3DEffectTest), #endif CL(Sprite3DWithSkinTest), - CL(Animate3DTest) +#if (CC_TARGET_PLATFORM != CC_PLATFORM_WP8) && (CC_TARGET_PLATFORM != CC_PLATFORM_WINRT) + CL(Sprite3DWithSkinOutlineTest), +#endif + CL(Animate3DTest), + CL(AttachmentTest), + CL(Sprite3DWithOBBPerfromanceTest), + CL(Sprite3DMirrorTest) }; #define MAX_LAYER (sizeof(createFunctions) / sizeof(createFunctions[0])) @@ -212,6 +224,87 @@ std::string Sprite3DBasicTest::subtitle() const return "Tap screen to add more sprites"; } +//------------------------------------------------------------------ +// +// Sprite3DHitTest +// +//------------------------------------------------------------------ + + +Sprite3DHitTest::Sprite3DHitTest() +{ + auto s = Director::getInstance()->getWinSize(); + + auto sprite1 = Sprite3D::create("Sprite3DTest/boss1.obj"); + + sprite1->setScale(4.f); + sprite1->setTexture("Sprite3DTest/boss.png"); + sprite1->setPosition( Vec2(s.width/2, s.height/2) ); + sprite1->setContentSize(Size(20, 20)); + + //add to scene + addChild( sprite1 ); + sprite1->runAction(RepeatForever::create(RotateBy::create(3, 360))); + + auto sprite2 = Sprite3D::create("Sprite3DTest/boss1.obj"); + + sprite2->setScale(4.f); + sprite2->setTexture("Sprite3DTest/boss.png"); + sprite2->setPosition( Vec2(s.width/2, s.height/2) ); + sprite2->setContentSize(Size(20, 20)); + sprite2->setAnchorPoint(Vec2(0.5, 0.5)); + + //add to scene + addChild( sprite2 ); + sprite2->runAction(RepeatForever::create(RotateBy::create(3, -360))); + + + // Make sprite1 touchable + auto listener1 = EventListenerTouchOneByOne::create(); + listener1->setSwallowTouches(true); + + listener1->onTouchBegan = [](Touch* touch, Event* event){ + auto target = static_cast(event->getCurrentTarget()); + + Vec2 locationInNode = target->convertToNodeSpace(touch->getLocation()); + Size s = target->getContentSize(); + Rect rect = Rect(-s.width/2, -s.height/2, s.width, s.height); + + if (rect.containsPoint(locationInNode)) + { + log("sprite3d began... x = %f, y = %f", locationInNode.x, locationInNode.y); + target->setOpacity(100); + return true; + } + return false; + }; + + listener1->onTouchMoved = [](Touch* touch, Event* event){ + auto target = static_cast(event->getCurrentTarget()); + target->setPosition(target->getPosition() + touch->getDelta()); + }; + + listener1->onTouchEnded = [=](Touch* touch, Event* event){ + auto target = static_cast(event->getCurrentTarget()); + log("sprite3d onTouchesEnded.. "); + target->setOpacity(255); + }; + + _eventDispatcher->addEventListenerWithSceneGraphPriority(listener1, sprite1); + _eventDispatcher->addEventListenerWithSceneGraphPriority(listener1->clone(), sprite2); + +} + +std::string Sprite3DHitTest::title() const +{ + return "Testing Sprite3D Touch in 2D"; +} + +std::string Sprite3DHitTest::subtitle() const +{ + return "Tap Sprite3D and Drag"; +} + void Sprite3DTestScene::runThisTest() { auto layer = nextSpriteTestAction(); @@ -231,7 +324,23 @@ EffectSprite3D* EffectSprite3D::createFromObjFileAndTexture(const std::string &o if (sprite && sprite->initWithFile(objFilePath)) { sprite->autorelease(); - sprite->setTexture(textureFilePath); + if(textureFilePath.size() > 0) + sprite->setTexture(textureFilePath); + return sprite; + } + CC_SAFE_DELETE(sprite); + return nullptr; +} + +EffectSprite3D* EffectSprite3D::create(const std::string &path) +{ + if (path.length() < 4) + CCASSERT(false, "improper name specified when creating Sprite3D"); + + auto sprite = new EffectSprite3D(); + if (sprite && sprite->initWithFile(path)) + { + sprite->autorelease(); return sprite; } CC_SAFE_DELETE(sprite); @@ -275,15 +384,33 @@ void EffectSprite3D::addEffect(Effect3DOutline* effect, ssize_t order) const std::string Effect3DOutline::_vertShaderFile = "Shaders3D/OutLine.vert"; const std::string Effect3DOutline::_fragShaderFile = "Shaders3D/OutLine.frag"; const std::string Effect3DOutline::_keyInGLProgramCache = "Effect3DLibrary_Outline"; -GLProgram* Effect3DOutline::getOrCreateProgram() + +const std::string Effect3DOutline::_vertSkinnedShaderFile = "Shaders3D/SkinnedOutline.vert"; +const std::string Effect3DOutline::_fragSkinnedShaderFile = "Shaders3D/OutLine.frag"; +const std::string Effect3DOutline::_keySkinnedInGLProgramCache = "Effect3DLibrary_Outline"; +GLProgram* Effect3DOutline::getOrCreateProgram(bool isSkinned /* = false */ ) { - auto program = GLProgramCache::getInstance()->getGLProgram(_keyInGLProgramCache); - if(program == nullptr) + if(isSkinned) { - program = GLProgram::createWithFilenames(_vertShaderFile, _fragShaderFile); - GLProgramCache::getInstance()->addGLProgram(program, _keyInGLProgramCache); + auto program = GLProgramCache::getInstance()->getGLProgram(_keySkinnedInGLProgramCache); + if(program == nullptr) + { + program = GLProgram::createWithFilenames(_vertSkinnedShaderFile, _fragSkinnedShaderFile); + GLProgramCache::getInstance()->addGLProgram(program, _keySkinnedInGLProgramCache); + } + return program; } - return program; + else + { + auto program = GLProgramCache::getInstance()->getGLProgram(_keyInGLProgramCache); + if(program == nullptr) + { + program = GLProgram::createWithFilenames(_vertShaderFile, _fragShaderFile); + GLProgramCache::getInstance()->addGLProgram(program, _keyInGLProgramCache); + } + return program; + } + } Effect3DOutline* Effect3DOutline::create() @@ -303,21 +430,6 @@ Effect3DOutline* Effect3DOutline::create() bool Effect3DOutline::init() { - - GLProgram* glprogram = GLProgram::createWithFilenames(_vertShaderFile, _fragShaderFile); - if(nullptr == glprogram) - { - CC_SAFE_DELETE(glprogram); - return false; - } - _glProgramState = GLProgramState::create(glprogram); - if(nullptr == _glProgramState) - { - return false; - } - _glProgramState->retain(); - _glProgramState->setUniformVec3("OutLineColor", _outlineColor); - _glProgramState->setUniformFloat("OutlineWidth", _outlineWidth); return true; } @@ -354,7 +466,8 @@ void Effect3DOutline::setOutlineColor(const Vec3& color) if(_outlineColor != color) { _outlineColor = color; - _glProgramState->setUniformVec3("OutLineColor", _outlineColor); + if(_glProgramState) + _glProgramState->setUniformVec3("OutLineColor", _outlineColor); } } @@ -363,7 +476,8 @@ void Effect3DOutline::setOutlineWidth(float width) if(_outlineWidth != width) { _outlineWidth = width; - _glProgramState->setUniformFloat("OutlineWidth", _outlineWidth); + if(_glProgramState) + _glProgramState->setUniformFloat("OutlineWidth", _outlineWidth); } } @@ -373,6 +487,19 @@ void Effect3DOutline::setTarget(EffectSprite3D *sprite) if(sprite != _sprite) { + GLProgram* glprogram; + if(!sprite->getSkin()) + glprogram = GLProgram::createWithFilenames(_vertShaderFile, _fragShaderFile); + else + glprogram = GLProgram::createWithFilenames(_vertSkinnedShaderFile, _fragSkinnedShaderFile); + + _glProgramState = GLProgramState::create(glprogram); + + _glProgramState->retain(); + _glProgramState->setUniformVec3("OutLineColor", _outlineColor); + _glProgramState->setUniformFloat("OutlineWidth", _outlineWidth); + + _sprite = sprite; auto mesh = sprite->getMesh(); @@ -397,9 +524,17 @@ void Effect3DOutline::setTarget(EffectSprite3D *sprite) } +static void MatrixPalleteCallBack( GLProgram* glProgram, Uniform* uniform, int paletteSize, const float* palette) +{ + glUniform4fv( uniform->location, (GLsizei)paletteSize, (const float*)palette ); +} + void Effect3DOutline::draw(const Mat4 &transform) { //draw + Color4F color(_sprite->getDisplayedColor()); + color.a = _sprite->getDisplayedOpacity() / 255.0f; + _glProgramState->setUniformVec4("u_color", Vec4(color.r, color.g, color.b, color.a)); if(_sprite && _sprite->getMesh()) { glEnable(GL_CULL_FACE); @@ -408,15 +543,28 @@ void Effect3DOutline::draw(const Mat4 &transform) auto mesh = _sprite->getMesh(); glBindBuffer(GL_ARRAY_BUFFER, mesh->getVertexBuffer()); - _glProgramState->apply(transform); - glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, mesh->getIndexBuffer()); - glDrawElements((GLenum)mesh->getPrimitiveType(), (GLsizei)mesh->getIndexCount(), (GLenum)mesh->getIndexFormat(), 0); + + if(_sprite && _sprite->getSkin()) + { + auto function = std::bind(MatrixPalleteCallBack, std::placeholders::_1, std::placeholders::_2, + _sprite->getSkin()->getMatrixPaletteSize(), (float*)_sprite->getSkin()->getMatrixPalette()); + _glProgramState->setUniformCallback("u_matrixPalette", function); + } + + if(_sprite) + _glProgramState->apply(transform); + + for (ssize_t i = 0; i < mesh->getSubMeshCount(); i++) { + auto submesh = mesh->getSubMesh((int)i); + glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, submesh->getIndexBuffer()); + glDrawElements((GLenum)submesh->getPrimitiveType(), (GLsizei)submesh->getIndexCount(), (GLenum)submesh->getIndexFormat(), 0); + CC_INCREMENT_GL_DRAWN_BATCHES_AND_VERTICES(1, submesh->getIndexCount()); + } glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0); glBindBuffer(GL_ARRAY_BUFFER, 0); glDisable(GL_DEPTH_TEST); glCullFace(GL_BACK); glDisable(GL_CULL_FACE); - CC_INCREMENT_GL_DRAWN_BATCHES_AND_VERTICES(1, mesh->getIndexCount()); } } @@ -478,13 +626,14 @@ void Sprite3DEffectTest::addNewSpriteWithCoords(Vec2 p) //option 2: load obj and assign the texture auto sprite = EffectSprite3D::createFromObjFileAndTexture("Sprite3DTest/boss1.obj", "Sprite3DTest/boss.png"); Effect3DOutline* effect = Effect3DOutline::create(); + sprite->addEffect(effect, -1); effect->setOutlineColor(Vec3(1,0,0)); effect->setOutlineWidth(0.01f); - sprite->addEffect(effect, -1); + Effect3DOutline* effect2 = Effect3DOutline::create(); + sprite->addEffect(effect2, -2); effect2->setOutlineWidth(0.02f); effect2->setOutlineColor(Vec3(1,1,0)); - sprite->addEffect(effect2, -2); //sprite->setEffect3D(effect); sprite->setScale(6.f); @@ -543,7 +692,7 @@ std::string Sprite3DWithSkinTest::subtitle() const void Sprite3DWithSkinTest::addNewSpriteWithCoords(Vec2 p) { std::string fileName = "Sprite3DTest/orc.c3b"; - auto sprite = Sprite3D::create(fileName); + auto sprite = EffectSprite3D::create(fileName); sprite->setScale(3); sprite->setRotation3D(Vec3(0,180,0)); addChild(sprite); @@ -581,6 +730,79 @@ void Sprite3DWithSkinTest::onTouchesEnded(const std::vector& touches, Ev } } +Sprite3DWithSkinOutlineTest::Sprite3DWithSkinOutlineTest() +{ + auto listener = EventListenerTouchAllAtOnce::create(); + listener->onTouchesEnded = CC_CALLBACK_2(Sprite3DWithSkinOutlineTest::onTouchesEnded, this); + _eventDispatcher->addEventListenerWithSceneGraphPriority(listener, this); + + auto s = Director::getInstance()->getWinSize(); + addNewSpriteWithCoords( Vec2(s.width/2, s.height/2) ); +} +std::string Sprite3DWithSkinOutlineTest::title() const +{ + return "Testing Sprite3D for skinned outline"; +} +std::string Sprite3DWithSkinOutlineTest::subtitle() const +{ + return "Tap screen to add more sprite3D"; +} + +void Sprite3DWithSkinOutlineTest::addNewSpriteWithCoords(Vec2 p) +{ + + std::string fileName = "Sprite3DTest/orc.c3b"; + auto sprite = EffectSprite3D::create(fileName); + + Effect3DOutline* effect = Effect3DOutline::create(); + effect->setOutlineColor(Vec3(1,0,0)); + effect->setOutlineWidth(0.01f); + sprite->addEffect(effect, -1); + + + Effect3DOutline* effect2 = Effect3DOutline::create(); + effect2->setOutlineWidth(0.02f); + effect2->setOutlineColor(Vec3(1,1,0)); + sprite->addEffect(effect2, -2); + + + sprite->setScale(3); + sprite->setRotation3D(Vec3(0,180,0)); + addChild(sprite); + sprite->setPosition( Vec2( p.x, p.y) ); + + auto animation = Animation3D::create(fileName); + if (animation) + { + auto animate = Animate3D::create(animation); + bool inverse = (std::rand() % 3 == 0); + + int rand2 = std::rand(); + float speed = 1.0f; + if(rand2 % 3 == 1) + { + speed = animate->getSpeed() + CCRANDOM_0_1(); + } + else if(rand2 % 3 == 2) + { + speed = animate->getSpeed() - 0.5 * CCRANDOM_0_1(); + } + animate->setSpeed(inverse ? -speed : speed); + + sprite->runAction(RepeatForever::create(animate)); + } +} + +void Sprite3DWithSkinOutlineTest::onTouchesEnded(const std::vector& touches, Event* event) +{ + for (auto touch: touches) + { + auto location = touch->getLocation(); + + addNewSpriteWithCoords( location ); + } +} + Animate3DTest::Animate3DTest() : _hurt(nullptr) , _swim(nullptr) @@ -718,3 +940,378 @@ void Animate3DTest::onTouchesEnded(const std::vector& touches, Event* ev } } } + +AttachmentTest::AttachmentTest() +: _hasWeapon(false) +, _sprite(nullptr) +{ + auto s = Director::getInstance()->getWinSize(); + addNewSpriteWithCoords( Vec2(s.width/2, s.height/2) ); + + auto listener = EventListenerTouchAllAtOnce::create(); + listener->onTouchesEnded = CC_CALLBACK_2(AttachmentTest::onTouchesEnded, this); + _eventDispatcher->addEventListenerWithSceneGraphPriority(listener, this); +} +std::string AttachmentTest::title() const +{ + return "Testing Sprite3D Attachment"; +} +std::string AttachmentTest::subtitle() const +{ + return "touch to switch weapon"; +} + +void AttachmentTest::addNewSpriteWithCoords(Vec2 p) +{ + std::string fileName = "Sprite3DTest/orc.c3b"; + auto sprite = Sprite3D::create(fileName); + sprite->setScale(5); + sprite->setRotation3D(Vec3(0,180,0)); + addChild(sprite); + sprite->setPosition( Vec2( p.x, p.y) ); + + //test attach + auto sp = Sprite3D::create("Sprite3DTest/axe.c3b"); + sprite->getAttachNode("Bip001 R Hand")->addChild(sp); + + auto animation = Animation3D::create(fileName); + if (animation) + { + auto animate = Animate3D::create(animation); + + sprite->runAction(RepeatForever::create(animate)); + } + _sprite = sprite; + _hasWeapon = true; +} + +void AttachmentTest::onTouchesEnded(const std::vector& touches, Event* event) +{ + if (_hasWeapon) + { + _sprite->removeAllAttachNode(); + } + else + { + auto sp = Sprite3D::create("Sprite3DTest/axe.c3b"); + _sprite->getAttachNode("Bip001 R Hand")->addChild(sp); + } + _hasWeapon = !_hasWeapon; +} + +Sprite3DWithOBBPerfromanceTest::Sprite3DWithOBBPerfromanceTest() +{ + auto listener = EventListenerTouchAllAtOnce::create(); + listener->onTouchesBegan = CC_CALLBACK_2(Sprite3DWithOBBPerfromanceTest::onTouchesBegan, this); + listener->onTouchesEnded = CC_CALLBACK_2(Sprite3DWithOBBPerfromanceTest::onTouchesEnded, this); + listener->onTouchesMoved = CC_CALLBACK_2(Sprite3DWithOBBPerfromanceTest::onTouchesMoved, this); + _eventDispatcher->addEventListenerWithSceneGraphPriority(listener, this); + auto s = Director::getInstance()->getWinSize(); + initDrawBox(); + + addNewSpriteWithCoords(Vec2(s.width/2, s.height/2)); + MenuItemFont::setFontName("fonts/arial.ttf"); + MenuItemFont::setFontSize(65); + auto decrease = MenuItemFont::create(" - ", CC_CALLBACK_1(Sprite3DWithOBBPerfromanceTest::delOBBCallback, this)); + decrease->setColor(Color3B(0,200,20)); + auto increase = MenuItemFont::create(" + ", CC_CALLBACK_1(Sprite3DWithOBBPerfromanceTest::addOBBCallback, this)); + increase->setColor(Color3B(0,200,20)); + + auto menu = Menu::create(decrease, increase, nullptr); + menu->alignItemsHorizontally(); + menu->setPosition(Vec2(s.width/2, s.height-65)); + addChild(menu, 1); + + TTFConfig ttfCount("fonts/Marker Felt.ttf", 30); + _labelCubeCount = Label::createWithTTF(ttfCount,"0 cubes"); + _labelCubeCount->setColor(Color3B(0,200,20)); + _labelCubeCount->setPosition(Vec2(s.width/2, s.height-90)); + addChild(_labelCubeCount); + _hasCollider = false; + scheduleUpdate(); +} +std::string Sprite3DWithOBBPerfromanceTest::title() const +{ + return "OBB Collison Perfromance Test"; +} +std::string Sprite3DWithOBBPerfromanceTest::subtitle() const +{ + return ""; +} +void Sprite3DWithOBBPerfromanceTest::addNewOBBWithCoords(Vec2 p) +{ + Vec3 extents = Vec3(10, 10, 10); + AABB aabb(-extents, extents); + auto obb = OBB(aabb); + obb._center = Vec3(p.x,p.y,0); + _obb.push_back(obb); +} + +void Sprite3DWithOBBPerfromanceTest::onTouchesBegan(const std::vector& touches, Event* event) +{ + for (auto touch: touches) + { + auto location = touch->getLocationInView(); + + if(_obb.size() > 0) + { + _intersetList.clear(); + Ray ray; + calculateRayByLocationInView(&ray,location); + for(int i = 0; i < _obb.size(); i++) + { + if(ray.intersects(_obb[i])) + { + _intersetList.insert(i); + return; + } + } + } + } +} + +void Sprite3DWithOBBPerfromanceTest::onTouchesEnded(const std::vector& touches, Event* event) +{ + +} + +void Sprite3DWithOBBPerfromanceTest::onTouchesMoved(const std::vector& touches, Event* event) +{ + for (auto touch: touches) + { + auto location = touch->getLocation(); + + for(int i = 0; i < _obb.size(); i++) + { + if(_intersetList.find(i) != _intersetList.end()) + _obb[i]._center = Vec3(location.x,location.y,0); + } + } +} + +void Sprite3DWithOBBPerfromanceTest::update(float dt) +{ + char szText[16]; + sprintf(szText,"%lu cubes",_obb.size()); + _labelCubeCount->setString(szText); + + if (_drawDebug) + { + _drawDebug->clear(); + + Mat4 mat = _sprite->getNodeToWorldTransform(); + mat.getRightVector(&_obbt._xAxis); + _obbt._xAxis.normalize(); + + mat.getUpVector(&_obbt._yAxis); + _obbt._yAxis.normalize(); + + mat.getForwardVector(&_obbt._zAxis); + _obbt._zAxis.normalize(); + + _obbt._center = _sprite->getPosition3D(); + + Vec3 corners[8] = {}; + _obbt.getCorners(corners); + _drawDebug->drawCube(corners, Color4F(0,0,1,1)); + } + if(_obb.size() > 0) + { + _drawOBB->clear(); + for(int i =0; i < _obb.size(); i++) + { + Vec3 corners[8] = {}; + _obb[i].getCorners(corners); + _drawOBB->drawCube(corners, _obbt.intersects(_obb[i])?Color4F(1,0,0,1):Color4F(0,1,0,1)); + } + } +} + +void Sprite3DWithOBBPerfromanceTest::initDrawBox() +{ + _drawOBB = DrawNode3D::create(); + addChild(_drawOBB); +} + +void Sprite3DWithOBBPerfromanceTest::addNewSpriteWithCoords(Vec2 p) +{ + std::string fileName = "Sprite3DTest/tortoise.c3b"; + auto sprite = Sprite3D::create(fileName); + sprite->setScale(0.1f); + auto s = Director::getInstance()->getWinSize(); + sprite->setPosition(Vec2(s.width * 4.f / 5.f, s.height / 2.f)); + addChild(sprite); + _sprite = sprite; + auto animation = Animation3D::create(fileName); + if (animation) + { + auto animate = Animate3D::create(animation, 0.f, 1.933f); + sprite->runAction(RepeatForever::create(animate)); + } + + _moveAction = MoveTo::create(4.f, Vec2(s.width / 5.f, s.height / 2.f)); + _moveAction->retain(); + auto seq = Sequence::create(_moveAction, CallFunc::create(CC_CALLBACK_0(Sprite3DWithOBBPerfromanceTest::reachEndCallBack, this)), nullptr); + seq->setTag(100); + sprite->runAction(seq); + + AABB aabb = _sprite->getAABB(); + _obbt = OBB(aabb); + + _drawDebug = DrawNode3D::create(); + addChild(_drawDebug); +} + +void Sprite3DWithOBBPerfromanceTest::reachEndCallBack() +{ + _sprite->stopActionByTag(100); + auto inverse = (MoveTo*)_moveAction->reverse(); + inverse->retain(); + _moveAction->release(); + _moveAction = inverse; + auto rot = RotateBy::create(1.0f, Vec3(0.f, 180.f, 0.f)); + auto seq = Sequence::create(rot, _moveAction, CallFunc::create(CC_CALLBACK_0(Sprite3DWithOBBPerfromanceTest::reachEndCallBack, this)), nullptr); + seq->setTag(100); + _sprite->runAction(seq); +} + +void Sprite3DWithOBBPerfromanceTest::addOBBCallback(Ref* sender) +{ + addOBBWithCount(10); +} + +void Sprite3DWithOBBPerfromanceTest::addOBBWithCount(float value) +{ + for(int i = 0; i < value; i++) + { + Vec2 randompos = Vec2(CCRANDOM_0_1() * Director::getInstance()->getWinSize().width,CCRANDOM_0_1() * Director::getInstance()->getWinSize().height); + Vec3 extents = Vec3(10, 10, 10); + AABB aabb(-extents, extents); + auto obb = OBB(aabb); + obb._center = Vec3(randompos.x,randompos.y,0); + _obb.push_back(obb); + } +} + +void Sprite3DWithOBBPerfromanceTest::delOBBCallback(Ref* sender) +{ + delOBBWithCount(10); +} + +void Sprite3DWithOBBPerfromanceTest::delOBBWithCount(float value) +{ + if(_obb.size() >= 10) + { + _obb.erase(_obb.begin(),_obb.begin() + value); + _drawOBB->clear(); + } + else + return; +} +void Sprite3DWithOBBPerfromanceTest::unproject(const Mat4& viewProjection, const Size* viewport, Vec3* src, Vec3* dst) +{ + assert(dst); + + assert(viewport->width != 0.0f && viewport->height != 0.0f); + Vec4 screen(src->x / viewport->width, ((viewport->height - src->y)) / viewport->height, src->z, 1.0f); + + screen.x = screen.x * 2.0f - 1.0f; + screen.y = screen.y * 2.0f - 1.0f; + screen.z = screen.z * 2.0f - 1.0f; + + viewProjection.getInversed().transformVector(screen, &screen); + + if (screen.w != 0.0f) + { + screen.x /= screen.w; + screen.y /= screen.w; + screen.z /= screen.w; + } + + dst->set(screen.x, screen.y, screen.z); +} + +void Sprite3DWithOBBPerfromanceTest::calculateRayByLocationInView(Ray* ray, const Vec2& location) +{ + auto dir = Director::getInstance(); + auto view = dir->getWinSize(); + Mat4 mat = dir->getMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_MODELVIEW); + mat = dir->getMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_PROJECTION); + + Vec3 src = Vec3(location.x, location.y, -1); + Vec3 nearPoint; + unproject(mat, &view, &src, &nearPoint); + + src = Vec3(location.x, location.y, 1); + Vec3 farPoint; + unproject(mat, &view, &src, &farPoint); + + Vec3 direction; + Vec3::subtract(farPoint, nearPoint, &direction); + direction.normalize(); + + ray->_origin = nearPoint; + ray->_direction = direction; +} + +Sprite3DMirrorTest::Sprite3DMirrorTest() +: _sprite(nullptr) +, _mirrorSprite(nullptr) +{ + auto s = Director::getInstance()->getWinSize(); + addNewSpriteWithCoords( Vec2(s.width/2, s.height/2) ); +} +std::string Sprite3DMirrorTest::title() const +{ + return "Sprite3D Mirror Test"; +} +std::string Sprite3DMirrorTest::subtitle() const +{ + return ""; +} + +void Sprite3DMirrorTest::addNewSpriteWithCoords(Vec2 p) +{ + std::string fileName = "Sprite3DTest/orc.c3b"; + auto sprite = Sprite3D::create(fileName); + sprite->setScale(5); + sprite->setRotation3D(Vec3(0,180,0)); + addChild(sprite); + sprite->setPosition( Vec2( p.x - 80, p.y) ); + + //test attach + auto sp = Sprite3D::create("Sprite3DTest/axe.c3b"); + sprite->getAttachNode("Bip001 R Hand")->addChild(sp); + + auto animation = Animation3D::create(fileName); + if (animation) + { + auto animate = Animate3D::create(animation); + + sprite->runAction(RepeatForever::create(animate)); + } + _sprite = sprite; + _hasWeapon = true; + + //create mirror Sprite3D + sprite = Sprite3D::create(fileName); + sprite->setScale(5); + sprite->setScaleX(-5); + sprite->setCullFace(GL_FRONT); + sprite->setRotation3D(Vec3(0,180,0)); + addChild(sprite); + sprite->setPosition( Vec2( p.x + 80, p.y) ); + + //test attach + sp = Sprite3D::create("Sprite3DTest/axe.c3b"); + sprite->getAttachNode("Bip001 R Hand")->addChild(sp); + + animation = Animation3D::create(fileName); + if (animation) + { + auto animate = Animate3D::create(animation); + + sprite->runAction(RepeatForever::create(animate)); + } + _mirrorSprite = sprite; +} diff --git a/tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.h b/tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.h index efb5052cc8..175c57f793 100644 --- a/tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.h +++ b/tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.h @@ -33,6 +33,8 @@ namespace cocos2d { class Animate3D; class Sprite3D; class Delay; + class Ray; + class DrawNode3D; } class Sprite3DTestDemo : public BaseTest @@ -113,13 +115,29 @@ protected: static const std::string _vertShaderFile; static const std::string _fragShaderFile; static const std::string _keyInGLProgramCache; - static GLProgram* getOrCreateProgram(); + + static const std::string _vertSkinnedShaderFile; + static const std::string _fragSkinnedShaderFile; + static const std::string _keySkinnedInGLProgramCache; + + static GLProgram* getOrCreateProgram(bool isSkinned = false); +}; + +class Sprite3DHitTest : public Sprite3DTestDemo +{ +public: + CREATE_FUNC(Sprite3DHitTest); + Sprite3DHitTest(); + virtual std::string title() const override; + virtual std::string subtitle() const override; }; class EffectSprite3D : public Sprite3D { public: static EffectSprite3D* createFromObjFileAndTexture(const std::string& objFilePath, const std::string& textureFilePath); + static EffectSprite3D* create(const std::string& path); + void setEffect3D(Effect3D* effect); void addEffect(Effect3DOutline* effect, ssize_t order); virtual void draw(Renderer *renderer, const Mat4 &transform, uint32_t flags) override; @@ -158,6 +176,19 @@ public: void onTouchesEnded(const std::vector& touches, Event* event); }; +class Sprite3DWithSkinOutlineTest : public Sprite3DTestDemo +{ +public: + CREATE_FUNC(Sprite3DWithSkinOutlineTest); + Sprite3DWithSkinOutlineTest(); + virtual std::string title() const override; + virtual std::string subtitle() const override; + + void addNewSpriteWithCoords(Vec2 p); + + void onTouchesEnded(const std::vector& touches, Event* event); +}; + class Animate3DTest : public Sprite3DTestDemo { public: @@ -198,6 +229,73 @@ protected: MoveTo* _moveAction; }; +class AttachmentTest : public Sprite3DTestDemo +{ +public: + CREATE_FUNC(AttachmentTest); + AttachmentTest(); + virtual std::string title() const override; + virtual std::string subtitle() const override; + + void onTouchesEnded(const std::vector& touches, Event* event); + + void addNewSpriteWithCoords(Vec2 p); + +protected: + bool _hasWeapon; + cocos2d::Sprite3D* _sprite; +}; + +class Sprite3DWithOBBPerfromanceTest : public Sprite3DTestDemo +{ +public: + CREATE_FUNC(Sprite3DWithOBBPerfromanceTest); + Sprite3DWithOBBPerfromanceTest(); + virtual std::string title() const override; + virtual std::string subtitle() const override; + virtual void update(float dt) override; + void addNewOBBWithCoords(Vec2 p); + void addNewSpriteWithCoords(Vec2 p); + void onTouchesBegan(const std::vector& touches, Event* event); + void onTouchesEnded(const std::vector& touches, Event* event); + void onTouchesMoved(const std::vector& touches, Event* event); + void addOBBCallback(Ref* sender); + void delOBBCallback(Ref* sender); + void addOBBWithCount(float value); + void delOBBWithCount(float value); +protected: + cocos2d::Sprite3D* _sprite; + std::vector _obb; + DrawNode3D* _drawOBB; + Label* _labelCubeCount; + MoveTo* _moveAction; + OBB _obbt; + DrawNode3D* _drawDebug; + bool _hasCollider; + std::set _intersetList; + void initDrawBox(); + void reachEndCallBack(); + + void unproject(const Mat4& viewProjection, const Size* viewport, Vec3* src, Vec3* dst); + void calculateRayByLocationInView(Ray* ray, const Vec2& location); +}; + +class Sprite3DMirrorTest : public Sprite3DTestDemo +{ +public: + CREATE_FUNC(Sprite3DMirrorTest); + Sprite3DMirrorTest(); + virtual std::string title() const override; + virtual std::string subtitle() const override; + + void addNewSpriteWithCoords(Vec2 p); + +protected: + bool _hasWeapon; + cocos2d::Sprite3D* _sprite; + cocos2d::Sprite3D* _mirrorSprite; +}; + class Sprite3DTestScene : public TestScene { public: diff --git a/tests/cpp-tests/Classes/SpriteTest/SpriteTest.cpp b/tests/cpp-tests/Classes/SpriteTest/SpriteTest.cpp index af90d8c5f5..354820ba84 100644 --- a/tests/cpp-tests/Classes/SpriteTest/SpriteTest.cpp +++ b/tests/cpp-tests/Classes/SpriteTest/SpriteTest.cpp @@ -109,6 +109,7 @@ static std::function createFunctions[] = CL(SpriteAnimationSplit), CL(SpriteFrameTest), CL(SpriteFrameAliasNameTest), + CL(SpriteFramesFromFileContent), CL(SpriteBatchNodeReorder), CL(SpriteBatchNodeReorderIssue744), CL(SpriteBatchNodeReorderIssue766), @@ -1880,6 +1881,87 @@ std::string SpriteFrameAliasNameTest::subtitle() const return "SpriteFrames are obtained using the alias name"; } +//------------------------------------------------------------------ +// +// SpriteFramesFromFileContent +// +//------------------------------------------------------------------ +void SpriteFramesFromFileContent::onEnter() +{ + SpriteTestDemo::onEnter(); + auto s = Director::getInstance()->getWinSize(); + + std::string plist_content; + { + std::string fullPath = FileUtils::getInstance()->fullPathForFilename("animations/grossini.plist"); + Data data = FileUtils::getInstance()->getDataFromFile(fullPath); + if (!data.isNull()) + plist_content.assign((const char*)data.getBytes(), data.getSize()); + } + + std::string image_content; + { + std::string fullPath = FileUtils::getInstance()->fullPathForFilename("animations/grossini.png"); + Data data = FileUtils::getInstance()->getDataFromFile(fullPath); + if (!data.isNull()) + image_content.assign((const char*)data.getBytes(), data.getSize()); + } + + Image image; + image.initWithImageData((const uint8_t*)image_content.c_str(), image_content.size()); + Texture2D* texture = new Texture2D(); + texture->initWithImage(&image); + texture->autorelease(); + + auto cache = SpriteFrameCache::getInstance(); + cache->addSpriteFramesWithFileContent(plist_content, texture); + + // + // Animation using Sprite BatchNode + // + Sprite * sprite = Sprite::createWithSpriteFrameName("grossini_dance_01.png"); + sprite->setPosition( Vec2( s.width/2-80, s.height/2) ); + addChild(sprite); + + Vector animFrames(15); + + char str[100] = {0}; + for(int i = 1; i < 15; i++) + { + sprintf(str, "grossini_dance_%02d.png", i); + auto frame = cache->getSpriteFrameByName( str ); + animFrames.pushBack(frame); + } + + auto animation = Animation::createWithSpriteFrames(animFrames, 0.3f); + sprite->runAction( RepeatForever::create( Animate::create(animation) ) ); +} + +void SpriteFramesFromFileContent::onExit() +{ + SpriteTestDemo::onExit(); + + std::string plist_content; + { + std::string fullPath = FileUtils::getInstance()->fullPathForFilename("animations/grossini.plist"); + Data data = FileUtils::getInstance()->getDataFromFile(fullPath); + if (!data.isNull()) + plist_content.assign((const char*)data.getBytes(), data.getSize()); + } + + SpriteFrameCache::getInstance()->removeSpriteFramesFromFileContent(plist_content); +} + +std::string SpriteFramesFromFileContent::title() const +{ + return "SpriteFrameCache load form file content"; +} + +std::string SpriteFramesFromFileContent::subtitle() const +{ + return "SpriteFrameCache load from plist file content"; +} + //------------------------------------------------------------------ // // SpriteOffsetAnchorRotation diff --git a/tests/cpp-tests/Classes/SpriteTest/SpriteTest.h b/tests/cpp-tests/Classes/SpriteTest/SpriteTest.h index 5467d46482..e4b6f7cd4e 100644 --- a/tests/cpp-tests/Classes/SpriteTest/SpriteTest.h +++ b/tests/cpp-tests/Classes/SpriteTest/SpriteTest.h @@ -337,6 +337,17 @@ public: virtual std::string subtitle() const override; }; +class SpriteFramesFromFileContent : public SpriteTestDemo +{ +public: + CREATE_FUNC(SpriteFramesFromFileContent); + + virtual void onEnter() override; + virtual void onExit() override; + virtual std::string title() const override; + virtual std::string subtitle() const override; +}; + class SpriteOffsetAnchorRotation: public SpriteTestDemo { public: diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CocosGUIScene.cpp b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CocosGUIScene.cpp index 7f56938d5e..51fb94d967 100644 --- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CocosGUIScene.cpp +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CocosGUIScene.cpp @@ -42,6 +42,18 @@ g_guisTests[] = Scene* scene = sceneManager->currentUIScene(); Director::getInstance()->replaceScene(scene); } + }, + { + "Scale9 Sprite Test", + [](Ref* sender) + { + UISceneManager* sceneManager = UISceneManager::sharedUISceneManager(); + sceneManager->setCurrentUISceneId(kUIScale9SpriteTest); + sceneManager->setMinUISceneId(kUIScale9SpriteTest); + sceneManager->setMaxUISceneId(kUIS9ChangeAnchorPoint); + Scene* scene = sceneManager->currentUIScene(); + Director::getInstance()->replaceScene(scene); + } }, { @@ -51,7 +63,7 @@ g_guisTests[] = UISceneManager* sceneManager = UISceneManager::sharedUISceneManager(); sceneManager->setCurrentUISceneId(kUIButtonTest); sceneManager->setMinUISceneId(kUIButtonTest); - sceneManager->setMaxUISceneId(kUIButtonTest_Title); + sceneManager->setMaxUISceneId(kUIButtonTestZoomScale); Scene* scene = sceneManager->currentUIScene(); Director::getInstance()->replaceScene(scene); } @@ -87,7 +99,7 @@ g_guisTests[] = UISceneManager* sceneManager = UISceneManager::sharedUISceneManager(); sceneManager->setCurrentUISceneId(kUIImageViewTest); sceneManager->setMinUISceneId(kUIImageViewTest); - sceneManager->setMaxUISceneId(kUIImageViewTest_Scale9); + sceneManager->setMaxUISceneId(kUIImageViewTest_ContentSize); Scene* scene = sceneManager->currentUIScene(); Director::getInstance()->replaceScene(scene); } @@ -147,7 +159,7 @@ g_guisTests[] = UISceneManager* sceneManager = UISceneManager::sharedUISceneManager(); sceneManager->setCurrentUISceneId(kUITextFieldTest); sceneManager->setMinUISceneId(kUITextFieldTest); - sceneManager->setMaxUISceneId(kUITextFieldTest_TrueTypeFont); + sceneManager->setMaxUISceneId(kUITextFieldTest_PlaceHolderColor); Scene* scene = sceneManager->currentUIScene(); Director::getInstance()->replaceScene(scene); } @@ -171,7 +183,7 @@ g_guisTests[] = UISceneManager* sceneManager = UISceneManager::sharedUISceneManager(); sceneManager->setCurrentUISceneId(kUIScrollViewTest_Vertical); sceneManager->setMinUISceneId(kUIScrollViewTest_Vertical); - sceneManager->setMaxUISceneId(kUIScrollViewTest_ScrollToPercentBothDirection_Bounce); + sceneManager->setMaxUISceneId(kUIScrollViewNestTest); Scene* scene = sceneManager->currentUIScene(); Director::getInstance()->replaceScene(scene); } @@ -183,7 +195,7 @@ g_guisTests[] = UISceneManager* sceneManager = UISceneManager::sharedUISceneManager(); sceneManager->setCurrentUISceneId(kUIPageViewTest); sceneManager->setMinUISceneId(kUIPageViewTest); - sceneManager->setMaxUISceneId(kUIPageViewButtonTest); + sceneManager->setMaxUISceneId(kUIPageViewTouchPropagationTest); Scene* scene = sceneManager->currentUIScene(); Director::getInstance()->replaceScene(scene); } diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CocostudioParserTest.cpp b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CocostudioParserTest.cpp index 7b600324aa..05b7a8055b 100644 --- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CocostudioParserTest.cpp +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CocostudioParserTest.cpp @@ -130,7 +130,7 @@ void CocostudioParserTestScene::onEnter() //#endif MenuItemLabel* pMenuItem = MenuItemLabel::create(label, CC_CALLBACK_1(CocostudioParserTestScene::BackCallback, this)); - Menu* pMenu = Menu::create(pMenuItem, NULL); + Menu* pMenu = Menu::create(pMenuItem, nullptr); pMenu->setPosition( Vec2::ZERO ); pMenuItem->setPosition( Vec2( VisibleRect::right().x - 50, VisibleRect::bottom().y + 25) ); diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CocostudioParserTest/CocostudioParserJsonTest.cpp b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CocostudioParserTest/CocostudioParserJsonTest.cpp index 689b3e1e4f..822bbed3fe 100644 --- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CocostudioParserTest/CocostudioParserJsonTest.cpp +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CocostudioParserTest/CocostudioParserJsonTest.cpp @@ -76,7 +76,7 @@ void CocostudioParserJsonScene::onEnter() //#endif MenuItemLabel* pMenuItem = MenuItemLabel::create(label, CC_CALLBACK_1(CocostudioParserJsonScene::BackCallback, this)); - Menu* pMenu = Menu::create(pMenuItem, NULL); + Menu* pMenu = Menu::create(pMenuItem, nullptr); pMenu->setPosition( Vec2::ZERO ); pMenuItem->setPosition( Vec2( VisibleRect::right().x - 50, VisibleRect::bottom().y + 25) ); diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CustomTest/CustomParticleWidgetTest/CustomParticleWidgetTest.cpp b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CustomTest/CustomParticleWidgetTest/CustomParticleWidgetTest.cpp index 2898a95f57..8724ddd8ce 100644 --- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CustomTest/CustomParticleWidgetTest/CustomParticleWidgetTest.cpp +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CustomTest/CustomParticleWidgetTest/CustomParticleWidgetTest.cpp @@ -34,7 +34,7 @@ void CustomParticleWidgetLayer::onEnter() CustomParticleWidget* custom = CustomParticleWidget::create(); custom->setParticlePlist("Particles/BoilingFoam.plist"); - + custom->setPosition(Vec2(VisibleRect::center())); addChild(custom, 10, -1); } diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CustomWidget/CustomImageView.cpp b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CustomWidget/CustomImageView.cpp index 6c392cc8a6..fdef802b13 100644 --- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CustomWidget/CustomImageView.cpp +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CustomWidget/CustomImageView.cpp @@ -49,7 +49,7 @@ void CustomImageView::initRenderer() ImageView::initRenderer(); _label = Label::create(); - ProtectedNode::addChild(_label, getLocalZOrder() + 1, -1); + addChild(_label, getLocalZOrder() + 1, -1); } void CustomImageView::setText(const std::string &text) diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CustomWidget/CustomParticleWidget.cpp b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CustomWidget/CustomParticleWidget.cpp index 43ec7bcc2d..af2f041c81 100644 --- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CustomWidget/CustomParticleWidget.cpp +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CustomWidget/CustomParticleWidget.cpp @@ -75,7 +75,7 @@ void CustomParticleWidget::setParticlePlist(const char *plist) _emitter = ParticleSystemQuad::create(plist); } //Warning!!! don't forget to set the position - addProtectedChild(_emitter , getLocalZOrder() + 1, -1); + addChild(_emitter , getLocalZOrder() + 1, -1); this->setParticlePosition(Vec2::ZERO); _emitterPlist = plist; diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp index 35c713551b..9c1016f681 100644 --- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp @@ -42,7 +42,8 @@ bool UIButtonTest::init() // button->addTouchEventListener(this, toucheventselector(UIButtonTest::touchEvent)); button->addTouchEventListener(CC_CALLBACK_2(UIButtonTest::touchEvent, this)); _uiLayer->addChild(button); - +// button->setColor(Color3B::RED); + button->setOpacity(100); // Create the imageview ImageView* imageView = ImageView::create(); @@ -80,6 +81,8 @@ void UIButtonTest::touchEvent(Ref *pSender, Widget::TouchEventType type) imageView->setOpacity(0); imageView->setVisible(true); imageView->runAction(Sequence::create(FadeIn::create(0.5),DelayTime::create(1.0),FadeOut::create(0.5), nullptr)); + Button *btn = (Button*)pSender; + btn->loadTextureNormal("cocosui/animationbuttonnormal.png"); } break; @@ -219,6 +222,11 @@ bool UIButtonTest_PressedAction::init() button->setName("button"); _uiLayer->addChild(button); + Button* button2 = Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png"); + button2->setPosition(button->getPosition() + Vec2(100,0)); + button2->setName("button2"); + _uiLayer->addChild(button2); + return true; } return false; @@ -241,6 +249,9 @@ void UIButtonTest_PressedAction::touchEvent(Ref *pSender, Widget::TouchEventType _displayValueLabel->setString(String::createWithFormat("Touch Up")->getCString()); Button* btn = (Button*)_uiLayer->getChildByName("button"); btn->loadTextureNormal("cocosui/animationbuttonnormal.png"); + + Button* btn2 = (Button*)_uiLayer->getChildByName("button2"); + btn2->setAnchorPoint(Vec2(0,0.5)); } break; @@ -344,3 +355,236 @@ void UIButtonTest_Title::touchEvent(Ref *pSender, Widget::TouchEventType type) break; } } + + +// UIButtonTest_RemoveSelf +UIButtonTestRemoveSelf::UIButtonTestRemoveSelf() +: _displayValueLabel(nullptr) +{ + +} + +UIButtonTestRemoveSelf::~UIButtonTestRemoveSelf() +{ +} + +bool UIButtonTestRemoveSelf::init() +{ + if (UIScene::init()) + { + Size widgetSize = _widget->getContentSize(); + + // Add a label in which the button events will be displayed + _displayValueLabel = Text::create("No Event", "fonts/Marker Felt.ttf",32); + _displayValueLabel->setAnchorPoint(Vec2(0.5f, -1.0f)); + _displayValueLabel->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f)); + _uiLayer->addChild(_displayValueLabel); + + // Add the alert + Text* alert = Text::create("Remove Self in the Button's Callback shouldn't cause crash!","fonts/Marker Felt.ttf",10); + alert->setColor(Color3B(159, 168, 176)); + + alert->setPosition(Vec2(widgetSize.width / 2.0f, + widgetSize.height / 2.0f - alert->getContentSize().height * 2.75f)); + + _uiLayer->addChild(alert); + + Layout *layout = Layout::create(); + layout->setContentSize(widgetSize * 0.6); + layout->setBackGroundColor(Color3B::GREEN); + layout->setBackGroundColorType(Layout::BackGroundColorType::SOLID); + layout->setBackGroundColorOpacity(100); + layout->setPosition(Size(widgetSize.width/2, widgetSize.height/2)); + layout->setAnchorPoint(Vec2::ANCHOR_MIDDLE); + layout->setTag(12); + _uiLayer->addChild(layout); + + // Create the button + Button* button = Button::create("cocosui/animationbuttonnormal.png", + "cocosui/animationbuttonpressed.png"); + button->setPosition(Vec2(layout->getContentSize().width / 2.0f, layout->getContentSize().height / 2.0f)); + // button->addTouchEventListener(this, toucheventselector(UIButtonTest::touchEvent)); + button->addTouchEventListener(CC_CALLBACK_2(UIButtonTestRemoveSelf::touchEvent, this)); + layout->addChild(button); + + + + return true; + } + return false; +} + +void UIButtonTestRemoveSelf::touchEvent(Ref *pSender, Widget::TouchEventType type) +{ + switch (type) + { + case Widget::TouchEventType::BEGAN: + _displayValueLabel->setString(String::createWithFormat("Touch Down")->getCString()); + break; + + case Widget::TouchEventType::MOVED: + _displayValueLabel->setString(String::createWithFormat("Touch Move")->getCString()); + break; + + case Widget::TouchEventType::ENDED: + { + _displayValueLabel->setString(String::createWithFormat("Touch Up")->getCString()); + auto layout = _uiLayer->getChildByTag(12); + layout->removeFromParentAndCleanup(true); + } + break; + + case Widget::TouchEventType::CANCELED: + _displayValueLabel->setString(String::createWithFormat("Touch Cancelled")->getCString()); + break; + + default: + break; + } +} + +// UIButtonTestSwitchScale9 +UIButtonTestSwitchScale9::UIButtonTestSwitchScale9() +: _displayValueLabel(nullptr) +{ + +} + +UIButtonTestSwitchScale9::~UIButtonTestSwitchScale9() +{ +} + +bool UIButtonTestSwitchScale9::init() +{ + if (UIScene::init()) + { + Size widgetSize = _widget->getContentSize(); + + // Add a label in which the button events will be displayed + _displayValueLabel = Text::create("No Event", "fonts/Marker Felt.ttf",32); + _displayValueLabel->setAnchorPoint(Vec2(0.5f, -1.0f)); + _displayValueLabel->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f)); + _uiLayer->addChild(_displayValueLabel); + + // Add the alert + Text* alert = Text::create("Button","fonts/Marker Felt.ttf",30); + alert->setColor(Color3B(159, 168, 176)); + + alert->setPosition(Vec2(widgetSize.width / 2.0f, + widgetSize.height / 2.0f - alert->getContentSize().height * 1.75f)); + + _uiLayer->addChild(alert); + + // Create the button + Button* button = Button::create("cocosui/animationbuttonnormal.png", + "cocosui/animationbuttonpressed.png"); + button->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f)); + button->addTouchEventListener(CC_CALLBACK_2(UIButtonTestSwitchScale9::touchEvent, this)); + button->ignoreContentAdaptWithSize(false); + + _uiLayer->addChild(button); + + + + return true; + } + return false; +} + +void UIButtonTestSwitchScale9::touchEvent(Ref *pSender, Widget::TouchEventType type) +{ + switch (type) + { + case Widget::TouchEventType::BEGAN: + _displayValueLabel->setString(String::createWithFormat("Touch Down")->getCString()); + break; + + case Widget::TouchEventType::MOVED: + _displayValueLabel->setString(String::createWithFormat("Touch Move")->getCString()); + break; + + case Widget::TouchEventType::ENDED: + { + _displayValueLabel->setString(String::createWithFormat("Touch Up")->getCString()); + auto btn = ((Button*)pSender); + btn->setScale9Enabled(!btn->isScale9Enabled()); + btn->setContentSize(Size(200,100)); + } + break; + + case Widget::TouchEventType::CANCELED: + _displayValueLabel->setString(String::createWithFormat("Touch Cancelled")->getCString()); + break; + + default: + break; + } +} + + +// UIButtonTestZoomScale +UIButtonTestZoomScale::UIButtonTestZoomScale() +: _displayValueLabel(nullptr) +{ + +} + +UIButtonTestZoomScale::~UIButtonTestZoomScale() +{ +} + +bool UIButtonTestZoomScale::init() +{ + if (UIScene::init()) + { + Size widgetSize = _widget->getContentSize(); + + // Add a label in which the button events will be displayed + _displayValueLabel = Text::create("Zoom Scale: 0.1", "fonts/Marker Felt.ttf",32); + _displayValueLabel->setAnchorPoint(Vec2(0.5f, -1.0f)); + _displayValueLabel->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f + 20)); + _uiLayer->addChild(_displayValueLabel); + + // Add the alert + Text* alert = Text::create("Button","fonts/Marker Felt.ttf",30); + alert->setColor(Color3B(159, 168, 176)); + + alert->setPosition(Vec2(widgetSize.width / 2.0f, + widgetSize.height / 2.0f - alert->getContentSize().height * 1.75f)); + + _uiLayer->addChild(alert); + + // Create the button + Button* button = Button::create("cocosui/animationbuttonnormal.png", + "cocosui/animationbuttonpressed.png"); + button->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f + 20)); + button->setPressedActionEnabled(true); + button->setName("button"); + _uiLayer->addChild(button); + button->setZoomScale(-0.5); + + Slider* slider = Slider::create(); + slider->loadBarTexture("cocosui/sliderTrack.png"); + slider->loadSlidBallTextures("cocosui/sliderThumb.png", "cocosui/sliderThumb.png", ""); + slider->loadProgressBarTexture("cocosui/sliderProgress.png"); + slider->setPosition(Vec2(widgetSize.width / 2.0f , widgetSize.height / 2.0f - 20)); + slider->addEventListener(CC_CALLBACK_2(UIButtonTestZoomScale::sliderEvent, this)); + slider->setPercent(button->getZoomScale()*100); + _uiLayer->addChild(slider); + return true; + } + return false; +} + +void UIButtonTestZoomScale::sliderEvent(Ref *pSender, Slider::EventType type) +{ + if (type == Slider::EventType::ON_PERCENTAGE_CHANGED) + { + Slider* slider = dynamic_cast(pSender); + int percent = slider->getPercent(); + Button* btn = (Button*)_uiLayer->getChildByName("button"); + float zoomScale = percent * 0.01; + btn->setZoomScale(zoomScale); + _displayValueLabel->setString(String::createWithFormat("Zoom Scale: %f", zoomScale)->getCString()); + } +} diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIButtonTest/UIButtonTest.h b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIButtonTest/UIButtonTest.h index 0cf2f01c8f..668789066a 100644 --- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIButtonTest/UIButtonTest.h +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIButtonTest/UIButtonTest.h @@ -79,4 +79,43 @@ protected: Text* _displayValueLabel; }; +class UIButtonTestRemoveSelf : public UIScene +{ +public: + UIButtonTestRemoveSelf(); + ~UIButtonTestRemoveSelf(); + bool init(); + void touchEvent(Ref *pSender, Widget::TouchEventType type); + +protected: + UI_SCENE_CREATE_FUNC(UIButtonTestRemoveSelf) + Text* _displayValueLabel; +}; + +class UIButtonTestSwitchScale9 : public UIScene +{ +public: + UIButtonTestSwitchScale9(); + ~UIButtonTestSwitchScale9(); + bool init(); + void touchEvent(Ref *pSender, Widget::TouchEventType type); + +protected: + UI_SCENE_CREATE_FUNC(UIButtonTestSwitchScale9) + Text* _displayValueLabel; +}; + +class UIButtonTestZoomScale : public UIScene +{ +public: + UIButtonTestZoomScale(); + ~UIButtonTestZoomScale(); + bool init(); + void sliderEvent(Ref* pSender, Slider::EventType type); + +protected: + UI_SCENE_CREATE_FUNC(UIButtonTestZoomScale) + Text* _displayValueLabel; +}; + #endif /* defined(__TestCpp__UIButtonTest__) */ diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.cpp b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.cpp index a8b34f408e..01978a4e86 100644 --- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.cpp +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.cpp @@ -61,3 +61,71 @@ bool UIImageViewTest_Scale9::init() } return false; } + +// UIImageViewTest_ContentSize + +bool UIImageViewTest_ContentSize::init() +{ + if (UIScene::init()) + { + Size widgetSize = _widget->getContentSize(); + + Text* alert = Text::create("ImageView ContentSize Change", "fonts/Marker Felt.ttf", 26); + alert->setColor(Color3B(159, 168, 176)); + alert->setPosition(Vec2(widgetSize.width / 2.0f, + widgetSize.height / 2.0f - alert->getContentSize().height * 2.125f)); + + _uiLayer->addChild(alert); + + Text *status = Text::create("child ImageView position percent", "fonts/Marker Felt.ttf", 16); + status->setColor(Color3B::RED); + status->setPosition(Vec2(widgetSize.width/2, widgetSize.height/2 + 80)); + _uiLayer->addChild(status,20); + + // Create the imageview + ImageView* imageView = ImageView::create("cocosui/buttonHighlighted.png"); + imageView->setScale9Enabled(true); + imageView->setContentSize(Size(200, 80)); + imageView->setPosition(Vec2(widgetSize.width / 2.0f, + widgetSize.height / 2.0f )); + + + ImageView* imageViewChild = ImageView::create("cocosui/buttonHighlighted.png"); + imageViewChild->setScale9Enabled(true); + imageViewChild->setSizeType(Widget::SizeType::PERCENT); + imageViewChild->setPositionType(Widget::PositionType::PERCENT); + imageViewChild->setSizePercent(Vec2::ANCHOR_MIDDLE); + imageViewChild->setPositionPercent(Vec2::ANCHOR_MIDDLE); + imageViewChild->setPosition(Vec2(widgetSize.width / 2.0f, + widgetSize.height / 2.0f)); + + ImageView* imageViewChild2 = ImageView::create("cocosui/buttonHighlighted.png"); + imageViewChild2->setScale9Enabled(true); + imageViewChild2->setSizeType(Widget::SizeType::PERCENT); + imageViewChild2->setPositionType(Widget::PositionType::PERCENT); + imageViewChild2->setSizePercent(Vec2::ANCHOR_MIDDLE); + imageViewChild2->setPositionPercent(Vec2::ANCHOR_MIDDLE); + imageViewChild->addChild(imageViewChild2); + + + imageView->addChild(imageViewChild); + + imageView->setTouchEnabled(true); + imageView->addTouchEventListener([=](Ref* sender, Widget::TouchEventType type){ + if (type == Widget::TouchEventType::ENDED) { + float width = CCRANDOM_0_1() * 200 + 50; + float height = CCRANDOM_0_1() * 80 + 30; + imageView->setContentSize(Size(width, height)); + + imageViewChild->setPositionPercent(Vec2(CCRANDOM_0_1(), CCRANDOM_0_1())); + status->setString(StringUtils::format("child ImageView position percent: %f, %f", + imageViewChild->getPositionPercent().x, imageViewChild->getPositionPercent().y)); + } + }); + + _uiLayer->addChild(imageView); + + return true; + } + return false; +} diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.h b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.h index 7067bbb407..a70668751c 100644 --- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.h +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.h @@ -45,4 +45,13 @@ protected: UI_SCENE_CREATE_FUNC(UIImageViewTest_Scale9) }; +class UIImageViewTest_ContentSize : public UIScene +{ +public: + bool init(); + +protected: + UI_SCENE_CREATE_FUNC(UIImageViewTest_ContentSize) +}; + #endif /* defined(__TestCpp__UIImageViewTest__) */ diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest.cpp b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest.cpp index 6eff4c32bb..d35da4c331 100644 --- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest.cpp +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest.cpp @@ -35,7 +35,21 @@ bool UILoadingBarTest_Left::init() loadingBar->setTag(0); loadingBar->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f + loadingBar->getContentSize().height / 4.0f)); - + Button* button = Button::create("cocosui/animationbuttonnormal.png", + "cocosui/animationbuttonpressed.png"); + button->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f + 50)); + button->setTitleText("Click to change direction!"); + // button->addTouchEventListener(this, toucheventselector(UIButtonTest::touchEvent)); + button->addTouchEventListener([=](Ref*, Widget::TouchEventType type){ + if (type == Widget::TouchEventType::ENDED) { + if (loadingBar->getDirection() == LoadingBar::Direction::LEFT) { + loadingBar->setDirection(LoadingBar::Direction::RIGHT); + }else{ + loadingBar->setDirection(LoadingBar::Direction::LEFT); + } + } + }); + _uiLayer->addChild(button); _uiLayer->addChild(loadingBar); return true; diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest.cpp b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest.cpp index 973d6ba1ef..f7d7e5afe3 100644 --- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest.cpp +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest.cpp @@ -1,7 +1,7 @@ #include "UIPageViewTest.h" - +#include "cocos2d.h" // UIPageViewTest UIPageViewTest::UIPageViewTest() @@ -208,3 +208,300 @@ void UIPageViewButtonTest::pageViewEvent(Ref *pSender, PageView::EventType type) break; } } + + +// UIPageViewCustomScrollThreshold +UIPageViewCustomScrollThreshold::UIPageViewCustomScrollThreshold() +: _displayValueLabel(nullptr) +{ + +} + +UIPageViewCustomScrollThreshold::~UIPageViewCustomScrollThreshold() +{ +} + +bool UIPageViewCustomScrollThreshold::init() +{ + if (UIScene::init()) + { + Size widgetSize = _widget->getContentSize(); + + // Add a label in which the dragpanel events will be displayed + _displayValueLabel = Text::create("Scroll Threshold", "fonts/Marker Felt.ttf", 32); + _displayValueLabel->setAnchorPoint(Vec2(0.5f, -1.0f)); + _displayValueLabel->setPosition(Vec2(widgetSize.width / 2.0f, + widgetSize.height / 2.0f + + _displayValueLabel->getContentSize().height * 1.5)); + _uiLayer->addChild(_displayValueLabel); + + // Add the black background + Text* alert = Text::create("PageView", "fonts/Marker Felt.ttf", 30); + alert->setColor(Color3B(159, 168, 176)); + alert->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.075f)); + _uiLayer->addChild(alert); + + Layout* root = static_cast(_uiLayer->getChildByTag(81)); + + Layout* background = dynamic_cast(root->getChildByName("background_Panel")); + + // Create the page view + PageView* pageView = PageView::create(); + pageView->setContentSize(Size(240.0f, 100.0f)); + Size backgroundSize = background->getContentSize(); + pageView->setPosition(Vec2((widgetSize.width - backgroundSize.width) / 2.0f + + (backgroundSize.width - pageView->getContentSize().width) / 2.0f, + (widgetSize.height - backgroundSize.height) / 2.0f + + (backgroundSize.height - pageView->getContentSize().height) / 2.0f + 20)); + + int pageCount = 4; + for (int i = 0; i < pageCount; ++i) + { + Layout* layout = Layout::create(); + layout->setContentSize(Size(240.0f, 130.0f)); + + ImageView* imageView = ImageView::create("cocosui/scrollviewbg.png"); + imageView->setScale9Enabled(true); + imageView->setContentSize(Size(240, 130)); + imageView->setPosition(Vec2(layout->getContentSize().width / 2.0f, layout->getContentSize().height / 2.0f)); + layout->addChild(imageView); + + Text* label = Text::create(StringUtils::format("page %d",(i+1)), "fonts/Marker Felt.ttf", 30); + label->setColor(Color3B(192, 192, 192)); + label->setPosition(Vec2(layout->getContentSize().width / 2.0f, layout->getContentSize().height / 2.0f)); + layout->addChild(label); + + pageView->insertPage(layout,i); + } + + _uiLayer->addChild(pageView); + pageView->setName("pageView"); + + Slider* slider = Slider::create(); + slider->loadBarTexture("cocosui/sliderTrack.png"); + slider->loadSlidBallTextures("cocosui/sliderThumb.png", "cocosui/sliderThumb.png", ""); + slider->loadProgressBarTexture("cocosui/sliderProgress.png"); + slider->setPosition(Vec2(widgetSize.width / 2.0f , widgetSize.height / 2.0f - 40)); + slider->addEventListener(CC_CALLBACK_2(UIPageViewCustomScrollThreshold::sliderEvent, this)); + slider->setPercent(50); + _uiLayer->addChild(slider); + + + return true; + } + return false; +} + + +void UIPageViewCustomScrollThreshold::sliderEvent(Ref *pSender, Slider::EventType type) +{ + if (type == Slider::EventType::ON_PERCENTAGE_CHANGED) + { + Slider* slider = dynamic_cast(pSender); + int percent = slider->getPercent(); + PageView* pageView = (PageView*)_uiLayer->getChildByName("pageView"); + if (percent == 0) { + percent = 1; + } + pageView->setCustomScrollThreshold(percent * 0.01 * pageView->getContentSize().width); + + _displayValueLabel->setString(String::createWithFormat("Scroll Threshold: %f", pageView->getCustomScrollThreshold())->getCString()); + } +} + +// UIPageViewTouchPropagationTest +UIPageViewTouchPropagationTest::UIPageViewTouchPropagationTest() +: _displayValueLabel(nullptr) +{ + +} + +UIPageViewTouchPropagationTest::~UIPageViewTouchPropagationTest() +{ +} + +bool UIPageViewTouchPropagationTest::init() +{ + if (UIScene::init()) + { + Size widgetSize = _widget->getContentSize(); + + // Add a label in which the dragpanel events will be displayed + _displayValueLabel = Text::create("Move by horizontal direction", "fonts/Marker Felt.ttf", 32); + _displayValueLabel->setAnchorPoint(Vec2(0.5f, -1.0f)); + _displayValueLabel->setPosition(Vec2(widgetSize.width / 2.0f, + widgetSize.height / 2.0f + + _displayValueLabel->getContentSize().height * 1.5)); + _uiLayer->addChild(_displayValueLabel); + + // Add the black background + Text* alert = Text::create("PageView Touch Propagation", "fonts/Marker Felt.ttf", 30); + alert->setColor(Color3B(159, 168, 176)); + alert->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.075f)); + _uiLayer->addChild(alert); + + Layout* root = static_cast(_uiLayer->getChildByTag(81)); + + Layout* background = dynamic_cast(root->getChildByName("background_Panel")); + + // Create the page view + PageView* pageView = PageView::create(); + pageView->setContentSize(Size(240.0f, 130.0f)); + pageView->setAnchorPoint(Vec2(0.5,0.5)); + Size backgroundSize = background->getContentSize(); + pageView->setPosition(Vec2(widgetSize.width / 2.0f ,widgetSize.height / 2.0f)); + pageView->setBackGroundColor(Color3B::GREEN); + pageView->setBackGroundColorType(Layout::BackGroundColorType::SOLID); + + int pageCount = 4; + for (int i = 0; i < pageCount; ++i) + { + HBox* outerBox = HBox::create(); + outerBox->setContentSize(Size(240.0f, 130.0f)); + + for (int k = 0; k < 2; ++k) { + VBox* innerBox = VBox::create(); + + for (int j = 0; j < 3; j++) { + Button *btn = Button::create("cocosui/animationbuttonnormal.png", + "cocosui/animationbuttonpressed.png"); + btn->setName(StringUtils::format("button %d", j)); + btn->addTouchEventListener( CC_CALLBACK_2(UIPageViewTouchPropagationTest::onButtonClicked, this)); + + innerBox->addChild(btn); + } + + LinearLayoutParameter *parameter = LinearLayoutParameter::create(); + parameter->setMargin(Margin(0,0,100,0)); + innerBox->setLayoutParameter(parameter); + + outerBox->addChild(innerBox); + + } + + pageView->insertPage(outerBox,i); + } + + pageView->addEventListener(CC_CALLBACK_2(UIPageViewTouchPropagationTest::pageViewEvent, this)); + pageView->setName("pageView"); + pageView->addTouchEventListener([](Ref* sender, Widget::TouchEventType type){ + if (type == Widget::TouchEventType::BEGAN) + { + CCLOG("page view touch began"); + } + else if(type == Widget::TouchEventType::MOVED) + { + CCLOG("page view touch moved"); + } + else if(type == Widget::TouchEventType::ENDED) + { + CCLOG("page view touch ended"); + } + else + { + CCLOG("page view touch cancelled"); + } + }); + _uiLayer->addChild(pageView); + + Text *propagationText = Text::create("Allow Propagation", "Arial", 10); + propagationText->setAnchorPoint(Vec2(0,0.5)); + propagationText->setTextColor(Color4B::RED); + propagationText->setPosition(Vec2(0, pageView->getPosition().y + 50)); + _uiLayer->addChild(propagationText); + + Text *swallowTouchText = Text::create("Swallow Touches", "Arial", 10); + swallowTouchText->setAnchorPoint(Vec2(0,0.5)); + swallowTouchText->setTextColor(Color4B::RED); + swallowTouchText->setPosition(Vec2(0, pageView->getPosition().y)); + _uiLayer->addChild(swallowTouchText); + + // Create the checkbox + CheckBox* checkBox1 = CheckBox::create("cocosui/check_box_normal.png", + "cocosui/check_box_normal_press.png", + "cocosui/check_box_active.png", + "cocosui/check_box_normal_disable.png", + "cocosui/check_box_active_disable.png"); + checkBox1->setPosition(propagationText->getPosition() + Vec2(propagationText->getContentSize().width/2, -20)); + + checkBox1->setName("propagation"); + _uiLayer->addChild(checkBox1); + + + // Create the checkbox + CheckBox* checkBox2 = CheckBox::create("cocosui/check_box_normal.png", + "cocosui/check_box_normal_press.png", + "cocosui/check_box_active.png", + "cocosui/check_box_normal_disable.png", + "cocosui/check_box_active_disable.png"); + checkBox2->setPosition(swallowTouchText->getPosition() + Vec2(swallowTouchText->getContentSize().width/2, -20)); + + checkBox2->setName("swallow"); + _uiLayer->addChild(checkBox2); + + + auto eventListener = EventListenerTouchOneByOne::create(); + eventListener->onTouchBegan = [](Touch* touch, Event* event) -> bool{ + CCLOG("layout recieves touches"); + return true; + }; + _eventDispatcher->addEventListenerWithSceneGraphPriority(eventListener, this); + + return true; + } + return false; +} + +void UIPageViewTouchPropagationTest::onButtonClicked(Ref* pSender, Widget::TouchEventType type) +{ + Button *btn = (Button*)pSender; + CheckBox *ck1 = (CheckBox*)_uiLayer->getChildByName("propagation"); + CheckBox *ck2 = (CheckBox*)_uiLayer->getChildByName("swallow"); + auto pageView = (PageView*)_uiLayer->getChildByName("pageView"); + + if (type == Widget::TouchEventType::BEGAN) + { + if (ck1->isSelected()) + { + btn->setPropagateTouchEvents(true); + pageView->setPropagateTouchEvents(true); + + }else + { + btn->setPropagateTouchEvents(false); + pageView->setPropagateTouchEvents(false); + } + + if (ck2->isSelected()) + { + btn->setSwallowTouches(true); + pageView->setSwallowTouches(true); + }else + { + btn->setSwallowTouches(false); + pageView->setSwallowTouches(false); + } + } + if (type == Widget::TouchEventType::ENDED) { + CCLOG("button clicked"); + } +} + + +void UIPageViewTouchPropagationTest::pageViewEvent(Ref *pSender, PageView::EventType type) +{ + switch (type) + { + case PageView::EventType::TURNING: + { + PageView* pageView = dynamic_cast(pSender); + + _displayValueLabel->setString(CCString::createWithFormat("page = %ld", pageView->getCurPageIndex() + 1)->getCString()); + } + break; + + default: + break; + } +} + diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest.h b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest.h index 114737a291..922115c52f 100644 --- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest.h +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest.h @@ -55,4 +55,34 @@ protected: Text* _displayValueLabel; }; +class UIPageViewCustomScrollThreshold : public UIScene +{ +public: + UIPageViewCustomScrollThreshold(); + ~UIPageViewCustomScrollThreshold(); + bool init(); + + void sliderEvent(Ref* pSender, Slider::EventType type); + + void pageViewEvent(Ref* pSender, PageView::EventType type); +protected: + UI_SCENE_CREATE_FUNC(UIPageViewCustomScrollThreshold) + Text* _displayValueLabel; +}; + +class UIPageViewTouchPropagationTest : public UIScene +{ +public: + UIPageViewTouchPropagationTest(); + ~UIPageViewTouchPropagationTest(); + bool init(); + + void pageViewEvent(Ref* pSender, PageView::EventType type); + void onButtonClicked(Ref* pSender, Widget::TouchEventType type); + +protected: + UI_SCENE_CREATE_FUNC(UIPageViewTouchPropagationTest) + Text* _displayValueLabel; +}; + #endif /* defined(__TestCpp__UIPageViewTest__) */ diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIRichTextTest/UIRichTextTest.cpp b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIRichTextTest/UIRichTextTest.cpp index 36bdf49f94..c9c3049ec6 100644 --- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIRichTextTest/UIRichTextTest.cpp +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIRichTextTest/UIRichTextTest.cpp @@ -20,6 +20,23 @@ bool UIRichTextTest::init() { Size widgetSize = _widget->getContentSize(); + auto config = Configuration::getInstance(); + config->loadConfigFile("configs/config-test-ok.plist"); + + + std::string str1 = config->getValue("Chinese").asString(); + std::string str2 = config->getValue("Japanese").asString(); + CCLOG("str1:%s ascii length = %ld, utf8 length = %ld, substr = %s", + str1.c_str(), + str1.length(), + StringUtils::getCharacterCountInUTF8String(str1), + Helper::getSubStringOfUTF8String(str1, 0, 5).c_str()); + CCLOG("str2:%s ascii length = %ld, utf8 length = %ld, substr = %s", + str2.c_str(), + str2.length(), + StringUtils::getCharacterCountInUTF8String(str2), + Helper::getSubStringOfUTF8String(str2, 0, 2).c_str()); + // Add the alert Text *alert = Text::create("RichText", "fonts/Marker Felt.ttf", 30); alert->setColor(Color3B(159, 168, 176)); @@ -31,7 +48,6 @@ bool UIRichTextTest::init() button->setTouchEnabled(true); button->setTitleText("switch"); button->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f + button->getContentSize().height * 2.5)); -// button->addTouchEventListener(this, toucheventselector(UIRichTextTest::touchEvent)); button->addTouchEventListener(CC_CALLBACK_2(UIRichTextTest::touchEvent, this)); button->setLocalZOrder(10); _widget->addChild(button); @@ -42,10 +58,10 @@ bool UIRichTextTest::init() _richText->ignoreContentAdaptWithSize(false); _richText->setContentSize(Size(100, 100)); - RichElementText* re1 = RichElementText::create(1, Color3B::WHITE, 255, "中国中国中国中国中国中国中国中国中国中国", "Marker Felt", 10); + RichElementText* re1 = RichElementText::create(1, Color3B::WHITE, 255, str1, "Marker Felt", 10); RichElementText* re2 = RichElementText::create(2, Color3B::YELLOW, 255, "And this is yellow. ", "Helvetica", 10); - RichElementText* re3 = RichElementText::create(3, Color3B::BLUE, 255, "ご静聴ありがとうございました！！ご静聴ありがとうございました！！", "Helvetica", 10); - RichElementText* re4 = RichElementText::create(4, Color3B::GREEN, 255, "And green. ", "Helvetica", 10); + RichElementText* re3 = RichElementText::create(3, Color3B::GRAY, 255, str2, "Helvetica", 10); + RichElementText* re4 = RichElementText::create(4, Color3B::GREEN, 255, "And green with TTF support. ", "fonts/Marker Felt.ttf", 10); RichElementText* re5 = RichElementText::create(5, Color3B::RED, 255, "Last one is red ", "Helvetica", 10); RichElementImage* reimg = RichElementImage::create(6, Color3B::WHITE, 255, "cocosui/sliderballnormal.png"); diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIScale9SpriteTest.cpp b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIScale9SpriteTest.cpp new file mode 100644 index 0000000000..0a8e8d8fb9 --- /dev/null +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIScale9SpriteTest.cpp @@ -0,0 +1,726 @@ +/**************************************************************************** + 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 "UIScale9SpriteTest.h" +#include "testResource.h" + +// UIScale9SpriteTest +UIScale9SpriteTest::UIScale9SpriteTest() +{ + +} + +UIScale9SpriteTest::~UIScale9SpriteTest() +{ +} + +bool UIScale9SpriteTest::init() +{ + if (UIScene::init()) + { + Size widgetSize = _widget->getContentSize(); + + auto moveTo = MoveBy::create(1.0, Vec2(30,0)); + auto moveBack = moveTo->reverse(); + auto rotateBy = RotateBy::create(1.0, 180); + auto action = Sequence::create(moveTo,moveBack, rotateBy, NULL); + + + Sprite *normalSprite1 = Sprite::create("cocosui/animationbuttonnormal.png"); + normalSprite1->setPosition(100, 270); +// normalSprite1->setAnchorPoint(Vec2(0.5,0.5)); +// normalSprite1->setContentSize(Size(100,100)); + + this->addChild(normalSprite1); + normalSprite1->runAction((FiniteTimeAction*)action->clone()); + + ui::Scale9Sprite *normalSprite2 = ui::Scale9Sprite::create("cocosui/animationbuttonnormal.png"); + normalSprite2->setPosition(120, 270); + normalSprite2->setScale9Enabled(false); +// normalSprite2->setContentSize(Size(100,100)); +// normalSprite2->setAnchorPoint(Vec2(0.5,0.5)); + normalSprite2->setOpacity(100); + this->addChild(normalSprite2); + normalSprite2->setColor(Color3B::GREEN); + normalSprite2->runAction(action); + + auto action2 = action->clone(); + ui::Scale9Sprite *sp1 = ui::Scale9Sprite::create("cocosui/animationbuttonnormal.png"); + sp1->setPosition(100, 160); + sp1->setScale(1.2); + sp1->setContentSize(Size(100,100)); + sp1->setColor(Color3B::GREEN); +// sp1->setScale9Enabled(false); + this->addChild(sp1); + sp1->runAction((FiniteTimeAction*)action2); + + cocos2d::ui::Scale9Sprite *sp2 = ui::Scale9Sprite::create("cocosui/animationbuttonnormal.png"); + sp2->setPosition(350, 160); + sp2->setPreferredSize(sp1->getContentSize() * 1.2); + sp2->setColor(Color3B::GREEN); + sp2->setContentSize(Size(100,100)); + + this->addChild(sp2); + auto action3 = action->clone(); + sp2->runAction((FiniteTimeAction*)action3); + + return true; + } + return false; +} + + +UIScale9SpriteHierarchialTest::UIScale9SpriteHierarchialTest() +{ + +} + +UIScale9SpriteHierarchialTest::~UIScale9SpriteHierarchialTest() +{ +} + +bool UIScale9SpriteHierarchialTest::init() +{ + if (UIScene::init()) + { + Size widgetSize = _widget->getContentSize(); + + auto moveTo = MoveBy::create(1.0, Vec2(30,0)); + auto moveBack = moveTo->reverse(); + auto rotateBy = RotateBy::create(1.0, 180); + auto fadeOut = FadeOut::create(2.0); + auto action = Sequence::create(moveTo,moveBack, rotateBy,fadeOut, NULL); + + + Sprite *normalSprite1 = Sprite::create("cocosui/animationbuttonnormal.png"); + normalSprite1->setPosition(100, 270); + // normalSprite1->setAnchorPoint(Vec2(0.5,0.5)); + // normalSprite1->setContentSize(Size(100,100)); + +// Sprite *childSprite = Sprite::create("cocosui/animationbuttonnormal.png"); + normalSprite1->setCascadeColorEnabled(true); + normalSprite1->setCascadeOpacityEnabled(true); + normalSprite1->setColor(Color3B::GREEN); + + + + this->addChild(normalSprite1); + normalSprite1->runAction((FiniteTimeAction*)action->clone()); + + ui::Scale9Sprite *normalSprite2 = ui::Scale9Sprite::create("cocosui/animationbuttonnormal.png"); +// normalSprite2->setPosition(120, 270); + normalSprite2->setScale9Enabled(false); + // normalSprite2->setContentSize(Size(100,100)); + // normalSprite2->setAnchorPoint(Vec2(0.5,0.5)); + normalSprite2->setOpacity(100); + normalSprite1->addChild(normalSprite2); + + auto action2 = action->clone(); + ui::Scale9Sprite *sp1 = ui::Scale9Sprite::create("cocosui/animationbuttonnormal.png"); + sp1->setPosition(200, 160); + sp1->setScale(1.2); + sp1->setContentSize(Size(100,100)); + sp1->setColor(Color3B::GREEN); + // sp1->setScale9Enabled(false); + this->addChild(sp1); + sp1->runAction((FiniteTimeAction*)action2); + + cocos2d::ui::Scale9Sprite *sp2 = ui::Scale9Sprite::create("cocosui/animationbuttonnormal.png"); +// sp2->setPosition(350, 160); + sp2->setPreferredSize(sp1->getContentSize() * 1.2); + sp2->setColor(Color3B::GREEN); + sp2->setContentSize(Size(100,100)); + + sp1->addChild(sp2); +// auto action3 = action->clone(); +// sp2->runAction((FiniteTimeAction*)action3); + + return true; + } + return false; +} + +UIScale9SpriteTouchTest::UIScale9SpriteTouchTest() +{ + +} + +UIScale9SpriteTouchTest::~UIScale9SpriteTouchTest() +{ +} + +bool UIScale9SpriteTouchTest::init() +{ + if (UIScene::init()) + { + + Vec2 origin = Director::getInstance()->getVisibleOrigin(); + Size size = Director::getInstance()->getVisibleSize(); + + auto containerForSprite1 = Node::create(); + auto sprite1 = cocos2d::ui::Scale9Sprite::create("Images/CyanSquare.png"); +// sprite1->setScale9Enabled(false); + sprite1->setPosition(origin+Vec2(size.width/2, size.height/2) + Vec2(-80, 80)); + containerForSprite1->addChild(sprite1); + addChild(containerForSprite1, 10); + + auto sprite2 = ui::Scale9Sprite::create("Images/MagentaSquare.png"); + sprite2->setPosition(origin+Vec2(size.width/2, size.height/2)); +// sprite2->setCascadeOpacityEnabled(false); +// sprite2->setScale9Enabled(false); + + addChild(sprite2, 20); + + auto sprite3 = ui::Scale9Sprite::create("Images/YellowSquare.png"); + sprite3->setPosition(Vec2(0, 0)); + sprite3->setCascadeOpacityEnabled(false); + sprite2->addChild(sprite3, 1); +// sprite3->setScale9Enabled(false); + + + // Make sprite1 touchable + auto listener1 = EventListenerTouchOneByOne::create(); + listener1->setSwallowTouches(true); + + listener1->onTouchBegan = [](Touch* touch, Event* event){ + auto target = static_cast(event->getCurrentTarget()); + + Vec2 locationInNode = target->convertToNodeSpace(touch->getLocation()); + Size s = target->getContentSize(); + Rect rect = Rect(0, 0, s.width, s.height); + + if (rect.containsPoint(locationInNode)) + { + log("sprite began... x = %f, y = %f", locationInNode.x, locationInNode.y); + target->setOpacity(180); + return true; + } + return false; + }; + + listener1->onTouchMoved = [](Touch* touch, Event* event){ + auto target = static_cast(event->getCurrentTarget()); + target->setPosition(target->getPosition() + touch->getDelta()); + }; + + listener1->onTouchEnded = [=](Touch* touch, Event* event){ + auto target = static_cast(event->getCurrentTarget()); + log("sprite onTouchesEnded.. "); + target->setOpacity(255); + if (target == sprite2) + { + containerForSprite1->setLocalZOrder(100); + } + else if(target == sprite1) + { + containerForSprite1->setLocalZOrder(0); + } + }; + + _eventDispatcher->addEventListenerWithSceneGraphPriority(listener1, sprite1); + _eventDispatcher->addEventListenerWithSceneGraphPriority(listener1->clone(), sprite2); + _eventDispatcher->addEventListenerWithSceneGraphPriority(listener1->clone(), sprite3); + + return true; + } + return false; +} + +bool UIS9BatchNodeBasic::init() +{ + if (UIScene::init()) { + auto winSize = Director::getInstance()->getWinSize(); + float x = winSize.width / 2; + float y = 0 + (winSize.height / 2); + + + auto sprite = Sprite::create("Images/blocks9.png"); + + auto blocks = ui::Scale9Sprite::create(); + + blocks->updateWithSprite(sprite, Rect(0, 0, 96, 96), false, Rect(0, 0, 96, 96)); + + blocks->setPosition(Vec2(x, y)); + + this->addChild(blocks); + + + return true; + } + + + return false; +} + +bool UIS9FrameNameSpriteSheet::init() +{ + if (UIScene::init()) { + auto winSize = Director::getInstance()->getWinSize(); + float x = winSize.width / 2; + float y = 0 + (winSize.height / 2); + + SpriteFrameCache::getInstance()->addSpriteFramesWithFile(s_s9s_blocks9_plist); + + + auto blocks = ui::Scale9Sprite::createWithSpriteFrameName("blocks9.png"); + + blocks->setPosition(Vec2(x, y)); + + this->addChild(blocks); + + + return true; + } + + return false; +} + + +bool UIS9FrameNameSpriteSheetRotated::init() +{ + if (UIScene::init()) { + auto winSize = Director::getInstance()->getWinSize(); + float x = winSize.width / 2; + float y = 0 + (winSize.height / 2); + + SpriteFrameCache::getInstance()->addSpriteFramesWithFile(s_s9s_blocks9_plist); + + auto blocks = ui::Scale9Sprite::createWithSpriteFrameName("blocks9r.png"); + + blocks->setPosition(Vec2(x, y)); + + this->addChild(blocks); + + return true; + } + + return false; +} + + +bool UIS9BatchNodeScaledNoInsets::init() +{ + if (UIScene::init()) { + auto winSize = Director::getInstance()->getWinSize(); + float x = winSize.width / 2; + float y = 0 + (winSize.height / 2); + + // scaled without insets + auto sprite_scaled = Sprite::create("Images/blocks9.png"); + + auto blocks_scaled = ui::Scale9Sprite::create(); + blocks_scaled->updateWithSprite(sprite_scaled, Rect(0, 0, 96, 96), false, Rect(0, 0, 96, 96)); + + blocks_scaled->setPosition(Vec2(x, y)); + + blocks_scaled->setContentSize(Size(96 * 4, 96*2)); + + this->addChild(blocks_scaled); + return true; + } + return false; +} + +bool UIS9FrameNameSpriteSheetScaledNoInsets::init() +{ + if (UIScene::init()) { + auto winSize = Director::getInstance()->getWinSize(); + float x = winSize.width / 2; + float y = 0 + (winSize.height / 2); + SpriteFrameCache::getInstance()->addSpriteFramesWithFile(s_s9s_blocks9_plist); + + auto blocks_scaled = ui::Scale9Sprite::createWithSpriteFrameName("blocks9.png"); + + blocks_scaled->setPosition(Vec2(x, y)); + + blocks_scaled->setContentSize(Size(96 * 4, 96*2)); + + this->addChild(blocks_scaled); + return true; + } + return false; +} + +bool UIS9FrameNameSpriteSheetRotatedScaledNoInsets::init() +{ + if (UIScene::init()) { + SpriteFrameCache::getInstance()->addSpriteFramesWithFile(s_s9s_blocks9_plist); + + auto winSize = Director::getInstance()->getWinSize(); + float x = winSize.width / 2; + float y = 0 + (winSize.height / 2); + + + auto blocks_scaled = ui::Scale9Sprite::createWithSpriteFrameName("blocks9r.png"); + + blocks_scaled->setPosition(Vec2(x, y)); + + blocks_scaled->setContentSize(Size(96 * 4, 96*2)); + + this->addChild(blocks_scaled); + + return true; + } + return false; +} + + +bool UIS9BatchNodeScaleWithCapInsets::init() +{ + if (UIScene::init()) { + auto winSize = Director::getInstance()->getWinSize(); + float x = winSize.width / 2; + float y = 0 + (winSize.height / 2); + + + auto sprite_scaled_with_insets = Sprite::create("Images/blocks9.png"); + + auto blocks_scaled_with_insets = ui::Scale9Sprite::create(); + + blocks_scaled_with_insets->updateWithSprite(sprite_scaled_with_insets, Rect(0, 0, 96, 96), false, Rect(32, 32, 32, 32)); + + blocks_scaled_with_insets->setContentSize(Size(96 * 4.5, 96 * 2.5)); + + blocks_scaled_with_insets->setPosition(Vec2(x, y)); + + this->addChild(blocks_scaled_with_insets); + return true; + } + return false; +} + +bool UIS9FrameNameSpriteSheetInsets::init() +{ + if (UIScene::init()) { + SpriteFrameCache::getInstance()->addSpriteFramesWithFile(s_s9s_blocks9_plist); + + + auto winSize = Director::getInstance()->getWinSize(); + float x = winSize.width / 2; + float y = 0 + (winSize.height / 2); + + + auto blocks_with_insets = ui::Scale9Sprite::createWithSpriteFrameName("blocks9.png", Rect(32, 32, 32, 32)); + + blocks_with_insets->setPosition(Vec2(x, y)); + + this->addChild(blocks_with_insets); + return true; + } + return false; +} + +bool UIS9FrameNameSpriteSheetInsetsScaled::init() +{ + if (UIScene::init()) { + SpriteFrameCache::getInstance()->addSpriteFramesWithFile(s_s9s_blocks9_plist); + + auto winSize = Director::getInstance()->getWinSize(); + float x = winSize.width / 2; + float y = 0 + (winSize.height / 2); + + auto blocks_scaled_with_insets = ui::Scale9Sprite::createWithSpriteFrameName("blocks9.png", Rect(32, 32, 32, 32)); + + blocks_scaled_with_insets->setContentSize(Size(96 * 4.5, 96 * 2.5)); + + blocks_scaled_with_insets->setPosition(Vec2(x, y)); + + this->addChild(blocks_scaled_with_insets); + return true; + } + return false; +} + +bool UIS9FrameNameSpriteSheetRotatedInsets::init() +{ + if (UIScene::init()) { + SpriteFrameCache::getInstance()->addSpriteFramesWithFile(s_s9s_blocks9_plist); + auto winSize = Director::getInstance()->getWinSize(); + float x = winSize.width / 2; + float y = 0 + (winSize.height / 2); + + auto blocks_with_insets = ui::Scale9Sprite::createWithSpriteFrameName("blocks9r.png", Rect(32, 32, 32, 32)); + + blocks_with_insets->setPosition(Vec2(x, y)); + + this->addChild(blocks_with_insets); + return true; + } + return false; +} + +bool UIS9_TexturePacker::init() +{ + if (UIScene::init()) { + SpriteFrameCache::getInstance()->addSpriteFramesWithFile(s_s9s_blocks9_plist); + + auto winSize = Director::getInstance()->getWinSize(); + SpriteFrameCache::getInstance()->addSpriteFramesWithFile(s_s9s_ui_plist); + + float x = winSize.width / 4; + float y = 0 + (winSize.height / 2); + + auto s = ui::Scale9Sprite::createWithSpriteFrameName("button_normal.png"); + + s->setPosition(Vec2(x, y)); + + s->setContentSize(Size(14 * 16, 10 * 16)); + + this->addChild(s); + + x = winSize.width * 3/4; + + auto s2 = ui::Scale9Sprite::createWithSpriteFrameName("button_actived.png"); + + s2->setPosition(Vec2(x, y)); + + s2->setContentSize(Size(14 * 16, 10 * 16)); + + this->addChild(s2); + return true; + } + return false; +} + +bool UIS9FrameNameSpriteSheetRotatedInsetsScaled::init() +{ + if (UIScene::init()) { + SpriteFrameCache::getInstance()->addSpriteFramesWithFile(s_s9s_blocks9_plist); + + auto winSize = Director::getInstance()->getWinSize(); + float x = winSize.width / 2; + float y = 0 + (winSize.height / 2); + + auto blocks_scaled_with_insets = ui::Scale9Sprite::createWithSpriteFrameName("blocks9.png", Rect(32, 32, 32, 32)); + + blocks_scaled_with_insets->setContentSize(Size(96 * 4.5, 96 * 2.5)); + + blocks_scaled_with_insets->setPosition(Vec2(x, y)); + + this->addChild(blocks_scaled_with_insets); + return true; + } + return false; +} + +bool UIS9FrameNameSpriteSheetRotatedSetCapInsetLater::init() +{ + if (UIScene::init()) { + SpriteFrameCache::getInstance()->addSpriteFramesWithFile(s_s9s_blocks9_plist); + + auto winSize = Director::getInstance()->getWinSize(); + float x = winSize.width / 2; + float y = 0 + (winSize.height / 2); + + auto blocks_scaled_with_insets = ui::Scale9Sprite::createWithSpriteFrameName("blocks9r.png"); + + blocks_scaled_with_insets->setInsetLeft(32); + blocks_scaled_with_insets->setInsetRight(32); + + blocks_scaled_with_insets->setPreferredSize(Size(32*5.5f, 32*4)); + blocks_scaled_with_insets->setPosition(Vec2(x, y)); + + this->addChild(blocks_scaled_with_insets); + return true; + } + return false; +} + +bool UIS9CascadeOpacityAndColor::init() +{ + if (UIScene::init()) { + SpriteFrameCache::getInstance()->addSpriteFramesWithFile(s_s9s_blocks9_plist); + + auto winSize = Director::getInstance()->getWinSize(); + float x = winSize.width / 2; + float y = 0 + (winSize.height / 2); + auto rgba = Layer::create(); + rgba->setCascadeColorEnabled(true); + rgba->setCascadeOpacityEnabled(true); + this->addChild(rgba); + + + auto blocks_scaled_with_insets = ui::Scale9Sprite::createWithSpriteFrameName("blocks9r.png"); + + blocks_scaled_with_insets->setPosition(Vec2(x, y)); + + rgba->addChild(blocks_scaled_with_insets); + auto actions = Sequence::create(FadeIn::create(1), + TintTo::create(1, 0, 255, 0), + TintTo::create(1, 255, 255, 255), + FadeOut::create(1), + nullptr); + auto repeat = RepeatForever::create(actions); + rgba->runAction(repeat); + return true; + } + return false; +} + +bool UIS9ZOrder::init() +{ + if (UIScene::init()) { + SpriteFrameCache::getInstance()->addSpriteFramesWithFile(s_s9s_blocks9_plist); + + auto winSize = Director::getInstance()->getWinSize(); + float x = winSize.width / 2; + float y = 0 + (winSize.height / 2); + + auto blocks_scaled_with_insets = ui::Scale9Sprite::createWithSpriteFrameName("blocks9r.png"); + + blocks_scaled_with_insets->setPosition(Vec2(x, y)); + this->addChild(blocks_scaled_with_insets); + + Sprite *normalSprite = Sprite::createWithSpriteFrameName("blocks9r.png"); + normalSprite->setColor(Color3B::RED); + blocks_scaled_with_insets->addChild(normalSprite); + + auto topLabel = Label::createWithSystemFont("I Must be On the Top", "Arial", 15); + topLabel->setPosition(Vec2(20,20)); + blocks_scaled_with_insets->addChild(topLabel); + + auto bottomLabel = Label::createWithSystemFont("I Must be On the Bottom", "Arial", 15); + bottomLabel->setPosition(Vec2(80,80)); + bottomLabel->setColor(Color3B::BLUE); + blocks_scaled_with_insets->addChild(bottomLabel,-1); + + return true; + } + return false; +} + +bool UIS9Flip::init() +{ + if (UIScene::init()) { + SpriteFrameCache::getInstance()->addSpriteFramesWithFile(s_s9s_blocks9_plist); + + auto winSize = Director::getInstance()->getWinSize(); + float x = winSize.width / 2; + float y = 0 + (winSize.height / 2); + + + auto normalSprite = ui::Scale9Sprite::createWithSpriteFrameName("blocks9r.png"); + + normalSprite->setPosition(Vec2(x, y )); + this->addChild(normalSprite); + + + auto normalLabel = Label::createWithSystemFont("Normal Sprite","Airal",10); + normalLabel->setPosition(normalSprite->getPosition() + Vec2(0, normalSprite->getContentSize().height/2 + 10)); + this->addChild(normalLabel); + + + + auto flipXSprite = ui::Scale9Sprite::createWithSpriteFrameName("blocks9r.png"); + + flipXSprite->setPosition(Vec2(x - 120, y )); + this->addChild(flipXSprite); + + flipXSprite->setFlippedX(true); + + auto flipXLabel = Label::createWithSystemFont("Sprite FlipX","Airal",10); + flipXLabel->setPosition(flipXSprite->getPosition() + Vec2(0, flipXSprite->getContentSize().height/2 + 10)); + this->addChild(flipXLabel); + + + auto flipYSprite = ui::Scale9Sprite::createWithSpriteFrameName("blocks9r.png"); + + flipYSprite->setPosition(Vec2(x + 120, y)); + this->addChild(flipYSprite); + + flipYSprite->setFlippedY(true); + + auto flipYLabel = Label::createWithSystemFont("Sprite FlipY","Airal",10); + flipYLabel->setPosition(flipYSprite->getPosition() + Vec2(0, flipYSprite->getContentSize().height/2 + 10)); + this->addChild(flipYLabel); + + return true; + } + return false; +} + +bool UIS9ChangeAnchorPoint::init() +{ + if (UIScene::init()) { + SpriteFrameCache::getInstance()->addSpriteFramesWithFile(s_s9s_blocks9_plist); + + auto winSize = Director::getInstance()->getWinSize(); + float x = winSize.width / 2; + float y = 0 + (winSize.height / 2 + 50); + + + auto normalSprite = ui::Scale9Sprite::createWithSpriteFrameName("blocks9r.png"); + normalSprite->setPosition(Vec2(x, y )); +// normalSprite->setScale9Enabled(false); +// normalSprite->setAnchorPoint(Vec2::ANCHOR_TOP_RIGHT); + + this->addChild(normalSprite); + + + Button* button1 = Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png"); + button1->setPosition(Vec2(winSize.width/2 - 100,winSize.height/2 - 50)); + button1->setName("button2"); + button1->setTitleText("Vec(0,0)"); + button1->addTouchEventListener([=](Ref*, Widget::TouchEventType type) + { + if (type == Widget::TouchEventType::ENDED) { + normalSprite->setAnchorPoint(Vec2::ZERO); + normalSprite->setScale9Enabled(true); + CCLOG("position = %f, %f, anchor point = %f, %f", normalSprite->getPosition().x, + normalSprite->getPosition().y, + normalSprite->getAnchorPoint().x, + normalSprite->getAnchorPoint().y); + CCLOG("tests:content size : width = %f, height = %f", + normalSprite->getContentSize().width, + normalSprite->getContentSize().height); + } + }); + this->addChild(button1); + + Button* button2 = Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png"); + button2->setPosition(Vec2(winSize.width/2 + 100,winSize.height/2 - 50)); + button2->setName("button2"); + button2->setTitleText("Vec(1,1)"); + button2->addTouchEventListener([=](Ref*, Widget::TouchEventType type) + { + if (type == Widget::TouchEventType::ENDED) { + normalSprite->setAnchorPoint(Vec2::ANCHOR_TOP_RIGHT); + normalSprite->setScale9Enabled(false); + CCLOG("position = %f, %f, anchor point = %f, %f", normalSprite->getPosition().x, + normalSprite->getPosition().y, + normalSprite->getAnchorPoint().x, + normalSprite->getAnchorPoint().y); + CCLOG("tests:content size : width = %f, height = %f", + normalSprite->getContentSize().width, + normalSprite->getContentSize().height); + + } + }); + this->addChild(button2); + + + return true; + } + return false; +} diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIScale9SpriteTest.h b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIScale9SpriteTest.h new file mode 100644 index 0000000000..6dd64f99e7 --- /dev/null +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIScale9SpriteTest.h @@ -0,0 +1,268 @@ +/**************************************************************************** + 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 __cocos2d_tests__UIScale9SpriteTest__ +#define __cocos2d_tests__UIScale9SpriteTest__ +#include "UIScene.h" + +class UIScale9SpriteTest : public UIScene +{ +public: + UIScale9SpriteTest(); + ~UIScale9SpriteTest(); + bool init(); + +protected: + UI_SCENE_CREATE_FUNC(UIScale9SpriteTest) +}; + +class UIScale9SpriteHierarchialTest : public UIScene +{ +public: + UIScale9SpriteHierarchialTest(); + ~UIScale9SpriteHierarchialTest(); + bool init(); + +protected: + UI_SCENE_CREATE_FUNC(UIScale9SpriteHierarchialTest) +}; + +class UIScale9SpriteTouchTest : public UIScene +{ +public: + UIScale9SpriteTouchTest(); + ~UIScale9SpriteTouchTest(); + bool init(); + +protected: + UI_SCENE_CREATE_FUNC(UIScale9SpriteTouchTest) +}; + +// S9BatchNodeBasic + +class UIS9BatchNodeBasic : public UIScene +{ +public: + CREATE_FUNC(UIS9BatchNodeBasic); + + bool init(); +protected: + UI_SCENE_CREATE_FUNC(UIS9BatchNodeBasic) +}; + +// S9FrameNameSpriteSheet + +class UIS9FrameNameSpriteSheet : public UIScene +{ +public: + CREATE_FUNC(UIS9FrameNameSpriteSheet); + + bool init(); +protected: + UI_SCENE_CREATE_FUNC(UIS9FrameNameSpriteSheet) + +}; + +// S9FrameNameSpriteSheetRotated + +class UIS9FrameNameSpriteSheetRotated : public UIScene +{ +public: + CREATE_FUNC(UIS9FrameNameSpriteSheetRotated); + + bool init(); +protected: + UI_SCENE_CREATE_FUNC(UIS9FrameNameSpriteSheetRotated) +}; + +// S9BatchNodeScaledNoInsets + +class UIS9BatchNodeScaledNoInsets : public UIScene +{ +public: + CREATE_FUNC(UIS9BatchNodeScaledNoInsets); + + bool init(); +protected: + UI_SCENE_CREATE_FUNC(UIS9BatchNodeScaledNoInsets) +}; + +// S9FrameNameSpriteSheetScaledNoInsets + +class UIS9FrameNameSpriteSheetScaledNoInsets : public UIScene +{ +public: + CREATE_FUNC(UIS9FrameNameSpriteSheetScaledNoInsets); + + bool init(); +protected: + UI_SCENE_CREATE_FUNC(UIS9FrameNameSpriteSheetScaledNoInsets) +}; + +// S9FrameNameSpriteSheetRotatedScaledNoInsets + +class UIS9FrameNameSpriteSheetRotatedScaledNoInsets : public UIScene +{ +public: + CREATE_FUNC(UIS9FrameNameSpriteSheetRotatedScaledNoInsets); + + bool init(); +protected: + UI_SCENE_CREATE_FUNC(UIS9FrameNameSpriteSheetRotatedScaledNoInsets) +}; + + +// S9BatchNodeScaleWithCapInsets + +class UIS9BatchNodeScaleWithCapInsets : public UIScene +{ +public: + CREATE_FUNC(UIS9BatchNodeScaleWithCapInsets); + + bool init(); +protected: + UI_SCENE_CREATE_FUNC(UIS9BatchNodeScaleWithCapInsets) +}; + +// S9FrameNameSpriteSheetInsets + +class UIS9FrameNameSpriteSheetInsets : public UIScene +{ +public: + CREATE_FUNC(UIS9FrameNameSpriteSheetInsets); + + bool init(); +protected: + UI_SCENE_CREATE_FUNC(UIS9FrameNameSpriteSheetInsets) +}; + +// S9FrameNameSpriteSheetInsetsScaled + +class UIS9FrameNameSpriteSheetInsetsScaled : public UIScene +{ +public: + CREATE_FUNC(UIS9FrameNameSpriteSheetInsetsScaled); + + bool init(); +protected: + UI_SCENE_CREATE_FUNC(UIS9FrameNameSpriteSheetInsetsScaled) +}; + +// S9FrameNameSpriteSheetRotatedInsets + +class UIS9FrameNameSpriteSheetRotatedInsets : public UIScene +{ +public: + CREATE_FUNC(UIS9FrameNameSpriteSheetRotatedInsets); + + bool init(); +protected: + UI_SCENE_CREATE_FUNC(UIS9FrameNameSpriteSheetRotatedInsets) +}; + +// S9_TexturePacker + +class UIS9_TexturePacker : public UIScene +{ +public: + CREATE_FUNC(UIS9_TexturePacker); + + bool init(); +protected: + UI_SCENE_CREATE_FUNC(UIS9_TexturePacker) + +}; + +// S9FrameNameSpriteSheetRotatedInsetsScaled + +class UIS9FrameNameSpriteSheetRotatedInsetsScaled : public UIScene +{ +public: + CREATE_FUNC(UIS9FrameNameSpriteSheetRotatedInsetsScaled); + + bool init(); +protected: + UI_SCENE_CREATE_FUNC(UIS9FrameNameSpriteSheetRotatedInsetsScaled) +}; + +// S9FrameNameSpriteSheetRotatedInsetsScaled + +class UIS9FrameNameSpriteSheetRotatedSetCapInsetLater : public UIScene +{ +public: + CREATE_FUNC(UIS9FrameNameSpriteSheetRotatedSetCapInsetLater); + + bool init(); +protected: + UI_SCENE_CREATE_FUNC(UIS9FrameNameSpriteSheetRotatedSetCapInsetLater) +}; + +// S9CascadeOpacityAndColor + +class UIS9CascadeOpacityAndColor : public UIScene +{ +public: + CREATE_FUNC(UIS9CascadeOpacityAndColor); + + bool init(); +protected: + UI_SCENE_CREATE_FUNC(UIS9CascadeOpacityAndColor) +}; + +// Scale9Sprite ZOrder + +class UIS9ZOrder : public UIScene +{ +public: + CREATE_FUNC(UIS9ZOrder); + + bool init(); +protected: + UI_SCENE_CREATE_FUNC(UIS9ZOrder) + +}; + +// Scale9Sprite Flip + +class UIS9Flip : public UIScene +{ +public: + CREATE_FUNC(UIS9Flip); + + bool init(); +protected: + UI_SCENE_CREATE_FUNC(UIS9Flip) +}; + +class UIS9ChangeAnchorPoint : public UIScene +{ +public: + CREATE_FUNC(UIS9ChangeAnchorPoint); + + bool init(); +protected: + UI_SCENE_CREATE_FUNC(UIS9ChangeAnchorPoint) +}; + +#endif /* defined(__cocos2d_tests__UIScale9SpriteTest__) */ diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UISceneManager.cpp b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UISceneManager.cpp index edbecf2bd2..11e781e255 100644 --- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UISceneManager.cpp +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UISceneManager.cpp @@ -21,21 +21,8 @@ #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS) #include "UIVideoPlayerTest/UIVideoPlayerTest.h" #endif -/* -#include "UISwitchTest/UISwitchTest.h" - */ - /* -#include "UIProgressTimerTest/UIProgressTimerTest.h" - */ -/* -#include "UIPotentiometerTest/UIPotentiometerTest.h" - */ -/* -#include "UIGridViewTest/UIGridViewTest.h" - */ -/* -#include "UIPickerViewTest/UIPickerViewTest.h" - */ +#include "UIScale9SpriteTest.h" + USING_NS_CC; @@ -45,32 +32,21 @@ static const char* s_testArray[] = "UIButtonTest_Scale9", "UIButtonTest_PressedAction", "UIButtonTest_Title", + "UIButtonTest_RemoveSelf", + "UIButtonTestSwitchScale9", + "UIButtonTestZoomScale", "UICheckBoxTest", "UISliderTest", "UISliderTest_Scale9", - /* - "UIPotentiometerTest", - */ - /* - "UISwitchTest_Horizontal", - "UISwitchTest_Vertical", - "UISwitchTest_VerticalAndTitleVertical", - */ + "UIImageViewTest", "UIImageViewTest_Scale9", + "UIImageViewTest_ContentSize", "UILoadingBarTest_Left", "UILoadingBarTest_Right", "UILoadingBarTest_Left_Scale9", "UILoadingBarTest_Right_Scale9", - /* - "UIProgressTimerTest_Radial", - "UIProgressTimerTest_Horizontal", - "UIProgressTimerTest_Vertical", - "UIProgressTimerTest_RadialMidpointChanged", - "UIProgressTimerTest_BarVarious", - "UIProgressTimerTest_BarTintAndFade", - "UIProgressTimerTest_WithSpriteFrame", - */ + "UITextAtlasTest", "UITextTest", "UITextTest_LineWrap", @@ -84,6 +60,7 @@ static const char* s_testArray[] = "UITextFieldTest_Password", "UITextFieldTest_LineWrap", "UITextFieldTest_TrueTypeFont", + "UITextFieldTest_PlaceHolderColor", "UILayoutTest", "UILayoutTest_Color", "UILayoutTest_Gradient", @@ -93,26 +70,20 @@ static const char* s_testArray[] = "UILayoutTest_Layout_Linear_Horizontal", "UILayoutTest_Layout_Relative_Align_Parent", "UILayoutTest_Layout_Relative_Location", - /* - "UILayoutTest_Layout_Grid", - */ + "UIScrollViewTest_Vertical", "UIScrollViewTest_Horizontal", "UIScrollViewTest_Both", "UIScrollViewTest_ScrollToPercentBothDirection", - "UIScrollViewTest_ScrollToPercentBothDirection_Bounce", + "UIScrollViewTest_ScrollToPercentBothDirection_Bounce", + "UIScrollViewNestTest", "UIPageViewTest", "UIPageViewButtonTest", + "UIPageViewCustomScrollThreshold", + "UIPageViewTouchPropagationTest", "UIListViewTest_Vertical", "UIListViewTest_Horizontal", - /* - "UIGridViewTest_Mode_Column", - "UIGridViewTest_Mode_Row", - */ - /* - "UIPickerViewTest_Vertical", - "UIPickerViewTest_Horizontal", - */ + "UIWidgetAddNodeTest", "UIRichTextTest", "UIFocusTest-HBox", @@ -122,8 +93,28 @@ static const char* s_testArray[] = "UIFocusTest-NestedLayout3", "UIFocusTest-ListView", #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS) - "UIVideoPlayerTest" + "UIVideoPlayerTest", #endif + "UIScale9SpriteTest", + "UIScale9SpriteHierarchialTest", + "UIScale9SpriteTouchTest", + "UIS9BatchNodeBasic", + "UIS9FrameNameSpriteSheet", + "UIS9FrameNameSpriteSheetRotated", + "UIS9BatchNodeScaledNoInsets", + "UIS9FrameNameSpriteSheetScaledNoInsets", + "UIS9FrameNameSpriteSheetRotatedScaledNoInsets", + "UIS9BatchNodeScaleWithCapInsets", + "UIS9FrameNameSpriteSheetInsets", + "UIS9FrameNameSpriteSheetInsetsScaled", + "UIS9FrameNameSpriteSheetRotatedInsets", + "UIS9_TexturePacker", + "UIS9FrameNameSpriteSheetRotatedInsetsScaled", + "UIS9FrameNameSpriteSheetRotatedSetCapInsetLater", + "UIS9CascadeOpacityAndColor", + "UIS9ZOrder", + "UIS9Flip", + "UIS9ChangeAnchorPoint", }; static UISceneManager *sharedInstance = nullptr; @@ -190,7 +181,12 @@ Scene *UISceneManager::currentUIScene() case kUIButtonTest_Title: return UIButtonTest_Title::sceneWithTitle(s_testArray[_currentUISceneId]); - + case kUIButtonTest_RemoveSelf: + return UIButtonTestRemoveSelf::sceneWithTitle(s_testArray[_currentUISceneId]); + case kUIButtonTestSwitchScale9: + return UIButtonTestSwitchScale9::sceneWithTitle(s_testArray[_currentUISceneId]); + case kUIButtonTestZoomScale: + return UIButtonTestZoomScale::sceneWithTitle(s_testArray[_currentUISceneId]); case kUICheckBoxTest: return UICheckBoxTest::sceneWithTitle(s_testArray[_currentUISceneId]); @@ -205,7 +201,8 @@ Scene *UISceneManager::currentUIScene() case kUIImageViewTest_Scale9: return UIImageViewTest_Scale9::sceneWithTitle(s_testArray[_currentUISceneId]); - + case kUIImageViewTest_ContentSize: + return UIImageViewTest_ContentSize::sceneWithTitle(s_testArray[_currentUISceneId]); case kUILoadingBarTest_Left: return UILoadingBarTest_Left::sceneWithTitle(s_testArray[_currentUISceneId]); @@ -251,7 +248,8 @@ Scene *UISceneManager::currentUIScene() return UITextFieldTest_LineWrap::sceneWithTitle(s_testArray[_currentUISceneId]); case kUITextFieldTest_TrueTypeFont: return UITextFieldTest_TrueTypeFont::sceneWithTitle(s_testArray[_currentUISceneId]); - + case kUITextFieldTest_PlaceHolderColor: + return UITextFieldTest_PlaceHolderColor::sceneWithTitle(s_testArray[_currentUISceneId]); case kUILayoutTest: return UILayoutTest::sceneWithTitle(s_testArray[_currentUISceneId]); @@ -293,11 +291,17 @@ Scene *UISceneManager::currentUIScene() case kUIScrollViewTest_ScrollToPercentBothDirection_Bounce: return UIScrollViewTest_ScrollToPercentBothDirection_Bounce::sceneWithTitle(s_testArray[_currentUISceneId]); - + case kUIScrollViewNestTest: + return UIScrollViewNestTest::sceneWithTitle(s_testArray[_currentUISceneId]); case kUIPageViewTest: return UIPageViewTest::sceneWithTitle(s_testArray[_currentUISceneId]); case kUIPageViewButtonTest: return UIPageViewButtonTest::sceneWithTitle(s_testArray[_currentUISceneId]); + case kUIPageViewCustomScrollThreshold: + return UIPageViewCustomScrollThreshold::sceneWithTitle(s_testArray[_currentUISceneId]); + case kUIPageViewTouchPropagationTest: + return UIPageViewTouchPropagationTest::sceneWithTitle(s_testArray[_currentUISceneId]); + case kUIListViewTest_Vertical: return UIListViewTest_Vertical::sceneWithTitle(s_testArray[_currentUISceneId]); @@ -325,6 +329,46 @@ Scene *UISceneManager::currentUIScene() case kUIVideoPlayerTest: return VideoPlayerTest::sceneWithTitle(s_testArray[_currentUISceneId]); #endif + case kUIScale9SpriteTest: + return UIScale9SpriteTest::sceneWithTitle(s_testArray[_currentUISceneId]); + case kUIScale9SpriteHierarchialTest: + return UIScale9SpriteHierarchialTest::sceneWithTitle(s_testArray[_currentUISceneId]); + case kUIScale9SpriteTouchTest: + return UIScale9SpriteTouchTest::sceneWithTitle(s_testArray[_currentUISceneId]); + case kUIS9BatchNodeBasic: + return UIS9BatchNodeBasic::sceneWithTitle(s_testArray[_currentUISceneId]); + case kUIS9FrameNameSpriteSheet: + return UIS9FrameNameSpriteSheet::sceneWithTitle(s_testArray[_currentUISceneId]); + case kUIS9FrameNameSpriteSheetRotated: + return UIS9FrameNameSpriteSheetRotated::sceneWithTitle(s_testArray[_currentUISceneId]); + case kUIS9BatchNodeScaledNoInsets: + return UIS9BatchNodeScaledNoInsets::sceneWithTitle(s_testArray[_currentUISceneId]); + case kUIS9FrameNameSpriteSheetScaledNoInsets: + return UIS9FrameNameSpriteSheetScaledNoInsets::sceneWithTitle(s_testArray[_currentUISceneId]); + case kUIS9FrameNameSpriteSheetRotatedScaledNoInsets: + return UIS9FrameNameSpriteSheetRotatedScaledNoInsets::sceneWithTitle(s_testArray[_currentUISceneId]); + case kUIS9BatchNodeScaleWithCapInsets: + return UIS9BatchNodeScaleWithCapInsets::sceneWithTitle(s_testArray[_currentUISceneId]); + case kUIS9FrameNameSpriteSheetInsets: + return UIS9FrameNameSpriteSheetInsets::sceneWithTitle(s_testArray[_currentUISceneId]); + case kUIS9FrameNameSpriteSheetInsetsScaled: + return UIS9FrameNameSpriteSheetInsetsScaled::sceneWithTitle(s_testArray[_currentUISceneId]); + case kUIS9FrameNameSpriteSheetRotatedInsets: + return UIS9FrameNameSpriteSheetRotatedInsets::sceneWithTitle(s_testArray[_currentUISceneId]); + case kUIS9_TexturePacker: + return UIS9_TexturePacker::sceneWithTitle(s_testArray[_currentUISceneId]); + case kUIS9FrameNameSpriteSheetRotatedInsetsScaled: + return UIS9FrameNameSpriteSheetRotatedInsetsScaled::sceneWithTitle(s_testArray[_currentUISceneId]); + case kUIS9FrameNameSpriteSheetRotatedSetCapInsetLater: + return UIS9FrameNameSpriteSheetRotatedSetCapInsetLater::sceneWithTitle(s_testArray[_currentUISceneId]); + case kUIS9CascadeOpacityAndColor: + return UIS9CascadeOpacityAndColor::sceneWithTitle(s_testArray[_currentUISceneId]); + case kUIS9ZOrder: + return UIS9ZOrder::sceneWithTitle(s_testArray[_currentUISceneId]); + case kUIS9Flip: + return UIS9Flip::sceneWithTitle(s_testArray[_currentUISceneId]); + case kUIS9ChangeAnchorPoint: + return UIS9ChangeAnchorPoint::sceneWithTitle(s_testArray[_currentUISceneId]); } return nullptr; } diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UISceneManager.h b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UISceneManager.h index 0dd94ad395..4361de611f 100644 --- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UISceneManager.h +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UISceneManager.h @@ -35,32 +35,19 @@ enum kUIButtonTest_Scale9, kUIButtonTest_PressedAction, kUIButtonTest_Title, + kUIButtonTest_RemoveSelf, + kUIButtonTestSwitchScale9, + kUIButtonTestZoomScale, kUICheckBoxTest, kUISliderTest, kUISliderTest_Scale9, - /* - kUIPotentiometerTest, - */ - /* - kUISwitchTest_Horizontal, - kUISwitchTest_Vertical, - kUISwitchTest_VerticalAndTitleVertical, - */ kUIImageViewTest, kUIImageViewTest_Scale9, + kUIImageViewTest_ContentSize, kUILoadingBarTest_Left, kUILoadingBarTest_Right, kUILoadingBarTest_Left_Scale9, kUILoadingBarTest_Right_Scale9, - /* - kUIProgressTimerTest_Radial, - kUIProgressTimerTest_Horizontal, - kUIProgressTimerTest_Vertical, - kUIProgressTimerTest_RadialMidpointChanged, - kUIProgressTimerTest_BarVarious, - kUIProgressTimerTest_BarTintAndFade, - kUIProgressTimerTest_WithSpriteFrame, - */ kUITextAtlasTest, kUITextTest, kUITextTest_LineWrap, @@ -73,6 +60,7 @@ enum kUITextFieldTest_Password, kUITextFieldTest_LineWrap, kUITextFieldTest_TrueTypeFont, + kUITextFieldTest_PlaceHolderColor, kUILayoutTest, kUILayoutTest_Color, kUILayoutTest_Gradient, @@ -82,24 +70,18 @@ enum kUILayoutTest_Layout_Linear_Horizontal, kUILayoutTest_Layout_Relative_Align_Parent, kUILayoutTest_Layout_Relative_Location, - /* - kUILayoutTest_Layout_Grid, - */ kUIScrollViewTest_Vertical, kUIScrollViewTest_Horizontal, kUIScrollViewTest_Both, kUIScrollViewTest_ScrollToPercentBothDirection, - kUIScrollViewTest_ScrollToPercentBothDirection_Bounce, + kUIScrollViewTest_ScrollToPercentBothDirection_Bounce, + kUIScrollViewNestTest, kUIPageViewTest, kUIPageViewButtonTest, + kUIPageViewCustomScrollThreshold, + kUIPageViewTouchPropagationTest, kUIListViewTest_Vertical, kUIListViewTest_Horizontal, - /* - kUIGridViewTest_Mode_Column, - kUIGridViewTest_Mode_Row, - kUIPickerViewTest_Vertical, - kUIPickerViewTest_Horizontal, - */ kUIWidgetAddNodeTest, kUIRichTextTest, KUIFocusTest_HBox, @@ -111,6 +93,26 @@ enum #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS) kUIVideoPlayerTest, #endif + kUIScale9SpriteTest, + kUIScale9SpriteHierarchialTest, + kUIScale9SpriteTouchTest, + kUIS9BatchNodeBasic, + kUIS9FrameNameSpriteSheet, + kUIS9FrameNameSpriteSheetRotated, + kUIS9BatchNodeScaledNoInsets, + kUIS9FrameNameSpriteSheetScaledNoInsets, + kUIS9FrameNameSpriteSheetRotatedScaledNoInsets, + kUIS9BatchNodeScaleWithCapInsets, + kUIS9FrameNameSpriteSheetInsets, + kUIS9FrameNameSpriteSheetInsetsScaled, + kUIS9FrameNameSpriteSheetRotatedInsets, + kUIS9_TexturePacker, + kUIS9FrameNameSpriteSheetRotatedInsetsScaled, + kUIS9FrameNameSpriteSheetRotatedSetCapInsetLater, + kUIS9CascadeOpacityAndColor, + kUIS9ZOrder, + kUIS9Flip, + kUIS9ChangeAnchorPoint, kUITestMax }; diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.cpp b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.cpp index d75facfd0e..e73cb4d4e5 100644 --- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.cpp +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.cpp @@ -329,3 +329,99 @@ bool UIScrollViewTest_ScrollToPercentBothDirection_Bounce::init() return false; } + +// UIScrollViewNestTest + +UIScrollViewNestTest::UIScrollViewNestTest() +: _displayValueLabel(nullptr) +{ +} + +UIScrollViewNestTest::~UIScrollViewNestTest() +{ +} + +bool UIScrollViewNestTest::init() +{ + if (UIScene::init()) + { + Size widgetSize = _widget->getContentSize(); + + // Add a label in which the scrollview alert will be displayed + _displayValueLabel = Text::create("Move by vertical direction", "fonts/Marker Felt.ttf", 32); + _displayValueLabel->setAnchorPoint(Vec2(0.5f, -1.0f)); + _displayValueLabel->setPosition(Vec2(widgetSize.width / 2.0f, + widgetSize.height / 2.0f + _displayValueLabel->getContentSize().height * 1.5f)); + _uiLayer->addChild(_displayValueLabel); + + // Add the alert + Text* alert = Text::create("ScrollView vertical", "fonts/Marker Felt.ttf", 30); + alert->setColor(Color3B(159, 168, 176)); + alert->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.075f)); + _uiLayer->addChild(alert); + + Layout* root = static_cast(_uiLayer->getChildByTag(81)); + + Layout* background = dynamic_cast(root->getChildByName("background_Panel")); + + // Create the scrollview by vertical + ui::ScrollView* scrollView = ui::ScrollView::create(); + scrollView->setContentSize(Size(280.0f, 150.0f)); + scrollView->setDirection(ui::ScrollView::Direction::BOTH); + Size backgroundSize = background->getContentSize(); + scrollView->setPosition(Vec2((widgetSize.width - backgroundSize.width) / 2.0f + + (backgroundSize.width - scrollView->getContentSize().width) / 2.0f, + (widgetSize.height - backgroundSize.height) / 2.0f + + (backgroundSize.height - scrollView->getContentSize().height) / 2.0f)); + _uiLayer->addChild(scrollView); + + ImageView* imageView = ImageView::create("cocosui/ccicon.png"); + + float innerWidth = scrollView->getContentSize().width; + float innerHeight = scrollView->getContentSize().height + imageView->getContentSize().height; + + scrollView->setInnerContainerSize(Size(innerWidth, innerHeight)); + + Button* button = Button::create("cocosui/animationbuttonnormal.png", "cocosui/animationbuttonpressed.png"); + button->setPosition(Vec2(innerWidth / 2.0f, scrollView->getInnerContainerSize().height - button->getContentSize().height / 2.0f)); + scrollView->addChild(button); + + Button* titleButton = Button::create("cocosui/backtotopnormal.png", "cocosui/backtotoppressed.png"); + titleButton->setTitleText("Title Button"); + titleButton->setPosition(Vec2(innerWidth / 2.0f, button->getBottomBoundary() - button->getContentSize().height)); + scrollView->addChild(titleButton); + + Button* button_scale9 = Button::create("cocosui/button.png", "cocosui/buttonHighlighted.png"); + button_scale9->setScale9Enabled(true); + button_scale9->setContentSize(Size(100.0f, button_scale9->getVirtualRendererSize().height)); + button_scale9->setPosition(Vec2(innerWidth / 2.0f, titleButton->getBottomBoundary() - titleButton->getContentSize().height)); + scrollView->addChild(button_scale9); + + imageView->setPosition(Vec2(innerWidth / 2.0f, imageView->getContentSize().height / 2.0f)); + scrollView->addChild(imageView); + + + + // Create the scrollview by horizontal + ui::ScrollView* sc = ui::ScrollView::create(); + sc->setBackGroundColor(Color3B::GREEN); + sc->setBackGroundColorType(Layout::BackGroundColorType::SOLID); + sc->setBounceEnabled(true); + sc->setDirection(ui::ScrollView::Direction::BOTH); + sc->setInnerContainerSize(Size(480, 320)); + sc->setContentSize(Size(100,100)); + sc->setPropagateTouchEvents(false); + sc->setPosition(Vec2(180,100)); + sc->scrollToPercentBothDirection(Vec2(50, 50), 1, true); + ImageView* iv = ImageView::create("cocosui/Hello.png"); + iv->setPosition(Vec2(240, 160)); + sc->addChild(iv); + + + scrollView->addChild(sc); + + return true; + } + + return false; +} diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.h b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.h index ec509b6851..bbb78949d3 100644 --- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.h +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.h @@ -87,4 +87,16 @@ protected: Text* _displayValueLabel; }; +class UIScrollViewNestTest : public UIScene +{ +public: + UIScrollViewNestTest(); + ~UIScrollViewNestTest(); + bool init(); + +protected: + UI_SCENE_CREATE_FUNC(UIScrollViewNestTest) + Text* _displayValueLabel; +}; + #endif /* defined(__TestCpp__UIScrollViewTest__) */ diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.cpp b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.cpp index 29e14b8389..7d3917246e 100644 --- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.cpp +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.cpp @@ -32,7 +32,7 @@ bool UITextFieldTest::init() _uiLayer->addChild(alert); // Create the textfield - TextField* textField = TextField::create("input words here","fonts/Marker Felt.ttf",30); + TextField* textField = TextField::create("input words here","Arial",30); textField->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f)); textField->addEventListener(CC_CALLBACK_2(UITextFieldTest::textFieldEvent, this)); @@ -110,7 +110,7 @@ bool UITextFieldTest_MaxLength::init() _uiLayer->addChild(alert); // Create the textfield - TextField* textField = TextField::create("input words here","fonts/Marker Felt.ttf",30); + TextField* textField = TextField::create("input words here","Arial",30); textField->setMaxLengthEnabled(true); textField->setMaxLength(3); textField->setPosition(Vec2(screenSize.width / 2.0f, screenSize.height / 2.0f)); @@ -194,7 +194,7 @@ bool UITextFieldTest_Password::init() _uiLayer->addChild(alert); // Create the textfield - TextField* textField = TextField::create("input password here","fonts/Marker Felt.ttf",30); + TextField* textField = TextField::create("input password here","Arial",30); textField->setPasswordEnabled(true); textField->setPasswordStyleText("*"); textField->setPosition(Vec2(screenSize.width / 2.0f, screenSize.height / 2.0f)); @@ -276,7 +276,8 @@ bool UITextFieldTest_LineWrap::init() TextField* textField = TextField::create("input words here","fonts/Marker Felt.ttf",30); textField->ignoreContentAdaptWithSize(false); ((Label*)(textField->getVirtualRenderer()))->setLineBreakWithoutSpace(true); - textField->setContentSize(Size(240, 70)); + textField->setContentSize(Size(240, 170)); + textField->setText("input words here"); textField->setTextHorizontalAlignment(TextHAlignment::CENTER); textField->setTextVerticalAlignment(TextVAlignment::CENTER); textField->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f)); @@ -297,7 +298,7 @@ void UITextFieldTest_LineWrap::textFieldEvent(Ref *pSender, TextField::EventType TextField* textField = dynamic_cast(pSender); Size widgetSize = _widget->getContentSize(); textField->runAction(CCMoveTo::create(0.225f, - Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f + textField->getContentSize().height / 2))); + Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f + 30))); textField->setTextHorizontalAlignment(TextHAlignment::LEFT); textField->setTextVerticalAlignment(TextVAlignment::TOP); @@ -406,3 +407,80 @@ void UITextFieldTest_TrueTypeFont::textFieldEvent(Ref *pSender, TextField::Event break; } } + +// UITextFieldTest_PlaceHolderColor +UITextFieldTest_PlaceHolderColor::UITextFieldTest_PlaceHolderColor() +: _displayValueLabel(nullptr) +{ + +} + +UITextFieldTest_PlaceHolderColor::~UITextFieldTest_PlaceHolderColor() +{ +} + +bool UITextFieldTest_PlaceHolderColor::init() +{ + if (UIScene::init()) + { + Size widgetSize = _widget->getContentSize(); + + // Add a label in which the textfield events will be displayed + _displayValueLabel = Text::create("Set place hold color","fonts/Marker Felt.ttf",32); + _displayValueLabel->setAnchorPoint(Vec2(0.5f, -1.0f)); + _displayValueLabel->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f + _displayValueLabel->getContentSize().height * 1.5f)); + _uiLayer->addChild(_displayValueLabel); + + // Add the alert + Text* alert = Text::create("TextField","fonts/Marker Felt.ttf",30); + alert->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f - alert->getContentSize().height * 3.075f)); + _uiLayer->addChild(alert); + + // Create the textfield + TextField* textField = TextField::create("input words here","Arial",30); + textField->setPlaceHolder("input text here"); + textField->setPlaceHolderColor(Color4B::GREEN); + textField->setTextColor(Color4B::RED); + textField->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f)); + textField->addEventListener(CC_CALLBACK_2(UITextFieldTest_PlaceHolderColor::textFieldEvent, this)); + _uiLayer->addChild(textField); + return true; + } + return false; +} + +void UITextFieldTest_PlaceHolderColor::textFieldEvent(Ref *pSender, TextField::EventType type) +{ + switch (type) + { + case TextField::EventType::ATTACH_WITH_IME: + { + TextField* textField = dynamic_cast(pSender); + Size screenSize = CCDirector::getInstance()->getWinSize(); + textField->runAction(CCMoveTo::create(0.225f, + Vec2(screenSize.width / 2.0f, screenSize.height / 2.0f + textField->getContentSize().height / 2.0f))); + _displayValueLabel->setString(String::createWithFormat("attach with IME")->getCString()); + } + break; + + case TextField::EventType::DETACH_WITH_IME: + { + TextField* textField = dynamic_cast(pSender); + Size screenSize = CCDirector::getInstance()->getWinSize(); + textField->runAction(CCMoveTo::create(0.175f, Vec2(screenSize.width / 2.0f, screenSize.height / 2.0f))); + _displayValueLabel->setString(String::createWithFormat("detach with IME")->getCString()); + } + break; + + case TextField::EventType::INSERT_TEXT: + _displayValueLabel->setString(String::createWithFormat("insert words")->getCString()); + break; + + case TextField::EventType::DELETE_BACKWARD: + _displayValueLabel->setString(String::createWithFormat("delete word")->getCString()); + break; + + default: + break; + } +} diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.h b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.h index e44798cb7f..6c62bc14d2 100644 --- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.h +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.h @@ -91,4 +91,17 @@ protected: UI_SCENE_CREATE_FUNC(UITextFieldTest_TrueTypeFont) Text* _displayValueLabel; }; + +class UITextFieldTest_PlaceHolderColor : public UIScene +{ +public: + UITextFieldTest_PlaceHolderColor(); + ~UITextFieldTest_PlaceHolderColor(); + bool init(); + void textFieldEvent(Ref* pSender, TextField::EventType type); + +protected: + UI_SCENE_CREATE_FUNC(UITextFieldTest_PlaceHolderColor) + Text* _displayValueLabel; +}; #endif /* defined(__TestCpp__UITextFieldTest__) */ diff --git a/tests/cpp-tests/Classes/controller.cpp b/tests/cpp-tests/Classes/controller.cpp index 84638e11da..5d7c834f06 100644 --- a/tests/cpp-tests/Classes/controller.cpp +++ b/tests/cpp-tests/Classes/controller.cpp @@ -76,6 +76,7 @@ Controller g_aTestNames[] = { { "Node: Spine", []() { return new SpineTestScene(); } }, { "Node: Sprite", [](){return new SpriteTestScene(); } }, { "Node: Sprite3D", [](){ return new Sprite3DTestScene(); }}, + { "Node: Camera 3D Test", [](){ return new Camera3DTestScene(); }}, { "Node: TileMap", [](){return new TileMapTestScene(); } }, #if CC_TARGET_PLATFORM != CC_PLATFORM_WP8 { "Node: FastTileMap", [](){return new TileMapTestSceneNew(); } }, @@ -89,8 +90,10 @@ Controller g_aTestNames[] = { { "ReleasePool", [](){ return new ReleasePoolTestScene(); } }, { "Rotate World", [](){return new RotateWorldTestScene(); } }, { "Scheduler", [](){return new SchedulerTestScene(); } }, +#if CC_TARGET_PLATFORM != CC_PLATFORM_WP8 { "Shader - Basic", []() { return new ShaderTestScene(); } }, { "Shader - Sprite", []() { return new ShaderTestScene2(); } }, +#endif { "Texture2D", [](){return new TextureTestScene(); } }, { "TextureCache", []() { return new TextureCacheTestScene(); } }, { "TexturePacker Encryption", []() { return new TextureAtlasEncryptionTestScene(); } }, diff --git a/tests/cpp-tests/Classes/testBasic.h b/tests/cpp-tests/Classes/testBasic.h index d86aed6e26..02fb9f32ad 100644 --- a/tests/cpp-tests/Classes/testBasic.h +++ b/tests/cpp-tests/Classes/testBasic.h @@ -2,6 +2,8 @@ #define _TEST_BASIC_H_ #include "cocos2d.h" +#include "3d/cocos3d.h" +#include "audio/include/SimpleAudioEngine.h" #include "VisibleRect.h" USING_NS_CC; diff --git a/tests/cpp-tests/Classes/tests.h b/tests/cpp-tests/Classes/tests.h index 6c1eb0c85d..5f0f139b23 100644 --- a/tests/cpp-tests/Classes/tests.h +++ b/tests/cpp-tests/Classes/tests.h @@ -69,5 +69,6 @@ #include "ReleasePoolTest/ReleasePoolTest.h" #include "Sprite3DTest/Sprite3DTest.h" +#include "Camera3DTest/Camera3DTest.h" #endif diff --git a/tests/cpp-tests/Resources/CocosBuilderExample.ccbresourcelog b/tests/cpp-tests/Resources/CocosBuilderExample.ccbresourcelog index 9f6795b5a0..10e21a680c 100755 --- a/tests/cpp-tests/Resources/CocosBuilderExample.ccbresourcelog +++ b/tests/cpp-tests/Resources/CocosBuilderExample.ccbresourcelog @@ -118,7 +118,7 @@ fonts/Marker Felt.ttf fonts/markerFelt.fnt fonts/markerFelt.png fonts/Paint Boy.ttf -fonts/Schwarzwald Regular.ttf +fonts/Schwarzwald.ttf fonts/Scissor Cuts.ttf fonts/tahoma.ttf fonts/Thonburi.ttf diff --git a/tests/cpp-tests/Resources/Shaders3D/SkinnedOutline.vert b/tests/cpp-tests/Resources/Shaders3D/SkinnedOutline.vert new file mode 100644 index 0000000000..fdf40e7a45 --- /dev/null +++ b/tests/cpp-tests/Resources/Shaders3D/SkinnedOutline.vert @@ -0,0 +1,75 @@ +attribute vec3 a_position; +attribute vec3 a_normal; +attribute vec4 a_blendWeight; +attribute vec4 a_blendIndex; + +attribute vec2 a_texCoord; +uniform float OutlineWidth; + +const int SKINNING_JOINT_COUNT = 60; +// Uniforms +uniform vec4 u_matrixPalette[SKINNING_JOINT_COUNT * 3]; + +// Varyings +varying vec2 TextureCoordOut; + +vec4 SkinnedVec3(vec4 vec) +{ + float blendWeight = a_blendWeight[0]; + + int matrixIndex = int (a_blendIndex[0]) * 3; + vec4 matrixPalette1 = u_matrixPalette[matrixIndex] * blendWeight; + vec4 matrixPalette2 = u_matrixPalette[matrixIndex + 1] * blendWeight; + vec4 matrixPalette3 = u_matrixPalette[matrixIndex + 2] * blendWeight; + + + blendWeight = a_blendWeight[1]; + if (blendWeight > 0.0) + { + matrixIndex = int(a_blendIndex[1]) * 3; + matrixPalette1 += u_matrixPalette[matrixIndex] * blendWeight; + matrixPalette2 += u_matrixPalette[matrixIndex + 1] * blendWeight; + matrixPalette3 += u_matrixPalette[matrixIndex + 2] * blendWeight; + } + + + blendWeight = a_blendWeight[2]; + if (blendWeight > 0.0) + { + matrixIndex = int(a_blendIndex[2]) * 3; + matrixPalette1 += u_matrixPalette[matrixIndex] * blendWeight; + matrixPalette2 += u_matrixPalette[matrixIndex + 1] * blendWeight; + matrixPalette3 += u_matrixPalette[matrixIndex + 2] * blendWeight; + } + + + blendWeight = a_blendWeight[3]; + if (blendWeight > 0.0) + { + matrixIndex = int(a_blendIndex[3]) * 3; + matrixPalette1 += u_matrixPalette[matrixIndex] * blendWeight; + matrixPalette2 += u_matrixPalette[matrixIndex + 1] * blendWeight; + matrixPalette3 += u_matrixPalette[matrixIndex + 2] * blendWeight; + } + + + vec4 _skinnedPosition; + vec4 postion = vec; + _skinnedPosition.x = dot(postion, matrixPalette1); + _skinnedPosition.y = dot(postion, matrixPalette2); + _skinnedPosition.z = dot(postion, matrixPalette3); + _skinnedPosition.w = postion.w; + + return _skinnedPosition; +} + +void main() +{ + vec4 pos = CC_MVPMatrix * SkinnedVec3(vec4(a_position,1.0)); + + vec4 normalproj = CC_MVPMatrix * vec4(SkinnedVec3(vec4(a_normal,0.0)).xyz, 0); + normalproj = normalize(normalproj); + pos.xy += normalproj.xy * (OutlineWidth * (pos.z * 0.5 + 0.5)); + + gl_Position = pos; +} diff --git a/tests/cpp-tests/Resources/Sprite3DTest/arx.png b/tests/cpp-tests/Resources/Sprite3DTest/arx.png new file mode 100755 index 0000000000..26c82f9d80 Binary files /dev/null and b/tests/cpp-tests/Resources/Sprite3DTest/arx.png differ diff --git a/tests/cpp-tests/Resources/Sprite3DTest/axe.c3b b/tests/cpp-tests/Resources/Sprite3DTest/axe.c3b new file mode 100755 index 0000000000..94ec4488f3 Binary files /dev/null and b/tests/cpp-tests/Resources/Sprite3DTest/axe.c3b differ diff --git a/tests/cpp-tests/Resources/Sprite3DTest/girl.c3t b/tests/cpp-tests/Resources/Sprite3DTest/girl.c3t deleted file mode 100644 index a154817fb5..0000000000 --- a/tests/cpp-tests/Resources/Sprite3DTest/girl.c3t +++ /dev/null @@ -1,20431 +0,0 @@ -{ - "version": "1.2", - "mesh": [ - { - "version": "1.2", - "attributes": [{ - "size": 3, - "type": "GL_FLOAT", - "attribute": "VERTEX_ATTRIB_POSITION" - }, { - "size": 3, - "type": "GL_FLOAT", - "attribute": "VERTEX_ATTRIB_NORMAL" - }, { - "size": 2, - "type": "GL_FLOAT", - "attribute": "VERTEX_ATTRIB_TEX_COORD" - }, { - "size": 4, - "type": "GL_FLOAT", - "attribute": "VERTEX_ATTRIB_BLEND_WEIGHT" - }, { - "size": 4, - "type": "GL_FLOAT", - "attribute": "VERTEX_ATTRIB_BLEND_INDEX" - }], - "body": [ - { - "vertices": [ - 3.081790, -4.465400, 137.182205, -0.158307, 0.978843, -0.129634, 0.050904, 0.832811, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -4.962190, 137.194473, -0.158307, 0.978843, -0.129634, 0.005317, 0.832365, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -4.633190, 139.678696, -0.158307, 0.978843, -0.129634, 0.005730, 0.868711, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -4.633190, 139.678696, -0.140495, 0.984252, -0.107283, 0.005730, 0.868711, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 3.322990, -4.168590, 139.589386, -0.140495, 0.984252, -0.107283, 0.054742, 0.867255, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 3.081790, -4.465400, 137.182205, -0.140495, 0.984252, -0.107283, 0.050904, 0.832811, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 1.546000, -4.618300, 135.609192, -0.124085, 0.987877, 0.093287, 0.028085, 0.810025, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -4.805690, 135.537186, -0.124085, 0.987877, 0.093287, 0.005020, 0.808898, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -4.962190, 137.194473, -0.124085, 0.987877, 0.093287, 0.005317, 0.832365, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -4.962190, 137.194473, -0.158640, 0.985567, 0.059087, 0.005317, 0.832365, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 3.081790, -4.465400, 137.182205, -0.158640, 0.985567, 0.059087, 0.050904, 0.832811, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 1.546000, -4.618300, 135.609192, -0.158640, 0.985567, 0.059087, 0.028085, 0.810025, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 1.126170, -4.287700, 134.387192, -0.125786, 0.944844, 0.302404, 0.022679, 0.791759, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -4.430300, 134.364304, -0.125786, 0.944844, 0.302404, 0.004767, 0.791829, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -4.805690, 135.537186, -0.125786, 0.944844, 0.302404, 0.005020, 0.808898, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -4.805690, 135.537186, -0.128544, 0.945272, 0.299896, 0.005020, 0.808898, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 1.546000, -4.618300, 135.609192, -0.128544, 0.945272, 0.299896, 0.028085, 0.810025, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 1.126170, -4.287700, 134.387192, -0.128544, 0.945272, 0.299896, 0.022679, 0.791759, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 1.126170, -4.287700, 134.387192, -0.171941, 0.954444, 0.243869, 0.022679, 0.791759, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 1.524770, -3.924290, 133.245926, -0.171941, 0.954445, 0.243869, 0.029939, 0.775120, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -4.219590, 133.326614, -0.171941, 0.954444, 0.243869, 0.004524, 0.777647, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -4.219590, 133.326614, -0.127097, 0.972053, 0.197382, 0.004524, 0.777647, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -4.430300, 134.364304, -0.127097, 0.972053, 0.197382, 0.004767, 0.791829, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 1.126170, -4.287700, 134.387192, -0.127097, 0.972053, 0.197382, 0.022679, 0.791759, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -4.219590, 133.326614, -0.196836, 0.947517, -0.251925, 0.004524, 0.777647, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 1.524770, -3.924290, 133.245926, -0.196836, 0.947517, -0.251925, 0.029939, 0.775120, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -4.408500, 132.616104, -0.196836, 0.947517, -0.251925, 0.004298, 0.769247, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -4.931500, 131.660416, -0.166413, 0.865001, -0.473371, 0.003874, 0.755120, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -4.408500, 132.616104, -0.166413, 0.865001, -0.473371, 0.004298, 0.769247, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.458490, -4.837390, 131.671204, -0.166413, 0.865001, -0.473371, 0.011353, 0.754962, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.324280, -5.527690, 130.985107, -0.222879, 0.675220, -0.703138, 0.005673, 0.744370, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -5.648490, 130.971893, -0.222879, 0.675220, -0.703138, 0.002040, 0.743056, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -4.931500, 131.660416, -0.222879, 0.675220, -0.703138, 0.003874, 0.755120, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -4.931500, 131.660416, -0.129808, 0.711561, -0.690529, 0.003874, 0.755120, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.458490, -4.837390, 131.671204, -0.129808, 0.711561, -0.690529, 0.011353, 0.754962, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.324280, -5.527690, 130.985107, -0.129808, 0.711561, -0.690529, 0.005673, 0.744370, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.319690, -5.644000, 130.523499, -0.224172, 0.962908, -0.150185, 0.006982, 0.738285, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -5.719690, 130.515396, -0.224172, 0.962908, -0.150185, 0.002238, 0.737315, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -5.648490, 130.971893, -0.224172, 0.962908, -0.150185, 0.002040, 0.743056, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -5.648490, 130.971893, -0.331789, 0.915539, -0.227386, 0.002040, 0.743056, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.324280, -5.527690, 130.985107, -0.331789, 0.915539, -0.227386, 0.005673, 0.744370, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.319690, -5.644000, 130.523499, -0.331789, 0.915539, -0.227386, 0.006982, 0.738285, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.319690, -5.644000, 130.523499, -0.093743, 0.788947, 0.607269, 0.006982, 0.738285, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.415790, -5.010390, 129.715164, -0.093743, 0.788947, 0.607269, 0.009010, 0.723979, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -5.056200, 129.710495, -0.093743, 0.788947, 0.607269, 0.003657, 0.723406, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -5.056200, 129.710495, -0.194996, 0.756821, 0.623857, 0.003657, 0.723406, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -5.719690, 130.515396, -0.194996, 0.756821, 0.623857, 0.002238, 0.737315, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.319690, -5.644000, 130.523499, -0.194996, 0.756821, 0.623857, 0.006982, 0.738285, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.523290, -4.700200, 128.863907, -0.096597, 0.937434, 0.334493, 0.010640, 0.711812, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -4.718400, 128.763794, -0.096597, 0.937434, 0.334493, 0.003840, 0.709965, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -5.056200, 129.710495, -0.096597, 0.937434, 0.334493, 0.003657, 0.723406, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -5.056200, 129.710495, -0.107082, 0.938437, 0.328434, 0.003657, 0.723406, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.415790, -5.010390, 129.715164, -0.107082, 0.938437, 0.328434, 0.009010, 0.723979, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.523290, -4.700200, 128.863907, -0.107082, 0.938437, 0.328434, 0.010640, 0.711812, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.393700, -4.105790, 128.500107, -0.082351, 0.438202, 0.895096, 0.010120, 0.702087, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -4.168900, 128.494781, -0.082351, 0.438202, 0.895096, 0.003879, 0.702104, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -4.718400, 128.763794, -0.082351, 0.438202, 0.895096, 0.003840, 0.709965, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -4.718400, 128.763794, -0.180606, 0.484496, 0.855947, 0.003840, 0.709965, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.523290, -4.700200, 128.863907, -0.180606, 0.484495, 0.855947, 0.010640, 0.711812, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.393700, -4.105790, 128.500107, -0.180606, 0.484495, 0.855947, 0.010120, 0.702087, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.393700, -4.105790, 128.500107, -0.123667, 0.965240, 0.230257, 0.010120, 0.702087, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.501290, -4.006790, 128.142883, -0.123667, 0.965240, 0.230258, 0.011487, 0.697451, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -4.069800, 128.137787, -0.123667, 0.965240, 0.230258, 0.003880, 0.697663, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -4.069800, 128.137787, -0.156138, 0.951745, 0.264200, 0.003880, 0.697663, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -4.168900, 128.494781, -0.156138, 0.951745, 0.264200, 0.003879, 0.702104, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.393700, -4.105790, 128.500107, -0.156138, 0.951745, 0.264200, 0.010120, 0.702087, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.501290, -4.006790, 128.142883, -0.036616, 0.640376, 0.767188, 0.011487, 0.697451, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.440800, -3.667390, 127.856697, -0.036616, 0.640376, 0.767188, 0.011019, 0.691563, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -3.690200, 127.854698, -0.036616, 0.640376, 0.767188, 0.003864, 0.691543, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -3.690200, 127.854698, -0.083006, 0.595757, 0.798864, 0.003864, 0.691543, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -4.069800, 128.137787, -0.083006, 0.595757, 0.798864, 0.003880, 0.697663, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.501290, -4.006790, 128.142883, -0.083006, 0.595757, 0.798864, 0.011487, 0.697451, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.366680, -3.459500, 127.770699, -0.000660, 0.343060, 0.939313, 0.010106, 0.689005, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -3.459600, 127.770477, -0.000660, 0.343060, 0.939313, 0.003848, 0.688999, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -3.690200, 127.854698, -0.000660, 0.343060, 0.939313, 0.003864, 0.691543, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -3.690200, 127.854698, -0.023605, 0.374953, 0.926743, 0.003864, 0.691543, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.440800, -3.667390, 127.856697, -0.023605, 0.374953, 0.926743, 0.011019, 0.691563, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.366680, -3.459500, 127.770699, -0.023605, 0.374953, 0.926743, 0.010106, 0.689005, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.366680, -3.459500, 127.770699, -0.083572, 0.774253, 0.627334, 0.010106, 0.689005, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.945100, -2.883690, 127.137093, -0.083572, 0.774253, 0.627334, 0.020759, 0.677651, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -2.836700, 126.953194, -0.083572, 0.774253, 0.627334, 0.003738, 0.674634, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -2.836700, 126.953194, -0.000582, 0.795334, 0.606171, 0.003738, 0.674634, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -3.459600, 127.770477, -0.000582, 0.795334, 0.606171, 0.003848, 0.688999, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.366680, -3.459500, 127.770699, -0.000582, 0.795334, 0.606171, 0.010106, 0.689005, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.918600, -2.280990, 126.055702, -0.197479, 0.911032, 0.361971, 0.021414, 0.660122, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -2.367990, 125.773514, -0.197479, 0.911032, 0.361971, 0.003607, 0.657195, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -2.836700, 126.953194, -0.197479, 0.911032, 0.361971, 0.003738, 0.674634, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -2.836700, 126.953194, -0.051444, 0.871802, 0.487149, 0.003738, 0.674634, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.945100, -2.883690, 127.137093, -0.051444, 0.871802, 0.487149, 0.020759, 0.677651, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.918600, -2.280990, 126.055702, -0.051444, 0.871802, 0.487149, 0.021414, 0.660122, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.918600, -2.280990, 126.055702, -0.213351, 0.103824, 0.971443, 0.021414, 0.660122, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.882300, -0.362500, 125.842690, -0.213351, 0.103824, 0.971443, 0.031807, 0.633193, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -0.661690, 125.680893, -0.213351, 0.103824, 0.971443, 0.003411, 0.632502, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -0.661690, 125.680893, -0.297732, 0.051744, 0.953246, 0.003411, 0.632502, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -2.367990, 125.773514, -0.297732, 0.051744, 0.953246, 0.003607, 0.657195, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.918600, -2.280990, 126.055702, -0.297732, 0.051744, 0.953246, 0.021414, 0.660122, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.882300, -0.362500, 125.842690, -0.093286, -0.207515, 0.973774, 0.654883, 0.841062, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 1.828770, 3.733800, 126.806297, -0.093286, -0.207515, 0.973774, 0.688083, 0.836980, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, 3.111500, 126.498489, -0.093286, -0.207515, 0.973774, 0.676609, 0.819210, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, 3.111500, 126.498489, -0.106795, -0.210560, 0.971730, 0.676609, 0.819210, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -0.661690, 125.680893, -0.106795, -0.210560, 0.971730, 0.652331, 0.838118, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.882300, -0.362500, 125.842690, -0.106795, -0.210560, 0.971730, 0.654883, 0.841062, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 2.153870, 4.774090, 122.373901, -0.444857, 0.893656, -0.058994, 0.722084, 0.813841, 0.900000, 0.100000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000, 0.000000, - 0.000000, 3.684200, 122.105690, -0.444857, 0.893657, -0.058994, 0.709467, 0.793621, 0.700000, 0.300000, 0.000000, 0.000000, 1.000000, 2.000000, 0.000000, 0.000000, - 0.000000, 3.835590, 124.398987, -0.444857, 0.893657, -0.058994, 0.692418, 0.806898, 0.500000, 0.500000, 0.000000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000, - 0.000000, 3.835590, 124.398987, -0.339373, 0.937765, 0.073639, 0.692418, 0.806898, 0.500000, 0.500000, 0.000000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000, - 1.840100, 4.478890, 124.687103, -0.339373, 0.937765, 0.073639, 0.704178, 0.824880, 0.500000, 0.500000, 0.000000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000, - 2.153870, 4.774090, 122.373901, -0.339373, 0.937765, 0.073639, 0.722084, 0.813841, 0.900000, 0.100000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -3.155600, 143.175095, -0.147075, 0.907804, -0.392760, 0.006335, 0.925455, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 3.589200, -2.677900, 142.935196, -0.147075, 0.907804, -0.392760, 0.064197, 0.920673, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 3.322990, -4.168590, 139.589386, -0.147075, 0.907804, -0.392760, 0.054742, 0.867255, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 3.322990, -4.168590, 139.589386, -0.137917, 0.912321, -0.385550, 0.054742, 0.867255, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -4.633190, 139.678696, -0.137917, 0.912321, -0.385550, 0.005730, 0.868711, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -3.155600, 143.175095, -0.137917, 0.912321, -0.385550, 0.006335, 0.925455, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -0.028590, 147.132431, -0.167580, 0.762669, -0.624703, 0.007055, 0.995545, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 3.681690, 0.370280, 146.631760, -0.167580, 0.762669, -0.624702, 0.081111, 0.984505, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 3.589200, -2.677900, 142.935196, -0.167580, 0.762669, -0.624702, 0.064197, 0.920673, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 3.589200, -2.677900, 142.935196, -0.144339, 0.776397, -0.613494, 0.064197, 0.920673, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -3.155600, 143.175095, -0.144339, 0.776397, -0.613494, 0.006335, 0.925455, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -0.028590, 147.132431, -0.144339, 0.776397, -0.613493, 0.007055, 0.995545, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 1.022790, -4.283705, 128.714615, -0.125986, 0.549968, 0.825629, 0.018068, 0.709414, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.893890, -3.851590, 128.407104, -0.125986, 0.549968, 0.825628, 0.018568, 0.700107, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.393700, -4.105790, 128.500107, -0.125986, 0.549968, 0.825628, 0.010120, 0.702087, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.393700, -4.105790, 128.500107, -0.153403, 0.491300, 0.857375, 0.010120, 0.702087, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.523290, -4.700200, 128.863907, -0.153403, 0.491300, 0.857375, 0.010640, 0.711812, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 1.022790, -4.283705, 128.714615, -0.153403, 0.491300, 0.857375, 0.018068, 0.709414, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 1.438590, -3.899695, 128.557098, -0.194676, 0.473717, 0.858891, 0.025562, 0.706482, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 1.326770, -3.593300, 128.362762, -0.194676, 0.473717, 0.858891, 0.025948, 0.698831, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.893890, -3.851590, 128.407104, -0.194676, 0.473718, 0.858891, 0.018568, 0.700107, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.893890, -3.851590, 128.407104, -0.180295, 0.534040, 0.826011, 0.018568, 0.700107, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 1.022790, -4.283705, 128.714615, -0.180295, 0.534040, 0.826011, 0.018068, 0.709414, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 1.438590, -3.899695, 128.557098, -0.180295, 0.534040, 0.826011, 0.025562, 0.706482, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.893890, -3.851590, 128.407104, -0.349605, 0.936399, -0.030559, 0.018568, 0.700107, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.926700, -3.846390, 128.191086, -0.349605, 0.936399, -0.030559, 0.018344, 0.697470, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.501290, -4.006790, 128.142883, -0.349605, 0.936399, -0.030559, 0.011487, 0.697451, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.501290, -4.006790, 128.142883, -0.432470, 0.893960, 0.117496, 0.011487, 0.697451, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.393700, -4.105790, 128.500107, -0.432470, 0.893960, 0.117496, 0.010120, 0.702087, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.893890, -3.851590, 128.407104, -0.432470, 0.893960, 0.117496, 0.018568, 0.700107, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.926700, -3.846390, 128.191086, -0.515899, 0.854699, -0.057783, 0.018344, 0.697470, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.893890, -3.851590, 128.407104, -0.515899, 0.854699, -0.057783, 0.018568, 0.700107, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 1.326770, -3.593300, 128.362762, -0.515899, 0.854699, -0.057783, 0.025948, 0.698831, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.501290, -4.006790, 128.142883, -0.322620, 0.648431, 0.689532, 0.011487, 0.697451, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.926700, -3.846390, 128.191086, -0.322620, 0.648431, 0.689532, 0.018344, 0.697470, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.904100, -3.598400, 127.947304, -0.322620, 0.648431, 0.689532, 0.018519, 0.693026, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.904100, -3.598400, 127.947304, -0.238672, 0.600789, 0.762947, 0.018519, 0.693026, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.440800, -3.667390, 127.856697, -0.238672, 0.600789, 0.762947, 0.011019, 0.691563, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.501290, -4.006790, 128.142883, -0.238672, 0.600789, 0.762947, 0.011487, 0.697451, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.904100, -3.598400, 127.947304, -0.595562, 0.534889, 0.599333, 0.018519, 0.693026, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.926700, -3.846390, 128.191086, -0.595562, 0.534889, 0.599333, 0.018344, 0.697470, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 1.326770, -3.593300, 128.362762, -0.595562, 0.534889, 0.599333, 0.025948, 0.698831, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.324280, -5.527690, 130.985107, -0.844638, 0.531256, -0.065979, 0.005673, 0.744370, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.700900, -4.941500, 130.883698, -0.844638, 0.531256, -0.065979, 0.014018, 0.741843, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.692600, -5.011590, 130.425598, -0.844638, 0.531256, -0.065979, 0.013973, 0.734840, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.692600, -5.011590, 130.425598, -0.863361, 0.491261, -0.115197, 0.013973, 0.734840, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.319690, -5.644000, 130.523499, -0.863361, 0.491261, -0.115197, 0.006982, 0.738285, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.324280, -5.527690, 130.985107, -0.863361, 0.491261, -0.115197, 0.005673, 0.744370, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.324280, -5.527690, 130.985107, -0.822194, 0.473634, -0.315703, 0.005673, 0.744370, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.458490, -4.837390, 131.671204, -0.822194, 0.473634, -0.315703, 0.011353, 0.754962, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.700900, -4.941500, 130.883698, -0.822194, 0.473634, -0.315703, 0.014018, 0.741843, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.415790, -5.010390, 129.715164, -0.796725, 0.517993, 0.311307, 0.009010, 0.723979, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.319690, -5.644000, 130.523499, -0.796725, 0.517993, 0.311307, 0.006982, 0.738285, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.692600, -5.011590, 130.425598, -0.796725, 0.517993, 0.311307, 0.013973, 0.734840, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.523290, -4.700200, 128.863907, -0.460924, 0.850947, 0.251869, 0.010640, 0.711812, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.415790, -5.010390, 129.715164, -0.460924, 0.850947, 0.251869, 0.009010, 0.723979, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 1.422100, -4.421100, 129.565796, -0.460924, 0.850947, 0.251869, 0.025325, 0.721688, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 1.422100, -4.421100, 129.565796, -0.580139, 0.727397, 0.366514, 0.025325, 0.721688, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 2.008100, -3.376790, 128.420776, -0.580139, 0.727396, 0.366514, 0.036674, 0.700049, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 1.438590, -3.899695, 128.557098, -0.580139, 0.727396, 0.366514, 0.025562, 0.706482, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 1.326770, -3.593300, 128.362762, -0.220447, 0.463796, 0.858077, 0.025948, 0.698831, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 1.438590, -3.899695, 128.557098, -0.220447, 0.463796, 0.858077, 0.025562, 0.706482, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 2.008100, -3.376790, 128.420776, -0.220447, 0.463796, 0.858077, 0.036674, 0.700049, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 2.008100, -3.376790, 128.420776, -0.395877, 0.698502, 0.596135, 0.036674, 0.700049, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.945100, -2.883690, 127.137093, -0.395877, 0.698502, 0.596135, 0.020759, 0.677651, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.904100, -3.598400, 127.947304, -0.395877, 0.698502, 0.596135, 0.018519, 0.693026, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.904100, -3.598400, 127.947304, -0.311887, 0.899406, 0.306260, 0.018519, 0.693026, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 1.326770, -3.593300, 128.362762, -0.311887, 0.899406, 0.306260, 0.025948, 0.698831, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 2.008100, -3.376790, 128.420776, -0.311887, 0.899406, 0.306259, 0.036674, 0.700049, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.366680, -3.459500, 127.770699, -0.226123, 0.302425, 0.925963, 0.010106, 0.689005, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.440800, -3.667390, 127.856697, -0.226123, 0.302425, 0.925963, 0.011019, 0.691563, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.904100, -3.598400, 127.947304, -0.226123, 0.302425, 0.925963, 0.018519, 0.693026, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.945100, -2.883690, 127.137093, -0.023192, 0.750302, 0.660689, 0.020759, 0.677651, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.366680, -3.459500, 127.770699, -0.023192, 0.750302, 0.660689, 0.010106, 0.689005, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.904100, -3.598400, 127.947304, -0.023192, 0.750302, 0.660689, 0.018519, 0.693026, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 1.022790, -4.283705, 128.714615, -0.526941, 0.764819, 0.370656, 0.018068, 0.709414, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.523290, -4.700200, 128.863907, -0.526941, 0.764819, 0.370656, 0.010640, 0.711812, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 1.422100, -4.421100, 129.565796, -0.526941, 0.764819, 0.370656, 0.025325, 0.721688, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.692600, -5.011590, 130.425598, -0.577900, 0.808220, -0.113188, 0.013973, 0.734840, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.700900, -4.941500, 130.883698, -0.577900, 0.808220, -0.113188, 0.014018, 0.741843, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 1.748700, -4.257990, 130.414597, -0.577900, 0.808220, -0.113188, 0.031714, 0.733700, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.692600, -5.011590, 130.425598, -0.579098, 0.812526, 0.066685, 0.013973, 0.734840, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 1.748700, -4.257990, 130.414597, -0.579098, 0.812526, 0.066685, 0.031714, 0.733700, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 1.422100, -4.421100, 129.565796, -0.579098, 0.812526, 0.066685, 0.025325, 0.721688, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 1.422100, -4.421100, 129.565796, -0.475642, 0.859580, 0.186779, 0.025325, 0.721688, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.415790, -5.010390, 129.715164, -0.475642, 0.859580, 0.186779, 0.009010, 0.723979, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.692600, -5.011590, 130.425598, -0.475642, 0.859580, 0.186779, 0.013973, 0.734840, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 2.610070, -1.040180, 126.759300, -0.431616, 0.110490, 0.895265, 0.058962, 0.662445, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 2.396070, 0.558700, 126.458801, -0.431616, 0.110490, 0.895265, 0.072360, 0.641149, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.882300, -0.362500, 125.842690, -0.431616, 0.110490, 0.895265, 0.031807, 0.633193, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.882300, -0.362500, 125.842690, -0.438629, 0.090969, 0.894052, 0.031807, 0.633193, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.918600, -2.280990, 126.055702, -0.438629, 0.090969, 0.894052, 0.021414, 0.660122, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 2.610070, -1.040180, 126.759300, -0.438629, 0.090969, 0.894052, 0.058962, 0.662445, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 4.392790, 0.595270, 127.926781, -0.592433, 0.029203, 0.805090, 0.103185, 0.675093, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 4.065590, 2.139590, 127.629990, -0.592433, 0.029203, 0.805090, 0.119619, 0.657320, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 2.396070, 0.558700, 126.458801, -0.592433, 0.029203, 0.805090, 0.072360, 0.641149, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 2.396070, 0.558700, 126.458801, -0.591666, 0.071725, 0.802986, 0.072360, 0.641149, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 2.610070, -1.040180, 126.759300, -0.591666, 0.071725, 0.802987, 0.058962, 0.662445, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 4.392790, 0.595270, 127.926781, -0.591666, 0.071725, 0.802986, 0.103185, 0.675093, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 5.872500, 2.210690, 129.773697, -0.760747, 0.123871, 0.637118, 0.145208, 0.701028, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 5.777100, 3.697590, 129.370697, -0.760747, 0.123871, 0.637118, 0.163520, 0.686215, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 4.065590, 2.139590, 127.629990, -0.760747, 0.123871, 0.637118, 0.119619, 0.657320, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 4.065590, 2.139590, 127.629990, -0.763449, -0.037843, 0.644759, 0.119619, 0.657320, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 4.392790, 0.595270, 127.926781, -0.763449, -0.037843, 0.644759, 0.103185, 0.675093, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 5.872500, 2.210690, 129.773697, -0.763449, -0.037843, 0.644759, 0.145208, 0.701028, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.781400, 3.167000, 131.485703, -0.888575, 0.101421, 0.447379, 0.171526, 0.727793, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.581590, 4.576200, 130.769379, -0.888575, 0.101421, 0.447379, 0.188096, 0.708864, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 5.777100, 3.697590, 129.370697, -0.888575, 0.101421, 0.447379, 0.163520, 0.686215, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 5.777100, 3.697590, 129.370697, -0.895476, 0.062009, 0.440769, 0.163520, 0.686215, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 5.872500, 2.210690, 129.773697, -0.895476, 0.062009, 0.440769, 0.145208, 0.701028, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.781400, 3.167000, 131.485703, -0.895476, 0.062009, 0.440769, 0.171526, 0.727793, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.581590, 4.576200, 130.769379, -0.905617, 0.083000, 0.415894, 0.188096, 0.708864, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.781400, 3.167000, 131.485703, -0.905617, 0.083000, 0.415894, 0.171526, 0.727793, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.972290, 4.712690, 131.592896, -0.905617, 0.083000, 0.415894, 0.195948, 0.724942, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.918600, -2.280990, 126.055702, -0.465052, 0.768396, 0.439653, 0.021414, 0.660122, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.945100, -2.883690, 127.137093, -0.465052, 0.768396, 0.439653, 0.020759, 0.677651, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 2.422600, -1.873380, 126.934196, -0.465052, 0.768396, 0.439653, 0.049371, 0.671108, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 2.610070, -1.040180, 126.759300, -0.539979, 0.287541, 0.791039, 0.058962, 0.662445, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.918600, -2.280990, 126.055702, -0.539979, 0.287542, 0.791039, 0.021414, 0.660122, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 2.422600, -1.873380, 126.934196, -0.539979, 0.287542, 0.791039, 0.049371, 0.671108, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 3.322990, -4.168590, 139.589386, -0.506505, 0.856141, -0.102347, 0.054742, 0.867255, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.121890, -2.569000, 139.118607, -0.506505, 0.856141, -0.102347, 0.102469, 0.860777, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 5.656890, -3.105400, 136.932816, -0.506505, 0.856141, -0.102347, 0.093337, 0.828675, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 5.656890, -3.105400, 136.932816, -0.470765, 0.880123, -0.061350, 0.093337, 0.828675, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 3.081790, -4.465400, 137.182205, -0.470765, 0.880123, -0.061350, 0.050904, 0.832811, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 3.322990, -4.168590, 139.589386, -0.470765, 0.880123, -0.061350, 0.054742, 0.867255, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 5.656890, -3.105400, 136.932816, -0.834091, 0.549989, 0.042474, 0.093337, 0.828675, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.121890, -2.569000, 139.118607, -0.834091, 0.549989, 0.042474, 0.102469, 0.860777, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 7.446100, -0.447200, 137.648193, -0.834091, 0.549989, 0.042474, 0.140008, 0.837352, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 7.446100, -0.447200, 137.648193, -0.822528, 0.566662, -0.048401, 0.140008, 0.837352, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 7.004200, -1.221090, 136.097427, -0.822528, 0.566662, -0.048401, 0.126505, 0.814319, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 5.656890, -3.105400, 136.932816, -0.822528, 0.566662, -0.048401, 0.093337, 0.828675, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.961400, 0.292190, 134.663193, -0.967564, 0.158826, 0.196453, 0.143680, 0.787763, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 7.004200, -1.221090, 136.097427, -0.967564, 0.158826, 0.196453, 0.126505, 0.814319, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 7.446100, -0.447200, 137.648193, -0.967564, 0.158826, 0.196453, 0.140008, 0.837352, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 7.446100, -0.447200, 137.648193, -0.935617, 0.275874, 0.220259, 0.140008, 0.837352, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 7.616390, 1.848090, 135.496704, -0.935617, 0.275874, 0.220259, 0.170224, 0.798081, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.961400, 0.292190, 134.663193, -0.935617, 0.275874, 0.220259, 0.143680, 0.787763, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 3.862200, -3.952890, 136.066895, -0.308152, 0.927715, 0.210684, 0.064681, 0.817214, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 1.546000, -4.618300, 135.609192, -0.308152, 0.927715, 0.210684, 0.028085, 0.810025, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 3.081790, -4.465400, 137.182205, -0.308152, 0.927715, 0.210684, 0.050904, 0.832811, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -4.408500, 132.616104, -0.261694, 0.959517, -0.104133, 0.004298, 0.769247, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 1.524770, -3.924290, 133.245926, -0.261694, 0.959517, -0.104133, 0.029939, 0.775120, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 2.122990, -3.950790, 131.498383, -0.261694, 0.959517, -0.104133, 0.038696, 0.749368, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.458490, -4.837390, 131.671204, -0.438853, 0.718796, -0.539204, 0.011353, 0.754962, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -4.408500, 132.616104, -0.438853, 0.718796, -0.539204, 0.004298, 0.769247, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 2.122990, -3.950790, 131.498383, -0.438853, 0.718796, -0.539204, 0.038696, 0.749368, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 2.122990, -3.950790, 131.498383, -0.474961, 0.841505, -0.257451, 0.038696, 0.749368, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.700900, -4.941500, 130.883698, -0.474961, 0.841505, -0.257451, 0.014018, 0.741843, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.458490, -4.837390, 131.671204, -0.474961, 0.841505, -0.257451, 0.011353, 0.754962, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 1.748700, -4.257990, 130.414597, -0.558919, 0.828172, -0.041721, 0.031714, 0.733700, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.700900, -4.941500, 130.883698, -0.558919, 0.828172, -0.041721, 0.014018, 0.741843, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 2.122990, -3.950790, 131.498383, -0.558919, 0.828172, -0.041721, 0.038696, 0.749368, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 1.546000, -4.618300, 135.609192, -0.316137, 0.905314, 0.283662, 0.028085, 0.810025, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 3.862200, -3.952890, 136.066895, -0.316137, 0.905314, 0.283662, 0.064681, 0.817214, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 2.718590, -3.805200, 134.320999, -0.316137, 0.905314, 0.283662, 0.048686, 0.790327, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 2.718590, -3.805200, 134.320999, -0.260510, 0.905666, 0.334520, 0.048686, 0.790327, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 1.126170, -4.287700, 134.387192, -0.260510, 0.905666, 0.334520, 0.022679, 0.791759, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 1.546000, -4.618300, 135.609192, -0.260510, 0.905666, 0.334520, 0.028085, 0.810025, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 1.524770, -3.924290, 133.245926, -0.276235, 0.939477, 0.202677, 0.029939, 0.775120, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 1.126170, -4.287700, 134.387192, -0.276235, 0.939477, 0.202677, 0.022679, 0.791759, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 2.718590, -3.805200, 134.320999, -0.276235, 0.939477, 0.202677, 0.048686, 0.790327, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 2.122990, -3.950790, 131.498383, -0.443761, 0.880775, -0.165265, 0.038696, 0.749368, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 1.524770, -3.924290, 133.245926, -0.443761, 0.880775, -0.165265, 0.029939, 0.775120, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 3.041290, -3.330790, 132.336884, -0.443761, 0.880775, -0.165265, 0.055550, 0.760246, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 3.041290, -3.330790, 132.336884, -0.591931, 0.800612, -0.092942, 0.055550, 0.760246, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 4.148500, -2.562570, 131.902786, -0.591931, 0.800612, -0.092942, 0.076015, 0.751705, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 3.916800, -2.872290, 130.710480, -0.591931, 0.800612, -0.092942, 0.069171, 0.733758, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 3.916800, -2.872290, 130.710480, -0.529580, 0.846995, -0.046301, 0.069171, 0.733758, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 2.122990, -3.950790, 131.498383, -0.529580, 0.846996, -0.046301, 0.038696, 0.749368, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 3.041290, -3.330790, 132.336884, -0.529580, 0.846995, -0.046301, 0.055550, 0.760246, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 4.148500, -2.562570, 131.902786, -0.584698, 0.803624, -0.110983, 0.076015, 0.751705, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 4.995190, -1.953690, 131.850998, -0.584698, 0.803624, -0.110983, 0.091939, 0.749917, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 5.189890, -1.914700, 131.107574, -0.584698, 0.803624, -0.110983, 0.093347, 0.738352, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 5.189890, -1.914700, 131.107574, -0.578538, 0.809756, -0.097920, 0.093347, 0.738352, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 3.916800, -2.872290, 130.710480, -0.578538, 0.809756, -0.097920, 0.069171, 0.733758, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 4.148500, -2.562570, 131.902786, -0.578538, 0.809756, -0.097920, 0.076015, 0.751705, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 4.995190, -1.953690, 131.850998, -0.677043, 0.713722, 0.179484, 0.091939, 0.749917, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 5.644090, -1.589990, 132.852493, -0.677043, 0.713722, 0.179484, 0.104709, 0.764527, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.075690, -1.045600, 132.315781, -0.677043, 0.713722, 0.179484, 0.113821, 0.755044, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.075690, -1.045600, 132.315781, -0.608578, 0.784636, -0.118233, 0.113821, 0.755044, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 5.189890, -1.914700, 131.107574, -0.608578, 0.784636, -0.118233, 0.093347, 0.738352, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 4.995190, -1.953690, 131.850998, -0.608578, 0.784636, -0.118233, 0.091939, 0.749917, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 5.656890, -3.105400, 136.932816, -0.489366, 0.853535, 0.178883, 0.093337, 0.828675, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 5.284800, -3.070090, 135.746414, -0.489366, 0.853535, 0.178883, 0.089424, 0.811521, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 3.862200, -3.952890, 136.066895, -0.489366, 0.853535, 0.178883, 0.064681, 0.817214, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 3.862200, -3.952890, 136.066895, -0.458825, 0.884417, 0.085359, 0.064681, 0.817214, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 3.081790, -4.465400, 137.182205, -0.458825, 0.884417, 0.085359, 0.050904, 0.832811, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 5.656890, -3.105400, 136.932816, -0.458825, 0.884417, 0.085359, 0.093337, 0.828675, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.220200, -1.675990, 134.945084, -0.732202, 0.634131, 0.248513, 0.113145, 0.796718, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 5.284800, -3.070090, 135.746414, -0.732202, 0.634131, 0.248513, 0.089424, 0.811521, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 5.656890, -3.105400, 136.932816, -0.732202, 0.634131, 0.248513, 0.093337, 0.828675, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 5.656890, -3.105400, 136.932816, -0.732569, 0.633832, 0.248193, 0.093337, 0.828675, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 7.004200, -1.221090, 136.097427, -0.732569, 0.633832, 0.248193, 0.126505, 0.814319, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.220200, -1.675990, 134.945084, -0.732569, 0.633832, 0.248193, 0.113145, 0.796718, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.961400, 0.292190, 134.663193, -0.886385, 0.373066, 0.274122, 0.143680, 0.787763, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.201700, -0.988380, 133.949463, -0.886385, 0.373066, 0.274122, 0.119853, 0.779626, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.220200, -1.675990, 134.945084, -0.886385, 0.373066, 0.274122, 0.113145, 0.796718, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.220200, -1.675990, 134.945084, -0.829155, 0.372015, 0.417261, 0.113145, 0.796718, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 7.004200, -1.221090, 136.097427, -0.829155, 0.372015, 0.417261, 0.126505, 0.814319, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.961400, 0.292190, 134.663193, -0.829155, 0.372015, 0.417261, 0.143680, 0.787763, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.075690, -1.045600, 132.315781, -0.765248, 0.642699, 0.036515, 0.113821, 0.755044, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 5.644090, -1.589990, 132.852493, -0.765248, 0.642699, 0.036515, 0.104709, 0.764527, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.201700, -0.988380, 133.949463, -0.765248, 0.642699, 0.036515, 0.119853, 0.779626, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 3.862200, -3.952890, 136.066895, -0.447192, 0.836039, 0.317895, 0.064681, 0.817214, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 5.284800, -3.070090, 135.746414, -0.447192, 0.836039, 0.317895, 0.089424, 0.811521, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 4.453990, -2.819290, 133.918106, -0.447192, 0.836039, 0.317895, 0.079590, 0.782940, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 4.453990, -2.819290, 133.918106, -0.404707, 0.850083, 0.337005, 0.079590, 0.782940, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 2.718590, -3.805200, 134.320999, -0.404707, 0.850082, 0.337005, 0.048686, 0.790327, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 3.862200, -3.952890, 136.066895, -0.404707, 0.850082, 0.337005, 0.064681, 0.817214, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 2.718590, -3.805200, 134.320999, -0.465968, 0.874694, 0.133357, 0.048686, 0.790327, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 4.453990, -2.819290, 133.918106, -0.465968, 0.874694, 0.133357, 0.079590, 0.782940, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 3.041290, -3.330790, 132.336884, -0.465968, 0.874694, 0.133357, 0.055550, 0.760246, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 3.041290, -3.330790, 132.336884, -0.260462, 0.947741, 0.184247, 0.055550, 0.760246, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 1.524770, -3.924290, 133.245926, -0.260462, 0.947741, 0.184247, 0.029939, 0.775120, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 2.718590, -3.805200, 134.320999, -0.260462, 0.947741, 0.184247, 0.048686, 0.790327, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 4.995190, -1.953690, 131.850998, -0.578717, 0.811571, 0.080241, 0.091939, 0.749917, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 4.148500, -2.562570, 131.902786, -0.578717, 0.811571, 0.080241, 0.076015, 0.751705, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 5.644090, -1.589990, 132.852493, -0.578717, 0.811571, 0.080241, 0.104709, 0.764527, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 3.041290, -3.330790, 132.336884, -0.510467, 0.839900, 0.184369, 0.055550, 0.760246, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 4.453990, -2.819290, 133.918106, -0.510467, 0.839900, 0.184368, 0.079590, 0.782940, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 4.148500, -2.562570, 131.902786, -0.510467, 0.839900, 0.184368, 0.076015, 0.751705, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 3.916800, -2.872290, 130.710480, -0.546508, 0.827248, 0.130342, 0.069171, 0.733758, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 3.627700, -2.884590, 129.576385, -0.546508, 0.827248, 0.130342, 0.063407, 0.716612, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 1.748700, -4.257990, 130.414597, -0.546508, 0.827248, 0.130342, 0.031714, 0.733700, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 1.748700, -4.257990, 130.414597, -0.532302, 0.844726, -0.055606, 0.031714, 0.733700, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 2.122990, -3.950790, 131.498383, -0.532302, 0.844726, -0.055606, 0.038696, 0.749368, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 3.916800, -2.872290, 130.710480, -0.532302, 0.844726, -0.055606, 0.069171, 0.733758, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 3.627700, -2.884590, 129.576385, -0.623841, 0.766883, 0.150710, 0.063407, 0.716612, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 3.916800, -2.872290, 130.710480, -0.623841, 0.766883, 0.150710, 0.069171, 0.733758, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 5.189890, -1.914700, 131.107574, -0.623841, 0.766883, 0.150710, 0.093347, 0.738352, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 5.382900, -1.311190, 130.023788, -0.801145, 0.572046, 0.175871, 0.098617, 0.720436, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 5.189890, -1.914700, 131.107574, -0.801144, 0.572046, 0.175871, 0.093347, 0.738352, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.075690, -1.045600, 132.315781, -0.801144, 0.572046, 0.175871, 0.113821, 0.755044, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.201700, -0.988380, 133.949463, -0.885502, 0.436350, 0.159639, 0.119853, 0.779626, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.961400, 0.292190, 134.663193, -0.885502, 0.436350, 0.159639, 0.143680, 0.787763, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.287700, -0.003500, 131.734467, -0.885502, 0.436350, 0.159639, 0.126807, 0.743123, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.287700, -0.003500, 131.734467, -0.969842, 0.234458, 0.066595, 0.126807, 0.743123, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.075690, -1.045600, 132.315781, -0.969842, 0.234458, 0.066595, 0.113821, 0.755044, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.201700, -0.988380, 133.949463, -0.969842, 0.234458, 0.066595, 0.119853, 0.779626, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 1.748700, -4.257990, 130.414597, -0.469494, 0.828544, 0.305106, 0.031714, 0.733700, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 3.627700, -2.884590, 129.576385, -0.469494, 0.828544, 0.305106, 0.063407, 0.716612, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 2.008100, -3.376790, 128.420776, -0.469494, 0.828544, 0.305106, 0.036674, 0.700049, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 2.008100, -3.376790, 128.420776, -0.764365, 0.620624, 0.174849, 0.036674, 0.700049, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 1.422100, -4.421100, 129.565796, -0.764365, 0.620623, 0.174849, 0.025325, 0.721688, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 1.748700, -4.257990, 130.414597, -0.764365, 0.620623, 0.174849, 0.031714, 0.733700, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 3.106190, -2.375090, 128.199295, -0.543844, 0.698887, 0.464532, 0.057630, 0.693354, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 2.008100, -3.376790, 128.420776, -0.543844, 0.698887, 0.464532, 0.036674, 0.700049, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 3.627700, -2.884590, 129.576385, -0.543844, 0.698887, 0.464532, 0.063407, 0.716612, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 2.008100, -3.376790, 128.420776, -0.505204, 0.673207, 0.539964, 0.036674, 0.700049, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 3.106190, -2.375090, 128.199295, -0.505204, 0.673207, 0.539964, 0.057630, 0.693354, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 2.422600, -1.873380, 126.934196, -0.505204, 0.673207, 0.539964, 0.049371, 0.671108, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 2.422600, -1.873380, 126.934196, -0.395815, 0.698561, 0.596106, 0.049371, 0.671108, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.945100, -2.883690, 127.137093, -0.395815, 0.698562, 0.596106, 0.020759, 0.677651, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 2.008100, -3.376790, 128.420776, -0.395815, 0.698562, 0.596106, 0.036674, 0.700049, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 4.502790, -1.177680, 128.527893, -0.636118, 0.613535, 0.467898, 0.086059, 0.695783, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 3.106190, -2.375090, 128.199295, -0.636118, 0.613535, 0.467898, 0.057630, 0.693354, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 3.627700, -2.884590, 129.576385, -0.636118, 0.613535, 0.467898, 0.063407, 0.716612, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 3.627700, -2.884590, 129.576385, -0.658622, 0.609078, 0.441861, 0.063407, 0.716612, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 5.382900, -1.311190, 130.023788, -0.658622, 0.609078, 0.441861, 0.098617, 0.720436, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 4.502790, -1.177680, 128.527893, -0.658622, 0.609078, 0.441861, 0.086059, 0.695783, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.619490, 1.699200, 131.503891, -0.853724, 0.099369, 0.511157, 0.150388, 0.733413, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 4.502790, -1.177680, 128.527893, -0.853724, 0.099369, 0.511157, 0.086059, 0.695783, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 5.382900, -1.311190, 130.023788, -0.853724, 0.099369, 0.511157, 0.098617, 0.720436, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 5.382900, -1.311190, 130.023788, -0.921799, 0.222603, 0.317388, 0.098617, 0.720436, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.287700, -0.003500, 131.734467, -0.921799, 0.222603, 0.317388, 0.126807, 0.743123, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.619490, 1.699200, 131.503891, -0.921799, 0.222603, 0.317388, 0.150388, 0.733413, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.961400, 0.292190, 134.663193, -0.935400, 0.274141, 0.223322, 0.143680, 0.787763, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 7.616390, 1.848090, 135.496704, -0.935400, 0.274141, 0.223322, 0.170224, 0.798081, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.619490, 1.699200, 131.503891, -0.935400, 0.274141, 0.223322, 0.150388, 0.733413, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.619490, 1.699200, 131.503891, -0.956608, 0.213288, 0.198516, 0.150388, 0.733413, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.287700, -0.003500, 131.734467, -0.956608, 0.213288, 0.198516, 0.126807, 0.743123, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.961400, 0.292190, 134.663193, -0.956608, 0.213288, 0.198516, 0.143680, 0.787763, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 2.422600, -1.873380, 126.934196, -0.613020, 0.562841, 0.554452, 0.049371, 0.671108, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 3.106190, -2.375090, 128.199295, -0.613020, 0.562841, 0.554452, 0.057630, 0.693354, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 4.502790, -1.177680, 128.527893, -0.613020, 0.562841, 0.554452, 0.086059, 0.695783, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 4.392790, 0.595270, 127.926781, -0.827195, 0.133720, 0.545772, 0.103185, 0.675093, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 4.502790, -1.177680, 128.527893, -0.827195, 0.133720, 0.545772, 0.086059, 0.695783, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 5.872500, 2.210690, 129.773697, -0.827195, 0.133720, 0.545772, 0.145208, 0.701028, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 4.502790, -1.177680, 128.527893, -0.660426, 0.204033, 0.722640, 0.086059, 0.695783, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 4.392790, 0.595270, 127.926781, -0.660426, 0.204033, 0.722640, 0.103185, 0.675093, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 2.610070, -1.040180, 126.759300, -0.660426, 0.204033, 0.722640, 0.058962, 0.662445, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 2.610070, -1.040180, 126.759300, -0.641294, 0.293136, 0.709093, 0.058962, 0.662445, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 2.422600, -1.873380, 126.934196, -0.641294, 0.293136, 0.709093, 0.049371, 0.671108, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 4.502790, -1.177680, 128.527893, -0.641294, 0.293136, 0.709093, 0.086059, 0.695783, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.781400, 3.167000, 131.485703, -0.901420, 0.104640, 0.420111, 0.171526, 0.727793, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 5.872500, 2.210690, 129.773697, -0.901420, 0.104640, 0.420111, 0.145208, 0.701028, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.619490, 1.699200, 131.503891, -0.901420, 0.104640, 0.420111, 0.150388, 0.733413, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.619490, 1.699200, 131.503891, -0.878329, 0.194491, 0.436705, 0.150388, 0.733413, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 5.872500, 2.210690, 129.773697, -0.878329, 0.194491, 0.436705, 0.145208, 0.701028, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 4.502790, -1.177680, 128.527893, -0.878329, 0.194491, 0.436705, 0.086059, 0.695783, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.287700, -0.003500, 131.734467, -0.916448, 0.320269, 0.239898, 0.126807, 0.743123, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 5.382900, -1.311190, 130.023788, -0.916448, 0.320269, 0.239898, 0.098617, 0.720436, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.075690, -1.045600, 132.315781, -0.916448, 0.320269, 0.239898, 0.113821, 0.755044, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 5.382900, -1.311190, 130.023788, -0.680426, 0.685033, 0.260287, 0.098617, 0.720436, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 3.627700, -2.884590, 129.576385, -0.680426, 0.685033, 0.260287, 0.063407, 0.716612, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 5.189890, -1.914700, 131.107574, -0.680426, 0.685033, 0.260287, 0.093347, 0.738352, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.781400, 3.167000, 131.485703, -0.951237, 0.173468, 0.255064, 0.171526, 0.727793, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 7.616390, 1.848090, 135.496704, -0.951237, 0.173468, 0.255064, 0.170224, 0.798081, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 8.117100, 4.052890, 135.864578, -0.951237, 0.173468, 0.255064, 0.204991, 0.800440, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 8.117100, 4.052890, 135.864578, -0.957190, 0.099357, 0.271873, 0.204991, 0.800440, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.972290, 4.712690, 131.592896, -0.957190, 0.099357, 0.271873, 0.195948, 0.724942, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.781400, 3.167000, 131.485703, -0.957190, 0.099357, 0.271873, 0.171526, 0.727793, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.781400, 3.167000, 131.485703, -0.965343, 0.109421, 0.236940, 0.171526, 0.727793, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.619490, 1.699200, 131.503891, -0.965343, 0.109421, 0.236940, 0.150388, 0.733413, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 7.616390, 1.848090, 135.496704, -0.965343, 0.109421, 0.236940, 0.170224, 0.798081, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 3.589200, -2.677900, 142.935196, -0.503249, 0.806257, -0.310951, 0.064197, 0.920673, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.480780, -1.310500, 141.800903, -0.503249, 0.806257, -0.310951, 0.115535, 0.902494, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.121890, -2.569000, 139.118607, -0.503249, 0.806257, -0.310951, 0.102469, 0.860777, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.121890, -2.569000, 139.118607, -0.510282, 0.799928, -0.315798, 0.102469, 0.860777, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 3.322990, -4.168590, 139.589386, -0.510282, 0.799927, -0.315798, 0.054742, 0.867255, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 3.589200, -2.677900, 142.935196, -0.510282, 0.799927, -0.315798, 0.064197, 0.920673, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 7.899380, 0.608390, 139.058304, -0.870348, 0.485303, -0.083518, 0.155524, 0.859073, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 7.446100, -0.447200, 137.648193, -0.870348, 0.485303, -0.083518, 0.140008, 0.837352, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.121890, -2.569000, 139.118607, -0.870348, 0.485303, -0.083518, 0.102469, 0.860777, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.121890, -2.569000, 139.118607, -0.868249, 0.483613, -0.110734, 0.102469, 0.860777, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.480780, -1.310500, 141.800903, -0.868249, 0.483613, -0.110734, 0.115535, 0.902494, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 7.899380, 0.608390, 139.058304, -0.868249, 0.483613, -0.110734, 0.155524, 0.859073, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 7.446100, -0.447200, 137.648193, -0.965334, 0.213015, 0.150846, 0.140008, 0.837352, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 7.899380, 0.608390, 139.058304, -0.965334, 0.213015, 0.150846, 0.155524, 0.859073, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 7.616390, 1.848090, 135.496704, -0.965334, 0.213015, 0.150846, 0.170224, 0.798081, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 3.681690, 0.370280, 146.631760, -0.552613, 0.634134, -0.540826, 0.081111, 0.984505, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.584600, 1.411200, 144.886093, -0.552613, 0.634134, -0.540826, 0.143048, 0.953690, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.480780, -1.310500, 141.800903, -0.552613, 0.634134, -0.540826, 0.115535, 0.902494, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.480780, -1.310500, 141.800903, -0.523456, 0.663763, -0.534241, 0.115535, 0.902494, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 3.589200, -2.677900, 142.935196, -0.523456, 0.663763, -0.534240, 0.064197, 0.920673, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 3.681690, 0.370280, 146.631760, -0.523456, 0.663763, -0.534240, 0.081111, 0.984505, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 8.277890, 3.089000, 140.970688, -0.913105, 0.327039, -0.243484, 0.191716, 0.890578, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 7.899380, 0.608390, 139.058304, -0.913105, 0.327039, -0.243484, 0.155524, 0.859073, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.480780, -1.310500, 141.800903, -0.913105, 0.327039, -0.243484, 0.115535, 0.902494, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.480780, -1.310500, 141.800903, -0.911007, 0.323980, -0.255153, 0.115535, 0.902494, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.584600, 1.411200, 144.886093, -0.911007, 0.323980, -0.255153, 0.143048, 0.953690, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 8.277890, 3.089000, 140.970688, -0.911007, 0.323980, -0.255153, 0.191716, 0.890578, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 8.117100, 4.052890, 135.864578, -0.969783, 0.195998, 0.145277, 0.204991, 0.800440, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 7.616390, 1.848090, 135.496704, -0.969783, 0.195998, 0.145277, 0.170224, 0.798081, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 7.899380, 0.608390, 139.058304, -0.969783, 0.195998, 0.145277, 0.155524, 0.859073, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 7.899380, 0.608390, 139.058304, -0.992429, 0.111162, 0.052236, 0.155524, 0.859073, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 8.277890, 3.089000, 140.970688, -0.992429, 0.111162, 0.052236, 0.191716, 0.890578, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 8.117100, 4.052890, 135.864578, -0.992429, 0.111162, 0.052236, 0.204991, 0.800440, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 9.370090, 5.002600, 136.636185, -0.697053, 0.510938, 0.503050, 0.643427, 0.934774, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 9.349790, 6.747000, 134.836304, -0.697053, 0.510938, 0.503050, 0.660233, 0.928448, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 8.117100, 4.052890, 135.864578, -0.697053, 0.510938, 0.503050, 0.635919, 0.925250, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 7.752900, 5.998000, 131.914307, -0.837032, 0.420949, 0.349541, 0.666156, 0.903551, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.972290, 4.712690, 131.592896, -0.837032, 0.420949, 0.349541, 0.659321, 0.893358, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 9.349790, 6.747000, 134.836304, -0.837032, 0.420949, 0.349541, 0.660233, 0.928448, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 8.117100, 4.052890, 135.864578, -0.821042, 0.488446, 0.295484, 0.635919, 0.925250, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 9.349790, 6.747000, 134.836304, -0.821042, 0.488446, 0.295484, 0.660233, 0.928448, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.972290, 4.712690, 131.592896, -0.821042, 0.488446, 0.295484, 0.659321, 0.893358, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 9.605290, 6.218590, 136.388885, -0.944620, 0.230264, 0.233820, 0.651670, 0.935714, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 9.349790, 6.747000, 134.836304, -0.944620, 0.230264, 0.233820, 0.660233, 0.928448, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 9.370090, 5.002600, 136.636185, -0.944620, 0.230264, 0.233820, 0.643427, 0.934774, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.972290, 4.712690, 131.592896, -0.338347, -0.029710, 0.940552, 0.659321, 0.893358, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 7.752900, 5.998000, 131.914307, -0.338347, -0.029710, 0.940552, 0.666156, 0.903551, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 7.170280, 6.133500, 131.709000, -0.338347, -0.029710, 0.940552, 0.669440, 0.901191, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 8.099390, 7.081600, 134.877914, -0.329345, -0.873722, 0.357969, 0.666934, 0.930436, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 7.170280, 6.133500, 131.709000, -0.329345, -0.873722, 0.357969, 0.669440, 0.901191, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 7.752900, 5.998000, 131.914307, -0.329345, -0.873722, 0.357969, 0.666156, 0.903551, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 7.752900, 5.998000, 131.914307, -0.230256, -0.904962, 0.357807, 0.666156, 0.903551, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 9.349790, 6.747000, 134.836304, -0.230256, -0.904962, 0.357807, 0.660233, 0.928448, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 8.099390, 7.081600, 134.877914, -0.230256, -0.904962, 0.357807, 0.666934, 0.930436, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 9.370090, 5.002600, 136.636185, -0.204116, -0.060643, -0.977066, 0.643427, 0.934774, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 8.304590, 4.791100, 136.871902, -0.204116, -0.060643, -0.977066, 0.638684, 0.938101, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 8.408100, 6.381190, 136.751587, -0.204116, -0.060643, -0.977066, 0.653297, 0.943021, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 8.408100, 6.381190, 136.751587, -0.303879, -0.133079, -0.943371, 0.653297, 0.943021, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 9.605290, 6.218590, 136.388885, -0.303879, -0.133079, -0.943371, 0.651670, 0.935714, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 9.370090, 5.002600, 136.636185, -0.303879, -0.133079, -0.943371, 0.643427, 0.934774, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 8.408100, 6.381190, 136.751587, -0.255834, -0.918590, -0.301233, 0.653297, 0.943021, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 8.099390, 7.081600, 134.877914, -0.255834, -0.918590, -0.301233, 0.666934, 0.930436, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 9.349790, 6.747000, 134.836304, -0.255834, -0.918590, -0.301233, 0.660233, 0.928448, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 9.349790, 6.747000, 134.836304, -0.212820, -0.935136, -0.283244, 0.660233, 0.928448, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 9.605290, 6.218590, 136.388885, -0.212820, -0.935136, -0.283244, 0.651670, 0.935714, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 8.408100, 6.381190, 136.751587, -0.212820, -0.935136, -0.283244, 0.653297, 0.943021, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 8.304590, 4.791100, 136.871902, -0.276718, 0.798929, -0.533984, 0.638684, 0.938101, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 9.370090, 5.002600, 136.636185, -0.276718, 0.798929, -0.533984, 0.643427, 0.934774, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 8.117100, 4.052890, 135.864578, -0.276718, 0.798929, -0.533984, 0.635919, 0.925250, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 7.170280, 6.133500, 131.709000, -0.645128, -0.200921, 0.737184, 0.669440, 0.901191, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.106500, 6.699400, 130.932297, -0.645128, -0.200921, 0.737184, 0.678957, 0.895348, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.581590, 4.576200, 130.769379, -0.645128, -0.200921, 0.737184, 0.664696, 0.885638, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.581590, 4.576200, 130.769379, -0.905458, 0.092322, 0.414274, 0.664696, 0.885638, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.972290, 4.712690, 131.592896, -0.905458, 0.092322, 0.414274, 0.659321, 0.893358, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 7.170280, 6.133500, 131.709000, -0.905458, 0.092322, 0.414274, 0.669440, 0.901191, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 7.470190, 8.966200, 134.994888, -0.665098, -0.534503, 0.521490, 0.679739, 0.936060, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.106500, 6.699400, 130.932297, -0.665098, -0.534503, 0.521490, 0.678957, 0.895348, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 7.170280, 6.133500, 131.709000, -0.665098, -0.534503, 0.521490, 0.669440, 0.901191, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 7.170280, 6.133500, 131.709000, -0.880758, -0.315949, 0.352762, 0.669440, 0.901191, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 8.099390, 7.081600, 134.877914, -0.880758, -0.315949, 0.352762, 0.666934, 0.930436, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 7.470190, 8.966200, 134.994888, -0.880758, -0.315949, 0.352762, 0.679739, 0.936060, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 8.304590, 4.791100, 136.871902, -0.994139, 0.101984, 0.035875, 0.638684, 0.938101, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 8.277890, 3.089000, 140.970688, -0.994139, 0.101984, 0.035875, 0.614558, 0.963397, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 8.716190, 7.940200, 139.325684, -0.994139, 0.101984, 0.035875, 0.656588, 0.966445, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 8.716190, 7.940200, 139.325684, -0.994586, 0.070520, 0.076330, 0.656588, 0.966445, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 8.408100, 6.381190, 136.751587, -0.994586, 0.070520, 0.076330, 0.653297, 0.943021, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 8.304590, 4.791100, 136.871902, -0.994586, 0.070520, 0.076330, 0.638684, 0.938101, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 8.408100, 6.381190, 136.751587, -0.954509, -0.190342, 0.229525, 0.653297, 0.943021, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 8.716190, 7.940200, 139.325684, -0.954509, -0.190342, 0.229525, 0.656588, 0.966445, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 7.470190, 8.966200, 134.994888, -0.954509, -0.190342, 0.229525, 0.679739, 0.936060, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 7.470190, 8.966200, 134.994888, -0.947191, -0.318529, 0.036990, 0.679739, 0.936060, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 8.099390, 7.081600, 134.877914, -0.947191, -0.318529, 0.036990, 0.666934, 0.930436, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 8.408100, 6.381190, 136.751587, -0.947191, -0.318529, 0.036990, 0.653297, 0.943021, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 8.304590, 4.791100, 136.871902, -0.984306, 0.165156, 0.062172, 0.638684, 0.938101, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 8.117100, 4.052890, 135.864578, -0.984306, 0.165156, 0.062172, 0.635919, 0.925250, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 8.277890, 3.089000, 140.970688, -0.984306, 0.165156, 0.062172, 0.614558, 0.963397, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 7.470190, 8.966200, 134.994888, -0.651624, -0.608337, 0.453114, 0.679739, 0.936060, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 4.502490, 11.761190, 134.479507, -0.651624, -0.608337, 0.453114, 0.710990, 0.936780, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 3.863690, 9.354200, 130.329300, -0.651624, -0.608337, 0.453114, 0.705338, 0.898151, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 3.863690, 9.354200, 130.329300, -0.710967, -0.484967, 0.509247, 0.705338, 0.898151, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.106500, 6.699400, 130.932297, -0.710967, -0.484967, 0.509247, 0.678957, 0.895348, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 7.470190, 8.966200, 134.994888, -0.710967, -0.484967, 0.509247, 0.679739, 0.936060, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, 12.565090, 134.254303, -0.187318, -0.842603, 0.504908, 0.746498, 0.929265, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, 10.139300, 130.206085, -0.187318, -0.842603, 0.504908, 0.735612, 0.893486, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 3.863690, 9.354200, 130.329300, -0.187318, -0.842603, 0.504908, 0.705338, 0.898151, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 3.863690, 9.354200, 130.329300, -0.175620, -0.839627, 0.513989, 0.705338, 0.898151, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 4.502490, 11.761190, 134.479507, -0.175620, -0.839627, 0.513989, 0.710990, 0.936780, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, 12.565090, 134.254303, -0.175620, -0.839627, 0.513989, 0.746498, 0.929265, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 1.732100, 8.210380, 127.882301, -0.183803, -0.819311, 0.543089, 0.715155, 0.872183, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 3.863690, 9.354200, 130.329300, -0.183803, -0.819311, 0.543089, 0.705338, 0.898151, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, 10.139300, 130.206085, -0.183803, -0.819311, 0.543089, 0.735612, 0.893486, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, 10.139300, 130.206085, -0.285545, -0.831170, 0.477096, 0.735612, 0.893486, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, 8.894690, 128.037796, -0.285545, -0.831170, 0.477096, 0.727550, 0.878809, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 1.732100, 8.210380, 127.882301, -0.285545, -0.831170, 0.477096, 0.715155, 0.872183, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, 8.894690, 128.037796, -0.343384, -0.891350, -0.295946, 0.727550, 0.878809, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, 9.581600, 125.968910, -0.343384, -0.891349, -0.295945, 0.734184, 0.873810, 0.500000, 0.500000, 0.000000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000, - 1.721500, 8.932590, 125.926201, -0.343384, -0.891349, -0.295945, 0.727689, 0.862166, 0.450000, 0.450000, 0.100000, 0.000000, 0.000000, 1.000000, 2.000000, 0.000000, - 1.721500, 8.932590, 125.926201, -0.372847, -0.871114, -0.319603, 0.727689, 0.862166, 0.450000, 0.450000, 0.100000, 0.000000, 0.000000, 1.000000, 2.000000, 0.000000, - 1.732100, 8.210380, 127.882301, -0.372847, -0.871114, -0.319603, 0.715155, 0.872183, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, 8.894690, 128.037796, -0.372847, -0.871114, -0.319603, 0.727550, 0.878809, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 1.828770, 3.733800, 126.806297, -0.921747, 0.362170, 0.138620, 0.688083, 0.836980, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 2.714090, 5.707900, 127.535492, -0.921747, 0.362170, 0.138620, 0.698156, 0.856592, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 2.675700, 6.447990, 125.346603, -0.921747, 0.362170, 0.138620, 0.715632, 0.843506, 0.650000, 0.350000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000, 0.000000, - 2.675700, 6.447990, 125.346603, -0.927711, 0.353692, 0.119395, 0.715632, 0.843506, 0.650000, 0.350000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000, 0.000000, - 1.840100, 4.478890, 124.687103, -0.927711, 0.353692, 0.119395, 0.704178, 0.824880, 0.500000, 0.500000, 0.000000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000, - 1.828770, 3.733800, 126.806297, -0.927711, 0.353692, 0.119395, 0.688083, 0.836980, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 2.675700, 6.447990, 125.346603, -0.930746, -0.351044, -0.102368, 0.715632, 0.843506, 0.650000, 0.350000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000, 0.000000, - 2.714090, 5.707900, 127.535492, -0.930746, -0.351044, -0.102368, 0.698156, 0.856592, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 1.732100, 8.210380, 127.882301, -0.930746, -0.351044, -0.102368, 0.715155, 0.872183, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 1.732100, 8.210380, 127.882301, -0.935922, -0.332024, -0.117514, 0.715155, 0.872183, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 1.721500, 8.932590, 125.926201, -0.935922, -0.332024, -0.117514, 0.727689, 0.862166, 0.450000, 0.450000, 0.100000, 0.000000, 0.000000, 1.000000, 2.000000, 0.000000, - 2.675700, 6.447990, 125.346603, -0.935922, -0.332024, -0.117514, 0.715632, 0.843506, 0.650000, 0.350000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000, 0.000000, - 5.777100, 3.697590, 129.370697, -0.669158, -0.392154, 0.631224, 0.669035, 0.871677, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.581590, 4.576200, 130.769379, -0.669158, -0.392154, 0.631224, 0.664696, 0.885638, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 5.221600, 4.397900, 129.216888, -0.669158, -0.392154, 0.631224, 0.675468, 0.871319, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 4.065590, 2.139590, 127.629990, -0.555980, -0.268226, 0.786728, 0.670215, 0.852502, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 5.777100, 3.697590, 129.370697, -0.555980, -0.268226, 0.786728, 0.669035, 0.871677, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 5.221600, 4.397900, 129.216888, -0.555980, -0.268226, 0.786728, 0.675468, 0.871319, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 5.221600, 4.397900, 129.216888, -0.511883, -0.302863, 0.803896, 0.675468, 0.871319, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 1.828770, 3.733800, 126.806297, -0.511883, -0.302863, 0.803896, 0.688083, 0.836980, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 4.065590, 2.139590, 127.629990, -0.511883, -0.302863, 0.803896, 0.670215, 0.852502, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.882300, -0.362500, 125.842690, -0.289945, -0.155162, 0.944382, 0.654883, 0.841062, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 2.396070, 0.558700, 126.458801, -0.289945, -0.155162, 0.944382, 0.661248, 0.846480, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 1.828770, 3.733800, 126.806297, -0.289945, -0.155162, 0.944382, 0.688083, 0.836980, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 2.396070, 0.558700, 126.458801, -0.448182, -0.175999, 0.876446, 0.661248, 0.846480, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 4.065590, 2.139590, 127.629990, -0.448182, -0.175999, 0.876446, 0.670215, 0.852502, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 1.828770, 3.733800, 126.806297, -0.448182, -0.175999, 0.876446, 0.688083, 0.836980, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 5.221600, 4.397900, 129.216888, -0.722861, -0.212208, 0.657602, 0.675468, 0.871319, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.581590, 4.576200, 130.769379, -0.722861, -0.212208, 0.657602, 0.664696, 0.885638, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.106500, 6.699400, 130.932297, -0.722861, -0.212208, 0.657602, 0.678957, 0.895348, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 5.221600, 4.397900, 129.216888, -0.633067, -0.291185, 0.717243, 0.675468, 0.871319, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.106500, 6.699400, 130.932297, -0.633067, -0.291185, 0.717243, 0.678957, 0.895348, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 2.714090, 5.707900, 127.535492, -0.633067, -0.291185, 0.717243, 0.698156, 0.856592, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 1.828770, 3.733800, 126.806297, -0.572652, -0.045535, 0.818533, 0.688083, 0.836980, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 5.221600, 4.397900, 129.216888, -0.572652, -0.045535, 0.818533, 0.675468, 0.871319, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 2.714090, 5.707900, 127.535492, -0.572652, -0.045535, 0.818533, 0.698156, 0.856592, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 2.714090, 5.707900, 127.535492, -0.608603, -0.352715, 0.710770, 0.698156, 0.856592, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.106500, 6.699400, 130.932297, -0.608603, -0.352715, 0.710770, 0.678957, 0.895348, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 3.863690, 9.354200, 130.329300, -0.608603, -0.352715, 0.710770, 0.705338, 0.898151, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 3.863690, 9.354200, 130.329300, -0.623484, -0.342089, 0.703024, 0.705338, 0.898151, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 1.732100, 8.210380, 127.882301, -0.623484, -0.342089, 0.703024, 0.715155, 0.872183, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 2.714090, 5.707900, 127.535492, -0.623484, -0.342089, 0.703024, 0.698156, 0.856592, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.201700, -0.988380, 133.949463, -0.885970, 0.403093, 0.229287, 0.119853, 0.779626, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 5.644090, -1.589990, 132.852493, -0.885970, 0.403093, 0.229287, 0.104709, 0.764527, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 5.682190, -2.135990, 133.959595, -0.885970, 0.403093, 0.229287, 0.100958, 0.782986, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 4.453990, -2.819290, 133.918106, -0.454637, 0.792507, 0.406494, 0.079590, 0.782940, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 5.682190, -2.135990, 133.959595, -0.454637, 0.792507, 0.406494, 0.100958, 0.782986, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 5.644090, -1.589990, 132.852493, -0.454637, 0.792507, 0.406494, 0.104709, 0.764527, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 5.644090, -1.589990, 132.852493, -0.617428, 0.763136, 0.190804, 0.104709, 0.764527, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 4.148500, -2.562570, 131.902786, -0.617428, 0.763136, 0.190804, 0.076015, 0.751705, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 4.453990, -2.819290, 133.918106, -0.617428, 0.763136, 0.190804, 0.079590, 0.782940, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 1.840100, 4.478890, 124.687103, -0.356481, 0.883249, 0.304620, 0.704178, 0.824880, 0.500000, 0.500000, 0.000000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000, - 0.000000, 3.835590, 124.398987, -0.356481, 0.883249, 0.304620, 0.692418, 0.806898, 0.500000, 0.500000, 0.000000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000, - 0.000000, 3.111500, 126.498489, -0.356481, 0.883249, 0.304620, 0.676609, 0.819210, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, 3.111500, 126.498489, -0.352566, 0.883399, 0.308711, 0.676609, 0.819210, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 1.828770, 3.733800, 126.806297, -0.352567, 0.883400, 0.308711, 0.688083, 0.836980, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 1.840100, 4.478890, 124.687103, -0.352566, 0.883399, 0.308711, 0.704178, 0.824880, 0.500000, 0.500000, 0.000000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000, - 2.013500, 9.711190, 123.491302, -0.340846, -0.882827, -0.323174, 0.747185, 0.858948, 0.553767, 0.231458, 0.200000, 0.014775, 1.000000, 3.000000, 0.000000, 4.000000, - 1.721500, 8.932590, 125.926201, -0.340846, -0.882826, -0.323174, 0.727689, 0.862166, 0.450000, 0.450000, 0.100000, 0.000000, 0.000000, 1.000000, 2.000000, 0.000000, - 0.000000, 9.581600, 125.968910, -0.340846, -0.882826, -0.323174, 0.734184, 0.873810, 0.500000, 0.500000, 0.000000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000, - 0.000000, 9.581600, 125.968910, -0.473974, -0.770902, -0.425510, 0.734184, 0.873810, 0.500000, 0.500000, 0.000000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000, - 0.000000, 10.830590, 123.706100, -0.473974, -0.770902, -0.425510, 0.748995, 0.877750, 0.800000, 0.200000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000, 0.000000, - 2.013500, 9.711190, 123.491302, -0.473974, -0.770902, -0.425510, 0.747185, 0.858948, 0.553767, 0.231458, 0.200000, 0.014775, 1.000000, 3.000000, 0.000000, 4.000000, - 1.840100, 4.478890, 124.687103, -0.898196, 0.422182, -0.122497, 0.704178, 0.824880, 0.500000, 0.500000, 0.000000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000, - 2.675700, 6.447990, 125.346603, -0.898196, 0.422182, -0.122497, 0.715632, 0.843506, 0.650000, 0.350000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000, 0.000000, - 3.156090, 6.980190, 123.658401, -0.898196, 0.422182, -0.122497, 0.731760, 0.837254, 0.900000, 0.100000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000, 0.000000, - 3.156090, 6.980190, 123.658401, -0.893845, 0.443695, -0.064622, 0.731760, 0.837254, 0.900000, 0.100000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000, 0.000000, - 2.153870, 4.774090, 122.373901, -0.893845, 0.443695, -0.064622, 0.722084, 0.813841, 0.900000, 0.100000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000, 0.000000, - 1.840100, 4.478890, 124.687103, -0.893845, 0.443695, -0.064622, 0.704178, 0.824880, 0.500000, 0.500000, 0.000000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000, - 3.156090, 6.980190, 123.658401, -0.901551, -0.266773, -0.340642, 0.731760, 0.837254, 0.900000, 0.100000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000, 0.000000, - 2.675700, 6.447990, 125.346603, -0.901551, -0.266773, -0.340642, 0.715632, 0.843506, 0.650000, 0.350000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000, 0.000000, - 1.721500, 8.932590, 125.926201, -0.901551, -0.266773, -0.340642, 0.727689, 0.862166, 0.450000, 0.450000, 0.100000, 0.000000, 0.000000, 1.000000, 2.000000, 0.000000, - 1.721500, 8.932590, 125.926201, -0.892466, -0.387518, -0.230943, 0.727689, 0.862166, 0.450000, 0.450000, 0.100000, 0.000000, 0.000000, 1.000000, 2.000000, 0.000000, - 2.013500, 9.711190, 123.491302, -0.892466, -0.387518, -0.230943, 0.747185, 0.858948, 0.553767, 0.231458, 0.200000, 0.014775, 1.000000, 3.000000, 0.000000, 4.000000, - 3.156090, 6.980190, 123.658401, -0.892466, -0.387518, -0.230943, 0.731760, 0.837254, 0.900000, 0.100000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000, 0.000000, - 6.220200, -1.675990, 134.945084, -0.870831, 0.396778, 0.290209, 0.113145, 0.796718, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.201700, -0.988380, 133.949463, -0.870831, 0.396778, 0.290209, 0.119853, 0.779626, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 5.682190, -2.135990, 133.959595, -0.870831, 0.396778, 0.290209, 0.100958, 0.782986, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 5.284800, -3.070090, 135.746414, -0.781692, 0.606944, 0.143445, 0.089424, 0.811521, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.220200, -1.675990, 134.945084, -0.781692, 0.606945, 0.143445, 0.113145, 0.796718, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 5.682190, -2.135990, 133.959595, -0.781692, 0.606944, 0.143445, 0.100958, 0.782986, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 5.682190, -2.135990, 133.959595, -0.468079, 0.821592, 0.325405, 0.100958, 0.782986, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 4.453990, -2.819290, 133.918106, -0.468079, 0.821592, 0.325405, 0.079590, 0.782940, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 5.284800, -3.070090, 135.746414, -0.468079, 0.821592, 0.325405, 0.089424, 0.811521, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 5.277790, 1.799490, 119.997787, -0.150503, 0.519360, -0.841198, 0.757208, 0.796121, 0.595727, 0.210221, 0.194052, 0.000000, 2.000000, 4.000000, 3.000000, 0.000000, - 0.000000, -0.609580, 119.454689, -0.150503, 0.519360, -0.841198, 0.741798, 0.768441, 1.000000, 0.000000, 0.000000, 0.000000, 2.000000, 0.000000, 0.000000, 0.000000, - 0.000000, 3.684200, 122.105690, -0.150503, 0.519360, -0.841198, 0.709467, 0.793621, 0.700000, 0.300000, 0.000000, 0.000000, 1.000000, 2.000000, 0.000000, 0.000000, - 0.000000, 3.684200, 122.105690, -0.154249, 0.512682, -0.844609, 0.709467, 0.793621, 0.700000, 0.300000, 0.000000, 0.000000, 1.000000, 2.000000, 0.000000, 0.000000, - 2.153870, 4.774090, 122.373901, -0.154249, 0.512682, -0.844609, 0.722084, 0.813841, 0.900000, 0.100000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000, 0.000000, - 5.277790, 1.799490, 119.997787, -0.154249, 0.512682, -0.844609, 0.757208, 0.796121, 0.595727, 0.210221, 0.194052, 0.000000, 2.000000, 4.000000, 3.000000, 0.000000, - 0.000000, 11.819690, 122.129089, -0.244192, -0.679905, -0.691448, 0.760808, 0.883957, 1.000000, 0.000000, 0.000000, 0.000000, 2.000000, 0.000000, 0.000000, 0.000000, - 5.458890, 9.787290, 122.199699, -0.244192, -0.679905, -0.691448, 0.768126, 0.840398, 0.425000, 0.425000, 0.150000, 0.000000, 2.000000, 3.000000, 1.000000, 0.000000, - 2.013500, 9.711190, 123.491302, -0.244192, -0.679905, -0.691448, 0.747185, 0.858948, 0.553767, 0.231458, 0.200000, 0.014775, 1.000000, 3.000000, 0.000000, 4.000000, - 2.013500, 9.711190, 123.491302, -0.466676, -0.749252, -0.469930, 0.747185, 0.858948, 0.553767, 0.231458, 0.200000, 0.014775, 1.000000, 3.000000, 0.000000, 4.000000, - 0.000000, 10.830590, 123.706100, -0.466676, -0.749252, -0.469930, 0.748995, 0.877750, 0.800000, 0.200000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000, 0.000000, - 0.000000, 11.819690, 122.129089, -0.466676, -0.749252, -0.469930, 0.760808, 0.883957, 1.000000, 0.000000, 0.000000, 0.000000, 2.000000, 0.000000, 0.000000, 0.000000, - 6.244400, 5.333000, 120.907593, -0.358154, 0.323484, -0.875833, 0.757604, 0.813466, 0.391313, 0.391313, 0.217375, 0.000000, 3.000000, 4.000000, 2.000000, 0.000000, - 5.277790, 1.799490, 119.997787, -0.358154, 0.323484, -0.875833, 0.757208, 0.796121, 0.595727, 0.210221, 0.194052, 0.000000, 2.000000, 4.000000, 3.000000, 0.000000, - 2.153870, 4.774090, 122.373901, -0.358154, 0.323484, -0.875833, 0.722084, 0.813841, 0.900000, 0.100000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000, 0.000000, - 2.153870, 4.774090, 122.373901, -0.343427, 0.584190, -0.735377, 0.722084, 0.813841, 0.900000, 0.100000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000, 0.000000, - 3.156090, 6.980190, 123.658401, -0.343427, 0.584190, -0.735377, 0.731760, 0.837254, 0.900000, 0.100000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000, 0.000000, - 6.244400, 5.333000, 120.907593, -0.343427, 0.584190, -0.735377, 0.757604, 0.813466, 0.391313, 0.391313, 0.217375, 0.000000, 3.000000, 4.000000, 2.000000, 0.000000, - 5.458890, 9.787290, 122.199699, -0.626497, 0.113216, -0.771157, 0.768126, 0.840398, 0.425000, 0.425000, 0.150000, 0.000000, 2.000000, 3.000000, 1.000000, 0.000000, - 6.244400, 5.333000, 120.907593, -0.626497, 0.113216, -0.771157, 0.757604, 0.813466, 0.391313, 0.391313, 0.217375, 0.000000, 3.000000, 4.000000, 2.000000, 0.000000, - 3.156090, 6.980190, 123.658401, -0.626497, 0.113216, -0.771157, 0.731760, 0.837254, 0.900000, 0.100000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000, 0.000000, - 3.156090, 6.980190, 123.658401, -0.340186, -0.198566, -0.919155, 0.731760, 0.837254, 0.900000, 0.100000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000, 0.000000, - 2.013500, 9.711190, 123.491302, -0.340186, -0.198566, -0.919155, 0.747185, 0.858948, 0.553767, 0.231458, 0.200000, 0.014775, 1.000000, 3.000000, 0.000000, 4.000000, - 5.458890, 9.787290, 122.199699, -0.340186, -0.198566, -0.919155, 0.768126, 0.840398, 0.425000, 0.425000, 0.150000, 0.000000, 2.000000, 3.000000, 1.000000, 0.000000, - 0.000000, -7.036400, 92.380791, -0.208411, 0.974214, -0.086436, 0.321384, 0.664017, 0.500000, 0.500000, 0.000000, 0.000000, 5.000000, 6.000000, 0.000000, 0.000000, - 0.000000, -6.406100, 99.484894, -0.208411, 0.974214, -0.086436, 0.355395, 0.671121, 0.569640, 0.430360, 0.000000, 0.000000, 7.000000, 5.000000, 0.000000, 0.000000, - 3.709390, -5.634100, 99.242104, -0.208411, 0.974214, -0.086436, 0.359453, 0.652327, 0.530700, 0.469300, 0.000000, 0.000000, 7.000000, 5.000000, 0.000000, 0.000000, - 3.709390, -5.634100, 99.242104, -0.151139, 0.981341, -0.118855, 0.359453, 0.652327, 0.530700, 0.469300, 0.000000, 0.000000, 7.000000, 5.000000, 0.000000, 0.000000, - 4.825790, -6.264500, 92.617493, -0.151139, 0.981341, -0.118855, 0.327461, 0.640259, 0.500000, 0.499472, 0.000528, 0.000000, 6.000000, 5.000000, 7.000000, 0.000000, - 0.000000, -7.036400, 92.380791, -0.151139, 0.981341, -0.118855, 0.321384, 0.664017, 0.500000, 0.500000, 0.000000, 0.000000, 5.000000, 6.000000, 0.000000, 0.000000, - 0.000000, -7.428190, 87.661690, -0.153505, 0.984760, -0.081757, 0.298567, 0.660440, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - 0.000000, -7.036400, 92.380791, -0.153505, 0.984760, -0.081757, 0.321384, 0.664017, 0.500000, 0.500000, 0.000000, 0.000000, 5.000000, 6.000000, 0.000000, 0.000000, - 4.825790, -6.264500, 92.617493, -0.153505, 0.984760, -0.081757, 0.327461, 0.640259, 0.500000, 0.499472, 0.000528, 0.000000, 6.000000, 5.000000, 7.000000, 0.000000, - 4.825790, -6.264500, 92.617493, -0.134966, 0.985786, -0.100050, 0.327461, 0.640259, 0.500000, 0.499472, 0.000528, 0.000000, 6.000000, 5.000000, 7.000000, 0.000000, - 5.662000, -6.638600, 87.803490, -0.134966, 0.985786, -0.100050, 0.303795, 0.632199, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - 0.000000, -7.428190, 87.661690, -0.134966, 0.985786, -0.100050, 0.298567, 0.660440, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - 0.000000, 8.269890, 90.548500, -0.097850, -0.911993, -0.398364, 0.387989, 0.554986, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - 7.255490, 7.509300, 90.507591, -0.097850, -0.911993, -0.398364, 0.360087, 0.563980, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - 4.704690, 5.477000, 95.786789, -0.097850, -0.911993, -0.398364, 0.379509, 0.588085, 0.500000, 0.394355, 0.085658, 0.019987, 6.000000, 5.000000, 7.000000, 8.000000, - 4.704690, 5.477000, 95.786789, -0.156413, -0.922982, -0.351625, 0.379509, 0.588085, 0.500000, 0.394355, 0.085658, 0.019987, 6.000000, 5.000000, 7.000000, 8.000000, - 0.000000, 6.230500, 95.901703, -0.156413, -0.922982, -0.351625, 0.402539, 0.581110, 0.500566, 0.382654, 0.076630, 0.040150, 6.000000, 5.000000, 7.000000, 8.000000, - 0.000000, 8.269890, 90.548500, -0.156413, -0.922982, -0.351625, 0.387989, 0.554986, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - 6.335590, -1.997000, 98.768501, -0.906075, 0.067109, -0.417760, 0.365176, 0.629928, 0.536170, 0.463305, 0.000525, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - 7.244800, 2.567690, 97.529793, -0.906075, 0.067109, -0.417760, 0.369250, 0.606203, 0.649612, 0.343663, 0.006725, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - 8.633000, 2.245590, 94.467201, -0.906075, 0.067109, -0.417760, 0.354786, 0.598233, 0.500000, 0.437489, 0.061784, 0.000726, 6.000000, 5.000000, 7.000000, 8.000000, - 8.633000, 2.245590, 94.467201, -0.929855, 0.175899, -0.323156, 0.354786, 0.598233, 0.500000, 0.437489, 0.061784, 0.000726, 6.000000, 5.000000, 7.000000, 8.000000, - 8.138200, -2.319500, 93.406090, -0.929855, 0.175899, -0.323156, 0.339147, 0.616701, 0.500000, 0.480327, 0.019673, 0.000000, 6.000000, 5.000000, 7.000000, 0.000000, - 6.335590, -1.997000, 98.768501, -0.929855, 0.175899, -0.323156, 0.365176, 0.629928, 0.536170, 0.463305, 0.000525, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - 7.244800, 2.567690, 97.529793, -0.973732, 0.214603, 0.076103, 0.369250, 0.606203, 0.649612, 0.343663, 0.006725, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - 6.335590, -1.997000, 98.768501, -0.973732, 0.214603, 0.076103, 0.365176, 0.629928, 0.536170, 0.463305, 0.000525, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - 6.862280, -1.351990, 103.688591, -0.973732, 0.214603, 0.076103, 0.390142, 0.635499, 0.916197, 0.079688, 0.004115, 0.000000, 7.000000, 5.000000, 2.000000, 0.000000, - 6.862280, -1.351990, 103.688591, -0.991439, -0.073166, -0.108143, 0.390142, 0.635499, 0.916197, 0.079688, 0.004115, 0.000000, 7.000000, 5.000000, 2.000000, 0.000000, - 6.506490, 3.943900, 103.367401, -0.991439, -0.073166, -0.108143, 0.398194, 0.610122, 0.847941, 0.138720, 0.013338, 0.000000, 7.000000, 5.000000, 2.000000, 0.000000, - 7.244800, 2.567690, 97.529793, -0.991439, -0.073166, -0.108143, 0.369250, 0.606203, 0.649612, 0.343663, 0.006725, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - 6.335590, -1.997000, 98.768501, -0.707874, 0.649743, -0.277033, 0.365176, 0.629928, 0.536170, 0.463305, 0.000525, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - 8.138200, -2.319500, 93.406090, -0.707875, 0.649743, -0.277033, 0.339147, 0.616701, 0.500000, 0.480327, 0.019673, 0.000000, 6.000000, 5.000000, 7.000000, 0.000000, - 4.825790, -6.264500, 92.617493, -0.707875, 0.649743, -0.277033, 0.327461, 0.640259, 0.500000, 0.499472, 0.000528, 0.000000, 6.000000, 5.000000, 7.000000, 0.000000, - 4.825790, -6.264500, 92.617493, -0.807622, 0.558507, -0.189251, 0.327461, 0.640259, 0.500000, 0.499472, 0.000528, 0.000000, 6.000000, 5.000000, 7.000000, 0.000000, - 3.709390, -5.634100, 99.242104, -0.807622, 0.558508, -0.189251, 0.359453, 0.652327, 0.530700, 0.469300, 0.000000, 0.000000, 7.000000, 5.000000, 0.000000, 0.000000, - 6.335590, -1.997000, 98.768501, -0.807622, 0.558508, -0.189251, 0.365176, 0.629928, 0.536170, 0.463305, 0.000525, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - 7.244800, 2.567690, 97.529793, -0.662973, -0.713897, -0.225428, 0.369250, 0.606203, 0.649612, 0.343663, 0.006725, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - 4.704690, 5.477000, 95.786789, -0.662973, -0.713897, -0.225428, 0.379509, 0.588085, 0.500000, 0.394355, 0.085658, 0.019987, 6.000000, 5.000000, 7.000000, 8.000000, - 8.633000, 2.245590, 94.467201, -0.662973, -0.713897, -0.225428, 0.354786, 0.598233, 0.500000, 0.437489, 0.061784, 0.000726, 6.000000, 5.000000, 7.000000, 8.000000, - 8.633000, 2.245590, 94.467201, -0.884030, 0.167872, -0.436245, 0.354786, 0.598233, 0.500000, 0.437489, 0.061784, 0.000726, 6.000000, 5.000000, 7.000000, 8.000000, - 11.093600, 3.121800, 89.818092, -0.884030, 0.167872, -0.436245, 0.334809, 0.580480, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - 10.686400, -1.521700, 88.856392, -0.884030, 0.167872, -0.436245, 0.319021, 0.598976, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - 10.686400, -1.521700, 88.856392, -0.869458, 0.199306, -0.452018, 0.319021, 0.598976, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - 8.138200, -2.319500, 93.406090, -0.869458, 0.199306, -0.452018, 0.339147, 0.616701, 0.500000, 0.480327, 0.019673, 0.000000, 6.000000, 5.000000, 7.000000, 0.000000, - 8.633000, 2.245590, 94.467201, -0.869458, 0.199306, -0.452018, 0.354786, 0.598233, 0.500000, 0.437489, 0.061784, 0.000726, 6.000000, 5.000000, 7.000000, 8.000000, - 3.709390, -5.634100, 99.242104, -0.207732, 0.975546, -0.071819, 0.359453, 0.652327, 0.530700, 0.469300, 0.000000, 0.000000, 7.000000, 5.000000, 0.000000, 0.000000, - 0.000000, -6.406100, 99.484894, -0.207732, 0.975546, -0.071819, 0.355395, 0.671121, 0.569640, 0.430360, 0.000000, 0.000000, 7.000000, 5.000000, 0.000000, 0.000000, - 0.000000, -6.053500, 104.274391, -0.207732, 0.975546, -0.071819, 0.377315, 0.678638, 0.981149, 0.018851, 0.000000, 0.000000, 7.000000, 5.000000, 0.000000, 0.000000, - 0.000000, -6.053500, 104.274391, -0.257263, 0.960104, -0.109617, 0.377315, 0.678638, 0.981149, 0.018851, 0.000000, 0.000000, 7.000000, 5.000000, 0.000000, 0.000000, - 4.437190, -4.900400, 103.960289, -0.257263, 0.960104, -0.109617, 0.383721, 0.656332, 0.955716, 0.044284, 0.000000, 0.000000, 7.000000, 5.000000, 0.000000, 0.000000, - 3.709390, -5.634100, 99.242104, -0.257263, 0.960104, -0.109617, 0.359453, 0.652327, 0.530700, 0.469300, 0.000000, 0.000000, 7.000000, 5.000000, 0.000000, 0.000000, - 6.335590, -1.997000, 98.768501, -0.808234, 0.587922, 0.033249, 0.365176, 0.629928, 0.536170, 0.463305, 0.000525, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - 3.709390, -5.634100, 99.242104, -0.808234, 0.587922, 0.033249, 0.359453, 0.652327, 0.530700, 0.469300, 0.000000, 0.000000, 7.000000, 5.000000, 0.000000, 0.000000, - 4.437190, -4.900400, 103.960289, -0.808234, 0.587922, 0.033249, 0.383721, 0.656332, 0.955716, 0.044284, 0.000000, 0.000000, 7.000000, 5.000000, 0.000000, 0.000000, - 4.437190, -4.900400, 103.960289, -0.825015, 0.564931, 0.014256, 0.383721, 0.656332, 0.955716, 0.044284, 0.000000, 0.000000, 7.000000, 5.000000, 0.000000, 0.000000, - 6.862280, -1.351990, 103.688591, -0.825015, 0.564931, 0.014256, 0.390142, 0.635499, 0.916197, 0.079688, 0.004115, 0.000000, 7.000000, 5.000000, 2.000000, 0.000000, - 6.335590, -1.997000, 98.768501, -0.825015, 0.564931, 0.014256, 0.365176, 0.629928, 0.536170, 0.463305, 0.000525, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - 8.138200, -2.319500, 93.406090, -0.664960, 0.704166, -0.248954, 0.339147, 0.616701, 0.500000, 0.480327, 0.019673, 0.000000, 6.000000, 5.000000, 7.000000, 0.000000, - 10.686400, -1.521700, 88.856392, -0.664960, 0.704166, -0.248954, 0.319021, 0.598976, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - 5.662000, -6.638600, 87.803490, -0.664960, 0.704166, -0.248954, 0.303795, 0.632199, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - 5.662000, -6.638600, 87.803490, -0.735661, 0.653390, -0.178562, 0.303795, 0.632199, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - 4.825790, -6.264500, 92.617493, -0.735661, 0.653390, -0.178562, 0.327461, 0.640259, 0.500000, 0.499472, 0.000528, 0.000000, 6.000000, 5.000000, 7.000000, 0.000000, - 8.138200, -2.319500, 93.406090, -0.735661, 0.653390, -0.178562, 0.339147, 0.616701, 0.500000, 0.480327, 0.019673, 0.000000, 6.000000, 5.000000, 7.000000, 0.000000, - 8.633000, 2.245590, 94.467201, -0.638874, -0.562215, -0.525123, 0.354786, 0.598233, 0.500000, 0.437489, 0.061784, 0.000726, 6.000000, 5.000000, 7.000000, 8.000000, - 4.704690, 5.477000, 95.786789, -0.638874, -0.562215, -0.525123, 0.379509, 0.588085, 0.500000, 0.394355, 0.085658, 0.019987, 6.000000, 5.000000, 7.000000, 8.000000, - 7.255490, 7.509300, 90.507591, -0.638874, -0.562215, -0.525123, 0.360087, 0.563980, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - 7.255490, 7.509300, 90.507591, -0.699180, -0.537556, -0.471362, 0.360087, 0.563980, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - 11.093600, 3.121800, 89.818092, -0.699180, -0.537556, -0.471362, 0.334809, 0.580480, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - 8.633000, 2.245590, 94.467201, -0.699180, -0.537556, -0.471362, 0.354786, 0.598233, 0.500000, 0.437489, 0.061784, 0.000726, 6.000000, 5.000000, 7.000000, 8.000000, - 0.000000, -7.695790, 83.062401, -0.212604, 0.976009, 0.046980, 0.276128, 0.657277, 1.000000, 0.000000, 0.000000, 0.000000, 6.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -7.901280, 87.331490, -0.212604, 0.976009, 0.046980, 0.296388, 0.660461, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - 6.636300, -6.463490, 87.493393, -0.212604, 0.976008, 0.046980, 0.302087, 0.627250, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - 6.636300, -6.463490, 87.493393, -0.154098, 0.987088, -0.043726, 0.302087, 0.627250, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - 7.102380, -6.574490, 83.345100, -0.154098, 0.987088, -0.043726, 0.281096, 0.621323, 1.000000, 0.000000, 0.000000, 0.000000, 6.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -7.695790, 83.062401, -0.154098, 0.987088, -0.043726, 0.276128, 0.657277, 1.000000, 0.000000, 0.000000, 0.000000, 6.000000, 0.000000, 0.000000, 0.000000, - 7.135800, 10.410180, 86.686890, -0.094386, -0.874713, -0.475361, 0.355142, 0.538989, 1.000000, 0.000000, 0.000000, 0.000000, 6.000000, 0.000000, 0.000000, 0.000000, - 7.255490, 8.387000, 90.385986, -0.094386, -0.874713, -0.475361, 0.360500, 0.559455, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - 0.000000, 9.147680, 90.426888, -0.094386, -0.874713, -0.475361, 0.387478, 0.549942, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - 0.000000, 9.147680, 90.426888, -0.164244, -0.796300, -0.582177, 0.387478, 0.549942, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - 0.000000, 11.811300, 86.783600, -0.164244, -0.796300, -0.582177, 0.388713, 0.525234, 0.716619, 0.194051, 0.044665, 0.044665, 8.000000, 6.000000, 9.000000, 10.000000, - 7.135800, 10.410180, 86.686890, -0.164244, -0.796300, -0.582177, 0.355142, 0.538989, 1.000000, 0.000000, 0.000000, 0.000000, 6.000000, 0.000000, 0.000000, 0.000000, - 7.102380, -6.574490, 83.345100, -0.701213, 0.706228, -0.097682, 0.281096, 0.621323, 1.000000, 0.000000, 0.000000, 0.000000, 6.000000, 0.000000, 0.000000, 0.000000, - 6.636300, -6.463490, 87.493393, -0.701213, 0.706228, -0.097682, 0.302087, 0.627250, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - 11.185780, -1.802000, 88.536789, -0.701213, 0.706228, -0.097682, 0.315682, 0.597922, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - 11.185780, -1.802000, 88.536789, -0.665528, 0.731376, -0.148867, 0.315682, 0.597922, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - 12.658590, -1.294000, 84.448189, -0.665528, 0.731376, -0.148867, 0.297581, 0.585244, 1.000000, 0.000000, 0.000000, 0.000000, 6.000000, 0.000000, 0.000000, 0.000000, - 7.102380, -6.574490, 83.345100, -0.665528, 0.731376, -0.148867, 0.281096, 0.621323, 1.000000, 0.000000, 0.000000, 0.000000, 6.000000, 0.000000, 0.000000, 0.000000, - 12.658590, -1.294000, 84.448189, -0.937988, 0.128688, -0.321896, 0.297581, 0.585244, 1.000000, 0.000000, 0.000000, 0.000000, 6.000000, 0.000000, 0.000000, 0.000000, - 11.185780, -1.802000, 88.536789, -0.937988, 0.128688, -0.321896, 0.315682, 0.597922, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - 11.611590, 4.097490, 89.654503, -0.937988, 0.128688, -0.321896, 0.334614, 0.575135, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - 11.611590, 4.097490, 89.654503, -0.926720, 0.151909, -0.343677, 0.334614, 0.575135, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - 13.304900, 5.546700, 85.729088, -0.926720, 0.151909, -0.343677, 0.320408, 0.558146, 1.000000, 0.000000, 0.000000, 0.000000, 6.000000, 0.000000, 0.000000, 0.000000, - 12.658590, -1.294000, 84.448189, -0.926720, 0.151909, -0.343677, 0.297581, 0.585244, 1.000000, 0.000000, 0.000000, 0.000000, 6.000000, 0.000000, 0.000000, 0.000000, - 13.304900, 5.546700, 85.729088, -0.650851, -0.576767, -0.493693, 0.320408, 0.558146, 1.000000, 0.000000, 0.000000, 0.000000, 6.000000, 0.000000, 0.000000, 0.000000, - 11.611590, 4.097490, 89.654503, -0.650851, -0.576767, -0.493693, 0.334614, 0.575135, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - 7.255490, 8.387000, 90.385986, -0.650851, -0.576767, -0.493693, 0.360500, 0.559455, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - 7.255490, 8.387000, 90.385986, -0.610732, -0.702869, -0.364665, 0.360500, 0.559455, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - 7.135800, 10.410180, 86.686890, -0.610732, -0.702869, -0.364665, 0.355142, 0.538989, 1.000000, 0.000000, 0.000000, 0.000000, 6.000000, 0.000000, 0.000000, 0.000000, - 13.304900, 5.546700, 85.729088, -0.610732, -0.702869, -0.364665, 0.320408, 0.558146, 1.000000, 0.000000, 0.000000, 0.000000, 6.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -7.901280, 87.331490, -0.059175, 0.571339, -0.818578, 0.296388, 0.660461, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - 0.000000, -7.428190, 87.661690, -0.059175, 0.571339, -0.818578, 0.298567, 0.660440, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - 5.662000, -6.638600, 87.803490, -0.059175, 0.571339, -0.818578, 0.303795, 0.632199, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - 5.662000, -6.638600, 87.803490, -0.208134, 0.972470, -0.104793, 0.303795, 0.632199, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - 6.636300, -6.463490, 87.493393, -0.208134, 0.972470, -0.104793, 0.302087, 0.627250, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - 0.000000, -7.901280, 87.331490, -0.208134, 0.972470, -0.104793, 0.296388, 0.660461, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - 7.255490, 8.387000, 90.385986, -0.019968, -0.137211, -0.990340, 0.360500, 0.559455, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - 7.255490, 7.509300, 90.507591, -0.019968, -0.137211, -0.990341, 0.360087, 0.563980, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - 0.000000, 8.269890, 90.548500, -0.019968, -0.137211, -0.990341, 0.387989, 0.554986, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - 0.000000, 8.269890, 90.548500, -0.019968, -0.137206, -0.990341, 0.387989, 0.554986, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - 0.000000, 9.147680, 90.426888, -0.019968, -0.137206, -0.990341, 0.387478, 0.549942, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - 7.255490, 8.387000, 90.385986, -0.019968, -0.137206, -0.990341, 0.360500, 0.559455, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - 6.636300, -6.463490, 87.493393, -0.342958, 0.500346, -0.795005, 0.302087, 0.627250, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - 5.662000, -6.638600, 87.803490, -0.342958, 0.500346, -0.795005, 0.303795, 0.632199, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - 10.686400, -1.521700, 88.856392, -0.342958, 0.500346, -0.795005, 0.319021, 0.598976, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - 10.686400, -1.521700, 88.856392, -0.279770, 0.461488, -0.841877, 0.319021, 0.598976, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - 11.185780, -1.802000, 88.536789, -0.279770, 0.461488, -0.841877, 0.315682, 0.597922, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - 6.636300, -6.463490, 87.493393, -0.279770, 0.461488, -0.841877, 0.302087, 0.627250, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - 11.185780, -1.802000, 88.536789, -0.435784, 0.219019, -0.872997, 0.315682, 0.597922, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - 10.686400, -1.521700, 88.856392, -0.435784, 0.219019, -0.872997, 0.319021, 0.598976, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - 11.093600, 3.121800, 89.818092, -0.435784, 0.219019, -0.872997, 0.334809, 0.580480, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - 11.093600, 3.121800, 89.818092, -0.603084, 0.190293, -0.774647, 0.334809, 0.580480, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - 11.611590, 4.097490, 89.654503, -0.603084, 0.190293, -0.774647, 0.334614, 0.575135, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - 11.185780, -1.802000, 88.536789, -0.603084, 0.190293, -0.774647, 0.315682, 0.597922, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - 11.611590, 4.097490, 89.654503, -0.224926, -0.043792, -0.973391, 0.334614, 0.575135, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - 11.093600, 3.121800, 89.818092, -0.224926, -0.043792, -0.973391, 0.334809, 0.580480, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - 7.255490, 7.509300, 90.507591, -0.224926, -0.043792, -0.973391, 0.360087, 0.563980, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - 7.255490, 7.509300, 90.507591, -0.288642, -0.131397, -0.948378, 0.360087, 0.563980, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - 7.255490, 8.387000, 90.385986, -0.288642, -0.131397, -0.948378, 0.360500, 0.559455, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - 11.611590, 4.097490, 89.654503, -0.288642, -0.131397, -0.948378, 0.334614, 0.575135, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - 0.000000, -7.695790, 83.062401, -0.158154, 0.985238, 0.065529, 0.276128, 0.657277, 1.000000, 0.000000, 0.000000, 0.000000, 6.000000, 0.000000, 0.000000, 0.000000, - 7.102380, -6.574490, 83.345100, -0.158154, 0.985238, 0.065529, 0.281096, 0.621323, 1.000000, 0.000000, 0.000000, 0.000000, 6.000000, 0.000000, 0.000000, 0.000000, - 3.659390, -6.982690, 81.172798, -0.158154, 0.985238, 0.065529, 0.267528, 0.637728, 0.850000, 0.150000, 0.000000, 0.000000, 6.000000, 9.000000, 0.000000, 0.000000, - 3.659390, -6.982690, 81.172798, -0.148098, 0.985310, 0.085031, 0.267528, 0.637728, 0.850000, 0.150000, 0.000000, 0.000000, 6.000000, 9.000000, 0.000000, 0.000000, - 0.000000, -7.496690, 80.755302, -0.148098, 0.985310, 0.085031, 0.266121, 0.656252, 1.000000, 0.000000, 0.000000, 0.000000, 6.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -7.695790, 83.062401, -0.148098, 0.985310, 0.085031, 0.276128, 0.657277, 1.000000, 0.000000, 0.000000, 0.000000, 6.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -7.496690, 80.755302, -0.175966, 0.851315, 0.494266, 0.266121, 0.656252, 1.000000, 0.000000, 0.000000, 0.000000, 6.000000, 0.000000, 0.000000, 0.000000, - 3.659390, -6.982690, 81.172798, -0.175966, 0.851315, 0.494266, 0.267528, 0.637728, 0.850000, 0.150000, 0.000000, 0.000000, 6.000000, 9.000000, 0.000000, 0.000000, - 2.639300, -4.583490, 76.677292, -0.175966, 0.851315, 0.494266, 0.240813, 0.643563, 0.800000, 0.200000, 0.000000, 0.000000, 6.000000, 9.000000, 0.000000, 0.000000, - 2.639300, -4.583490, 76.677292, -0.041638, 0.825547, 0.562796, 0.240813, 0.643563, 0.800000, 0.200000, 0.000000, 0.000000, 6.000000, 9.000000, 0.000000, 0.000000, - 0.000000, -4.979480, 77.062889, -0.041638, 0.825547, 0.562796, 0.245957, 0.656144, 0.950000, 0.050000, 0.000000, 0.000000, 6.000000, 10.000000, 0.000000, 0.000000, - 0.000000, -7.496690, 80.755302, -0.041638, 0.825547, 0.562796, 0.266121, 0.656252, 1.000000, 0.000000, 0.000000, 0.000000, 6.000000, 0.000000, 0.000000, 0.000000, - 2.639300, -4.583490, 76.677292, 0.007995, 0.382307, 0.924001, 0.240813, 0.643563, 0.800000, 0.200000, 0.000000, 0.000000, 6.000000, 9.000000, 0.000000, 0.000000, - 1.526690, 1.231190, 74.281082, 0.007995, 0.382307, 0.924001, 0.213184, 0.661578, 0.600000, 0.400000, 0.000000, 0.000000, 6.000000, 9.000000, 0.000000, 0.000000, - 0.000000, 1.066090, 74.362602, 0.007995, 0.382307, 0.924001, 0.216407, 0.668004, 0.900000, 0.100000, 0.000000, 0.000000, 6.000000, 10.000000, 0.000000, 0.000000, - 0.000000, 1.066090, 74.362602, 0.072021, 0.406765, 0.910690, 0.216407, 0.668004, 0.900000, 0.100000, 0.000000, 0.000000, 6.000000, 10.000000, 0.000000, 0.000000, - 0.000000, -4.979480, 77.062889, 0.072021, 0.406765, 0.910690, 0.245957, 0.656144, 0.950000, 0.050000, 0.000000, 0.000000, 6.000000, 10.000000, 0.000000, 0.000000, - 2.639300, -4.583490, 76.677292, 0.072021, 0.406765, 0.910690, 0.240813, 0.643563, 0.800000, 0.200000, 0.000000, 0.000000, 6.000000, 9.000000, 0.000000, 0.000000, - 0.000000, 1.066090, 74.362602, 0.093449, -0.417940, 0.903655, 0.383516, 0.434691, 0.900000, 0.100000, 0.000000, 0.000000, 6.000000, 10.000000, 0.000000, 0.000000, - 1.526690, 1.231190, 74.281082, 0.093449, -0.417940, 0.903655, 0.375780, 0.434234, 0.600000, 0.400000, 0.000000, 0.000000, 6.000000, 9.000000, 0.000000, 0.000000, - 3.078590, 7.203090, 76.882599, 0.093449, -0.417940, 0.903655, 0.364065, 0.465636, 0.800000, 0.200000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 3.078590, 7.203090, 76.882599, 0.287405, -0.483650, 0.826729, 0.364065, 0.465636, 0.800000, 0.200000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 0.000000, 7.529490, 78.143791, 0.287405, -0.483650, 0.826729, 0.379610, 0.472345, 0.539465, 0.153631, 0.153631, 0.153273, 6.000000, 10.000000, 9.000000, 8.000000, - 0.000000, 1.066090, 74.362602, 0.287405, -0.483650, 0.826729, 0.383516, 0.434691, 0.900000, 0.100000, 0.000000, 0.000000, 6.000000, 10.000000, 0.000000, 0.000000, - 3.078590, 7.203090, 76.882599, 0.250520, -0.435846, 0.864452, 0.364065, 0.465636, 0.800000, 0.200000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 4.300280, 13.359590, 79.632584, 0.250520, -0.435846, 0.864452, 0.353286, 0.498103, 0.850000, 0.150000, 0.000000, 0.000000, 6.000000, 9.000000, 0.000000, 0.000000, - 0.000000, 10.504280, 79.439201, 0.250520, -0.435846, 0.864452, 0.376676, 0.489425, 0.445398, 0.363990, 0.095306, 0.095306, 8.000000, 6.000000, 9.000000, 10.000000, - 0.000000, 10.504280, 79.439201, 0.316173, -0.378769, 0.869809, 0.376676, 0.489425, 0.445398, 0.363990, 0.095306, 0.095306, 8.000000, 6.000000, 9.000000, 10.000000, - 0.000000, 7.529490, 78.143791, 0.316173, -0.378769, 0.869809, 0.379610, 0.472345, 0.539465, 0.153631, 0.153631, 0.153273, 6.000000, 10.000000, 9.000000, 8.000000, - 3.078590, 7.203090, 76.882599, 0.316173, -0.378770, 0.869809, 0.364065, 0.465636, 0.800000, 0.200000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 4.300280, 13.359590, 79.632584, -0.068867, -0.899215, -0.432052, 0.353286, 0.498103, 0.850000, 0.150000, 0.000000, 0.000000, 6.000000, 9.000000, 0.000000, 0.000000, - 5.276800, 11.467100, 83.415703, -0.068867, -0.899215, -0.432052, 0.357475, 0.519003, 1.000000, 0.000000, 0.000000, 0.000000, 6.000000, 0.000000, 0.000000, 0.000000, - 0.000000, 11.878000, 83.401604, -0.068867, -0.899215, -0.432052, 0.381646, 0.509014, 0.617984, 0.254734, 0.063641, 0.063641, 8.000000, 6.000000, 9.000000, 10.000000, - 0.000000, 11.878000, 83.401604, 0.522386, -0.805665, 0.279315, 0.381646, 0.509014, 0.617984, 0.254734, 0.063641, 0.063641, 8.000000, 6.000000, 9.000000, 10.000000, - 0.000000, 10.504280, 79.439201, 0.522386, -0.805665, 0.279315, 0.376676, 0.489425, 0.445398, 0.363990, 0.095306, 0.095306, 8.000000, 6.000000, 9.000000, 10.000000, - 4.300280, 13.359590, 79.632584, 0.522386, -0.805665, 0.279315, 0.353286, 0.498103, 0.850000, 0.150000, 0.000000, 0.000000, 6.000000, 9.000000, 0.000000, 0.000000, - 5.276800, 11.467100, 83.415703, -0.191345, -0.960590, -0.201626, 0.357475, 0.519003, 1.000000, 0.000000, 0.000000, 0.000000, 6.000000, 0.000000, 0.000000, 0.000000, - 7.135800, 10.410180, 86.686890, -0.191345, -0.960590, -0.201626, 0.355142, 0.538989, 1.000000, 0.000000, 0.000000, 0.000000, 6.000000, 0.000000, 0.000000, 0.000000, - 0.000000, 11.811300, 86.783600, -0.191345, -0.960590, -0.201626, 0.388713, 0.525234, 0.716619, 0.194051, 0.044665, 0.044665, 8.000000, 6.000000, 9.000000, 10.000000, - 0.000000, 11.811300, 86.783600, -0.077567, -0.996793, -0.019659, 0.388713, 0.525234, 0.716619, 0.194051, 0.044665, 0.044665, 8.000000, 6.000000, 9.000000, 10.000000, - 0.000000, 11.878000, 83.401604, -0.077567, -0.996793, -0.019659, 0.381646, 0.509014, 0.617984, 0.254734, 0.063641, 0.063641, 8.000000, 6.000000, 9.000000, 10.000000, - 5.276800, 11.467100, 83.415703, -0.077567, -0.996793, -0.019659, 0.357475, 0.519003, 1.000000, 0.000000, 0.000000, 0.000000, 6.000000, 0.000000, 0.000000, 0.000000, - 12.658590, -1.294000, 84.448189, -0.896286, 0.161983, -0.412836, 0.297581, 0.585244, 1.000000, 0.000000, 0.000000, 0.000000, 6.000000, 0.000000, 0.000000, 0.000000, - 13.304900, 5.546700, 85.729088, -0.896286, 0.161983, -0.412836, 0.320408, 0.558146, 1.000000, 0.000000, 0.000000, 0.000000, 6.000000, 0.000000, 0.000000, 0.000000, - 15.051400, 6.219900, 82.201500, -0.896286, 0.161983, -0.412836, 0.306191, 0.545226, 0.406329, 0.331289, 0.262070, 0.000313, 6.000000, 11.000000, 9.000000, 5.000000, - 15.051400, 6.219900, 82.201500, -0.824791, 0.096044, -0.557222, 0.306191, 0.545226, 0.406329, 0.331289, 0.262070, 0.000313, 6.000000, 11.000000, 9.000000, 5.000000, - 15.044500, -1.294000, 80.916603, -0.824791, 0.096044, -0.557222, 0.280829, 0.572128, 0.652963, 0.347037, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 12.658590, -1.294000, 84.448189, -0.824791, 0.096044, -0.557222, 0.297581, 0.585244, 1.000000, 0.000000, 0.000000, 0.000000, 6.000000, 0.000000, 0.000000, 0.000000, - 15.044500, -1.294000, 80.916603, -0.969194, 0.042379, -0.242624, 0.280829, 0.572128, 0.652963, 0.347037, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 15.051400, 6.219900, 82.201500, -0.969194, 0.042379, -0.242624, 0.306191, 0.545226, 0.406329, 0.331289, 0.262070, 0.000313, 6.000000, 11.000000, 9.000000, 5.000000, - 16.522690, 6.528200, 76.378090, -0.969194, 0.042379, -0.242624, 0.283100, 0.526295, 0.870182, 0.129818, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 16.522690, 6.528200, 76.378090, -0.950078, -0.001491, -0.312010, 0.283100, 0.526295, 0.870182, 0.129818, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 16.610600, -1.294000, 76.147789, -0.950078, -0.001491, -0.312010, 0.260250, 0.558061, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 15.044500, -1.294000, 80.916603, -0.950078, -0.001491, -0.312010, 0.280829, 0.572128, 0.652963, 0.347037, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 16.522690, 6.528200, 76.378090, -0.953325, 0.053530, -0.297164, 0.283100, 0.526295, 0.870182, 0.129818, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 17.652889, 6.494200, 72.746201, -0.953325, 0.053530, -0.297164, 0.267614, 0.514864, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 17.137100, -0.829690, 73.081589, -0.953325, 0.053530, -0.297164, 0.248114, 0.548130, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 17.137100, -0.829690, 73.081589, -0.985404, -0.006066, -0.170123, 0.248114, 0.548130, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 16.610600, -1.294000, 76.147789, -0.985404, -0.006066, -0.170123, 0.260250, 0.558061, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 16.522690, 6.528200, 76.378090, -0.985404, -0.006066, -0.170123, 0.283100, 0.526295, 0.870182, 0.129818, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 1.526690, 1.231190, 74.281082, 0.911918, -0.172948, 0.372148, 0.375780, 0.434234, 0.600000, 0.400000, 0.000000, 0.000000, 6.000000, 9.000000, 0.000000, 0.000000, - 2.168290, 1.231190, 72.708893, 0.911918, -0.172948, 0.372148, 0.369099, 0.428976, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 2.878090, 7.203090, 73.744904, 0.911918, -0.172948, 0.372148, 0.352737, 0.454505, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 2.878090, 7.203090, 73.744904, 0.972240, -0.225589, -0.062127, 0.352737, 0.454505, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 3.078590, 7.203090, 76.882599, 0.972240, -0.225589, -0.062127, 0.364065, 0.465636, 0.800000, 0.200000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 1.526690, 1.231190, 74.281082, 0.972240, -0.225589, -0.062127, 0.375780, 0.434234, 0.600000, 0.400000, 0.000000, 0.000000, 6.000000, 9.000000, 0.000000, 0.000000, - 2.168290, 1.231190, 72.708893, 0.941509, -0.175833, 0.287479, 0.369099, 0.428976, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 2.850500, 1.233270, 70.475891, 0.941509, -0.175833, 0.287479, 0.359898, 0.421436, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 3.767200, 7.204690, 71.125992, 0.941509, -0.175833, 0.287479, 0.341444, 0.446219, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 3.767200, 7.204690, 71.125992, 0.933816, -0.165971, 0.316925, 0.341444, 0.446219, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 2.878090, 7.203090, 73.744904, 0.933816, -0.165971, 0.316925, 0.352737, 0.454505, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 2.168290, 1.231190, 72.708893, 0.933816, -0.165971, 0.316925, 0.369099, 0.428976, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 12.658590, -1.294000, 84.448189, -0.623797, 0.658235, -0.421432, 0.297581, 0.585244, 1.000000, 0.000000, 0.000000, 0.000000, 6.000000, 0.000000, 0.000000, 0.000000, - 15.044500, -1.294000, 80.916603, -0.623797, 0.658235, -0.421432, 0.280829, 0.572128, 0.652963, 0.347037, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 10.359380, -6.548400, 79.644592, -0.623797, 0.658235, -0.421432, 0.263824, 0.603145, 0.544761, 0.455239, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 10.359380, -6.548400, 79.644592, -0.551921, 0.681213, -0.480970, 0.263824, 0.603145, 0.544761, 0.455239, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 7.102380, -6.574490, 83.345100, -0.551921, 0.681213, -0.480970, 0.281096, 0.621323, 1.000000, 0.000000, 0.000000, 0.000000, 6.000000, 0.000000, 0.000000, 0.000000, - 12.658590, -1.294000, 84.448189, -0.551921, 0.681213, -0.480970, 0.297581, 0.585244, 1.000000, 0.000000, 0.000000, 0.000000, 6.000000, 0.000000, 0.000000, 0.000000, - 7.102380, -6.574490, 83.345100, -0.016064, 0.999846, -0.007089, 0.281096, 0.621323, 1.000000, 0.000000, 0.000000, 0.000000, 6.000000, 0.000000, 0.000000, 0.000000, - 10.359380, -6.548400, 79.644592, -0.016064, 0.999846, -0.007089, 0.263824, 0.603145, 0.544761, 0.455239, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 4.759800, -6.652100, 77.707199, -0.016064, 0.999846, -0.007089, 0.250454, 0.630078, 0.540601, 0.459399, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 4.759800, -6.652100, 77.707199, -0.147122, 0.987976, 0.047530, 0.250454, 0.630078, 0.540601, 0.459399, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 3.659390, -6.982690, 81.172798, -0.147122, 0.987976, 0.047530, 0.267528, 0.637728, 0.850000, 0.150000, 0.000000, 0.000000, 6.000000, 9.000000, 0.000000, 0.000000, - 7.102380, -6.574490, 83.345100, -0.147122, 0.987976, 0.047530, 0.281096, 0.621323, 1.000000, 0.000000, 0.000000, 0.000000, 6.000000, 0.000000, 0.000000, 0.000000, - 3.659390, -6.982690, 81.172798, 0.604886, 0.751368, 0.263740, 0.267528, 0.637728, 0.850000, 0.150000, 0.000000, 0.000000, 6.000000, 9.000000, 0.000000, 0.000000, - 4.759800, -6.652100, 77.707199, 0.604886, 0.751368, 0.263740, 0.250454, 0.630078, 0.540601, 0.459399, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 2.639300, -4.583490, 76.677292, 0.604886, 0.751368, 0.263740, 0.240813, 0.643563, 0.800000, 0.200000, 0.000000, 0.000000, 6.000000, 9.000000, 0.000000, 0.000000, - 10.359380, -6.548400, 79.644592, -0.116322, 0.984834, 0.128728, 0.263824, 0.603145, 0.544761, 0.455239, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 12.701390, -5.694820, 75.230591, -0.116322, 0.984834, 0.128728, 0.243271, 0.588549, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 5.661900, -6.311990, 73.591202, -0.116322, 0.984834, 0.128728, 0.230457, 0.622279, 0.850000, 0.150000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 5.661900, -6.311990, 73.591202, -0.043630, 0.996394, 0.072771, 0.230457, 0.622279, 0.850000, 0.150000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 4.759800, -6.652100, 77.707199, -0.043630, 0.996394, 0.072771, 0.250454, 0.630078, 0.540601, 0.459399, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 10.359380, -6.548400, 79.644592, -0.043630, 0.996394, 0.072771, 0.263824, 0.603145, 0.544761, 0.455239, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 12.701390, -5.694820, 75.230591, -0.093175, 0.995513, -0.016473, 0.243271, 0.588549, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 13.376090, -5.677410, 72.466583, -0.093175, 0.995514, -0.016473, 0.230742, 0.582084, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 6.719700, -6.325500, 70.950401, -0.093175, 0.995514, -0.016473, 0.218362, 0.614238, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 6.719700, -6.325500, 70.950401, -0.078803, 0.996216, -0.036662, 0.218362, 0.614238, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 5.661900, -6.311990, 73.591202, -0.078803, 0.996216, -0.036662, 0.230457, 0.622279, 0.850000, 0.150000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 12.701390, -5.694820, 75.230591, -0.078803, 0.996216, -0.036662, 0.243271, 0.588549, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 5.276800, 11.467100, 83.415703, -0.166657, -0.962037, -0.216124, 0.357475, 0.519003, 1.000000, 0.000000, 0.000000, 0.000000, 6.000000, 0.000000, 0.000000, 0.000000, - 9.960800, 10.779800, 82.863190, -0.166657, -0.962037, -0.216124, 0.334718, 0.527421, 0.446474, 0.426889, 0.126063, 0.000574, 6.000000, 9.000000, 8.000000, 12.000000, - 7.135800, 10.410180, 86.686890, -0.166657, -0.962037, -0.216124, 0.355142, 0.538989, 1.000000, 0.000000, 0.000000, 0.000000, 6.000000, 0.000000, 0.000000, 0.000000, - 13.304900, 5.546700, 85.729088, -0.584312, -0.643897, -0.493940, 0.320408, 0.558146, 1.000000, 0.000000, 0.000000, 0.000000, 6.000000, 0.000000, 0.000000, 0.000000, - 7.135800, 10.410180, 86.686890, -0.584312, -0.643897, -0.493940, 0.355142, 0.538989, 1.000000, 0.000000, 0.000000, 0.000000, 6.000000, 0.000000, 0.000000, 0.000000, - 9.960800, 10.779800, 82.863190, -0.584312, -0.643897, -0.493940, 0.334718, 0.527421, 0.446474, 0.426889, 0.126063, 0.000574, 6.000000, 9.000000, 8.000000, 12.000000, - 9.960800, 10.779800, 82.863190, -0.631463, -0.641815, -0.435119, 0.334718, 0.527421, 0.446474, 0.426889, 0.126063, 0.000574, 6.000000, 9.000000, 8.000000, 12.000000, - 15.051400, 6.219900, 82.201500, -0.631463, -0.641815, -0.435119, 0.306191, 0.545226, 0.406329, 0.331289, 0.262070, 0.000313, 6.000000, 11.000000, 9.000000, 5.000000, - 13.304900, 5.546700, 85.729088, -0.631463, -0.641815, -0.435119, 0.320408, 0.558146, 1.000000, 0.000000, 0.000000, 0.000000, 6.000000, 0.000000, 0.000000, 0.000000, - 5.276800, 11.467100, 83.415703, -0.179215, -0.897591, -0.402756, 0.357475, 0.519003, 1.000000, 0.000000, 0.000000, 0.000000, 6.000000, 0.000000, 0.000000, 0.000000, - 4.300280, 13.359590, 79.632584, -0.179215, -0.897591, -0.402756, 0.353286, 0.498103, 0.850000, 0.150000, 0.000000, 0.000000, 6.000000, 9.000000, 0.000000, 0.000000, - 9.960800, 10.779800, 82.863190, -0.179215, -0.897591, -0.402756, 0.334718, 0.527421, 0.446474, 0.426889, 0.126063, 0.000574, 6.000000, 9.000000, 8.000000, 12.000000, - 9.960800, 10.779800, 82.863190, -0.323480, -0.929782, -0.175688, 0.334718, 0.527421, 0.446474, 0.426889, 0.126063, 0.000574, 6.000000, 9.000000, 8.000000, 12.000000, - 4.300280, 13.359590, 79.632584, -0.323480, -0.929782, -0.175688, 0.353286, 0.498103, 0.850000, 0.150000, 0.000000, 0.000000, 6.000000, 9.000000, 0.000000, 0.000000, - 6.484800, 13.491690, 74.911293, -0.323480, -0.929782, -0.175688, 0.332375, 0.483405, 0.650000, 0.350000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 6.484800, 13.491690, 74.911293, -0.068626, -0.953024, -0.295018, 0.332375, 0.483405, 0.650000, 0.350000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 12.881980, 12.562390, 76.425201, -0.068626, -0.953024, -0.295018, 0.308304, 0.503217, 0.577420, 0.373615, 0.039735, 0.009230, 9.000000, 6.000000, 8.000000, 12.000000, - 9.960800, 10.779800, 82.863190, -0.068626, -0.953024, -0.295018, 0.334718, 0.527421, 0.446474, 0.426889, 0.126063, 0.000574, 6.000000, 9.000000, 8.000000, 12.000000, - 12.881980, 12.562390, 76.425201, -0.205885, -0.932167, 0.297785, 0.308304, 0.503217, 0.577420, 0.373615, 0.039735, 0.009230, 9.000000, 6.000000, 8.000000, 12.000000, - 6.484800, 13.491690, 74.911293, -0.205885, -0.932167, 0.297785, 0.332375, 0.483405, 0.650000, 0.350000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 8.501090, 11.866100, 71.216690, -0.205885, -0.932167, 0.297785, 0.315058, 0.469632, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 8.501090, 11.866100, 71.216690, -0.105487, -0.970138, 0.218416, 0.315058, 0.469632, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 13.855600, 11.535090, 72.332474, -0.105487, -0.970138, 0.218416, 0.291815, 0.490252, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 12.881980, 12.562390, 76.425201, -0.105487, -0.970138, 0.218416, 0.308304, 0.503217, 0.577420, 0.373615, 0.039735, 0.009230, 9.000000, 6.000000, 8.000000, 12.000000, - 4.759800, -6.652100, 77.707199, 0.632506, 0.748169, 0.200448, 0.250454, 0.630078, 0.540601, 0.459399, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 5.661900, -6.311990, 73.591202, 0.632506, 0.748169, 0.200448, 0.230457, 0.622279, 0.850000, 0.150000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 2.639300, -4.583490, 76.677292, 0.632506, 0.748169, 0.200448, 0.240813, 0.643563, 0.800000, 0.200000, 0.000000, 0.000000, 6.000000, 9.000000, 0.000000, 0.000000, - 2.639300, -4.583490, 76.677292, 0.755798, 0.409785, 0.510731, 0.240813, 0.643563, 0.800000, 0.200000, 0.000000, 0.000000, 6.000000, 9.000000, 0.000000, 0.000000, - 5.661900, -6.311990, 73.591202, 0.755798, 0.409785, 0.510731, 0.230457, 0.622279, 0.850000, 0.150000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 2.168290, 1.231190, 72.708893, 0.755798, 0.409785, 0.510731, 0.207032, 0.657052, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 2.168290, 1.231190, 72.708893, 0.878480, 0.315830, 0.358502, 0.207032, 0.657052, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 1.526690, 1.231190, 74.281082, 0.878480, 0.315830, 0.358502, 0.213184, 0.661578, 0.600000, 0.400000, 0.000000, 0.000000, 6.000000, 9.000000, 0.000000, 0.000000, - 2.639300, -4.583490, 76.677292, 0.878480, 0.315830, 0.358502, 0.240813, 0.643563, 0.800000, 0.200000, 0.000000, 0.000000, 6.000000, 9.000000, 0.000000, 0.000000, - 5.661900, -6.311990, 73.591202, 0.831468, 0.446378, 0.330769, 0.230457, 0.622279, 0.850000, 0.150000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 6.719700, -6.325500, 70.950401, 0.831468, 0.446378, 0.330769, 0.218362, 0.614238, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 2.850500, 1.233270, 70.475891, 0.831468, 0.446378, 0.330769, 0.197384, 0.650764, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 2.850500, 1.233270, 70.475891, 0.863044, 0.430605, 0.264072, 0.197384, 0.650764, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 2.168290, 1.231190, 72.708893, 0.863044, 0.430605, 0.264072, 0.207032, 0.657052, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 5.661900, -6.311990, 73.591202, 0.863044, 0.430605, 0.264072, 0.230457, 0.622279, 0.850000, 0.150000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 12.701390, -5.694820, 75.230591, -0.695606, 0.677857, -0.237995, 0.243271, 0.588549, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 10.359380, -6.548400, 79.644592, -0.695606, 0.677857, -0.237995, 0.263824, 0.603145, 0.544761, 0.455239, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 15.044500, -1.294000, 80.916603, -0.695606, 0.677857, -0.237995, 0.280829, 0.572128, 0.652963, 0.347037, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 15.044500, -1.294000, 80.916603, -0.703042, 0.672626, -0.230882, 0.280829, 0.572128, 0.652963, 0.347037, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 16.610600, -1.294000, 76.147789, -0.703042, 0.672625, -0.230882, 0.260250, 0.558061, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 12.701390, -5.694820, 75.230591, -0.703042, 0.672625, -0.230882, 0.243271, 0.588549, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 13.376090, -5.677410, 72.466583, -0.718615, 0.674013, -0.171170, 0.230742, 0.582084, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 12.701390, -5.694820, 75.230591, -0.718615, 0.674013, -0.171170, 0.243271, 0.588549, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 16.610600, -1.294000, 76.147789, -0.718615, 0.674013, -0.171170, 0.260250, 0.558061, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 16.610600, -1.294000, 76.147789, -0.786825, 0.615754, -0.041864, 0.260250, 0.558061, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 17.137100, -0.829690, 73.081589, -0.786825, 0.615754, -0.041864, 0.248114, 0.548130, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 13.376090, -5.677410, 72.466583, -0.786825, 0.615754, -0.041864, 0.230742, 0.582084, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 12.881980, 12.562390, 76.425201, -0.832675, -0.500542, -0.236875, 0.308304, 0.503217, 0.577420, 0.373615, 0.039735, 0.009230, 9.000000, 6.000000, 8.000000, 12.000000, - 16.522690, 6.528200, 76.378090, -0.832675, -0.500542, -0.236875, 0.283100, 0.526295, 0.870182, 0.129818, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 15.051400, 6.219900, 82.201500, -0.832675, -0.500542, -0.236875, 0.306191, 0.545226, 0.406329, 0.331289, 0.262070, 0.000313, 6.000000, 11.000000, 9.000000, 5.000000, - 15.051400, 6.219900, 82.201500, -0.625259, -0.631488, -0.458556, 0.306191, 0.545226, 0.406329, 0.331289, 0.262070, 0.000313, 6.000000, 11.000000, 9.000000, 5.000000, - 9.960800, 10.779800, 82.863190, -0.625259, -0.631488, -0.458556, 0.334718, 0.527421, 0.446474, 0.426889, 0.126063, 0.000574, 6.000000, 9.000000, 8.000000, 12.000000, - 12.881980, 12.562390, 76.425201, -0.625259, -0.631488, -0.458556, 0.308304, 0.503217, 0.577420, 0.373615, 0.039735, 0.009230, 9.000000, 6.000000, 8.000000, 12.000000, - 13.855600, 11.535090, 72.332474, -0.767413, -0.597232, -0.233219, 0.291815, 0.490252, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 17.652889, 6.494200, 72.746201, -0.767413, -0.597232, -0.233219, 0.267614, 0.514864, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 16.522690, 6.528200, 76.378090, -0.767413, -0.597232, -0.233219, 0.283100, 0.526295, 0.870182, 0.129818, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 16.522690, 6.528200, 76.378090, -0.854135, -0.514762, -0.073982, 0.283100, 0.526295, 0.870182, 0.129818, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 12.881980, 12.562390, 76.425201, -0.854135, -0.514762, -0.073982, 0.308304, 0.503217, 0.577420, 0.373615, 0.039735, 0.009230, 9.000000, 6.000000, 8.000000, 12.000000, - 13.855600, 11.535090, 72.332474, -0.854135, -0.514762, -0.073982, 0.291815, 0.490252, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 3.078590, 7.203090, 76.882599, 0.870531, -0.488959, -0.055627, 0.364065, 0.465636, 0.800000, 0.200000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 2.878090, 7.203090, 73.744904, 0.870531, -0.488959, -0.055627, 0.352737, 0.454505, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 6.484800, 13.491690, 74.911293, 0.870531, -0.488959, -0.055627, 0.332375, 0.483405, 0.650000, 0.350000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 6.484800, 13.491690, 74.911293, 0.856252, -0.342599, 0.386598, 0.332375, 0.483405, 0.650000, 0.350000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 4.300280, 13.359590, 79.632584, 0.856252, -0.342600, 0.386598, 0.353286, 0.498103, 0.850000, 0.150000, 0.000000, 0.000000, 6.000000, 9.000000, 0.000000, 0.000000, - 3.078590, 7.203090, 76.882599, 0.856252, -0.342599, 0.386598, 0.364065, 0.465636, 0.800000, 0.200000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 2.878090, 7.203090, 73.744904, 0.680475, -0.695543, 0.230594, 0.352737, 0.454505, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 3.767200, 7.204690, 71.125992, 0.680475, -0.695543, 0.230594, 0.341444, 0.446219, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 8.501090, 11.866100, 71.216690, 0.680475, -0.695543, 0.230594, 0.315058, 0.469632, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 8.501090, 11.866100, 71.216690, 0.660102, -0.484985, 0.573633, 0.315058, 0.469632, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 6.484800, 13.491690, 74.911293, 0.660102, -0.484985, 0.573633, 0.332375, 0.483405, 0.650000, 0.350000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 2.878090, 7.203090, 73.744904, 0.660102, -0.484985, 0.573633, 0.352737, 0.454505, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 7.008690, 3.943900, 105.614403, -0.974589, -0.052265, 0.217818, 0.408847, 0.613878, 0.875409, 0.090885, 0.033705, 0.000000, 7.000000, 2.000000, 5.000000, 0.000000, - 6.506490, 3.943900, 103.367401, -0.974589, -0.052265, 0.217818, 0.398194, 0.610122, 0.847941, 0.138720, 0.013338, 0.000000, 7.000000, 5.000000, 2.000000, 0.000000, - 6.862280, -1.351990, 103.688591, -0.974589, -0.052265, 0.217818, 0.390142, 0.635499, 0.916197, 0.079688, 0.004115, 0.000000, 7.000000, 5.000000, 2.000000, 0.000000, - 6.862280, -1.351990, 103.688591, -0.974598, -0.052251, 0.217782, 0.390142, 0.635499, 0.916197, 0.079688, 0.004115, 0.000000, 7.000000, 5.000000, 2.000000, 0.000000, - 7.364390, -1.351990, 105.935593, -0.974598, -0.052251, 0.217781, 0.401270, 0.638861, 0.937523, 0.047160, 0.015317, 0.000000, 7.000000, 2.000000, 5.000000, 0.000000, - 7.008690, 3.943900, 105.614403, -0.974598, -0.052251, 0.217781, 0.408847, 0.613878, 0.875409, 0.090885, 0.033705, 0.000000, 7.000000, 2.000000, 5.000000, 0.000000, - 0.000000, -6.053500, 106.521500, -0.205968, 0.975102, 0.082177, 0.387454, 0.682907, 0.992731, 0.007269, 0.000000, 0.000000, 7.000000, 2.000000, 0.000000, 0.000000, - 5.333700, -4.900400, 106.207291, -0.205968, 0.975102, 0.082177, 0.395899, 0.657461, 0.982096, 0.016358, 0.001546, 0.000000, 7.000000, 2.000000, 5.000000, 0.000000, - 4.437190, -4.900400, 103.960289, -0.205968, 0.975102, 0.082177, 0.383721, 0.656332, 0.955716, 0.044284, 0.000000, 0.000000, 7.000000, 5.000000, 0.000000, 0.000000, - 4.437190, -4.900400, 103.960289, -0.251518, 0.967853, 0.000000, 0.383721, 0.656332, 0.955716, 0.044284, 0.000000, 0.000000, 7.000000, 5.000000, 0.000000, 0.000000, - 0.000000, -6.053500, 104.274391, -0.251518, 0.967853, 0.000000, 0.377315, 0.678638, 0.981149, 0.018851, 0.000000, 0.000000, 7.000000, 5.000000, 0.000000, 0.000000, - 0.000000, -6.053500, 106.521500, -0.251518, 0.967853, 0.000000, 0.387454, 0.682907, 0.992731, 0.007269, 0.000000, 0.000000, 7.000000, 2.000000, 0.000000, 0.000000, - 5.333700, -4.900400, 106.207291, -0.845966, 0.498605, 0.189038, 0.395899, 0.657461, 0.982096, 0.016358, 0.001546, 0.000000, 7.000000, 2.000000, 5.000000, 0.000000, - 7.364390, -1.351990, 105.935593, -0.845966, 0.498605, 0.189038, 0.401270, 0.638861, 0.937523, 0.047160, 0.015317, 0.000000, 7.000000, 2.000000, 5.000000, 0.000000, - 6.862280, -1.351990, 103.688591, -0.845966, 0.498605, 0.189038, 0.390142, 0.635499, 0.916197, 0.079688, 0.004115, 0.000000, 7.000000, 5.000000, 2.000000, 0.000000, - 6.862280, -1.351990, 103.688591, -0.774066, 0.552667, 0.308837, 0.390142, 0.635499, 0.916197, 0.079688, 0.004115, 0.000000, 7.000000, 5.000000, 2.000000, 0.000000, - 4.437190, -4.900400, 103.960289, -0.774066, 0.552667, 0.308837, 0.383721, 0.656332, 0.955716, 0.044284, 0.000000, 0.000000, 7.000000, 5.000000, 0.000000, 0.000000, - 5.333700, -4.900400, 106.207291, -0.774066, 0.552667, 0.308837, 0.395899, 0.657461, 0.982096, 0.016358, 0.001546, 0.000000, 7.000000, 2.000000, 5.000000, 0.000000, - 17.877800, -1.258700, 75.823189, 0.606503, -0.009702, -0.795022, 0.899786, 0.613617, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 17.137100, -0.829690, 75.252892, 0.606503, -0.009702, -0.795022, 0.912541, 0.612718, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 17.652889, 6.494200, 75.556999, 0.606503, -0.009702, -0.795022, 0.909836, 0.574199, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 17.652889, 6.494200, 75.556999, 0.394610, -0.020093, -0.918629, 0.909836, 0.574199, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 18.451200, 6.883800, 75.891403, 0.394610, -0.020093, -0.918629, 0.897084, 0.575074, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 17.877800, -1.258700, 75.823189, 0.394610, -0.020093, -0.918629, 0.899786, 0.613617, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 2.749990, 7.673690, 72.840889, 0.204696, 0.041944, -0.977927, 0.890527, 0.478184, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 3.767200, 7.204690, 73.033691, 0.204696, 0.041944, -0.977927, 0.903204, 0.477681, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 2.338390, 1.233270, 72.478500, 0.204696, 0.041944, -0.977927, 0.901032, 0.445773, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 2.338390, 1.233270, 72.478500, 0.382490, 0.027522, -0.923550, 0.901032, 0.445773, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 1.482190, 1.034780, 72.117989, 0.382490, 0.027522, -0.923550, 0.888452, 0.446461, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 2.749990, 7.673690, 72.840889, 0.382490, 0.027522, -0.923550, 0.890527, 0.478184, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 6.295990, -7.368800, 72.814392, 0.198782, 0.201851, -0.959032, 0.905099, 0.688952, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 6.719700, -6.325500, 73.121803, 0.198782, 0.201851, -0.959032, 0.917831, 0.687968, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 13.376090, -5.677411, 74.637901, 0.198782, 0.201851, -0.959032, 0.915249, 0.651636, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 13.376090, -5.677411, 74.637901, 0.205954, 0.175731, -0.962653, 0.915249, 0.651636, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 13.696390, -6.808221, 74.500000, 0.205954, 0.175731, -0.962653, 0.902481, 0.652546, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 6.295990, -7.368800, 72.814392, 0.205954, 0.175731, -0.962653, 0.905099, 0.688952, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 14.229600, 12.488200, 74.350899, 0.185302, -0.226127, -0.956311, 0.894655, 0.541284, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 13.855600, 11.535090, 74.503799, 0.185302, -0.226127, -0.956311, 0.907461, 0.540604, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 8.501090, 11.866100, 73.388000, 0.185302, -0.226126, -0.956311, 0.905455, 0.511556, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 8.501090, 11.866100, 73.388000, 0.185300, -0.226102, -0.956317, 0.905455, 0.511556, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 8.276480, 12.856200, 73.110390, 0.185300, -0.226102, -0.956317, 0.892671, 0.512240, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 14.229600, 12.488200, 74.350899, 0.185300, -0.226102, -0.956317, 0.894655, 0.541284, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 1.482190, 1.034780, 72.117989, 0.359142, 0.129510, -0.924253, 0.908476, 0.732975, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 2.338390, 1.233270, 72.478500, 0.359142, 0.129510, -0.924253, 0.921039, 0.731952, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 6.719700, -6.325500, 73.121803, 0.359142, 0.129510, -0.924253, 0.917831, 0.687968, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 6.719700, -6.325500, 73.121803, 0.356864, 0.127735, -0.925382, 0.917831, 0.687968, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 6.295990, -7.368800, 72.814392, 0.356864, 0.127735, -0.925382, 0.905099, 0.688952, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 1.482190, 1.034780, 72.117989, 0.356864, 0.127735, -0.925382, 0.908476, 0.732975, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 17.877800, -1.258700, 75.823189, 0.110374, 0.151059, -0.982343, 0.899786, 0.613617, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 13.696390, -6.808221, 74.500000, 0.110374, 0.151059, -0.982343, 0.902481, 0.652546, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 13.376090, -5.677411, 74.637901, 0.110374, 0.151059, -0.982343, 0.915249, 0.651636, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 13.376090, -5.677411, 74.637901, 0.484265, -0.270137, -0.832174, 0.915249, 0.651636, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 17.137100, -0.829690, 75.252892, 0.484265, -0.270137, -0.832174, 0.912541, 0.612718, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 17.877800, -1.258700, 75.823189, 0.484265, -0.270137, -0.832174, 0.899786, 0.613617, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 18.451200, 6.883800, 75.891403, 0.354966, 0.072660, -0.932051, 0.897084, 0.575074, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 17.652889, 6.494200, 75.556999, 0.354966, 0.072660, -0.932051, 0.909836, 0.574199, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 13.855600, 11.535090, 74.503799, 0.354966, 0.072660, -0.932051, 0.907461, 0.540604, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 13.855600, 11.535090, 74.503799, 0.097500, -0.194828, -0.975979, 0.907461, 0.540604, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 14.229600, 12.488200, 74.350899, 0.097500, -0.194828, -0.975979, 0.894655, 0.541284, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 18.451200, 6.883800, 75.891403, 0.097500, -0.194828, -0.975979, 0.897084, 0.575074, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 2.749990, 7.673690, 72.840889, 0.243366, -0.210280, -0.946866, 0.890527, 0.478184, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 8.276480, 12.856200, 73.110390, 0.243366, -0.210280, -0.946866, 0.892671, 0.512240, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 8.501090, 11.866100, 73.388000, 0.243366, -0.210280, -0.946866, 0.905455, 0.511556, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 8.501090, 11.866100, 73.388000, 0.150742, -0.078180, -0.985477, 0.905455, 0.511556, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 3.767200, 7.204690, 73.033691, 0.150742, -0.078180, -0.985477, 0.903204, 0.477681, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 2.749990, 7.673690, 72.840889, 0.150742, -0.078180, -0.985477, 0.890527, 0.478184, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 19.026779, 6.883800, 71.279800, -0.989815, 0.070736, -0.123544, 0.864165, 0.577387, 1.000000, 0.000000, 0.000000, 0.000000, 9.000000, 0.000000, 0.000000, 0.000000, - 18.453400, -1.258700, 71.211594, -0.989815, 0.070736, -0.123544, 0.866876, 0.616123, 1.000000, 0.000000, 0.000000, 0.000000, 9.000000, 0.000000, 0.000000, 0.000000, - 17.877800, -1.258700, 75.823189, -0.989815, 0.070736, -0.123544, 0.899786, 0.613617, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 17.877800, -1.258700, 75.823189, -0.989815, 0.070738, -0.123540, 0.899786, 0.613617, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 18.451200, 6.883800, 75.891403, -0.989815, 0.070738, -0.123540, 0.897084, 0.575074, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 19.026779, 6.883800, 71.279800, -0.989815, 0.070738, -0.123540, 0.864165, 0.577387, 1.000000, 0.000000, 0.000000, 0.000000, 9.000000, 0.000000, 0.000000, 0.000000, - 3.644900, 7.673690, 68.366989, 0.959910, -0.204217, 0.192010, 0.857516, 0.480611, 1.000000, 0.000000, 0.000000, 0.000000, 9.000000, 0.000000, 0.000000, 0.000000, - 2.749990, 7.673690, 72.840889, 0.959910, -0.204217, 0.192010, 0.890527, 0.478184, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 1.482190, 1.034780, 72.117989, 0.959910, -0.204217, 0.192010, 0.888452, 0.446461, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 1.482190, 1.034780, 72.117989, 0.960950, -0.213736, 0.175761, 0.888452, 0.446461, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 2.373570, 1.034780, 67.244492, 0.960950, -0.213736, 0.175761, 0.855339, 0.448824, 1.000000, 0.000000, 0.000000, 0.000000, 9.000000, 0.000000, 0.000000, 0.000000, - 3.644900, 7.673690, 68.366989, 0.960950, -0.213736, 0.175761, 0.857516, 0.480611, 1.000000, 0.000000, 0.000000, 0.000000, 9.000000, 0.000000, 0.000000, 0.000000, - 14.395900, -6.808220, 69.721397, -0.072140, 0.997361, -0.008155, 0.869564, 0.654856, 1.000000, 0.000000, 0.000000, 0.000000, 9.000000, 0.000000, 0.000000, 0.000000, - 6.836200, -7.368800, 68.035690, -0.072140, 0.997361, -0.008155, 0.872156, 0.691320, 1.000000, 0.000000, 0.000000, 0.000000, 9.000000, 0.000000, 0.000000, 0.000000, - 6.295990, -7.368800, 72.814392, -0.072140, 0.997361, -0.008155, 0.905099, 0.688952, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 6.295990, -7.368800, 72.814392, -0.073105, 0.997267, -0.010701, 0.905099, 0.688952, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 13.696390, -6.808221, 74.500000, -0.073105, 0.997267, -0.010701, 0.902481, 0.652546, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 14.395900, -6.808220, 69.721397, -0.073105, 0.997267, -0.010701, 0.869564, 0.654856, 1.000000, 0.000000, 0.000000, 0.000000, 9.000000, 0.000000, 0.000000, 0.000000, - 14.929090, 12.488200, 69.931580, -0.059733, -0.998170, -0.009455, 0.861787, 0.543690, 1.000000, 0.000000, 0.000000, 0.000000, 9.000000, 0.000000, 0.000000, 0.000000, - 14.229600, 12.488200, 74.350899, -0.059733, -0.998170, -0.009455, 0.894655, 0.541284, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 8.276480, 12.856200, 73.110390, -0.059733, -0.998170, -0.009455, 0.892671, 0.512240, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 8.276480, 12.856200, 73.110390, -0.058719, -0.998248, -0.007322, 0.892671, 0.512240, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 8.816690, 12.856200, 68.778389, -0.058719, -0.998248, -0.007322, 0.859785, 0.514598, 1.000000, 0.000000, 0.000000, 0.000000, 9.000000, 0.000000, 0.000000, 0.000000, - 14.929090, 12.488200, 69.931580, -0.058719, -0.998248, -0.007322, 0.861787, 0.543690, 1.000000, 0.000000, 0.000000, 0.000000, 9.000000, 0.000000, 0.000000, 0.000000, - 6.836200, -7.368800, 68.035690, 0.865795, 0.474681, 0.158357, 0.872156, 0.691320, 1.000000, 0.000000, 0.000000, 0.000000, 9.000000, 0.000000, 0.000000, 0.000000, - 2.373570, 1.034780, 67.244492, 0.865795, 0.474681, 0.158357, 0.875367, 0.735300, 1.000000, 0.000000, 0.000000, 0.000000, 9.000000, 0.000000, 0.000000, 0.000000, - 1.482190, 1.034780, 72.117989, 0.865795, 0.474681, 0.158357, 0.908476, 0.732975, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 1.482190, 1.034780, 72.117989, 0.860112, 0.500753, 0.097232, 0.908476, 0.732975, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 6.295990, -7.368800, 72.814392, 0.860112, 0.500753, 0.097232, 0.905099, 0.688952, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 6.836200, -7.368800, 68.035690, 0.860112, 0.500753, 0.097232, 0.872156, 0.691320, 1.000000, 0.000000, 0.000000, 0.000000, 9.000000, 0.000000, 0.000000, 0.000000, - 18.453400, -1.258700, 71.211594, -0.786883, 0.606256, -0.115187, 0.866876, 0.616123, 1.000000, 0.000000, 0.000000, 0.000000, 9.000000, 0.000000, 0.000000, 0.000000, - 14.395900, -6.808220, 69.721397, -0.786883, 0.606256, -0.115187, 0.869564, 0.654856, 1.000000, 0.000000, 0.000000, 0.000000, 9.000000, 0.000000, 0.000000, 0.000000, - 13.696390, -6.808221, 74.500000, -0.786884, 0.606256, -0.115187, 0.902481, 0.652546, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 13.696390, -6.808221, 74.500000, -0.783493, 0.613657, -0.097792, 0.902481, 0.652546, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 17.877800, -1.258700, 75.823189, -0.783493, 0.613657, -0.097792, 0.899786, 0.613617, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 18.453400, -1.258700, 71.211594, -0.783493, 0.613657, -0.097792, 0.866876, 0.616123, 1.000000, 0.000000, 0.000000, 0.000000, 9.000000, 0.000000, 0.000000, 0.000000, - 19.026779, 6.883800, 71.279800, -0.781859, -0.615771, -0.097585, 0.864165, 0.577387, 1.000000, 0.000000, 0.000000, 0.000000, 9.000000, 0.000000, 0.000000, 0.000000, - 18.451200, 6.883800, 75.891403, -0.781859, -0.615771, -0.097585, 0.897084, 0.575074, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 14.229600, 12.488200, 74.350899, -0.781859, -0.615771, -0.097585, 0.894655, 0.541284, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 14.229600, 12.488200, 74.350899, -0.786458, -0.604969, -0.124481, 0.894655, 0.541284, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 14.929090, 12.488200, 69.931580, -0.786458, -0.604969, -0.124481, 0.861787, 0.543690, 1.000000, 0.000000, 0.000000, 0.000000, 9.000000, 0.000000, 0.000000, 0.000000, - 19.026779, 6.883800, 71.279800, -0.786458, -0.604969, -0.124481, 0.864165, 0.577387, 1.000000, 0.000000, 0.000000, 0.000000, 9.000000, 0.000000, 0.000000, 0.000000, - 3.644900, 7.673690, 68.366989, 0.701642, -0.707137, 0.087496, 0.857516, 0.480611, 1.000000, 0.000000, 0.000000, 0.000000, 9.000000, 0.000000, 0.000000, 0.000000, - 8.816690, 12.856200, 68.778389, 0.701642, -0.707137, 0.087496, 0.859785, 0.514598, 1.000000, 0.000000, 0.000000, 0.000000, 9.000000, 0.000000, 0.000000, 0.000000, - 8.276480, 12.856200, 73.110390, 0.701642, -0.707137, 0.087496, 0.892671, 0.512240, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 8.276480, 12.856200, 73.110390, 0.674283, -0.726051, 0.134876, 0.892671, 0.512240, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 2.749990, 7.673690, 72.840889, 0.674283, -0.726051, 0.134876, 0.890527, 0.478184, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 3.644900, 7.673690, 68.366989, 0.674283, -0.726051, 0.134876, 0.857516, 0.480611, 1.000000, 0.000000, 0.000000, 0.000000, 9.000000, 0.000000, 0.000000, 0.000000, - 17.149200, 7.517190, 22.389700, -0.716344, 0.694982, 0.062058, 0.432831, 0.602063, 0.500000, 0.500000, 0.000000, 0.000000, 13.000000, 14.000000, 0.000000, 0.000000, - 15.858190, 6.210000, 22.126490, -0.716344, 0.694982, 0.062058, 0.429994, 0.612200, 0.500000, 0.500000, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 14.434200, 3.293400, 38.351891, -0.716344, 0.694982, 0.062058, 0.516971, 0.647442, 1.000000, 0.000000, 0.000000, 0.000000, 13.000000, 0.000000, 0.000000, 0.000000, - 14.434200, 3.293400, 38.351891, -0.541978, 0.830647, 0.127615, 0.516971, 0.647442, 1.000000, 0.000000, 0.000000, 0.000000, 13.000000, 0.000000, 0.000000, 0.000000, - 17.398399, 5.051790, 39.495399, -0.541978, 0.830647, 0.127615, 0.526377, 0.630591, 1.000000, 0.000000, 0.000000, 0.000000, 13.000000, 0.000000, 0.000000, 0.000000, - 17.149200, 7.517190, 22.389700, -0.541978, 0.830647, 0.127615, 0.432831, 0.602063, 0.500000, 0.500000, 0.000000, 0.000000, 13.000000, 14.000000, 0.000000, 0.000000, - 18.093691, 9.878300, 22.735991, -0.929749, 0.362274, 0.065758, 0.436478, 0.587608, 0.500000, 0.500000, 0.000000, 0.000000, 13.000000, 14.000000, 0.000000, 0.000000, - 17.149200, 7.517190, 22.389700, -0.929749, 0.362274, 0.065758, 0.432831, 0.602063, 0.500000, 0.500000, 0.000000, 0.000000, 13.000000, 14.000000, 0.000000, 0.000000, - 17.398399, 5.051790, 39.495399, -0.929749, 0.362274, 0.065758, 0.526377, 0.630591, 1.000000, 0.000000, 0.000000, 0.000000, 13.000000, 0.000000, 0.000000, 0.000000, - 17.398399, 5.051790, 39.495399, -0.987289, 0.158863, 0.004791, 0.526377, 0.630591, 1.000000, 0.000000, 0.000000, 0.000000, 13.000000, 0.000000, 0.000000, 0.000000, - 18.111601, 9.402990, 42.185379, -0.987289, 0.158864, 0.004791, 0.543586, 0.609829, 1.000000, 0.000000, 0.000000, 0.000000, 13.000000, 0.000000, 0.000000, 0.000000, - 18.093691, 9.878300, 22.735991, -0.987289, 0.158863, 0.004791, 0.436478, 0.587608, 0.500000, 0.500000, 0.000000, 0.000000, 13.000000, 14.000000, 0.000000, 0.000000, - 18.093691, 9.878300, 22.735991, -0.623891, -0.781292, -0.018519, 0.436478, 0.587608, 0.500000, 0.500000, 0.000000, 0.000000, 13.000000, 14.000000, 0.000000, 0.000000, - 18.111601, 9.402990, 42.185379, -0.623891, -0.781292, -0.018519, 0.543586, 0.609829, 1.000000, 0.000000, 0.000000, 0.000000, 13.000000, 0.000000, 0.000000, 0.000000, - 14.176200, 12.555290, 41.774792, -0.623891, -0.781292, -0.018519, 0.546014, 0.584386, 1.000000, 0.000000, 0.000000, 0.000000, 13.000000, 0.000000, 0.000000, 0.000000, - 14.176200, 12.555290, 41.774792, -0.678970, -0.733253, -0.036607, 0.546014, 0.584386, 1.000000, 0.000000, 0.000000, 0.000000, 13.000000, 0.000000, 0.000000, 0.000000, - 15.791900, 12.021400, 22.501390, -0.678970, -0.733253, -0.036607, 0.438964, 0.569045, 0.500000, 0.500000, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 18.093691, 9.878300, 22.735991, -0.678970, -0.733253, -0.036607, 0.436478, 0.587608, 0.500000, 0.500000, 0.000000, 0.000000, 13.000000, 14.000000, 0.000000, 0.000000, - 15.858190, 6.210000, 22.126490, 0.676124, 0.700949, 0.226993, 0.429994, 0.612200, 0.500000, 0.500000, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 14.548190, 7.524090, 21.970591, 0.676124, 0.700949, 0.226993, 0.424901, 0.621262, 0.500000, 0.500000, 0.000000, 0.000000, 13.000000, 14.000000, 0.000000, 0.000000, - 11.407600, 5.360000, 38.007889, 0.676124, 0.700949, 0.226993, 0.507048, 0.665176, 1.000000, 0.000000, 0.000000, 0.000000, 13.000000, 0.000000, 0.000000, 0.000000, - 11.407600, 5.360000, 38.007889, 0.537927, 0.820211, 0.194647, 0.507048, 0.665176, 1.000000, 0.000000, 0.000000, 0.000000, 13.000000, 0.000000, 0.000000, 0.000000, - 14.434200, 3.293400, 38.351891, 0.537927, 0.820211, 0.194647, 0.516971, 0.647442, 1.000000, 0.000000, 0.000000, 0.000000, 13.000000, 0.000000, 0.000000, 0.000000, - 15.858190, 6.210000, 22.126490, 0.537927, 0.820211, 0.194647, 0.429994, 0.612200, 0.500000, 0.500000, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 11.407600, 5.360000, 38.007889, 0.896653, 0.380175, 0.226893, 0.507048, 0.665176, 1.000000, 0.000000, 0.000000, 0.000000, 13.000000, 0.000000, 0.000000, 0.000000, - 14.548190, 7.524090, 21.970591, 0.896653, 0.380175, 0.226893, 0.424901, 0.621262, 0.500000, 0.500000, 0.000000, 0.000000, 13.000000, 14.000000, 0.000000, 0.000000, - 13.536980, 9.890380, 22.001890, 0.896653, 0.380175, 0.226893, 0.417672, 0.633621, 0.500000, 0.500000, 0.000000, 0.000000, 13.000000, 14.000000, 0.000000, 0.000000, - 13.536980, 9.890380, 22.001890, 0.975476, 0.140399, 0.169513, 0.417672, 0.633621, 0.500000, 0.500000, 0.000000, 0.000000, 13.000000, 14.000000, 0.000000, 0.000000, - 10.376280, 9.800590, 40.264801, 0.975476, 0.140399, 0.169513, 0.503547, 0.693363, 1.000000, 0.000000, 0.000000, 0.000000, 13.000000, 0.000000, 0.000000, 0.000000, - 11.407600, 5.360000, 38.007889, 0.975476, 0.140399, 0.169513, 0.507048, 0.665176, 1.000000, 0.000000, 0.000000, 0.000000, 13.000000, 0.000000, 0.000000, 0.000000, - 10.376280, 9.800590, 40.264801, 0.669276, -0.734491, 0.112218, 0.546396, 0.558312, 1.000000, 0.000000, 0.000000, 0.000000, 13.000000, 0.000000, 0.000000, 0.000000, - 13.536980, 9.890380, 22.001890, 0.669276, -0.734491, 0.112218, 0.440047, 0.550948, 0.500000, 0.500000, 0.000000, 0.000000, 13.000000, 14.000000, 0.000000, 0.000000, - 15.791900, 12.021400, 22.501390, 0.669276, -0.734491, 0.112218, 0.438964, 0.569045, 0.500000, 0.500000, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 15.791900, 12.021400, 22.501390, 0.567029, -0.820695, 0.070268, 0.438964, 0.569045, 0.500000, 0.500000, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 14.176200, 12.555290, 41.774792, 0.567029, -0.820695, 0.070268, 0.546014, 0.584386, 1.000000, 0.000000, 0.000000, 0.000000, 13.000000, 0.000000, 0.000000, 0.000000, - 10.376280, 9.800590, 40.264801, 0.567029, -0.820695, 0.070268, 0.546396, 0.558312, 1.000000, 0.000000, 0.000000, 0.000000, 13.000000, 0.000000, 0.000000, 0.000000, - 13.089090, 1.318300, 46.891701, -0.556461, 0.769965, 0.312259, 0.564731, 0.664003, 0.700000, 0.300000, 0.000000, 0.000000, 13.000000, 9.000000, 0.000000, 0.000000, - 12.557200, -0.737690, 51.013489, -0.556461, 0.769965, 0.312259, 0.588509, 0.673496, 0.500000, 0.500000, 0.000000, 0.000000, 9.000000, 13.000000, 0.000000, 0.000000, - 15.487390, 1.156000, 51.565788, -0.556461, 0.769965, 0.312259, 0.594239, 0.656420, 0.500000, 0.500000, 0.000000, 0.000000, 13.000000, 9.000000, 0.000000, 0.000000, - 15.487390, 1.156000, 51.565788, -0.662855, 0.654949, 0.362856, 0.594239, 0.656420, 0.500000, 0.500000, 0.000000, 0.000000, 13.000000, 9.000000, 0.000000, 0.000000, - 15.536290, 2.877190, 48.548401, -0.662855, 0.654949, 0.362856, 0.577335, 0.647425, 0.700000, 0.300000, 0.000000, 0.000000, 13.000000, 9.000000, 0.000000, 0.000000, - 13.089090, 1.318300, 46.891701, -0.662855, 0.654949, 0.362856, 0.564731, 0.664003, 0.700000, 0.300000, 0.000000, 0.000000, 13.000000, 9.000000, 0.000000, 0.000000, - 16.258801, 5.886590, 52.189388, -0.985946, 0.151492, 0.070436, 0.601452, 0.629855, 0.500000, 0.500000, 0.000000, 0.000000, 9.000000, 13.000000, 0.000000, 0.000000, - 15.536290, 2.877190, 48.548401, -0.985946, 0.151492, 0.070436, 0.577335, 0.647425, 0.700000, 0.300000, 0.000000, 0.000000, 13.000000, 9.000000, 0.000000, 0.000000, - 15.487390, 1.156000, 51.565788, -0.985946, 0.151492, 0.070436, 0.594239, 0.656420, 0.500000, 0.500000, 0.000000, 0.000000, 13.000000, 9.000000, 0.000000, 0.000000, - 12.423600, 8.846690, 51.768902, -0.556005, -0.742728, -0.373113, 0.605538, 0.598648, 0.500000, 0.500000, 0.000000, 0.000000, 13.000000, 9.000000, 0.000000, 0.000000, - 14.176200, 12.555290, 41.774792, -0.556006, -0.742728, -0.373113, 0.546014, 0.584386, 1.000000, 0.000000, 0.000000, 0.000000, 13.000000, 0.000000, 0.000000, 0.000000, - 18.111601, 9.402990, 42.185379, -0.556006, -0.742728, -0.373113, 0.543586, 0.609829, 1.000000, 0.000000, 0.000000, 0.000000, 13.000000, 0.000000, 0.000000, 0.000000, - 18.111601, 9.402990, 42.185379, -0.543069, -0.755635, -0.366185, 0.543586, 0.609829, 1.000000, 0.000000, 0.000000, 0.000000, 13.000000, 0.000000, 0.000000, 0.000000, - 16.258801, 5.886590, 52.189388, -0.543069, -0.755635, -0.366185, 0.601452, 0.629855, 0.500000, 0.500000, 0.000000, 0.000000, 9.000000, 13.000000, 0.000000, 0.000000, - 12.423600, 8.846690, 51.768902, -0.543069, -0.755635, -0.366185, 0.605538, 0.598648, 0.500000, 0.500000, 0.000000, 0.000000, 13.000000, 9.000000, 0.000000, 0.000000, - 13.089090, 1.318300, 46.891701, 0.523738, 0.676976, 0.517109, 0.564731, 0.664003, 0.700000, 0.300000, 0.000000, 0.000000, 13.000000, 9.000000, 0.000000, 0.000000, - 10.443390, 2.749390, 47.697800, 0.523738, 0.676976, 0.517109, 0.561210, 0.682423, 0.700000, 0.300000, 0.000000, 0.000000, 13.000000, 9.000000, 0.000000, 0.000000, - 9.599380, 1.172370, 50.617191, 0.523738, 0.676976, 0.517109, 0.579124, 0.688514, 0.500000, 0.500000, 0.000000, 0.000000, 9.000000, 13.000000, 0.000000, 0.000000, - 9.599380, 1.172370, 50.617191, 0.442860, 0.778184, 0.445314, 0.579124, 0.688514, 0.500000, 0.500000, 0.000000, 0.000000, 9.000000, 13.000000, 0.000000, 0.000000, - 12.557200, -0.737690, 51.013489, 0.442860, 0.778184, 0.445314, 0.588509, 0.673496, 0.500000, 0.500000, 0.000000, 0.000000, 9.000000, 13.000000, 0.000000, 0.000000, - 13.089090, 1.318300, 46.891701, 0.442860, 0.778184, 0.445314, 0.564731, 0.664003, 0.700000, 0.300000, 0.000000, 0.000000, 13.000000, 9.000000, 0.000000, 0.000000, - 10.443390, 2.749390, 47.697800, 0.977831, 0.156252, 0.139397, 0.561210, 0.682423, 0.700000, 0.300000, 0.000000, 0.000000, 13.000000, 9.000000, 0.000000, 0.000000, - 11.407600, 5.360000, 38.007889, 0.977831, 0.156252, 0.139397, 0.507048, 0.665176, 1.000000, 0.000000, 0.000000, 0.000000, 13.000000, 0.000000, 0.000000, 0.000000, - 10.376280, 9.800590, 40.264801, 0.977831, 0.156252, 0.139397, 0.503547, 0.693363, 1.000000, 0.000000, 0.000000, 0.000000, 13.000000, 0.000000, 0.000000, 0.000000, - 10.376280, 9.800590, 40.264801, 0.902653, 0.316270, 0.291875, 0.503547, 0.693363, 1.000000, 0.000000, 0.000000, 0.000000, 13.000000, 0.000000, 0.000000, 0.000000, - 8.656200, 4.835400, 50.964500, 0.902653, 0.316270, 0.291875, 0.568758, 0.705268, 0.500000, 0.500000, 0.000000, 0.000000, 9.000000, 13.000000, 0.000000, 0.000000, - 10.443390, 2.749390, 47.697800, 0.902653, 0.316270, 0.291875, 0.561210, 0.682423, 0.700000, 0.300000, 0.000000, 0.000000, 13.000000, 9.000000, 0.000000, 0.000000, - 12.423600, 8.846690, 51.768902, 0.734584, -0.652849, -0.184863, 0.605538, 0.598648, 0.500000, 0.500000, 0.000000, 0.000000, 13.000000, 9.000000, 0.000000, 0.000000, - 8.656200, 4.835400, 50.964500, 0.734584, -0.652849, -0.184863, 0.611650, 0.566587, 0.500000, 0.500000, 0.000000, 0.000000, 9.000000, 13.000000, 0.000000, 0.000000, - 10.376280, 9.800590, 40.264801, 0.734584, -0.652849, -0.184863, 0.546396, 0.558312, 1.000000, 0.000000, 0.000000, 0.000000, 13.000000, 0.000000, 0.000000, 0.000000, - 10.376280, 9.800590, 40.264801, 0.622375, -0.763125, -0.174038, 0.546396, 0.558312, 1.000000, 0.000000, 0.000000, 0.000000, 13.000000, 0.000000, 0.000000, 0.000000, - 14.176200, 12.555290, 41.774792, 0.622375, -0.763125, -0.174038, 0.546014, 0.584386, 1.000000, 0.000000, 0.000000, 0.000000, 13.000000, 0.000000, 0.000000, 0.000000, - 12.423600, 8.846690, 51.768902, 0.622375, -0.763125, -0.174038, 0.605538, 0.598648, 0.500000, 0.500000, 0.000000, 0.000000, 13.000000, 9.000000, 0.000000, 0.000000, - 12.557200, -0.737690, 51.013489, -0.617862, 0.778358, -0.111378, 0.588509, 0.673496, 0.500000, 0.500000, 0.000000, 0.000000, 9.000000, 13.000000, 0.000000, 0.000000, - 12.134980, -0.490700, 55.081791, -0.617862, 0.778358, -0.111378, 0.609131, 0.682551, 0.700000, 0.300000, 0.000000, 0.000000, 9.000000, 13.000000, 0.000000, 0.000000, - 14.728300, 1.538590, 54.877102, -0.617862, 0.778358, -0.111378, 0.612644, 0.660915, 0.700000, 0.300000, 0.000000, 0.000000, 9.000000, 13.000000, 0.000000, 0.000000, - 14.728300, 1.538590, 54.877102, -0.501959, 0.838519, -0.211952, 0.612644, 0.660915, 0.700000, 0.300000, 0.000000, 0.000000, 9.000000, 13.000000, 0.000000, 0.000000, - 15.487390, 1.156000, 51.565788, -0.501959, 0.838519, -0.211952, 0.594239, 0.656420, 0.500000, 0.500000, 0.000000, 0.000000, 13.000000, 9.000000, 0.000000, 0.000000, - 12.557200, -0.737690, 51.013489, -0.501959, 0.838519, -0.211952, 0.588509, 0.673496, 0.500000, 0.500000, 0.000000, 0.000000, 9.000000, 13.000000, 0.000000, 0.000000, - 15.487390, 1.156000, 51.565788, -0.952602, 0.186974, -0.239979, 0.594239, 0.656420, 0.500000, 0.500000, 0.000000, 0.000000, 13.000000, 9.000000, 0.000000, 0.000000, - 14.728300, 1.538590, 54.877102, -0.952602, 0.186974, -0.239979, 0.612644, 0.660915, 0.700000, 0.300000, 0.000000, 0.000000, 9.000000, 13.000000, 0.000000, 0.000000, - 16.258801, 5.886590, 52.189388, -0.952602, 0.186974, -0.239979, 0.601452, 0.629855, 0.500000, 0.500000, 0.000000, 0.000000, 9.000000, 13.000000, 0.000000, 0.000000, - 16.258801, 5.886590, 52.189388, -0.529923, -0.847866, 0.017473, 0.601452, 0.629855, 0.500000, 0.500000, 0.000000, 0.000000, 9.000000, 13.000000, 0.000000, 0.000000, - 16.593901, 5.936800, 64.789101, -0.529923, -0.847866, 0.017473, 0.673173, 0.642347, 0.999332, 0.000668, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 10.706590, 9.592600, 63.633190, -0.529923, -0.847866, 0.017473, 0.675005, 0.603664, 0.999817, 0.000182, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 10.706590, 9.592600, 63.633190, -0.607933, -0.793073, -0.038120, 0.675005, 0.603664, 0.999817, 0.000182, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 12.423600, 8.846690, 51.768902, -0.607933, -0.793073, -0.038120, 0.605538, 0.598648, 0.500000, 0.500000, 0.000000, 0.000000, 13.000000, 9.000000, 0.000000, 0.000000, - 16.258801, 5.886590, 52.189388, -0.607933, -0.793073, -0.038120, 0.601452, 0.629855, 0.500000, 0.500000, 0.000000, 0.000000, 9.000000, 13.000000, 0.000000, 0.000000, - 9.263500, 1.479400, 54.230701, 0.564025, 0.825715, 0.008406, 0.595162, 0.700563, 0.700000, 0.300000, 0.000000, 0.000000, 9.000000, 13.000000, 0.000000, 0.000000, - 12.134980, -0.490700, 55.081791, 0.564025, 0.825715, 0.008406, 0.609131, 0.682551, 0.700000, 0.300000, 0.000000, 0.000000, 9.000000, 13.000000, 0.000000, 0.000000, - 12.557200, -0.737690, 51.013489, 0.564025, 0.825715, 0.008406, 0.588509, 0.673496, 0.500000, 0.500000, 0.000000, 0.000000, 9.000000, 13.000000, 0.000000, 0.000000, - 12.557200, -0.737690, 51.013489, 0.544322, 0.838622, -0.020660, 0.588509, 0.673496, 0.500000, 0.500000, 0.000000, 0.000000, 9.000000, 13.000000, 0.000000, 0.000000, - 9.599380, 1.172370, 50.617191, 0.544322, 0.838622, -0.020660, 0.579124, 0.688514, 0.500000, 0.500000, 0.000000, 0.000000, 9.000000, 13.000000, 0.000000, 0.000000, - 9.263500, 1.479400, 54.230701, 0.544322, 0.838622, -0.020660, 0.595162, 0.700563, 0.700000, 0.300000, 0.000000, 0.000000, 9.000000, 13.000000, 0.000000, 0.000000, - 9.263500, 1.479400, 54.230701, 0.967650, 0.242583, 0.069332, 0.595162, 0.700563, 0.700000, 0.300000, 0.000000, 0.000000, 9.000000, 13.000000, 0.000000, 0.000000, - 9.599380, 1.172370, 50.617191, 0.967650, 0.242583, 0.069332, 0.579124, 0.688514, 0.500000, 0.500000, 0.000000, 0.000000, 9.000000, 13.000000, 0.000000, 0.000000, - 8.656200, 4.835400, 50.964500, 0.967650, 0.242583, 0.069332, 0.568758, 0.705268, 0.500000, 0.500000, 0.000000, 0.000000, 9.000000, 13.000000, 0.000000, 0.000000, - 5.648190, 4.884390, 61.870789, 0.695152, -0.691957, 0.194835, 0.671228, 0.564066, 0.994270, 0.005314, 0.000416, 0.000000, 9.000000, 10.000000, 13.000000, 0.000000, - 8.656200, 4.835400, 50.964500, 0.695152, -0.691957, 0.194835, 0.611650, 0.566587, 0.500000, 0.500000, 0.000000, 0.000000, 9.000000, 13.000000, 0.000000, 0.000000, - 12.423600, 8.846690, 51.768902, 0.695152, -0.691957, 0.194835, 0.605538, 0.598648, 0.500000, 0.500000, 0.000000, 0.000000, 13.000000, 9.000000, 0.000000, 0.000000, - 12.423600, 8.846690, 51.768902, 0.647794, -0.748688, 0.140819, 0.605538, 0.598648, 0.500000, 0.500000, 0.000000, 0.000000, 13.000000, 9.000000, 0.000000, 0.000000, - 10.706590, 9.592600, 63.633190, 0.647794, -0.748688, 0.140819, 0.675005, 0.603664, 0.999817, 0.000182, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 5.648190, 4.884390, 61.870789, 0.647794, -0.748688, 0.140819, 0.671228, 0.564066, 0.994270, 0.005314, 0.000416, 0.000000, 9.000000, 10.000000, 13.000000, 0.000000, - 9.345480, -5.654490, 75.020081, -0.524726, 0.848141, 0.072937, 0.713315, 0.736603, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 14.933690, -2.276200, 75.938904, -0.524726, 0.848141, 0.072937, 0.726886, 0.701308, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 15.847800, -0.668490, 63.820190, -0.524726, 0.848140, 0.072937, 0.662211, 0.676944, 1.000000, 0.000000, 0.000000, 0.000000, 9.000000, 0.000000, 0.000000, 0.000000, - 15.847800, -0.668490, 63.820190, -0.535922, 0.841865, 0.063644, 0.662211, 0.676944, 1.000000, 0.000000, 0.000000, 0.000000, 9.000000, 0.000000, 0.000000, 0.000000, - 10.966300, -3.682990, 62.589890, -0.535922, 0.841865, 0.063644, 0.649362, 0.705258, 1.000000, 0.000000, 0.000000, 0.000000, 9.000000, 0.000000, 0.000000, 0.000000, - 9.345480, -5.654490, 75.020081, -0.535922, 0.841865, 0.063644, 0.713315, 0.736603, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 14.933690, -2.276200, 75.938904, -0.988760, 0.143664, -0.041403, 0.726886, 0.701308, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 16.179991, 6.591700, 76.946289, -0.988760, 0.143664, -0.041403, 0.741809, 0.653018, 0.750000, 0.250000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 16.593901, 5.936800, 64.789101, -0.988760, 0.143664, -0.041403, 0.673173, 0.642347, 0.999332, 0.000668, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 16.593901, 5.936800, 64.789101, -0.990967, 0.120553, -0.058755, 0.673173, 0.642347, 0.999332, 0.000668, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 15.847800, -0.668490, 63.820190, -0.990967, 0.120553, -0.058755, 0.662211, 0.676944, 1.000000, 0.000000, 0.000000, 0.000000, 9.000000, 0.000000, 0.000000, 0.000000, - 14.933690, -2.276200, 75.938904, -0.990967, 0.120553, -0.058755, 0.726886, 0.701308, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 16.593901, 5.936800, 64.789101, -0.491571, -0.870315, 0.030147, 0.673173, 0.642347, 0.999332, 0.000668, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 16.179991, 6.591700, 76.946289, -0.491571, -0.870315, 0.030147, 0.741809, 0.653018, 0.750000, 0.250000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 9.163700, 10.530190, 76.240402, -0.491572, -0.870315, 0.030147, 0.747238, 0.608641, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 9.163700, 10.530190, 76.240402, -0.527339, -0.849654, -0.001348, 0.747238, 0.608641, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 10.706590, 9.592600, 63.633190, -0.527339, -0.849654, -0.001348, 0.675005, 0.603664, 0.999817, 0.000182, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 16.593901, 5.936800, 64.789101, -0.527339, -0.849654, -0.001348, 0.673173, 0.642347, 0.999332, 0.000668, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 10.966300, -3.682990, 62.589890, 0.499057, 0.836282, 0.227099, 0.649362, 0.705258, 1.000000, 0.000000, 0.000000, 0.000000, 9.000000, 0.000000, 0.000000, 0.000000, - 7.001200, -1.029890, 61.533401, 0.499057, 0.836282, 0.227099, 0.632830, 0.725089, 1.000000, 0.000000, 0.000000, 0.000000, 9.000000, 0.000000, 0.000000, 0.000000, - 3.761600, -2.578390, 74.354790, 0.499057, 0.836282, 0.227099, 0.694216, 0.768210, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 3.761600, -2.578390, 74.354790, 0.454939, 0.868446, 0.197062, 0.694216, 0.768210, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 9.345480, -5.654490, 75.020081, 0.454939, 0.868445, 0.197062, 0.713315, 0.736603, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 10.966300, -3.682990, 62.589890, 0.454939, 0.868446, 0.197062, 0.649362, 0.705258, 1.000000, 0.000000, 0.000000, 0.000000, 9.000000, 0.000000, 0.000000, 0.000000, - 5.648190, 4.884390, 61.870789, 0.956779, 0.162066, 0.241470, 0.612151, 0.751552, 0.994270, 0.005314, 0.000416, 0.000000, 9.000000, 10.000000, 13.000000, 0.000000, - 2.368200, 4.805780, 74.919899, 0.956779, 0.162066, 0.241470, 0.669089, 0.802964, 0.700000, 0.300000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 3.761600, -2.578390, 74.354790, 0.956780, 0.162066, 0.241470, 0.694216, 0.768210, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 3.761600, -2.578390, 74.354790, 0.943724, 0.200909, 0.262717, 0.694216, 0.768210, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 7.001200, -1.029890, 61.533401, 0.943724, 0.200909, 0.262717, 0.632830, 0.725089, 1.000000, 0.000000, 0.000000, 0.000000, 9.000000, 0.000000, 0.000000, 0.000000, - 5.648190, 4.884390, 61.870789, 0.943724, 0.200909, 0.262717, 0.612151, 0.751552, 0.994270, 0.005314, 0.000416, 0.000000, 9.000000, 10.000000, 13.000000, 0.000000, - 10.706590, 9.592600, 63.633190, 0.623176, -0.770590, 0.133574, 0.675005, 0.603664, 0.999817, 0.000182, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 9.163700, 10.530190, 76.240402, 0.623176, -0.770591, 0.133574, 0.747238, 0.608641, 0.900000, 0.100000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 2.368200, 4.805780, 74.919899, 0.623176, -0.770591, 0.133574, 0.746208, 0.558395, 0.700000, 0.300000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 2.368200, 4.805780, 74.919899, 0.642973, -0.749603, 0.157100, 0.746208, 0.558395, 0.700000, 0.300000, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 5.648190, 4.884390, 61.870789, 0.642973, -0.749603, 0.157100, 0.671228, 0.564066, 0.994270, 0.005314, 0.000416, 0.000000, 9.000000, 10.000000, 13.000000, 0.000000, - 10.706590, 9.592600, 63.633190, 0.642973, -0.749603, 0.157100, 0.675005, 0.603664, 0.999817, 0.000182, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 14.728300, 1.538590, 54.877102, -0.985257, 0.089942, 0.145532, 0.612644, 0.660915, 0.700000, 0.300000, 0.000000, 0.000000, 9.000000, 13.000000, 0.000000, 0.000000, - 15.847800, -0.668490, 63.820190, -0.985257, 0.089942, 0.145532, 0.662211, 0.676944, 1.000000, 0.000000, 0.000000, 0.000000, 9.000000, 0.000000, 0.000000, 0.000000, - 16.593901, 5.936800, 64.789101, -0.985257, 0.089942, 0.145532, 0.673173, 0.642347, 0.999332, 0.000668, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 16.593901, 5.936800, 64.789101, -0.938351, 0.344878, 0.023582, 0.673173, 0.642347, 0.999332, 0.000668, 0.000000, 0.000000, 9.000000, 6.000000, 0.000000, 0.000000, - 16.258801, 5.886590, 52.189388, -0.938351, 0.344878, 0.023582, 0.601452, 0.629855, 0.500000, 0.500000, 0.000000, 0.000000, 9.000000, 13.000000, 0.000000, 0.000000, - 14.728300, 1.538590, 54.877102, -0.938351, 0.344878, 0.023582, 0.612644, 0.660915, 0.700000, 0.300000, 0.000000, 0.000000, 9.000000, 13.000000, 0.000000, 0.000000, - 12.134980, -0.490700, 55.081791, -0.553628, 0.793916, 0.251381, 0.609131, 0.682551, 0.700000, 0.300000, 0.000000, 0.000000, 9.000000, 13.000000, 0.000000, 0.000000, - 10.966300, -3.682990, 62.589890, -0.553628, 0.793916, 0.251381, 0.649362, 0.705258, 1.000000, 0.000000, 0.000000, 0.000000, 9.000000, 0.000000, 0.000000, 0.000000, - 15.847800, -0.668490, 63.820190, -0.553628, 0.793916, 0.251382, 0.662211, 0.676944, 1.000000, 0.000000, 0.000000, 0.000000, 9.000000, 0.000000, 0.000000, 0.000000, - 15.847800, -0.668490, 63.820190, -0.581648, 0.769821, 0.262796, 0.662211, 0.676944, 1.000000, 0.000000, 0.000000, 0.000000, 9.000000, 0.000000, 0.000000, 0.000000, - 14.728300, 1.538590, 54.877102, -0.581648, 0.769821, 0.262796, 0.612644, 0.660915, 0.700000, 0.300000, 0.000000, 0.000000, 9.000000, 13.000000, 0.000000, 0.000000, - 12.134980, -0.490700, 55.081791, -0.581648, 0.769821, 0.262796, 0.609131, 0.682551, 0.700000, 0.300000, 0.000000, 0.000000, 9.000000, 13.000000, 0.000000, 0.000000, - 12.134980, -0.490700, 55.081791, 0.430395, 0.804305, 0.409700, 0.609131, 0.682551, 0.700000, 0.300000, 0.000000, 0.000000, 9.000000, 13.000000, 0.000000, 0.000000, - 9.263500, 1.479400, 54.230701, 0.430395, 0.804305, 0.409700, 0.595162, 0.700563, 0.700000, 0.300000, 0.000000, 0.000000, 9.000000, 13.000000, 0.000000, 0.000000, - 7.001200, -1.029890, 61.533401, 0.430395, 0.804305, 0.409700, 0.632830, 0.725089, 1.000000, 0.000000, 0.000000, 0.000000, 9.000000, 0.000000, 0.000000, 0.000000, - 7.001200, -1.029890, 61.533401, 0.429622, 0.805001, 0.409143, 0.632830, 0.725089, 1.000000, 0.000000, 0.000000, 0.000000, 9.000000, 0.000000, 0.000000, 0.000000, - 10.966300, -3.682990, 62.589890, 0.429622, 0.805001, 0.409143, 0.649362, 0.705258, 1.000000, 0.000000, 0.000000, 0.000000, 9.000000, 0.000000, 0.000000, 0.000000, - 12.134980, -0.490700, 55.081791, 0.429622, 0.805001, 0.409143, 0.609131, 0.682551, 0.700000, 0.300000, 0.000000, 0.000000, 9.000000, 13.000000, 0.000000, 0.000000, - 5.648190, 4.884390, 61.870789, 0.917480, 0.189955, 0.349496, 0.612151, 0.751552, 0.994270, 0.005314, 0.000416, 0.000000, 9.000000, 10.000000, 13.000000, 0.000000, - 7.001200, -1.029890, 61.533401, 0.917480, 0.189955, 0.349496, 0.632830, 0.725089, 1.000000, 0.000000, 0.000000, 0.000000, 9.000000, 0.000000, 0.000000, 0.000000, - 9.263500, 1.479400, 54.230701, 0.917480, 0.189955, 0.349496, 0.595162, 0.700563, 0.700000, 0.300000, 0.000000, 0.000000, 9.000000, 13.000000, 0.000000, 0.000000, - 9.263500, 1.479400, 54.230701, 0.885561, 0.396225, 0.242462, 0.595162, 0.700563, 0.700000, 0.300000, 0.000000, 0.000000, 9.000000, 13.000000, 0.000000, 0.000000, - 8.656200, 4.835400, 50.964500, 0.885561, 0.396225, 0.242462, 0.568758, 0.705268, 0.500000, 0.500000, 0.000000, 0.000000, 9.000000, 13.000000, 0.000000, 0.000000, - 5.648190, 4.884390, 61.870789, 0.885561, 0.396225, 0.242462, 0.612151, 0.751552, 0.994270, 0.005314, 0.000416, 0.000000, 9.000000, 10.000000, 13.000000, 0.000000, - 10.443390, 2.749390, 47.697800, 0.907659, 0.198655, 0.369719, 0.561210, 0.682423, 0.700000, 0.300000, 0.000000, 0.000000, 13.000000, 9.000000, 0.000000, 0.000000, - 8.656200, 4.835400, 50.964500, 0.907659, 0.198655, 0.369719, 0.568758, 0.705268, 0.500000, 0.500000, 0.000000, 0.000000, 9.000000, 13.000000, 0.000000, 0.000000, - 9.599380, 1.172370, 50.617191, 0.907659, 0.198655, 0.369719, 0.579124, 0.688514, 0.500000, 0.500000, 0.000000, 0.000000, 9.000000, 13.000000, 0.000000, 0.000000, - 13.089090, 1.318300, 46.891701, 0.521980, 0.809299, 0.269393, 0.564731, 0.664003, 0.700000, 0.300000, 0.000000, 0.000000, 13.000000, 9.000000, 0.000000, 0.000000, - 14.434200, 3.293400, 38.351891, 0.521980, 0.809299, 0.269393, 0.516971, 0.647442, 1.000000, 0.000000, 0.000000, 0.000000, 13.000000, 0.000000, 0.000000, 0.000000, - 11.407600, 5.360000, 38.007889, 0.521980, 0.809299, 0.269393, 0.507048, 0.665176, 1.000000, 0.000000, 0.000000, 0.000000, 13.000000, 0.000000, 0.000000, 0.000000, - 11.407600, 5.360000, 38.007889, 0.520451, 0.810070, 0.270033, 0.507048, 0.665176, 1.000000, 0.000000, 0.000000, 0.000000, 13.000000, 0.000000, 0.000000, 0.000000, - 10.443390, 2.749390, 47.697800, 0.520451, 0.810070, 0.270033, 0.561210, 0.682423, 0.700000, 0.300000, 0.000000, 0.000000, 13.000000, 9.000000, 0.000000, 0.000000, - 13.089090, 1.318300, 46.891701, 0.520451, 0.810070, 0.270033, 0.564731, 0.664003, 0.700000, 0.300000, 0.000000, 0.000000, 13.000000, 9.000000, 0.000000, 0.000000, - 17.398399, 5.051790, 39.495399, -0.537842, 0.836016, 0.108639, 0.526377, 0.630591, 1.000000, 0.000000, 0.000000, 0.000000, 13.000000, 0.000000, 0.000000, 0.000000, - 14.434200, 3.293400, 38.351891, -0.537843, 0.836016, 0.108639, 0.516971, 0.647442, 1.000000, 0.000000, 0.000000, 0.000000, 13.000000, 0.000000, 0.000000, 0.000000, - 13.089090, 1.318300, 46.891701, -0.537842, 0.836016, 0.108639, 0.564731, 0.664003, 0.700000, 0.300000, 0.000000, 0.000000, 13.000000, 9.000000, 0.000000, 0.000000, - 13.089090, 1.318300, 46.891701, -0.572740, 0.815998, 0.078202, 0.564731, 0.664003, 0.700000, 0.300000, 0.000000, 0.000000, 13.000000, 9.000000, 0.000000, 0.000000, - 15.536290, 2.877190, 48.548401, -0.572740, 0.815998, 0.078202, 0.577335, 0.647425, 0.700000, 0.300000, 0.000000, 0.000000, 13.000000, 9.000000, 0.000000, 0.000000, - 17.398399, 5.051790, 39.495399, -0.572740, 0.815998, 0.078202, 0.526377, 0.630591, 1.000000, 0.000000, 0.000000, 0.000000, 13.000000, 0.000000, 0.000000, 0.000000, - 15.536290, 2.877190, 48.548401, -0.948705, 0.308960, -0.067107, 0.577335, 0.647425, 0.700000, 0.300000, 0.000000, 0.000000, 13.000000, 9.000000, 0.000000, 0.000000, - 16.258801, 5.886590, 52.189388, -0.948705, 0.308960, -0.067107, 0.601452, 0.629855, 0.500000, 0.500000, 0.000000, 0.000000, 9.000000, 13.000000, 0.000000, 0.000000, - 18.111601, 9.402990, 42.185379, -0.948705, 0.308960, -0.067107, 0.543586, 0.609829, 1.000000, 0.000000, 0.000000, 0.000000, 13.000000, 0.000000, 0.000000, 0.000000, - 18.111601, 9.402990, 42.185379, -0.959942, 0.243283, -0.139012, 0.543586, 0.609829, 1.000000, 0.000000, 0.000000, 0.000000, 13.000000, 0.000000, 0.000000, 0.000000, - 17.398399, 5.051790, 39.495399, -0.959942, 0.243283, -0.139012, 0.526377, 0.630591, 1.000000, 0.000000, 0.000000, 0.000000, 13.000000, 0.000000, 0.000000, 0.000000, - 15.536290, 2.877190, 48.548401, -0.959942, 0.243283, -0.139012, 0.577335, 0.647425, 0.700000, 0.300000, 0.000000, 0.000000, 13.000000, 9.000000, 0.000000, 0.000000, - 18.782499, 5.618698, 16.876896, -0.507111, 0.846528, -0.161952, 0.514942, 0.433887, 0.598788, 0.401212, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 16.614897, 4.320200, 16.876896, -0.507111, 0.846528, -0.161952, 0.517109, 0.447610, 0.659751, 0.340249, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 15.856799, 4.856800, 22.055500, -0.507111, 0.846528, -0.161952, 0.541751, 0.442967, 0.500000, 0.500000, 0.000000, 0.000000, 13.000000, 14.000000, 0.000000, 0.000000, - 15.856799, 4.856800, 22.055500, -0.428485, 0.896812, -0.110134, 0.541751, 0.442967, 0.500000, 0.500000, 0.000000, 0.000000, 13.000000, 14.000000, 0.000000, 0.000000, - 18.258699, 6.043300, 22.372297, -0.428485, 0.896812, -0.110134, 0.540385, 0.430422, 0.500000, 0.500000, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 18.782499, 5.618698, 16.876896, -0.428485, 0.896812, -0.110134, 0.514942, 0.433887, 0.598788, 0.401212, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 19.748102, 1.964200, 10.146900, -0.349406, 0.807387, -0.475438, 0.480668, 0.443233, 0.981907, 0.018093, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 20.275198, 0.082599, 6.564199, -0.349406, 0.807387, -0.475438, 0.461261, 0.445588, 0.750000, 0.250000, 0.000000, 0.000000, 14.000000, 15.000000, 0.000000, 0.000000, - 17.630400, -0.642700, 7.276198, -0.349406, 0.807387, -0.475438, 0.466377, 0.459148, 0.750000, 0.250000, 0.000000, 0.000000, 14.000000, 15.000000, 0.000000, 0.000000, - 17.630400, -0.642700, 7.276198, -0.427014, 0.803545, -0.414698, 0.466377, 0.459148, 0.750000, 0.250000, 0.000000, 0.000000, 14.000000, 15.000000, 0.000000, 0.000000, - 17.563993, 0.912998, 10.358999, -0.427014, 0.803545, -0.414698, 0.483048, 0.454680, 0.987984, 0.012016, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 19.748102, 1.964200, 10.146900, -0.427014, 0.803545, -0.414698, 0.480668, 0.443233, 0.981907, 0.018093, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 20.736898, -2.723700, 4.664198, -0.348446, 0.485914, -0.801544, 0.445994, 0.449911, 0.850000, 0.150000, 0.000000, 0.000000, 15.000000, 14.000000, 0.000000, 0.000000, - 17.630400, -3.471199, 5.561499, -0.348446, 0.485914, -0.801544, 0.451186, 0.463800, 0.850000, 0.150000, 0.000000, 0.000000, 15.000000, 14.000000, 0.000000, 0.000000, - 17.630400, -0.642700, 7.276198, -0.348446, 0.485914, -0.801544, 0.466377, 0.459148, 0.750000, 0.250000, 0.000000, 0.000000, 14.000000, 15.000000, 0.000000, 0.000000, - 17.630400, -0.642700, 7.276198, -0.348920, 0.485365, -0.801671, 0.466377, 0.459148, 0.750000, 0.250000, 0.000000, 0.000000, 14.000000, 15.000000, 0.000000, 0.000000, - 20.275198, 0.082599, 6.564199, -0.348920, 0.485365, -0.801671, 0.461261, 0.445588, 0.750000, 0.250000, 0.000000, 0.000000, 14.000000, 15.000000, 0.000000, 0.000000, - 20.736898, -2.723700, 4.664198, -0.348920, 0.485365, -0.801671, 0.445994, 0.449911, 0.850000, 0.150000, 0.000000, 0.000000, 15.000000, 14.000000, 0.000000, 0.000000, - 20.763296, -6.813999, 3.768400, -0.274683, 0.241769, -0.930643, 0.430298, 0.458341, 1.000000, 0.000000, 0.000000, 0.000000, 15.000000, 0.000000, 0.000000, 0.000000, - 17.630400, -7.604599, 4.487698, -0.274683, 0.241769, -0.930644, 0.433518, 0.469225, 1.000000, 0.000000, 0.000000, 0.000000, 15.000000, 0.000000, 0.000000, 0.000000, - 17.630400, -3.471199, 5.561499, -0.274683, 0.241769, -0.930643, 0.451186, 0.463800, 0.850000, 0.150000, 0.000000, 0.000000, 15.000000, 14.000000, 0.000000, 0.000000, - 17.630400, -3.471199, 5.561499, -0.316176, 0.201013, -0.927161, 0.451186, 0.463800, 0.850000, 0.150000, 0.000000, 0.000000, 15.000000, 14.000000, 0.000000, 0.000000, - 20.736898, -2.723700, 4.664198, -0.316176, 0.201013, -0.927161, 0.445994, 0.449911, 0.850000, 0.150000, 0.000000, 0.000000, 15.000000, 14.000000, 0.000000, 0.000000, - 20.763296, -6.813999, 3.768400, -0.316176, 0.201013, -0.927161, 0.430298, 0.458341, 1.000000, 0.000000, 0.000000, 0.000000, 15.000000, 0.000000, 0.000000, 0.000000, - 21.313396, -8.093797, 1.152399, -0.416487, 0.712704, -0.564439, 0.417816, 0.458531, 1.000000, 0.000000, 0.000000, 0.000000, 15.000000, 0.000000, 0.000000, 0.000000, - 17.630400, -10.353599, 1.016599, -0.416487, 0.712704, -0.564439, 0.416250, 0.474502, 1.000000, 0.000000, 0.000000, 0.000000, 15.000000, 0.000000, 0.000000, 0.000000, - 17.630400, -7.604599, 4.487698, -0.416487, 0.712704, -0.564439, 0.433518, 0.469225, 1.000000, 0.000000, 0.000000, 0.000000, 15.000000, 0.000000, 0.000000, 0.000000, - 17.630400, -7.604599, 4.487698, -0.315879, 0.824368, -0.469721, 0.433518, 0.469225, 1.000000, 0.000000, 0.000000, 0.000000, 15.000000, 0.000000, 0.000000, 0.000000, - 20.763296, -6.813999, 3.768400, -0.315879, 0.824368, -0.469721, 0.430298, 0.458341, 1.000000, 0.000000, 0.000000, 0.000000, 15.000000, 0.000000, 0.000000, 0.000000, - 21.313396, -8.093797, 1.152399, -0.315879, 0.824368, -0.469721, 0.417816, 0.458531, 1.000000, 0.000000, 0.000000, 0.000000, 15.000000, 0.000000, 0.000000, 0.000000, - 17.630400, -9.388897, -1.604799, -0.507226, 0.808784, 0.297641, 0.406643, 0.477435, 1.000000, 0.000000, 0.000000, 0.000000, 15.000000, 0.000000, 0.000000, 0.000000, - 17.630400, -10.353599, 1.016599, -0.507226, 0.808784, 0.297641, 0.416250, 0.474502, 1.000000, 0.000000, 0.000000, 0.000000, 15.000000, 0.000000, 0.000000, 0.000000, - 21.313396, -8.093797, 1.152399, -0.507226, 0.808784, 0.297641, 0.417816, 0.458531, 1.000000, 0.000000, 0.000000, 0.000000, 15.000000, 0.000000, 0.000000, 0.000000, - 21.313396, -8.093797, 1.152399, -0.412905, 0.901737, 0.127987, 0.417816, 0.458531, 1.000000, 0.000000, 0.000000, 0.000000, 15.000000, 0.000000, 0.000000, 0.000000, - 21.313396, -7.702299, -1.605900, -0.412905, 0.901737, 0.127987, 0.407012, 0.455274, 1.000000, 0.000000, 0.000000, 0.000000, 15.000000, 0.000000, 0.000000, 0.000000, - 17.630400, -9.388897, -1.604799, -0.412905, 0.901737, 0.127987, 0.406643, 0.477435, 1.000000, 0.000000, 0.000000, 0.000000, 15.000000, 0.000000, 0.000000, 0.000000, - 18.259199, 12.477197, 22.368896, -0.393479, -0.883863, -0.252906, 0.541273, 0.398637, 0.500000, 0.500000, 0.000000, 0.000000, 13.000000, 14.000000, 0.000000, 0.000000, - 15.856101, 13.635197, 22.060698, -0.393479, -0.883863, -0.252906, 0.541967, 0.386969, 0.500000, 0.500000, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 16.614897, 14.749398, 16.986200, -0.393479, -0.883863, -0.252906, 0.522095, 0.383094, 0.679232, 0.320768, 0.000000, 0.000000, 13.000000, 14.000000, 0.000000, 0.000000, - 16.614897, 14.749398, 16.986200, -0.509165, -0.837577, -0.198028, 0.522095, 0.383094, 0.679232, 0.320768, 0.000000, 0.000000, 13.000000, 14.000000, 0.000000, 0.000000, - 18.782499, 13.497199, 16.709200, -0.509165, -0.837577, -0.198028, 0.517639, 0.393253, 0.659227, 0.340773, 0.000000, 0.000000, 13.000000, 14.000000, 0.000000, 0.000000, - 18.259199, 12.477197, 22.368896, -0.509165, -0.837577, -0.198028, 0.541273, 0.398637, 0.500000, 0.500000, 0.000000, 0.000000, 13.000000, 14.000000, 0.000000, 0.000000, - 19.417801, 14.814999, 13.283600, -0.497437, -0.774745, -0.390291, 0.504291, 0.385471, 0.586975, 0.413025, 0.000000, 0.000000, 13.000000, 14.000000, 0.000000, 0.000000, - 18.782499, 13.497199, 16.709200, -0.497437, -0.774745, -0.390291, 0.517639, 0.393253, 0.659227, 0.340773, 0.000000, 0.000000, 13.000000, 14.000000, 0.000000, 0.000000, - 16.614897, 14.749398, 16.986200, -0.497437, -0.774745, -0.390291, 0.522095, 0.383094, 0.679232, 0.320768, 0.000000, 0.000000, 13.000000, 14.000000, 0.000000, 0.000000, - 16.614897, 14.749398, 16.986200, -0.639692, -0.588293, -0.494676, 0.522095, 0.383094, 0.679232, 0.320768, 0.000000, 0.000000, 13.000000, 14.000000, 0.000000, 0.000000, - 16.884001, 17.278900, 13.629999, -0.639692, -0.588293, -0.494676, 0.510086, 0.371129, 0.615463, 0.384537, 0.000000, 0.000000, 13.000000, 14.000000, 0.000000, 0.000000, - 19.417801, 14.814999, 13.283600, -0.639692, -0.588293, -0.494676, 0.504291, 0.385471, 0.586975, 0.413025, 0.000000, 0.000000, 13.000000, 14.000000, 0.000000, 0.000000, - 17.630400, 16.448700, 7.983899, -0.479791, -0.870878, -0.106643, 0.485066, 0.367603, 0.887816, 0.112184, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 21.395794, 14.353300, 8.154899, -0.479791, -0.870878, -0.106643, 0.481500, 0.385375, 0.904887, 0.095113, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 19.417801, 14.814999, 13.283600, -0.479791, -0.870878, -0.106643, 0.504291, 0.385471, 0.586975, 0.413025, 0.000000, 0.000000, 13.000000, 14.000000, 0.000000, 0.000000, - 19.417801, 14.814999, 13.283600, -0.696135, -0.717784, 0.013516, 0.504291, 0.385471, 0.586975, 0.413025, 0.000000, 0.000000, 13.000000, 14.000000, 0.000000, 0.000000, - 16.884001, 17.278900, 13.629999, -0.696135, -0.717784, 0.013516, 0.510086, 0.371129, 0.615463, 0.384537, 0.000000, 0.000000, 13.000000, 14.000000, 0.000000, 0.000000, - 17.630400, 16.448700, 7.983899, -0.696135, -0.717784, 0.013516, 0.485066, 0.367603, 0.887816, 0.112184, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 17.630400, 14.964800, 5.484899, -0.395540, -0.842908, 0.364767, 0.471612, 0.368677, 0.992869, 0.007131, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 21.395794, 13.197300, 5.483599, -0.395540, -0.842908, 0.364767, 0.469847, 0.386926, 0.997663, 0.002337, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 21.395794, 14.353300, 8.154899, -0.395540, -0.842908, 0.364767, 0.481500, 0.385375, 0.904887, 0.095113, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 21.395794, 14.353300, 8.154899, -0.448412, -0.768545, 0.456360, 0.481500, 0.385375, 0.904887, 0.095113, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 17.630400, 16.448700, 7.983899, -0.448412, -0.768545, 0.456360, 0.485066, 0.367603, 0.887816, 0.112184, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 17.630400, 14.964800, 5.484899, -0.448412, -0.768545, 0.456360, 0.471612, 0.368677, 0.992869, 0.007131, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 22.666098, -3.346297, 1.198099, -0.953931, 0.299971, -0.005809, 0.429018, 0.442405, 0.850000, 0.150000, 0.000000, 0.000000, 15.000000, 14.000000, 0.000000, 0.000000, - 22.666098, -3.400599, -1.605900, -0.953931, 0.299971, -0.005809, 0.417639, 0.436766, 1.000000, 0.000000, 0.000000, 0.000000, 15.000000, 0.000000, 0.000000, 0.000000, - 21.313396, -7.702299, -1.605900, -0.953931, 0.299971, -0.005809, 0.407012, 0.455274, 1.000000, 0.000000, 0.000000, 0.000000, 15.000000, 0.000000, 0.000000, 0.000000, - 21.313396, -7.702299, -1.605900, -0.961097, 0.273471, 0.038815, 0.407012, 0.455274, 1.000000, 0.000000, 0.000000, 0.000000, 15.000000, 0.000000, 0.000000, 0.000000, - 21.313396, -8.093797, 1.152399, -0.961097, 0.273471, 0.038815, 0.417816, 0.458531, 1.000000, 0.000000, 0.000000, 0.000000, 15.000000, 0.000000, 0.000000, 0.000000, - 22.666098, -3.346297, 1.198099, -0.961097, 0.273471, 0.038815, 0.429018, 0.442405, 0.850000, 0.150000, 0.000000, 0.000000, 15.000000, 14.000000, 0.000000, 0.000000, - 22.469294, 2.208499, -0.781399, -0.999381, -0.035165, 0.000681, 0.433611, 0.419808, 0.750000, 0.250000, 0.000000, 0.000000, 14.000000, 15.000000, 0.000000, 0.000000, - 22.666098, -3.400599, -1.605900, -0.999381, -0.035165, 0.000681, 0.417639, 0.436766, 1.000000, 0.000000, 0.000000, 0.000000, 15.000000, 0.000000, 0.000000, 0.000000, - 22.666098, -3.346297, 1.198099, -0.999381, -0.035165, 0.000681, 0.429018, 0.442405, 0.850000, 0.150000, 0.000000, 0.000000, 15.000000, 14.000000, 0.000000, 0.000000, - 22.666098, -3.346297, 1.198099, -0.999414, -0.033990, 0.003982, 0.429018, 0.442405, 0.850000, 0.150000, 0.000000, 0.000000, 15.000000, 14.000000, 0.000000, 0.000000, - 22.469294, 2.536997, 2.022700, -0.999414, -0.033990, 0.003982, 0.445608, 0.424832, 0.800000, 0.200000, 0.000000, 0.000000, 14.000000, 15.000000, 0.000000, 0.000000, - 22.469294, 2.208499, -0.781399, -0.999414, -0.033990, 0.003982, 0.433611, 0.419808, 0.750000, 0.250000, 0.000000, 0.000000, 14.000000, 15.000000, 0.000000, 0.000000, - 22.666098, 8.060097, 6.581599, -0.999212, 0.039416, -0.004618, 0.471669, 0.410151, 0.994015, 0.005985, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 22.469294, 2.208499, -0.781399, -0.999212, 0.039416, -0.004618, 0.433611, 0.419808, 0.750000, 0.250000, 0.000000, 0.000000, 14.000000, 15.000000, 0.000000, 0.000000, - 22.469294, 2.536997, 2.022700, -0.999212, 0.039416, -0.004618, 0.445608, 0.424832, 0.800000, 0.200000, 0.000000, 0.000000, 14.000000, 15.000000, 0.000000, 0.000000, - 22.469294, 2.536997, 2.022700, -0.999080, 0.042143, -0.007926, 0.445608, 0.424832, 0.800000, 0.200000, 0.000000, 0.000000, 14.000000, 15.000000, 0.000000, 0.000000, - 22.666098, 8.380999, 8.287799, -0.999080, 0.042143, -0.007926, 0.478732, 0.410798, 0.954867, 0.045133, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 22.666098, 8.060097, 6.581599, -0.999080, 0.042143, -0.007926, 0.471669, 0.410151, 0.994015, 0.005985, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 21.395794, 14.353300, 8.154899, -0.965680, -0.238371, 0.103155, 0.481500, 0.385375, 0.904887, 0.095113, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 21.395794, 13.197300, 5.483599, -0.965680, -0.238371, 0.103155, 0.469847, 0.386926, 0.997663, 0.002337, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 22.652899, 8.104600, 5.483699, -0.965680, -0.238371, 0.103155, 0.466098, 0.409710, 0.999664, 0.000336, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 22.666098, 8.380999, 8.287799, -0.977926, -0.207447, 0.025051, 0.478732, 0.410798, 0.954867, 0.045133, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 21.395794, 14.353300, 8.154899, -0.977926, -0.207447, 0.025051, 0.481500, 0.385375, 0.904887, 0.095113, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 22.652899, 8.104600, 5.483699, -0.977926, -0.207447, 0.025051, 0.466098, 0.409710, 0.999664, 0.000336, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 22.666098, 8.380999, 8.287799, -0.998572, -0.052511, 0.009876, 0.478732, 0.410798, 0.954867, 0.045133, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 22.652899, 8.104600, 5.483699, -0.998572, -0.052511, 0.009876, 0.466098, 0.409710, 0.999664, 0.000336, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 22.666098, 8.060097, 6.581599, -0.998571, -0.052511, 0.009876, 0.471669, 0.410151, 0.994015, 0.005985, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 20.279299, 9.653599, 16.876896, -0.931297, 0.345477, -0.115461, 0.516058, 0.412547, 0.516662, 0.483338, 0.000000, 0.000000, 13.000000, 14.000000, 0.000000, 0.000000, - 18.782499, 5.618698, 16.876896, -0.931297, 0.345477, -0.115461, 0.514942, 0.433887, 0.598788, 0.401212, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 18.258699, 6.043300, 22.372297, -0.931297, 0.345477, -0.115461, 0.540385, 0.430422, 0.500000, 0.500000, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 18.258699, 6.043300, 22.372297, -0.918819, 0.385513, -0.084570, 0.540385, 0.430422, 0.500000, 0.500000, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 19.688293, 9.491899, 22.560797, -0.918819, 0.385513, -0.084570, 0.540674, 0.413387, 0.500000, 0.500000, 0.000000, 0.000000, 13.000000, 14.000000, 0.000000, 0.000000, - 20.279299, 9.653599, 16.876896, -0.918819, 0.385513, -0.084570, 0.516058, 0.412547, 0.516662, 0.483338, 0.000000, 0.000000, 13.000000, 14.000000, 0.000000, 0.000000, - 18.259199, 12.477197, 22.368896, -0.918960, -0.364440, -0.150648, 0.541273, 0.398637, 0.500000, 0.500000, 0.000000, 0.000000, 13.000000, 14.000000, 0.000000, 0.000000, - 18.782499, 13.497199, 16.709200, -0.918961, -0.364440, -0.150648, 0.517639, 0.393253, 0.659227, 0.340773, 0.000000, 0.000000, 13.000000, 14.000000, 0.000000, 0.000000, - 20.279299, 9.653599, 16.876896, -0.918961, -0.364440, -0.150648, 0.516058, 0.412547, 0.516662, 0.483338, 0.000000, 0.000000, 13.000000, 14.000000, 0.000000, 0.000000, - 20.279299, 9.653599, 16.876896, -0.894301, -0.434884, -0.105360, 0.516058, 0.412547, 0.516662, 0.483338, 0.000000, 0.000000, 13.000000, 14.000000, 0.000000, 0.000000, - 19.688293, 9.491899, 22.560797, -0.894301, -0.434884, -0.105360, 0.540674, 0.413387, 0.500000, 0.500000, 0.000000, 0.000000, 13.000000, 14.000000, 0.000000, 0.000000, - 18.259199, 12.477197, 22.368896, -0.894301, -0.434884, -0.105360, 0.541273, 0.398637, 0.500000, 0.500000, 0.000000, 0.000000, 13.000000, 14.000000, 0.000000, 0.000000, - 21.775400, 9.481700, 11.706999, -0.907082, 0.264467, -0.327506, 0.493629, 0.409729, 0.706395, 0.293605, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 21.341997, 4.469200, 8.859698, -0.907082, 0.264467, -0.327506, 0.477127, 0.428749, 0.976286, 0.023714, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 18.782499, 5.618698, 16.876896, -0.907082, 0.264467, -0.327506, 0.514942, 0.433887, 0.598788, 0.401212, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 18.782499, 5.618698, 16.876896, -0.902165, 0.334670, -0.272203, 0.514942, 0.433887, 0.598788, 0.401212, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 20.279299, 9.653599, 16.876896, -0.902165, 0.334670, -0.272203, 0.516058, 0.412547, 0.516662, 0.483338, 0.000000, 0.000000, 13.000000, 14.000000, 0.000000, 0.000000, - 21.775400, 9.481700, 11.706999, -0.902165, 0.334670, -0.272203, 0.493629, 0.409729, 0.706395, 0.293605, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 19.417801, 14.814999, 13.283600, -0.910374, -0.327775, -0.252552, 0.504291, 0.385471, 0.586975, 0.413025, 0.000000, 0.000000, 13.000000, 14.000000, 0.000000, 0.000000, - 21.775400, 9.481700, 11.706999, -0.910374, -0.327775, -0.252552, 0.493629, 0.409729, 0.706395, 0.293605, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 20.279299, 9.653599, 16.876896, -0.910374, -0.327775, -0.252552, 0.516058, 0.412547, 0.516662, 0.483338, 0.000000, 0.000000, 13.000000, 14.000000, 0.000000, 0.000000, - 20.279299, 9.653599, 16.876896, -0.883975, -0.357394, -0.301426, 0.516058, 0.412547, 0.516662, 0.483338, 0.000000, 0.000000, 13.000000, 14.000000, 0.000000, 0.000000, - 18.782499, 13.497199, 16.709200, -0.883975, -0.357394, -0.301426, 0.517639, 0.393253, 0.659227, 0.340773, 0.000000, 0.000000, 13.000000, 14.000000, 0.000000, 0.000000, - 19.417801, 14.814999, 13.283600, -0.883975, -0.357394, -0.301426, 0.504291, 0.385471, 0.586975, 0.413025, 0.000000, 0.000000, 13.000000, 14.000000, 0.000000, 0.000000, - 22.666098, 8.380999, 8.287799, -0.930988, 0.281074, -0.232937, 0.478732, 0.410798, 0.954867, 0.045133, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 22.469294, 2.536997, 2.022700, -0.930988, 0.281074, -0.232937, 0.445608, 0.424832, 0.800000, 0.200000, 0.000000, 0.000000, 14.000000, 15.000000, 0.000000, 0.000000, - 21.341997, 4.469200, 8.859698, -0.930988, 0.281074, -0.232937, 0.477127, 0.428749, 0.976286, 0.023714, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 21.341997, 4.469200, 8.859698, -0.910287, 0.261163, -0.321202, 0.477127, 0.428749, 0.976286, 0.023714, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 21.775400, 9.481700, 11.706999, -0.910287, 0.261163, -0.321202, 0.493629, 0.409729, 0.706395, 0.293605, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 22.666098, 8.380999, 8.287799, -0.910287, 0.261163, -0.321202, 0.478732, 0.410798, 0.954867, 0.045133, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 21.775400, 9.481700, 11.706999, -0.898085, -0.302665, -0.319119, 0.493629, 0.409729, 0.706395, 0.293605, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 19.417801, 14.814999, 13.283600, -0.898085, -0.302665, -0.319119, 0.504291, 0.385471, 0.586975, 0.413025, 0.000000, 0.000000, 13.000000, 14.000000, 0.000000, 0.000000, - 21.395794, 14.353300, 8.154899, -0.898085, -0.302665, -0.319119, 0.481500, 0.385375, 0.904887, 0.095113, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 21.395794, 14.353300, 8.154899, -0.960733, -0.208423, -0.183175, 0.481500, 0.385375, 0.904887, 0.095113, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 22.666098, 8.380999, 8.287799, -0.960733, -0.208423, -0.183175, 0.478732, 0.410798, 0.954867, 0.045133, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 21.775400, 9.481700, 11.706999, -0.960733, -0.208423, -0.183175, 0.493629, 0.409729, 0.706395, 0.293605, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 21.341997, 4.469200, 8.859698, -0.903631, 0.349398, -0.247736, 0.477127, 0.428749, 0.976286, 0.023714, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 22.469294, 2.536997, 2.022700, -0.903631, 0.349398, -0.247735, 0.445608, 0.424832, 0.800000, 0.200000, 0.000000, 0.000000, 14.000000, 15.000000, 0.000000, 0.000000, - 20.275198, 0.082599, 6.564199, -0.903631, 0.349398, -0.247736, 0.461261, 0.445588, 0.750000, 0.250000, 0.000000, 0.000000, 14.000000, 15.000000, 0.000000, 0.000000, - 20.275198, 0.082599, 6.564199, -0.864321, 0.381624, -0.327586, 0.461261, 0.445588, 0.750000, 0.250000, 0.000000, 0.000000, 14.000000, 15.000000, 0.000000, 0.000000, - 19.748102, 1.964200, 10.146900, -0.864321, 0.381624, -0.327586, 0.480668, 0.443233, 0.981907, 0.018093, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 21.341997, 4.469200, 8.859698, -0.864321, 0.381624, -0.327586, 0.477127, 0.428749, 0.976286, 0.023714, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 22.469294, 2.536997, 2.022700, -0.870029, 0.039770, -0.491394, 0.445608, 0.424832, 0.800000, 0.200000, 0.000000, 0.000000, 14.000000, 15.000000, 0.000000, 0.000000, - 22.666098, -3.346297, 1.198099, -0.870029, 0.039770, -0.491394, 0.429018, 0.442405, 0.850000, 0.150000, 0.000000, 0.000000, 15.000000, 14.000000, 0.000000, 0.000000, - 20.736898, -2.723700, 4.664198, -0.870029, 0.039770, -0.491394, 0.445994, 0.449911, 0.850000, 0.150000, 0.000000, 0.000000, 15.000000, 14.000000, 0.000000, 0.000000, - 20.736898, -2.723700, 4.664198, -0.916869, 0.109129, -0.383982, 0.445994, 0.449911, 0.850000, 0.150000, 0.000000, 0.000000, 15.000000, 14.000000, 0.000000, 0.000000, - 20.275198, 0.082599, 6.564199, -0.916869, 0.109129, -0.383982, 0.461261, 0.445588, 0.750000, 0.250000, 0.000000, 0.000000, 14.000000, 15.000000, 0.000000, 0.000000, - 22.469294, 2.536997, 2.022700, -0.916869, 0.109129, -0.383982, 0.445608, 0.424832, 0.800000, 0.200000, 0.000000, 0.000000, 14.000000, 15.000000, 0.000000, 0.000000, - 20.763296, -6.813999, 3.768400, -0.861068, 0.103475, -0.497849, 0.430298, 0.458341, 1.000000, 0.000000, 0.000000, 0.000000, 15.000000, 0.000000, 0.000000, 0.000000, - 20.736898, -2.723700, 4.664198, -0.861068, 0.103475, -0.497849, 0.445994, 0.449911, 0.850000, 0.150000, 0.000000, 0.000000, 15.000000, 14.000000, 0.000000, 0.000000, - 22.666098, -3.346297, 1.198099, -0.861068, 0.103475, -0.497850, 0.429018, 0.442405, 0.850000, 0.150000, 0.000000, 0.000000, 15.000000, 14.000000, 0.000000, 0.000000, - 22.666098, -3.346297, 1.198099, -0.910387, 0.262475, -0.319847, 0.429018, 0.442405, 0.850000, 0.150000, 0.000000, 0.000000, 15.000000, 14.000000, 0.000000, 0.000000, - 21.313396, -8.093797, 1.152399, -0.910387, 0.262475, -0.319847, 0.417816, 0.458531, 1.000000, 0.000000, 0.000000, 0.000000, 15.000000, 0.000000, 0.000000, 0.000000, - 20.763296, -6.813999, 3.768400, -0.910387, 0.262475, -0.319847, 0.430298, 0.458341, 1.000000, 0.000000, 0.000000, 0.000000, 15.000000, 0.000000, 0.000000, 0.000000, - 17.798698, 4.703199, 29.518997, -0.453141, 0.880999, 0.136032, 0.572459, 0.427456, 1.000000, 0.000000, 0.000000, 0.000000, 13.000000, 0.000000, 0.000000, 0.000000, - 18.258699, 6.043300, 22.372297, -0.453141, 0.880999, 0.136032, 0.540385, 0.430422, 0.500000, 0.500000, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 15.856799, 4.856800, 22.055500, -0.453141, 0.880999, 0.136032, 0.541751, 0.442967, 0.500000, 0.500000, 0.000000, 0.000000, 13.000000, 14.000000, 0.000000, 0.000000, - 15.856799, 4.856800, 22.055500, -0.455336, 0.879782, 0.136578, 0.541751, 0.442967, 0.500000, 0.500000, 0.000000, 0.000000, 13.000000, 14.000000, 0.000000, 0.000000, - 14.855898, 3.253099, 29.048998, -0.455336, 0.879781, 0.136578, 0.573395, 0.436442, 1.000000, 0.000000, 0.000000, 0.000000, 13.000000, 0.000000, 0.000000, 0.000000, - 17.798698, 4.703199, 29.518997, -0.455336, 0.879781, 0.136578, 0.572459, 0.427456, 1.000000, 0.000000, 0.000000, 0.000000, 13.000000, 0.000000, 0.000000, 0.000000, - 14.744999, 13.314299, 29.873997, -0.421932, -0.901421, -0.097023, 0.575119, 0.383967, 1.000000, 0.000000, 0.000000, 0.000000, 13.000000, 0.000000, 0.000000, 0.000000, - 15.856101, 13.635197, 22.060698, -0.421932, -0.901421, -0.097023, 0.541967, 0.386969, 0.500000, 0.500000, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 18.259199, 12.477197, 22.368896, -0.421932, -0.901421, -0.097023, 0.541273, 0.398637, 0.500000, 0.500000, 0.000000, 0.000000, 13.000000, 14.000000, 0.000000, 0.000000, - 18.259199, 12.477197, 22.368896, -0.421258, -0.901774, -0.096669, 0.541273, 0.398637, 0.500000, 0.500000, 0.000000, 0.000000, 13.000000, 14.000000, 0.000000, 0.000000, - 17.720600, 11.899997, 30.100401, -0.421258, -0.901774, -0.096669, 0.574830, 0.397969, 1.000000, 0.000000, 0.000000, 0.000000, 13.000000, 0.000000, 0.000000, 0.000000, - 14.744999, 13.314299, 29.873997, -0.421258, -0.901774, -0.096669, 0.575119, 0.383967, 1.000000, 0.000000, 0.000000, 0.000000, 13.000000, 0.000000, 0.000000, 0.000000, - 19.520899, 8.250698, 30.017200, -0.923754, 0.380607, 0.042618, 0.573596, 0.413939, 1.000000, 0.000000, 0.000000, 0.000000, 13.000000, 0.000000, 0.000000, 0.000000, - 19.688293, 9.491899, 22.560797, -0.923754, 0.380607, 0.042618, 0.540674, 0.413387, 0.500000, 0.500000, 0.000000, 0.000000, 13.000000, 14.000000, 0.000000, 0.000000, - 18.258699, 6.043300, 22.372297, -0.923754, 0.380607, 0.042618, 0.540385, 0.430422, 0.500000, 0.500000, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 18.258699, 6.043300, 22.372297, -0.900636, 0.433944, 0.023400, 0.540385, 0.430422, 0.500000, 0.500000, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 17.798698, 4.703199, 29.518997, -0.900636, 0.433944, 0.023400, 0.572459, 0.427456, 1.000000, 0.000000, 0.000000, 0.000000, 13.000000, 0.000000, 0.000000, 0.000000, - 19.520899, 8.250698, 30.017200, -0.900636, 0.433944, 0.023400, 0.573596, 0.413939, 1.000000, 0.000000, 0.000000, 0.000000, 13.000000, 0.000000, 0.000000, 0.000000, - 17.720600, 11.899997, 30.100401, -0.895522, -0.434793, -0.094844, 0.574830, 0.397969, 1.000000, 0.000000, 0.000000, 0.000000, 13.000000, 0.000000, 0.000000, 0.000000, - 18.259199, 12.477197, 22.368896, -0.895522, -0.434793, -0.094844, 0.541273, 0.398637, 0.500000, 0.500000, 0.000000, 0.000000, 13.000000, 14.000000, 0.000000, 0.000000, - 19.688293, 9.491899, 22.560797, -0.895522, -0.434793, -0.094844, 0.540674, 0.413387, 0.500000, 0.500000, 0.000000, 0.000000, 13.000000, 14.000000, 0.000000, 0.000000, - 19.688293, 9.491899, 22.560797, -0.893753, -0.438790, -0.093106, 0.540674, 0.413387, 0.500000, 0.500000, 0.000000, 0.000000, 13.000000, 14.000000, 0.000000, 0.000000, - 19.520899, 8.250698, 30.017200, -0.893753, -0.438790, -0.093106, 0.573596, 0.413939, 1.000000, 0.000000, 0.000000, 0.000000, 13.000000, 0.000000, 0.000000, 0.000000, - 17.720600, 11.899997, 30.100401, -0.893753, -0.438790, -0.093106, 0.574830, 0.397969, 1.000000, 0.000000, 0.000000, 0.000000, 13.000000, 0.000000, 0.000000, 0.000000, - 15.856799, 4.856800, 22.055500, 0.513848, 0.857772, -0.013659, 0.541751, 0.442967, 0.500000, 0.500000, 0.000000, 0.000000, 13.000000, 14.000000, 0.000000, 0.000000, - 16.614897, 4.320200, 16.876896, 0.513848, 0.857772, -0.013659, 0.517109, 0.447610, 0.659751, 0.340249, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 14.447299, 5.618698, 16.876896, 0.513848, 0.857772, -0.013659, 0.522758, 0.460197, 0.581534, 0.418466, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 14.447299, 5.618698, 16.876896, 0.567688, 0.822562, -0.033493, 0.522758, 0.460197, 0.581534, 0.418466, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 14.103697, 6.053800, 21.738796, 0.567688, 0.822562, -0.033493, 0.544455, 0.452834, 0.500000, 0.500000, 0.000000, 0.000000, 13.000000, 14.000000, 0.000000, 0.000000, - 15.856799, 4.856800, 22.055500, 0.567688, 0.822562, -0.033493, 0.541751, 0.442967, 0.500000, 0.500000, 0.000000, 0.000000, 13.000000, 14.000000, 0.000000, 0.000000, - 15.379999, 1.958800, 10.134499, 0.428999, 0.810122, -0.399577, 0.487569, 0.465529, 0.971473, 0.028527, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 17.563993, 0.912998, 10.358999, 0.428999, 0.810122, -0.399577, 0.483048, 0.454680, 0.987984, 0.012016, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 17.630400, -0.642700, 7.276198, 0.428999, 0.810122, -0.399577, 0.466377, 0.459148, 0.750000, 0.250000, 0.000000, 0.000000, 14.000000, 15.000000, 0.000000, 0.000000, - 17.630400, -0.642700, 7.276198, 0.348457, 0.813330, -0.465910, 0.466377, 0.459148, 0.750000, 0.250000, 0.000000, 0.000000, 14.000000, 15.000000, 0.000000, 0.000000, - 14.985499, 0.082599, 6.564199, 0.348457, 0.813330, -0.465910, 0.469616, 0.473016, 0.750000, 0.250000, 0.000000, 0.000000, 14.000000, 15.000000, 0.000000, 0.000000, - 15.379999, 1.958800, 10.134499, 0.348457, 0.813330, -0.465910, 0.487569, 0.465529, 0.971473, 0.028527, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 17.630400, -0.642700, 7.276198, 0.348436, 0.485916, -0.801547, 0.466377, 0.459148, 0.750000, 0.250000, 0.000000, 0.000000, 14.000000, 15.000000, 0.000000, 0.000000, - 17.630400, -3.471199, 5.561499, 0.348436, 0.485916, -0.801547, 0.451186, 0.463800, 0.850000, 0.150000, 0.000000, 0.000000, 15.000000, 14.000000, 0.000000, 0.000000, - 14.523799, -2.723700, 4.664198, 0.348436, 0.485916, -0.801547, 0.454656, 0.478259, 0.850000, 0.150000, 0.000000, 0.000000, 15.000000, 14.000000, 0.000000, 0.000000, - 14.523799, -2.723700, 4.664198, 0.348908, 0.485369, -0.801673, 0.454656, 0.478259, 0.850000, 0.150000, 0.000000, 0.000000, 15.000000, 14.000000, 0.000000, 0.000000, - 14.985499, 0.082599, 6.564199, 0.348908, 0.485369, -0.801673, 0.469616, 0.473016, 0.750000, 0.250000, 0.000000, 0.000000, 14.000000, 15.000000, 0.000000, 0.000000, - 17.630400, -0.642700, 7.276198, 0.348908, 0.485369, -0.801673, 0.466377, 0.459148, 0.750000, 0.250000, 0.000000, 0.000000, 14.000000, 15.000000, 0.000000, 0.000000, - 17.630400, -3.471199, 5.561499, 0.274674, 0.241769, -0.930646, 0.451186, 0.463800, 0.850000, 0.150000, 0.000000, 0.000000, 15.000000, 14.000000, 0.000000, 0.000000, - 17.630400, -7.604599, 4.487698, 0.274674, 0.241769, -0.930646, 0.433518, 0.469225, 1.000000, 0.000000, 0.000000, 0.000000, 15.000000, 0.000000, 0.000000, 0.000000, - 14.497398, -6.813999, 3.768400, 0.274674, 0.241769, -0.930646, 0.436965, 0.480059, 1.000000, 0.000000, 0.000000, 0.000000, 15.000000, 0.000000, 0.000000, 0.000000, - 14.497398, -6.813999, 3.768400, 0.316166, 0.201013, -0.927164, 0.436965, 0.480059, 1.000000, 0.000000, 0.000000, 0.000000, 15.000000, 0.000000, 0.000000, 0.000000, - 14.523799, -2.723700, 4.664198, 0.316166, 0.201013, -0.927164, 0.454656, 0.478259, 0.850000, 0.150000, 0.000000, 0.000000, 15.000000, 14.000000, 0.000000, 0.000000, - 17.630400, -3.471199, 5.561499, 0.316166, 0.201013, -0.927164, 0.451186, 0.463800, 0.850000, 0.150000, 0.000000, 0.000000, 15.000000, 14.000000, 0.000000, 0.000000, - 17.630400, -7.604599, 4.487698, 0.416477, 0.712708, -0.564442, 0.433518, 0.469225, 1.000000, 0.000000, 0.000000, 0.000000, 15.000000, 0.000000, 0.000000, 0.000000, - 17.630400, -10.353599, 1.016599, 0.416477, 0.712708, -0.564442, 0.416250, 0.474502, 1.000000, 0.000000, 0.000000, 0.000000, 15.000000, 0.000000, 0.000000, 0.000000, - 13.947299, -8.093797, 1.152399, 0.416477, 0.712708, -0.564442, 0.426534, 0.486856, 1.000000, 0.000000, 0.000000, 0.000000, 15.000000, 0.000000, 0.000000, 0.000000, - 13.947299, -8.093797, 1.152399, 0.315869, 0.824372, -0.469720, 0.426534, 0.486856, 1.000000, 0.000000, 0.000000, 0.000000, 15.000000, 0.000000, 0.000000, 0.000000, - 14.497398, -6.813999, 3.768400, 0.315869, 0.824372, -0.469720, 0.436965, 0.480059, 1.000000, 0.000000, 0.000000, 0.000000, 15.000000, 0.000000, 0.000000, 0.000000, - 17.630400, -7.604599, 4.487698, 0.315869, 0.824372, -0.469720, 0.433518, 0.469225, 1.000000, 0.000000, 0.000000, 0.000000, 15.000000, 0.000000, 0.000000, 0.000000, - 17.630400, -9.388897, -1.604799, 0.412895, 0.901741, 0.127988, 0.406643, 0.477435, 1.000000, 0.000000, 0.000000, 0.000000, 15.000000, 0.000000, 0.000000, 0.000000, - 13.947299, -7.702299, -1.605900, 0.412895, 0.901741, 0.127988, 0.419358, 0.495539, 1.000000, 0.000000, 0.000000, 0.000000, 15.000000, 0.000000, 0.000000, 0.000000, - 13.947299, -8.093797, 1.152399, 0.412895, 0.901741, 0.127988, 0.426534, 0.486856, 1.000000, 0.000000, 0.000000, 0.000000, 15.000000, 0.000000, 0.000000, 0.000000, - 13.947299, -8.093797, 1.152399, 0.507215, 0.808790, 0.297643, 0.426534, 0.486856, 1.000000, 0.000000, 0.000000, 0.000000, 15.000000, 0.000000, 0.000000, 0.000000, - 17.630400, -10.353599, 1.016599, 0.507215, 0.808790, 0.297643, 0.416250, 0.474502, 1.000000, 0.000000, 0.000000, 0.000000, 15.000000, 0.000000, 0.000000, 0.000000, - 17.630400, -9.388897, -1.604799, 0.507215, 0.808790, 0.297643, 0.406643, 0.477435, 1.000000, 0.000000, 0.000000, 0.000000, 15.000000, 0.000000, 0.000000, 0.000000, - 15.856101, 13.635197, 22.060698, 0.439619, -0.893389, -0.092694, 0.564035, 0.490250, 0.500000, 0.500000, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 13.455398, 12.487600, 21.735497, 0.439619, -0.893389, -0.092694, 0.558388, 0.480132, 0.500000, 0.500000, 0.000000, 0.000000, 13.000000, 14.000000, 0.000000, 0.000000, - 14.447299, 13.497199, 16.709200, 0.439619, -0.893389, -0.092694, 0.541723, 0.494333, 0.664828, 0.335172, 0.000000, 0.000000, 13.000000, 14.000000, 0.000000, 0.000000, - 14.447299, 13.497199, 16.709200, 0.507752, -0.854239, -0.111640, 0.541723, 0.494333, 0.664828, 0.335172, 0.000000, 0.000000, 13.000000, 14.000000, 0.000000, 0.000000, - 16.614897, 14.749398, 16.986200, 0.507752, -0.854239, -0.111640, 0.548794, 0.503064, 0.679232, 0.320768, 0.000000, 0.000000, 13.000000, 14.000000, 0.000000, 0.000000, - 15.856101, 13.635197, 22.060698, 0.507752, -0.854239, -0.111640, 0.564035, 0.490250, 0.500000, 0.500000, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 14.350198, 14.814999, 13.283600, 0.662493, -0.622768, -0.416248, 0.532895, 0.506750, 0.602108, 0.397892, 0.000000, 0.000000, 13.000000, 14.000000, 0.000000, 0.000000, - 16.884001, 17.278900, 13.629999, 0.662493, -0.622768, -0.416248, 0.542663, 0.518661, 0.615463, 0.384537, 0.000000, 0.000000, 13.000000, 14.000000, 0.000000, 0.000000, - 16.614897, 14.749398, 16.986200, 0.662493, -0.622768, -0.416248, 0.548794, 0.503064, 0.679232, 0.320768, 0.000000, 0.000000, 13.000000, 14.000000, 0.000000, 0.000000, - 16.614897, 14.749398, 16.986200, 0.504057, -0.801198, -0.322502, 0.548794, 0.503064, 0.679232, 0.320768, 0.000000, 0.000000, 13.000000, 14.000000, 0.000000, 0.000000, - 14.447299, 13.497199, 16.709200, 0.504057, -0.801198, -0.322502, 0.541723, 0.494333, 0.664828, 0.335172, 0.000000, 0.000000, 13.000000, 14.000000, 0.000000, 0.000000, - 14.350198, 14.814999, 13.283600, 0.504057, -0.801198, -0.322502, 0.532895, 0.506750, 0.602108, 0.397892, 0.000000, 0.000000, 13.000000, 14.000000, 0.000000, 0.000000, - 14.350198, 14.814999, 13.283600, 0.487125, -0.872729, 0.032471, 0.532895, 0.506750, 0.602108, 0.397892, 0.000000, 0.000000, 13.000000, 14.000000, 0.000000, 0.000000, - 13.864899, 14.353300, 8.154899, 0.487125, -0.872729, 0.032471, 0.513987, 0.516962, 0.850937, 0.149063, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 17.630400, 16.448700, 7.983899, 0.487124, -0.872729, 0.032471, 0.522420, 0.533306, 0.887816, 0.112184, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 17.630400, 16.448700, 7.983899, 0.670157, -0.716435, 0.193937, 0.522420, 0.533306, 0.887816, 0.112184, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 16.884001, 17.278900, 13.629999, 0.670157, -0.716435, 0.193937, 0.542663, 0.518661, 0.615463, 0.384537, 0.000000, 0.000000, 13.000000, 14.000000, 0.000000, 0.000000, - 14.350198, 14.814999, 13.283600, 0.670157, -0.716435, 0.193937, 0.532895, 0.506750, 0.602108, 0.397892, 0.000000, 0.000000, 13.000000, 14.000000, 0.000000, 0.000000, - 13.864899, 14.353300, 8.154899, 0.395531, -0.842911, 0.364768, 0.513987, 0.516962, 0.850937, 0.149063, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 13.864899, 13.197300, 5.483599, 0.395531, -0.842911, 0.364768, 0.502230, 0.519577, 0.989801, 0.010199, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 17.630400, 14.964800, 5.484899, 0.395531, -0.842911, 0.364768, 0.509674, 0.536257, 0.992869, 0.007131, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 17.630400, 14.964800, 5.484899, 0.448402, -0.768550, 0.456363, 0.509674, 0.536257, 0.992869, 0.007131, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 17.630400, 16.448700, 7.983899, 0.448402, -0.768550, 0.456363, 0.522420, 0.533306, 0.887816, 0.112184, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 13.864899, 14.353300, 8.154899, 0.448402, -0.768550, 0.456363, 0.513987, 0.516962, 0.850937, 0.149063, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 13.947299, -7.702299, -1.605900, 0.953937, 0.299950, -0.005809, 0.419358, 0.495539, 1.000000, 0.000000, 0.000000, 0.000000, 15.000000, 0.000000, 0.000000, 0.000000, - 12.594699, -3.400599, -1.605900, 0.953937, 0.299950, -0.005809, 0.438263, 0.504862, 1.000000, 0.000000, 0.000000, 0.000000, 15.000000, 0.000000, 0.000000, 0.000000, - 12.594699, -3.346297, 1.198099, 0.953937, 0.299950, -0.005809, 0.444978, 0.494098, 0.850000, 0.150000, 0.000000, 0.000000, 15.000000, 14.000000, 0.000000, 0.000000, - 12.594699, -3.346297, 1.198099, 0.961102, 0.273452, 0.038812, 0.444978, 0.494098, 0.850000, 0.150000, 0.000000, 0.000000, 15.000000, 14.000000, 0.000000, 0.000000, - 13.947299, -8.093797, 1.152399, 0.961102, 0.273452, 0.038812, 0.426534, 0.486856, 1.000000, 0.000000, 0.000000, 0.000000, 15.000000, 0.000000, 0.000000, 0.000000, - 13.947299, -7.702299, -1.605900, 0.961102, 0.273452, 0.038812, 0.419358, 0.495539, 1.000000, 0.000000, 0.000000, 0.000000, 15.000000, 0.000000, 0.000000, 0.000000, - 12.791398, 2.208400, -0.602599, 0.999395, -0.034728, 0.002042, 0.460316, 0.510249, 0.750000, 0.250000, 0.000000, 0.000000, 14.000000, 15.000000, 0.000000, 0.000000, - 12.791398, 2.524300, 4.770400, 0.999395, -0.034728, 0.002042, 0.473699, 0.489789, 0.750000, 0.250000, 0.000000, 0.000000, 14.000000, 15.000000, 0.000000, 0.000000, - 12.594699, -3.346297, 1.198099, 0.999395, -0.034728, 0.002042, 0.444978, 0.494098, 0.850000, 0.150000, 0.000000, 0.000000, 15.000000, 14.000000, 0.000000, 0.000000, - 12.594699, -3.346297, 1.198099, 0.999381, -0.035169, 0.000681, 0.444978, 0.494098, 0.850000, 0.150000, 0.000000, 0.000000, 15.000000, 14.000000, 0.000000, 0.000000, - 12.594699, -3.400599, -1.605900, 0.999381, -0.035169, 0.000681, 0.438263, 0.504862, 1.000000, 0.000000, 0.000000, 0.000000, 15.000000, 0.000000, 0.000000, 0.000000, - 12.791398, 2.208400, -0.602599, 0.999381, -0.035169, 0.000681, 0.460316, 0.510249, 0.750000, 0.250000, 0.000000, 0.000000, 14.000000, 15.000000, 0.000000, 0.000000, - 12.594699, 8.060097, 6.581599, 0.999260, 0.037814, -0.007053, 0.496266, 0.497570, 0.981322, 0.018678, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 12.594599, 8.380999, 8.287799, 0.999260, 0.037814, -0.007053, 0.501837, 0.494128, 0.921648, 0.078352, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 12.791398, 2.524300, 4.770400, 0.999260, 0.037814, -0.007053, 0.473699, 0.489789, 0.750000, 0.250000, 0.000000, 0.000000, 14.000000, 15.000000, 0.000000, 0.000000, - 12.791398, 2.524300, 4.770400, 0.999342, 0.036205, -0.002129, 0.473699, 0.489789, 0.750000, 0.250000, 0.000000, 0.000000, 14.000000, 15.000000, 0.000000, 0.000000, - 12.791398, 2.208400, -0.602599, 0.999342, 0.036205, -0.002129, 0.460316, 0.510249, 0.750000, 0.250000, 0.000000, 0.000000, 14.000000, 15.000000, 0.000000, 0.000000, - 12.594699, 8.060097, 6.581599, 0.999342, 0.036205, -0.002129, 0.496266, 0.497570, 0.981322, 0.018678, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 12.607799, 8.104600, 5.483699, 0.965680, -0.238370, 0.103154, 0.490879, 0.499555, 0.996037, 0.003963, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 13.864899, 13.197300, 5.483599, 0.965681, -0.238370, 0.103154, 0.502230, 0.519577, 0.989801, 0.010199, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 13.864899, 14.353300, 8.154899, 0.965681, -0.238370, 0.103154, 0.513987, 0.516962, 0.850937, 0.149063, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 12.607799, 8.104600, 5.483699, 0.977926, -0.207446, 0.025051, 0.490879, 0.499555, 0.996037, 0.003963, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 13.864899, 14.353300, 8.154899, 0.977926, -0.207446, 0.025051, 0.513987, 0.516962, 0.850937, 0.149063, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 12.594599, 8.380999, 8.287799, 0.977926, -0.207446, 0.025051, 0.501837, 0.494128, 0.921648, 0.078352, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 12.607799, 8.104600, 5.483699, 0.998606, -0.051862, 0.009813, 0.490879, 0.499555, 0.996037, 0.003963, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 12.594599, 8.380999, 8.287799, 0.998606, -0.051862, 0.009813, 0.501837, 0.494128, 0.921648, 0.078352, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 12.594699, 8.060097, 6.581599, 0.998606, -0.051862, 0.009813, 0.496266, 0.497570, 0.981322, 0.018678, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 13.636898, 9.653599, 16.876896, 0.901895, 0.384032, 0.197749, 0.533662, 0.477519, 0.504958, 0.495042, 0.000000, 0.000000, 13.000000, 14.000000, 0.000000, 0.000000, - 12.673998, 9.508499, 21.550297, 0.901895, 0.384032, 0.197748, 0.551852, 0.468167, 0.500000, 0.500000, 0.000000, 0.000000, 13.000000, 14.000000, 0.000000, 0.000000, - 14.103697, 6.053800, 21.738796, 0.901895, 0.384032, 0.197748, 0.544455, 0.452834, 0.500000, 0.500000, 0.000000, 0.000000, 13.000000, 14.000000, 0.000000, 0.000000, - 14.103697, 6.053800, 21.738796, 0.979115, 0.196653, 0.051597, 0.544455, 0.452834, 0.500000, 0.500000, 0.000000, 0.000000, 13.000000, 14.000000, 0.000000, 0.000000, - 14.447299, 5.618698, 16.876896, 0.979115, 0.196653, 0.051597, 0.522758, 0.460197, 0.581534, 0.418466, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 13.636898, 9.653599, 16.876896, 0.979115, 0.196653, 0.051597, 0.533662, 0.477519, 0.504958, 0.495042, 0.000000, 0.000000, 13.000000, 14.000000, 0.000000, 0.000000, - 13.636898, 9.653599, 16.876896, 0.968515, -0.197599, 0.151439, 0.533662, 0.477519, 0.504958, 0.495042, 0.000000, 0.000000, 13.000000, 14.000000, 0.000000, 0.000000, - 14.447299, 13.497199, 16.709200, 0.968515, -0.197599, 0.151439, 0.541723, 0.494333, 0.664828, 0.335172, 0.000000, 0.000000, 13.000000, 14.000000, 0.000000, 0.000000, - 13.455398, 12.487600, 21.735497, 0.968515, -0.197599, 0.151439, 0.558388, 0.480132, 0.500000, 0.500000, 0.000000, 0.000000, 13.000000, 14.000000, 0.000000, 0.000000, - 13.455398, 12.487600, 21.735497, 0.947282, -0.260097, 0.187101, 0.558388, 0.480132, 0.500000, 0.500000, 0.000000, 0.000000, 13.000000, 14.000000, 0.000000, 0.000000, - 12.673998, 9.508499, 21.550297, 0.947282, -0.260097, 0.187101, 0.551852, 0.468167, 0.500000, 0.500000, 0.000000, 0.000000, 13.000000, 14.000000, 0.000000, 0.000000, - 13.636898, 9.653599, 16.876896, 0.947282, -0.260097, 0.187101, 0.533662, 0.477519, 0.504958, 0.495042, 0.000000, 0.000000, 13.000000, 14.000000, 0.000000, 0.000000, - 13.352698, 9.481700, 11.706999, 0.978634, 0.196557, -0.060333, 0.515291, 0.489075, 0.647511, 0.352489, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 13.636898, 9.653599, 16.876896, 0.978634, 0.196557, -0.060333, 0.533662, 0.477519, 0.504958, 0.495042, 0.000000, 0.000000, 13.000000, 14.000000, 0.000000, 0.000000, - 14.447299, 5.618698, 16.876896, 0.978635, 0.196557, -0.060333, 0.522758, 0.460197, 0.581534, 0.418466, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 14.447299, 5.618698, 16.876896, 0.981359, 0.176595, -0.075826, 0.522758, 0.460197, 0.581534, 0.418466, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 14.100197, 4.461400, 9.689299, 0.981359, 0.176595, -0.075826, 0.494326, 0.476942, 0.917328, 0.082672, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 13.352698, 9.481700, 11.706999, 0.981359, 0.176595, -0.075826, 0.515291, 0.489075, 0.647511, 0.352489, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 13.636898, 9.653599, 16.876896, 0.984292, -0.169768, -0.048464, 0.533662, 0.477519, 0.504958, 0.495042, 0.000000, 0.000000, 13.000000, 14.000000, 0.000000, 0.000000, - 13.352698, 9.481700, 11.706999, 0.984292, -0.169768, -0.048464, 0.515291, 0.489075, 0.647511, 0.352489, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 14.350198, 14.814999, 13.283600, 0.984292, -0.169768, -0.048464, 0.532895, 0.506750, 0.602108, 0.397892, 0.000000, 0.000000, 13.000000, 14.000000, 0.000000, 0.000000, - 14.350198, 14.814999, 13.283600, 0.971781, -0.209614, -0.108183, 0.532895, 0.506750, 0.602108, 0.397892, 0.000000, 0.000000, 13.000000, 14.000000, 0.000000, 0.000000, - 14.447299, 13.497199, 16.709200, 0.971781, -0.209614, -0.108183, 0.541723, 0.494333, 0.664828, 0.335172, 0.000000, 0.000000, 13.000000, 14.000000, 0.000000, 0.000000, - 13.636898, 9.653599, 16.876896, 0.971781, -0.209614, -0.108183, 0.533662, 0.477519, 0.504958, 0.495042, 0.000000, 0.000000, 13.000000, 14.000000, 0.000000, 0.000000, - 14.100197, 4.461400, 9.689299, 0.913632, 0.231435, -0.334236, 0.494326, 0.476942, 0.917328, 0.082672, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 12.791398, 2.524300, 4.770400, 0.913632, 0.231435, -0.334236, 0.473699, 0.489789, 0.750000, 0.250000, 0.000000, 0.000000, 14.000000, 15.000000, 0.000000, 0.000000, - 12.594599, 8.380999, 8.287799, 0.913632, 0.231435, -0.334236, 0.501837, 0.494128, 0.921648, 0.078352, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 12.594599, 8.380999, 8.287799, 0.924239, 0.252664, -0.286258, 0.501837, 0.494128, 0.921648, 0.078352, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 13.352698, 9.481700, 11.706999, 0.924239, 0.252664, -0.286258, 0.515291, 0.489075, 0.647511, 0.352489, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 14.100197, 4.461400, 9.689299, 0.924239, 0.252664, -0.286258, 0.494326, 0.476942, 0.917328, 0.082672, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 13.352698, 9.481700, 11.706999, 0.966807, -0.208912, -0.147106, 0.515291, 0.489075, 0.647511, 0.352489, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 12.594599, 8.380999, 8.287799, 0.966807, -0.208912, -0.147106, 0.501837, 0.494128, 0.921648, 0.078352, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 13.864899, 14.353300, 8.154899, 0.966807, -0.208912, -0.147106, 0.513987, 0.516962, 0.850937, 0.149063, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 13.864899, 14.353300, 8.154899, 0.983855, -0.160770, -0.078624, 0.513987, 0.516962, 0.850937, 0.149063, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 14.350198, 14.814999, 13.283600, 0.983855, -0.160771, -0.078624, 0.532895, 0.506750, 0.602108, 0.397892, 0.000000, 0.000000, 13.000000, 14.000000, 0.000000, 0.000000, - 13.352698, 9.481700, 11.706999, 0.983855, -0.160770, -0.078624, 0.515291, 0.489075, 0.647511, 0.352489, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 14.985499, 0.082599, 6.564199, 0.808820, 0.441088, -0.388911, 0.469616, 0.473016, 0.750000, 0.250000, 0.000000, 0.000000, 14.000000, 15.000000, 0.000000, 0.000000, - 12.791398, 2.524300, 4.770400, 0.808820, 0.441088, -0.388911, 0.473699, 0.489789, 0.750000, 0.250000, 0.000000, 0.000000, 14.000000, 15.000000, 0.000000, 0.000000, - 14.100197, 4.461400, 9.689299, 0.808820, 0.441088, -0.388911, 0.494326, 0.476942, 0.917328, 0.082672, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 14.100197, 4.461400, 9.689299, 0.869565, 0.391037, -0.301574, 0.494326, 0.476942, 0.917328, 0.082672, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 15.379999, 1.958800, 10.134499, 0.869565, 0.391037, -0.301574, 0.487569, 0.465529, 0.971473, 0.028527, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 14.985499, 0.082599, 6.564199, 0.869565, 0.391038, -0.301574, 0.469616, 0.473016, 0.750000, 0.250000, 0.000000, 0.000000, 14.000000, 15.000000, 0.000000, 0.000000, - 14.523799, -2.723700, 4.664198, 0.816649, 0.279797, -0.504775, 0.454656, 0.478259, 0.850000, 0.150000, 0.000000, 0.000000, 15.000000, 14.000000, 0.000000, 0.000000, - 12.594699, -3.346297, 1.198099, 0.816649, 0.279797, -0.504775, 0.444978, 0.494098, 0.850000, 0.150000, 0.000000, 0.000000, 15.000000, 14.000000, 0.000000, 0.000000, - 12.791398, 2.524300, 4.770400, 0.816649, 0.279797, -0.504775, 0.473699, 0.489789, 0.750000, 0.250000, 0.000000, 0.000000, 14.000000, 15.000000, 0.000000, 0.000000, - 12.791398, 2.524300, 4.770400, 0.770054, 0.265936, -0.579910, 0.473699, 0.489789, 0.750000, 0.250000, 0.000000, 0.000000, 14.000000, 15.000000, 0.000000, 0.000000, - 14.985499, 0.082599, 6.564199, 0.770054, 0.265936, -0.579910, 0.469616, 0.473016, 0.750000, 0.250000, 0.000000, 0.000000, 14.000000, 15.000000, 0.000000, 0.000000, - 14.523799, -2.723700, 4.664198, 0.770054, 0.265936, -0.579910, 0.454656, 0.478259, 0.850000, 0.150000, 0.000000, 0.000000, 15.000000, 14.000000, 0.000000, 0.000000, - 14.497398, -6.813999, 3.768400, 0.910395, 0.262457, -0.319839, 0.436965, 0.480059, 1.000000, 0.000000, 0.000000, 0.000000, 15.000000, 0.000000, 0.000000, 0.000000, - 13.947299, -8.093797, 1.152399, 0.910395, 0.262457, -0.319839, 0.426534, 0.486856, 1.000000, 0.000000, 0.000000, 0.000000, 15.000000, 0.000000, 0.000000, 0.000000, - 12.594699, -3.346297, 1.198099, 0.910395, 0.262458, -0.319839, 0.444978, 0.494098, 0.850000, 0.150000, 0.000000, 0.000000, 15.000000, 14.000000, 0.000000, 0.000000, - 12.594699, -3.346297, 1.198099, 0.861080, 0.103470, -0.497830, 0.444978, 0.494098, 0.850000, 0.150000, 0.000000, 0.000000, 15.000000, 14.000000, 0.000000, 0.000000, - 14.523799, -2.723700, 4.664198, 0.861080, 0.103470, -0.497830, 0.454656, 0.478259, 0.850000, 0.150000, 0.000000, 0.000000, 15.000000, 14.000000, 0.000000, 0.000000, - 14.497398, -6.813999, 3.768400, 0.861080, 0.103470, -0.497830, 0.436965, 0.480059, 1.000000, 0.000000, 0.000000, 0.000000, 15.000000, 0.000000, 0.000000, 0.000000, - 12.524100, 4.716299, 28.815998, 0.494274, 0.829233, 0.260894, 0.575506, 0.442631, 1.000000, 0.000000, 0.000000, 0.000000, 13.000000, 0.000000, 0.000000, 0.000000, - 14.855898, 3.253099, 29.048998, 0.494274, 0.829233, 0.260894, 0.573395, 0.436442, 1.000000, 0.000000, 0.000000, 0.000000, 13.000000, 0.000000, 0.000000, 0.000000, - 15.856799, 4.856800, 22.055500, 0.494274, 0.829233, 0.260894, 0.541751, 0.442967, 0.500000, 0.500000, 0.000000, 0.000000, 13.000000, 14.000000, 0.000000, 0.000000, - 15.856799, 4.856800, 22.055500, 0.509696, 0.817466, 0.268252, 0.541751, 0.442967, 0.500000, 0.500000, 0.000000, 0.000000, 13.000000, 14.000000, 0.000000, 0.000000, - 14.103697, 6.053800, 21.738796, 0.509696, 0.817466, 0.268252, 0.544455, 0.452834, 0.500000, 0.500000, 0.000000, 0.000000, 13.000000, 14.000000, 0.000000, 0.000000, - 12.524100, 4.716299, 28.815998, 0.509696, 0.817466, 0.268252, 0.575506, 0.442631, 1.000000, 0.000000, 0.000000, 0.000000, 13.000000, 0.000000, 0.000000, 0.000000, - 15.856101, 13.635197, 22.060698, 0.514313, -0.856762, 0.037951, 0.564035, 0.490250, 0.500000, 0.500000, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 14.744999, 13.314299, 29.873997, 0.514313, -0.856762, 0.037951, 0.595059, 0.478594, 1.000000, 0.000000, 0.000000, 0.000000, 13.000000, 0.000000, 0.000000, 0.000000, - 12.445998, 11.913100, 29.397400, 0.514313, -0.856762, 0.037951, 0.589699, 0.468384, 1.000000, 0.000000, 0.000000, 0.000000, 13.000000, 0.000000, 0.000000, 0.000000, - 12.445998, 11.913100, 29.397400, 0.432430, -0.901605, -0.010634, 0.589699, 0.468384, 1.000000, 0.000000, 0.000000, 0.000000, 13.000000, 0.000000, 0.000000, 0.000000, - 13.455398, 12.487600, 21.735497, 0.432430, -0.901605, -0.010634, 0.558388, 0.480132, 0.500000, 0.500000, 0.000000, 0.000000, 13.000000, 14.000000, 0.000000, 0.000000, - 15.856101, 13.635197, 22.060698, 0.432430, -0.901605, -0.010634, 0.564035, 0.490250, 0.500000, 0.500000, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 10.724199, 8.271600, 28.895796, 0.860678, 0.429591, 0.273286, 0.582388, 0.454328, 1.000000, 0.000000, 0.000000, 0.000000, 13.000000, 0.000000, 0.000000, 0.000000, - 12.524100, 4.716299, 28.815998, 0.860678, 0.429591, 0.273286, 0.575506, 0.442631, 1.000000, 0.000000, 0.000000, 0.000000, 13.000000, 0.000000, 0.000000, 0.000000, - 14.103697, 6.053800, 21.738796, 0.860678, 0.429591, 0.273286, 0.544455, 0.452834, 0.500000, 0.500000, 0.000000, 0.000000, 13.000000, 14.000000, 0.000000, 0.000000, - 14.103697, 6.053800, 21.738796, 0.876625, 0.378962, 0.296506, 0.544455, 0.452834, 0.500000, 0.500000, 0.000000, 0.000000, 13.000000, 14.000000, 0.000000, 0.000000, - 12.673998, 9.508499, 21.550297, 0.876625, 0.378962, 0.296506, 0.551852, 0.468167, 0.500000, 0.500000, 0.000000, 0.000000, 13.000000, 14.000000, 0.000000, 0.000000, - 10.724199, 8.271600, 28.895796, 0.876625, 0.378962, 0.296506, 0.582388, 0.454328, 1.000000, 0.000000, 0.000000, 0.000000, 13.000000, 0.000000, 0.000000, 0.000000, - 12.445998, 11.913100, 29.397400, 0.883597, -0.439893, 0.160470, 0.589699, 0.468384, 1.000000, 0.000000, 0.000000, 0.000000, 13.000000, 0.000000, 0.000000, 0.000000, - 10.724199, 8.271600, 28.895796, 0.883597, -0.439893, 0.160470, 0.582388, 0.454328, 1.000000, 0.000000, 0.000000, 0.000000, 13.000000, 0.000000, 0.000000, 0.000000, - 12.673998, 9.508499, 21.550297, 0.883597, -0.439893, 0.160470, 0.551852, 0.468167, 0.500000, 0.500000, 0.000000, 0.000000, 13.000000, 14.000000, 0.000000, 0.000000, - 12.673998, 9.508499, 21.550297, 0.960062, -0.258476, 0.107100, 0.551852, 0.468167, 0.500000, 0.500000, 0.000000, 0.000000, 13.000000, 14.000000, 0.000000, 0.000000, - 13.455398, 12.487600, 21.735497, 0.960062, -0.258476, 0.107100, 0.558388, 0.480132, 0.500000, 0.500000, 0.000000, 0.000000, 13.000000, 14.000000, 0.000000, 0.000000, - 12.445998, 11.913100, 29.397400, 0.960062, -0.258476, 0.107100, 0.589699, 0.468384, 1.000000, 0.000000, 0.000000, 0.000000, 13.000000, 0.000000, 0.000000, 0.000000, - 21.313396, -7.702299, -1.605900, 0.000000, 0.000000, 1.000000, 0.866263, 0.976581, 1.000000, 0.000000, 0.000000, 0.000000, 15.000000, 0.000000, 0.000000, 0.000000, - 22.666098, -3.400599, -1.605900, 0.000000, 0.000000, 1.000000, 0.885801, 0.972799, 1.000000, 0.000000, 0.000000, 0.000000, 15.000000, 0.000000, 0.000000, 0.000000, - 12.594699, -3.400599, -1.605900, 0.000000, 0.000000, 1.000000, 0.864660, 0.933687, 1.000000, 0.000000, 0.000000, 0.000000, 15.000000, 0.000000, 0.000000, 0.000000, - 13.947299, -7.702299, -1.605900, 0.000000, 0.000000, 1.000000, 0.850793, 0.947977, 1.000000, 0.000000, 0.000000, 0.000000, 15.000000, 0.000000, 0.000000, 0.000000, - 21.313396, -7.702299, -1.605900, 0.000000, 0.000000, 1.000000, 0.866263, 0.976581, 1.000000, 0.000000, 0.000000, 0.000000, 15.000000, 0.000000, 0.000000, 0.000000, - 22.666098, -3.400599, -1.605900, 0.018279, -0.144779, 0.989295, 0.885801, 0.972799, 1.000000, 0.000000, 0.000000, 0.000000, 15.000000, 0.000000, 0.000000, 0.000000, - 22.469294, 2.208499, -0.781399, 0.018279, -0.144779, 0.989295, 0.907393, 0.960148, 0.750000, 0.250000, 0.000000, 0.000000, 14.000000, 15.000000, 0.000000, 0.000000, - 12.791398, 2.208400, -0.602599, 0.018279, -0.144779, 0.989295, 0.887212, 0.922484, 0.750000, 0.250000, 0.000000, 0.000000, 14.000000, 15.000000, 0.000000, 0.000000, - 12.791398, 2.208400, -0.602599, 0.000000, -0.176079, 0.984376, 0.887212, 0.922484, 0.750000, 0.250000, 0.000000, 0.000000, 14.000000, 15.000000, 0.000000, 0.000000, - 12.594699, -3.400599, -1.605900, 0.000000, -0.176079, 0.984376, 0.864660, 0.933687, 1.000000, 0.000000, 0.000000, 0.000000, 15.000000, 0.000000, 0.000000, 0.000000, - 22.666098, -3.400599, -1.605900, 0.000000, -0.176079, 0.984376, 0.885801, 0.972799, 1.000000, 0.000000, 0.000000, 0.000000, 15.000000, 0.000000, 0.000000, 0.000000, - 22.666098, 8.060097, 6.581599, 0.000000, 0.999179, 0.040502, 0.944121, 0.940789, 0.994015, 0.005985, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 22.652899, 8.104600, 5.483699, 0.000000, 0.999179, 0.040502, 0.948331, 0.938388, 0.999664, 0.000336, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 12.607799, 8.104600, 5.483699, 0.000000, 0.999180, 0.040502, 0.926853, 0.899591, 0.996037, 0.003963, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 12.607799, 8.104600, 5.483699, 0.000000, 0.999179, 0.040502, 0.926853, 0.899591, 0.996037, 0.003963, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 12.594699, 8.060097, 6.581599, 0.000000, 0.999179, 0.040502, 0.922579, 0.901895, 0.981322, 0.018678, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 22.652899, 8.317097, -1.151100, 0.000000, 0.000000, 1.000000, 0.973966, 0.924198, 1.000000, 0.000000, 0.000000, 0.000000, 14.000000, 0.000000, 0.000000, 0.000000, - 21.395794, 11.616898, -1.151100, 0.000000, 0.000000, 1.000000, 0.984024, 0.912292, 1.000000, 0.000000, 0.000000, 0.000000, 14.000000, 0.000000, 0.000000, 0.000000, - 13.864899, 11.616898, -1.151100, 0.000000, 0.000000, 1.000000, 0.967932, 0.883200, 1.000000, 0.000000, 0.000000, 0.000000, 14.000000, 0.000000, 0.000000, 0.000000, - 12.607799, 8.317097, -1.151100, 0.000000, 0.000000, 1.000000, 0.952497, 0.885396, 1.000000, 0.000000, 0.000000, 0.000000, 14.000000, 0.000000, 0.000000, 0.000000, - 22.652899, 8.317097, -1.151100, 0.000000, 0.000000, 1.000000, 0.973966, 0.924198, 1.000000, 0.000000, 0.000000, 0.000000, 14.000000, 0.000000, 0.000000, 0.000000, - 22.666098, 8.060097, 6.581599, 0.000000, -0.775346, 0.631537, 0.944121, 0.940789, 0.994015, 0.005985, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 12.594699, 8.060097, 6.581599, 0.000000, -0.775346, 0.631537, 0.922579, 0.901895, 0.981322, 0.018678, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 12.791398, 2.208400, -0.602599, 0.000000, -0.775346, 0.631537, 0.887212, 0.922484, 0.750000, 0.250000, 0.000000, 0.000000, 14.000000, 15.000000, 0.000000, 0.000000, - 12.791398, 2.208400, -0.602599, 0.011499, -0.782975, 0.621947, 0.887212, 0.922484, 0.750000, 0.250000, 0.000000, 0.000000, 14.000000, 15.000000, 0.000000, 0.000000, - 22.469294, 2.208499, -0.781399, 0.011499, -0.782975, 0.621947, 0.907393, 0.960148, 0.750000, 0.250000, 0.000000, 0.000000, 14.000000, 15.000000, 0.000000, 0.000000, - 22.666098, 8.060097, 6.581599, 0.011499, -0.782975, 0.621947, 0.944121, 0.940789, 0.994015, 0.005985, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 13.947299, -7.702299, -1.605900, 0.000000, 0.000653, 1.000000, 0.850793, 0.947977, 1.000000, 0.000000, 0.000000, 0.000000, 15.000000, 0.000000, 0.000000, 0.000000, - 17.630400, -9.388897, -1.604799, 0.000000, 0.000653, 1.000000, 0.851979, 0.965822, 1.000000, 0.000000, 0.000000, 0.000000, 15.000000, 0.000000, 0.000000, 0.000000, - 21.313396, -7.702299, -1.605900, 0.000000, 0.000653, 1.000000, 0.866263, 0.976581, 1.000000, 0.000000, 0.000000, 0.000000, 15.000000, 0.000000, 0.000000, 0.000000, - 21.395794, 11.616898, -1.151100, 0.000000, -0.001050, 0.999999, 0.984024, 0.912292, 1.000000, 0.000000, 0.000000, 0.000000, 14.000000, 0.000000, 0.000000, 0.000000, - 17.630400, 12.762100, -1.149898, 0.000000, -0.001050, 0.999999, 0.980402, 0.895299, 1.000000, 0.000000, 0.000000, 0.000000, 14.000000, 0.000000, 0.000000, 0.000000, - 13.864899, 11.616898, -1.151100, 0.000000, -0.001050, 0.999999, 0.967932, 0.883200, 1.000000, 0.000000, 0.000000, 0.000000, 14.000000, 0.000000, 0.000000, 0.000000, - 17.630400, 12.762100, -1.149898, -0.283639, -0.932831, 0.222203, 0.440886, 0.370710, 1.000000, 0.000000, 0.000000, 0.000000, 14.000000, 0.000000, 0.000000, 0.000000, - 21.395794, 11.616898, -1.151100, -0.283639, -0.932832, 0.222203, 0.440308, 0.388025, 1.000000, 0.000000, 0.000000, 0.000000, 14.000000, 0.000000, 0.000000, 0.000000, - 21.395794, 13.197300, 5.483599, -0.283639, -0.932831, 0.222203, 0.469847, 0.386926, 0.997663, 0.002337, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 21.395794, 13.197300, 5.483599, -0.406858, -0.866962, 0.287825, 0.469847, 0.386926, 0.997663, 0.002337, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 17.630400, 14.964800, 5.484899, -0.406858, -0.866962, 0.287825, 0.471612, 0.368677, 0.992869, 0.007131, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 17.630400, 12.762100, -1.149898, -0.406858, -0.866962, 0.287825, 0.440886, 0.370710, 1.000000, 0.000000, 0.000000, 0.000000, 14.000000, 0.000000, 0.000000, 0.000000, - 21.395794, 11.616898, -1.151100, -0.934423, -0.355982, -0.011401, 0.440308, 0.388025, 1.000000, 0.000000, 0.000000, 0.000000, 14.000000, 0.000000, 0.000000, 0.000000, - 22.652899, 8.317097, -1.151100, -0.934423, -0.355982, -0.011401, 0.437537, 0.403334, 1.000000, 0.000000, 0.000000, 0.000000, 14.000000, 0.000000, 0.000000, 0.000000, - 22.652899, 8.104600, 5.483699, -0.934423, -0.355982, -0.011401, 0.466098, 0.409710, 0.999664, 0.000336, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 22.652899, 8.104600, 5.483699, -0.969281, -0.239261, 0.056993, 0.466098, 0.409710, 0.999664, 0.000336, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 21.395794, 13.197300, 5.483599, -0.969281, -0.239261, 0.056992, 0.469847, 0.386926, 0.997663, 0.002337, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 21.395794, 11.616898, -1.151100, -0.969281, -0.239261, 0.056992, 0.440308, 0.388025, 1.000000, 0.000000, 0.000000, 0.000000, 14.000000, 0.000000, 0.000000, 0.000000, - 22.652899, 8.317097, -1.151100, 0.000000, 0.999488, 0.032011, 0.973966, 0.924198, 1.000000, 0.000000, 0.000000, 0.000000, 14.000000, 0.000000, 0.000000, 0.000000, - 12.607799, 8.317097, -1.151100, 0.000000, 0.999487, 0.032011, 0.952497, 0.885396, 1.000000, 0.000000, 0.000000, 0.000000, 14.000000, 0.000000, 0.000000, 0.000000, - 12.607799, 8.104600, 5.483699, 0.000000, 0.999488, 0.032011, 0.926853, 0.899591, 0.996037, 0.003963, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 22.652899, 8.104600, 5.483699, 0.000000, 0.999487, 0.032011, 0.948331, 0.938388, 0.999664, 0.000336, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 13.864899, 11.616898, -1.151100, 0.969281, -0.239260, 0.056992, 0.473914, 0.528452, 1.000000, 0.000000, 0.000000, 0.000000, 14.000000, 0.000000, 0.000000, 0.000000, - 13.864899, 13.197300, 5.483599, 0.969281, -0.239260, 0.056992, 0.502230, 0.519577, 0.989801, 0.010199, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 12.607799, 8.104600, 5.483699, 0.969281, -0.239260, 0.056992, 0.490879, 0.499555, 0.996037, 0.003963, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 12.607799, 8.104600, 5.483699, 0.934424, -0.355980, -0.011401, 0.490879, 0.499555, 0.996037, 0.003963, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 12.607799, 8.317097, -1.151100, 0.934424, -0.355980, -0.011401, 0.466191, 0.515041, 1.000000, 0.000000, 0.000000, 0.000000, 14.000000, 0.000000, 0.000000, 0.000000, - 13.864899, 11.616898, -1.151100, 0.934424, -0.355980, -0.011401, 0.473914, 0.528452, 1.000000, 0.000000, 0.000000, 0.000000, 14.000000, 0.000000, 0.000000, 0.000000, - 17.630400, 12.762100, -1.149898, 0.406849, -0.866966, 0.287826, 0.480158, 0.544525, 1.000000, 0.000000, 0.000000, 0.000000, 14.000000, 0.000000, 0.000000, 0.000000, - 17.630400, 14.964800, 5.484899, 0.406849, -0.866966, 0.287826, 0.509674, 0.536257, 0.992869, 0.007131, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 13.864899, 13.197300, 5.483599, 0.406849, -0.866966, 0.287826, 0.502230, 0.519577, 0.989801, 0.010199, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 13.864899, 13.197300, 5.483599, 0.283632, -0.932834, 0.222203, 0.502230, 0.519577, 0.989801, 0.010199, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 13.864899, 11.616898, -1.151100, 0.283632, -0.932834, 0.222203, 0.473914, 0.528452, 1.000000, 0.000000, 0.000000, 0.000000, 14.000000, 0.000000, 0.000000, 0.000000, - 17.630400, 12.762100, -1.149898, 0.283632, -0.932834, 0.222203, 0.480158, 0.544525, 1.000000, 0.000000, 0.000000, 0.000000, 14.000000, 0.000000, 0.000000, 0.000000, - 21.341997, 4.469200, 8.859698, -0.863992, 0.380012, -0.330316, 0.477127, 0.428749, 0.976286, 0.023714, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 19.748102, 1.964200, 10.146900, -0.863992, 0.380012, -0.330316, 0.480668, 0.443233, 0.981907, 0.018093, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 18.782499, 5.618698, 16.876896, -0.863992, 0.380012, -0.330316, 0.514942, 0.433887, 0.598788, 0.401212, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 16.614897, 4.320200, 16.876896, -0.452262, 0.754968, -0.474849, 0.517109, 0.447610, 0.659751, 0.340249, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 18.782499, 5.618698, 16.876896, -0.452262, 0.754968, -0.474850, 0.514942, 0.433887, 0.598788, 0.401212, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 19.748102, 1.964200, 10.146900, -0.452262, 0.754968, -0.474849, 0.480668, 0.443233, 0.981907, 0.018093, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 19.748102, 1.964200, 10.146900, -0.419784, 0.777824, -0.467730, 0.480668, 0.443233, 0.981907, 0.018093, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 17.563993, 0.912998, 10.358999, -0.419784, 0.777823, -0.467730, 0.483048, 0.454680, 0.987984, 0.012016, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 16.614897, 4.320200, 16.876896, -0.419784, 0.777824, -0.467730, 0.517109, 0.447610, 0.659751, 0.340249, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 15.379999, 1.958800, 10.134499, 0.478030, 0.797982, -0.367032, 0.487569, 0.465529, 0.971473, 0.028527, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 14.447299, 5.618698, 16.876896, 0.478030, 0.797982, -0.367032, 0.522758, 0.460197, 0.581534, 0.418466, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 16.614897, 4.320200, 16.876896, 0.478030, 0.797982, -0.367032, 0.517109, 0.447610, 0.659751, 0.340249, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 16.614897, 4.320200, 16.876896, 0.432120, 0.823510, -0.367564, 0.517109, 0.447610, 0.659751, 0.340249, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 17.563993, 0.912998, 10.358999, 0.432120, 0.823510, -0.367564, 0.483048, 0.454680, 0.987984, 0.012016, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 15.379999, 1.958800, 10.134499, 0.432120, 0.823510, -0.367564, 0.487569, 0.465529, 0.971473, 0.028527, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 15.379999, 1.958800, 10.134499, 0.892626, 0.436313, -0.113359, 0.487569, 0.465529, 0.971473, 0.028527, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 14.100197, 4.461400, 9.689299, 0.892626, 0.436313, -0.113359, 0.494326, 0.476942, 0.917328, 0.082672, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 14.447299, 5.618698, 16.876896, 0.892626, 0.436313, -0.113359, 0.522758, 0.460197, 0.581534, 0.418466, 0.000000, 0.000000, 14.000000, 13.000000, 0.000000, 0.000000, - 37.302181, 3.471190, 79.003990, -0.992336, -0.007469, -0.123342, 0.111636, 0.456491, 0.497899, 0.252101, 0.250000, 0.000000, 16.000000, 17.000000, 18.000000, 0.000000, - 37.710701, 3.006890, 75.745392, -0.992336, -0.007469, -0.123342, 0.108018, 0.420697, 0.750000, 0.250000, 0.000000, 0.000000, 18.000000, 19.000000, 0.000000, 0.000000, - 37.707691, 1.419990, 75.865700, -0.992336, -0.007469, -0.123342, 0.096392, 0.418069, 0.750000, 0.250000, 0.000000, 0.000000, 18.000000, 19.000000, 0.000000, 0.000000, - 37.707691, 1.419990, 75.865700, -0.980598, 0.079970, -0.178975, 0.096392, 0.418069, 0.750000, 0.250000, 0.000000, 0.000000, 18.000000, 19.000000, 0.000000, 0.000000, - 37.103100, 1.384990, 79.162590, -0.980598, 0.079970, -0.178975, 0.095001, 0.446598, 0.750000, 0.250000, 0.000000, 0.000000, 18.000000, 16.000000, 0.000000, 0.000000, - 37.302181, 3.471190, 79.003990, -0.980598, 0.079970, -0.178975, 0.111636, 0.456491, 0.497899, 0.252101, 0.250000, 0.000000, 16.000000, 17.000000, 18.000000, 0.000000, - 37.710701, 3.006890, 75.745392, -0.997753, -0.003224, -0.066923, 0.108018, 0.420697, 0.750000, 0.250000, 0.000000, 0.000000, 18.000000, 19.000000, 0.000000, 0.000000, - 37.862492, 2.835590, 73.490593, -0.997753, -0.003224, -0.066923, 0.111076, 0.400859, 0.750000, 0.250000, 0.000000, 0.000000, 19.000000, 18.000000, 0.000000, 0.000000, - 37.859600, 1.279000, 73.608688, -0.997753, -0.003224, -0.066923, 0.098897, 0.398862, 0.750000, 0.250000, 0.000000, 0.000000, 19.000000, 18.000000, 0.000000, 0.000000, - 37.859600, 1.279000, 73.608688, -0.997751, -0.003184, -0.066955, 0.098897, 0.398862, 0.750000, 0.250000, 0.000000, 0.000000, 19.000000, 18.000000, 0.000000, 0.000000, - 37.707691, 1.419990, 75.865700, -0.997751, -0.003184, -0.066955, 0.096392, 0.418069, 0.750000, 0.250000, 0.000000, 0.000000, 18.000000, 19.000000, 0.000000, 0.000000, - 37.710701, 3.006890, 75.745392, -0.997751, -0.003184, -0.066955, 0.108018, 0.420697, 0.750000, 0.250000, 0.000000, 0.000000, 18.000000, 19.000000, 0.000000, 0.000000, - 37.862492, 2.835590, 73.490593, -0.970297, 0.012652, 0.241585, 0.111076, 0.400859, 0.750000, 0.250000, 0.000000, 0.000000, 19.000000, 18.000000, 0.000000, 0.000000, - 37.138802, 2.619370, 70.595299, -0.970297, 0.012652, 0.241585, 0.116117, 0.375566, 1.000000, 0.000000, 0.000000, 0.000000, 19.000000, 0.000000, 0.000000, 0.000000, - 37.147480, 1.119800, 70.708687, -0.970297, 0.012652, 0.241585, 0.102799, 0.373382, 1.000000, 0.000000, 0.000000, 0.000000, 19.000000, 0.000000, 0.000000, 0.000000, - 37.147480, 1.119800, 70.708687, -0.971210, 0.019815, 0.237401, 0.102799, 0.373382, 1.000000, 0.000000, 0.000000, 0.000000, 19.000000, 0.000000, 0.000000, 0.000000, - 37.859600, 1.279000, 73.608688, -0.971210, 0.019815, 0.237401, 0.098897, 0.398862, 0.750000, 0.250000, 0.000000, 0.000000, 19.000000, 18.000000, 0.000000, 0.000000, - 37.862492, 2.835590, 73.490593, -0.971210, 0.019815, 0.237401, 0.111076, 0.400859, 0.750000, 0.250000, 0.000000, 0.000000, 19.000000, 18.000000, 0.000000, 0.000000, - 37.302181, 3.471190, 79.003990, -0.989162, -0.116884, -0.088866, 0.111636, 0.456491, 0.497899, 0.252101, 0.250000, 0.000000, 16.000000, 17.000000, 18.000000, 0.000000, - 36.669979, 9.265290, 78.420082, -0.989162, -0.116884, -0.088866, 0.171699, 0.481266, 0.750000, 0.250000, 0.000000, 0.000000, 17.000000, 16.000000, 0.000000, 0.000000, - 36.944801, 8.998390, 75.712090, -0.989162, -0.116884, -0.088866, 0.183131, 0.462501, 0.750000, 0.250000, 0.000000, 0.000000, 17.000000, 20.000000, 0.000000, 0.000000, - 36.944801, 8.998390, 75.712090, -0.983663, -0.134719, -0.119408, 0.183131, 0.462501, 0.750000, 0.250000, 0.000000, 0.000000, 17.000000, 20.000000, 0.000000, 0.000000, - 37.712292, 3.390590, 75.716499, -0.983663, -0.134719, -0.119408, 0.142782, 0.434518, 0.750000, 0.250000, 0.000000, 0.000000, 17.000000, 20.000000, 0.000000, 0.000000, - 37.302181, 3.471190, 79.003990, -0.983663, -0.134719, -0.119408, 0.111636, 0.456491, 0.497899, 0.252101, 0.250000, 0.000000, 16.000000, 17.000000, 18.000000, 0.000000, - 37.712292, 3.390590, 75.716499, -0.990318, -0.135560, -0.029898, 0.142782, 0.434518, 0.750000, 0.250000, 0.000000, 0.000000, 17.000000, 20.000000, 0.000000, 0.000000, - 36.944801, 8.998390, 75.712090, -0.990318, -0.135560, -0.029898, 0.183131, 0.462501, 0.750000, 0.250000, 0.000000, 0.000000, 17.000000, 20.000000, 0.000000, 0.000000, - 37.034889, 8.789590, 73.674789, -0.990318, -0.135560, -0.029898, 0.191669, 0.447454, 0.750000, 0.250000, 0.000000, 0.000000, 20.000000, 17.000000, 0.000000, 0.000000, - 37.034889, 8.789590, 73.674789, -0.987185, -0.147181, -0.061669, 0.191669, 0.447454, 0.750000, 0.250000, 0.000000, 0.000000, 20.000000, 17.000000, 0.000000, 0.000000, - 37.863380, 3.325400, 73.453499, -0.987185, -0.147181, -0.061669, 0.155391, 0.418781, 0.750000, 0.250000, 0.000000, 0.000000, 20.000000, 17.000000, 0.000000, 0.000000, - 37.712292, 3.390590, 75.716499, -0.987185, -0.147181, -0.061669, 0.142782, 0.434518, 0.750000, 0.250000, 0.000000, 0.000000, 17.000000, 20.000000, 0.000000, 0.000000, - 37.863380, 3.325400, 73.453499, -0.939846, -0.154833, 0.304492, 0.155391, 0.418781, 0.750000, 0.250000, 0.000000, 0.000000, 20.000000, 17.000000, 0.000000, 0.000000, - 37.034889, 8.789590, 73.674789, -0.939846, -0.154833, 0.304492, 0.191669, 0.447454, 0.750000, 0.250000, 0.000000, 0.000000, 20.000000, 17.000000, 0.000000, 0.000000, - 36.286201, 8.284970, 71.107292, -0.939846, -0.154833, 0.304492, 0.204127, 0.427865, 1.000000, 0.000000, 0.000000, 0.000000, 20.000000, 0.000000, 0.000000, 0.000000, - 36.286201, 8.284970, 71.107292, -0.950211, -0.182790, 0.252362, 0.204127, 0.427865, 1.000000, 0.000000, 0.000000, 0.000000, 20.000000, 0.000000, 0.000000, 0.000000, - 37.136002, 3.109290, 70.558189, -0.950211, -0.182790, 0.252362, 0.169242, 0.396812, 1.000000, 0.000000, 0.000000, 0.000000, 20.000000, 0.000000, 0.000000, 0.000000, - 37.863380, 3.325400, 73.453499, -0.950211, -0.182790, 0.252362, 0.155391, 0.418781, 0.750000, 0.250000, 0.000000, 0.000000, 20.000000, 17.000000, 0.000000, 0.000000, - 37.710701, 3.006890, 75.745392, -0.110009, -0.985825, 0.126673, 0.108018, 0.420697, 0.750000, 0.250000, 0.000000, 0.000000, 18.000000, 19.000000, 0.000000, 0.000000, - 37.302181, 3.471190, 79.003990, -0.110009, -0.985825, 0.126673, 0.111636, 0.456491, 0.497899, 0.252101, 0.250000, 0.000000, 16.000000, 17.000000, 18.000000, 0.000000, - 34.447392, 3.648400, 77.903893, -0.110009, -0.985826, 0.126673, 0.118464, 0.444956, 0.477273, 0.272727, 0.250000, 0.000000, 18.000000, 17.000000, 16.000000, 0.000000, - 34.447392, 3.648400, 77.903893, -0.098403, -0.984690, 0.143882, 0.118464, 0.444956, 0.477273, 0.272727, 0.250000, 0.000000, 18.000000, 17.000000, 16.000000, 0.000000, - 36.387482, 3.029900, 74.997902, -0.098403, -0.984690, 0.143882, 0.119086, 0.416931, 0.750000, 0.250000, 0.000000, 0.000000, 18.000000, 19.000000, 0.000000, 0.000000, - 37.710701, 3.006890, 75.745392, -0.098403, -0.984690, 0.143882, 0.108018, 0.420697, 0.750000, 0.250000, 0.000000, 0.000000, 18.000000, 19.000000, 0.000000, 0.000000, - 37.707691, 1.419990, 75.865700, -0.110002, 0.993699, 0.021489, 0.096392, 0.418069, 0.750000, 0.250000, 0.000000, 0.000000, 18.000000, 19.000000, 0.000000, 0.000000, - 36.384289, 1.289400, 75.129997, -0.110002, 0.993699, 0.021489, 0.085753, 0.409941, 0.750000, 0.250000, 0.000000, 0.000000, 18.000000, 19.000000, 0.000000, 0.000000, - 35.421589, 1.108290, 78.576897, -0.110002, 0.993699, 0.021489, 0.079285, 0.437406, 0.750000, 0.250000, 0.000000, 0.000000, 18.000000, 16.000000, 0.000000, 0.000000, - 35.421589, 1.108290, 78.576897, -0.156183, 0.987561, -0.018157, 0.079285, 0.437406, 0.750000, 0.250000, 0.000000, 0.000000, 18.000000, 16.000000, 0.000000, 0.000000, - 37.103100, 1.384990, 79.162590, -0.156183, 0.987561, -0.018157, 0.095001, 0.446598, 0.750000, 0.250000, 0.000000, 0.000000, 18.000000, 16.000000, 0.000000, 0.000000, - 37.707691, 1.419990, 75.865700, -0.156183, 0.987561, -0.018157, 0.096392, 0.418069, 0.750000, 0.250000, 0.000000, 0.000000, 18.000000, 19.000000, 0.000000, 0.000000, - 37.859600, 1.279000, 73.608688, -0.031577, 0.998800, -0.037450, 0.098897, 0.398862, 0.750000, 0.250000, 0.000000, 0.000000, 19.000000, 18.000000, 0.000000, 0.000000, - 36.473400, 1.249090, 73.979790, -0.031577, 0.998799, -0.037450, 0.087022, 0.399243, 0.750000, 0.250000, 0.000000, 0.000000, 19.000000, 18.000000, 0.000000, 0.000000, - 36.384289, 1.289400, 75.129997, -0.031577, 0.998799, -0.037450, 0.085753, 0.409941, 0.750000, 0.250000, 0.000000, 0.000000, 18.000000, 19.000000, 0.000000, 0.000000, - 36.384289, 1.289400, 75.129997, -0.061392, 0.995906, -0.066344, 0.085753, 0.409941, 0.750000, 0.250000, 0.000000, 0.000000, 18.000000, 19.000000, 0.000000, 0.000000, - 37.707691, 1.419990, 75.865700, -0.061392, 0.995906, -0.066344, 0.096392, 0.418069, 0.750000, 0.250000, 0.000000, 0.000000, 18.000000, 19.000000, 0.000000, 0.000000, - 37.859600, 1.279000, 73.608688, -0.061392, 0.995906, -0.066344, 0.098897, 0.398862, 0.750000, 0.250000, 0.000000, 0.000000, 19.000000, 18.000000, 0.000000, 0.000000, - 37.862492, 2.835590, 73.490593, -0.057849, -0.995743, 0.071754, 0.111076, 0.400859, 0.750000, 0.250000, 0.000000, 0.000000, 19.000000, 18.000000, 0.000000, 0.000000, - 37.710701, 3.006890, 75.745392, -0.057849, -0.995743, 0.071754, 0.108018, 0.420697, 0.750000, 0.250000, 0.000000, 0.000000, 18.000000, 19.000000, 0.000000, 0.000000, - 36.387482, 3.029900, 74.997902, -0.057849, -0.995743, 0.071754, 0.119086, 0.416931, 0.750000, 0.250000, 0.000000, 0.000000, 18.000000, 19.000000, 0.000000, 0.000000, - 36.387482, 3.029900, 74.997902, -0.042387, -0.995321, 0.086830, 0.119086, 0.416931, 0.750000, 0.250000, 0.000000, 0.000000, 18.000000, 19.000000, 0.000000, 0.000000, - 36.476601, 2.926190, 73.852592, -0.042387, -0.995321, 0.086830, 0.121998, 0.405198, 0.750000, 0.250000, 0.000000, 0.000000, 19.000000, 18.000000, 0.000000, 0.000000, - 37.862492, 2.835590, 73.490593, -0.042387, -0.995321, 0.086830, 0.111076, 0.400859, 0.750000, 0.250000, 0.000000, 0.000000, 19.000000, 18.000000, 0.000000, 0.000000, - 37.147480, 1.119800, 70.708687, -0.003962, 0.999179, -0.040309, 0.102799, 0.373382, 1.000000, 0.000000, 0.000000, 0.000000, 19.000000, 0.000000, 0.000000, 0.000000, - 35.893188, 1.117400, 70.772491, -0.003962, 0.999179, -0.040309, 0.091763, 0.370265, 1.000000, 0.000000, 0.000000, 0.000000, 19.000000, 0.000000, 0.000000, 0.000000, - 36.473400, 1.249090, 73.979790, -0.003962, 0.999179, -0.040309, 0.087022, 0.399243, 0.750000, 0.250000, 0.000000, 0.000000, 19.000000, 18.000000, 0.000000, 0.000000, - 36.473400, 1.249090, 73.979790, -0.033980, 0.998342, -0.046462, 0.087022, 0.399243, 0.750000, 0.250000, 0.000000, 0.000000, 19.000000, 18.000000, 0.000000, 0.000000, - 37.859600, 1.279000, 73.608688, -0.033980, 0.998342, -0.046462, 0.098897, 0.398862, 0.750000, 0.250000, 0.000000, 0.000000, 19.000000, 18.000000, 0.000000, 0.000000, - 37.147480, 1.119800, 70.708687, -0.033980, 0.998342, -0.046462, 0.102799, 0.373382, 1.000000, 0.000000, 0.000000, 0.000000, 19.000000, 0.000000, 0.000000, 0.000000, - 37.138802, 2.619370, 70.595299, -0.042860, -0.995454, 0.085053, 0.116117, 0.375566, 1.000000, 0.000000, 0.000000, 0.000000, 19.000000, 0.000000, 0.000000, 0.000000, - 37.862492, 2.835590, 73.490593, -0.042860, -0.995454, 0.085053, 0.111076, 0.400859, 0.750000, 0.250000, 0.000000, 0.000000, 19.000000, 18.000000, 0.000000, 0.000000, - 36.476601, 2.926190, 73.852592, -0.042860, -0.995454, 0.085053, 0.121998, 0.405198, 0.750000, 0.250000, 0.000000, 0.000000, 19.000000, 18.000000, 0.000000, 0.000000, - 36.476601, 2.926190, 73.852592, 0.006720, -0.995442, 0.095132, 0.121998, 0.405198, 0.750000, 0.250000, 0.000000, 0.000000, 19.000000, 18.000000, 0.000000, 0.000000, - 35.884480, 2.617000, 70.659103, 0.006720, -0.995442, 0.095132, 0.127554, 0.376374, 1.000000, 0.000000, 0.000000, 0.000000, 19.000000, 0.000000, 0.000000, 0.000000, - 37.138802, 2.619370, 70.595299, 0.006720, -0.995442, 0.095132, 0.116117, 0.375566, 1.000000, 0.000000, 0.000000, 0.000000, 19.000000, 0.000000, 0.000000, 0.000000, - 37.147480, 1.119800, 70.708687, 0.050514, 0.075593, 0.995858, 0.102799, 0.373382, 1.000000, 0.000000, 0.000000, 0.000000, 19.000000, 0.000000, 0.000000, 0.000000, - 37.138802, 2.619370, 70.595299, 0.050514, 0.075593, 0.995858, 0.116117, 0.375566, 1.000000, 0.000000, 0.000000, 0.000000, 19.000000, 0.000000, 0.000000, 0.000000, - 35.884480, 2.617000, 70.659103, 0.050514, 0.075593, 0.995858, 0.117729, 0.364695, 1.000000, 0.000000, 0.000000, 0.000000, 19.000000, 0.000000, 0.000000, 0.000000, - 35.884480, 2.617000, 70.659103, 0.050514, 0.075592, 0.995859, 0.117729, 0.364695, 1.000000, 0.000000, 0.000000, 0.000000, 19.000000, 0.000000, 0.000000, 0.000000, - 35.893188, 1.117400, 70.772491, 0.050514, 0.075592, 0.995859, 0.104745, 0.362565, 1.000000, 0.000000, 0.000000, 0.000000, 19.000000, 0.000000, 0.000000, 0.000000, - 37.147480, 1.119800, 70.708687, 0.050514, 0.075592, 0.995859, 0.102799, 0.373382, 1.000000, 0.000000, 0.000000, 0.000000, 19.000000, 0.000000, 0.000000, 0.000000, - 36.944801, 8.998390, 75.712090, -0.010686, -0.995227, 0.097005, 0.183131, 0.462501, 0.750000, 0.250000, 0.000000, 0.000000, 17.000000, 20.000000, 0.000000, 0.000000, - 36.669979, 9.265290, 78.420082, -0.010686, -0.995227, 0.097005, 0.171699, 0.481266, 0.750000, 0.250000, 0.000000, 0.000000, 17.000000, 16.000000, 0.000000, 0.000000, - 33.739792, 9.189680, 77.321579, -0.010686, -0.995227, 0.097005, 0.198453, 0.488377, 1.000000, 0.000000, 0.000000, 0.000000, 16.000000, 0.000000, 0.000000, 0.000000, - 33.739792, 9.189680, 77.321579, -0.012411, -0.995532, 0.093606, 0.198453, 0.488377, 1.000000, 0.000000, 0.000000, 0.000000, 16.000000, 0.000000, 0.000000, 0.000000, - 34.756001, 8.905390, 74.432793, -0.012411, -0.995532, 0.093606, 0.206059, 0.462555, 0.500000, 0.500000, 0.000000, 0.000000, 17.000000, 20.000000, 0.000000, 0.000000, - 36.944801, 8.998390, 75.712090, -0.012411, -0.995532, 0.093606, 0.183131, 0.462501, 0.750000, 0.250000, 0.000000, 0.000000, 17.000000, 20.000000, 0.000000, 0.000000, - 37.712292, 3.390590, 75.716499, 0.039527, 0.997500, -0.058570, 0.142782, 0.434518, 0.750000, 0.250000, 0.000000, 0.000000, 17.000000, 20.000000, 0.000000, 0.000000, - 35.521889, 3.394900, 74.311691, 0.039527, 0.997500, -0.058570, 0.136752, 0.412871, 0.500000, 0.500000, 0.000000, 0.000000, 17.000000, 20.000000, 0.000000, 0.000000, - 34.447392, 3.648400, 77.903893, 0.039527, 0.997500, -0.058570, 0.118464, 0.444956, 0.477273, 0.272727, 0.250000, 0.000000, 18.000000, 17.000000, 16.000000, 0.000000, - 34.447392, 3.648400, 77.903893, 0.068075, 0.997552, -0.015965, 0.118464, 0.444956, 0.477273, 0.272727, 0.250000, 0.000000, 18.000000, 17.000000, 16.000000, 0.000000, - 37.302181, 3.471190, 79.003990, 0.068075, 0.997552, -0.015965, 0.111636, 0.456491, 0.497899, 0.252101, 0.250000, 0.000000, 16.000000, 17.000000, 18.000000, 0.000000, - 37.712292, 3.390590, 75.716499, 0.068075, 0.997553, -0.015965, 0.142782, 0.434518, 0.750000, 0.250000, 0.000000, 0.000000, 17.000000, 20.000000, 0.000000, 0.000000, - 37.863380, 3.325400, 73.453499, 0.019592, 0.999430, -0.027482, 0.155391, 0.418781, 0.750000, 0.250000, 0.000000, 0.000000, 20.000000, 17.000000, 0.000000, 0.000000, - 35.521889, 3.394900, 74.311691, 0.019592, 0.999430, -0.027482, 0.136752, 0.412871, 0.500000, 0.500000, 0.000000, 0.000000, 17.000000, 20.000000, 0.000000, 0.000000, - 37.712292, 3.390590, 75.716499, 0.019592, 0.999430, -0.027482, 0.142782, 0.434518, 0.750000, 0.250000, 0.000000, 0.000000, 17.000000, 20.000000, 0.000000, 0.000000, - 36.944801, 8.998390, 75.712090, -0.016885, -0.994723, 0.101201, 0.183131, 0.462501, 0.750000, 0.250000, 0.000000, 0.000000, 17.000000, 20.000000, 0.000000, 0.000000, - 34.756001, 8.905390, 74.432793, -0.016885, -0.994723, 0.101201, 0.206059, 0.462555, 0.500000, 0.500000, 0.000000, 0.000000, 17.000000, 20.000000, 0.000000, 0.000000, - 37.034889, 8.789590, 73.674789, -0.016885, -0.994723, 0.101201, 0.191669, 0.447454, 0.750000, 0.250000, 0.000000, 0.000000, 20.000000, 17.000000, 0.000000, 0.000000, - 37.863380, 3.325400, 73.453499, -0.005587, 0.997314, -0.073037, 0.155391, 0.418781, 0.750000, 0.250000, 0.000000, 0.000000, 20.000000, 17.000000, 0.000000, 0.000000, - 37.136002, 3.109290, 70.558189, -0.005587, 0.997313, -0.073037, 0.169242, 0.396812, 1.000000, 0.000000, 0.000000, 0.000000, 20.000000, 0.000000, 0.000000, 0.000000, - 35.327999, 3.108770, 70.689400, -0.005587, 0.997314, -0.073037, 0.156015, 0.386935, 1.000000, 0.000000, 0.000000, 0.000000, 20.000000, 0.000000, 0.000000, 0.000000, - 35.327999, 3.108770, 70.689400, 0.000714, 0.996891, -0.078784, 0.156015, 0.386935, 1.000000, 0.000000, 0.000000, 0.000000, 20.000000, 0.000000, 0.000000, 0.000000, - 35.521889, 3.394900, 74.311691, 0.000714, 0.996891, -0.078784, 0.136752, 0.412871, 0.500000, 0.500000, 0.000000, 0.000000, 17.000000, 20.000000, 0.000000, 0.000000, - 37.863380, 3.325400, 73.453499, 0.000714, 0.996891, -0.078784, 0.155391, 0.418781, 0.750000, 0.250000, 0.000000, 0.000000, 20.000000, 17.000000, 0.000000, 0.000000, - 36.286201, 8.284970, 71.107292, 0.060364, -0.091422, 0.993981, 0.204127, 0.427865, 1.000000, 0.000000, 0.000000, 0.000000, 20.000000, 0.000000, 0.000000, 0.000000, - 34.390789, 8.282790, 71.222198, 0.060364, -0.091422, 0.993981, 0.216870, 0.417275, 1.000000, 0.000000, 0.000000, 0.000000, 20.000000, 0.000000, 0.000000, 0.000000, - 35.327999, 3.108770, 70.689400, 0.060364, -0.091422, 0.993981, 0.181838, 0.387092, 1.000000, 0.000000, 0.000000, 0.000000, 20.000000, 0.000000, 0.000000, 0.000000, - 35.327999, 3.108770, 70.689400, 0.072091, -0.093514, 0.993005, 0.181838, 0.387092, 1.000000, 0.000000, 0.000000, 0.000000, 20.000000, 0.000000, 0.000000, 0.000000, - 37.136002, 3.109290, 70.558189, 0.072091, -0.093514, 0.993005, 0.169242, 0.396812, 1.000000, 0.000000, 0.000000, 0.000000, 20.000000, 0.000000, 0.000000, 0.000000, - 36.286201, 8.284970, 71.107292, 0.072091, -0.093514, 0.993005, 0.204127, 0.427865, 1.000000, 0.000000, 0.000000, 0.000000, 20.000000, 0.000000, 0.000000, 0.000000, - 37.034889, 8.789590, 73.674789, 0.012950, -0.981904, 0.188938, 0.191669, 0.447454, 0.750000, 0.250000, 0.000000, 0.000000, 20.000000, 17.000000, 0.000000, 0.000000, - 34.756001, 8.905390, 74.432793, 0.012950, -0.981904, 0.188938, 0.206059, 0.462555, 0.500000, 0.500000, 0.000000, 0.000000, 17.000000, 20.000000, 0.000000, 0.000000, - 34.390789, 8.282790, 71.222198, 0.012950, -0.981904, 0.188938, 0.219952, 0.435615, 1.000000, 0.000000, 0.000000, 0.000000, 20.000000, 0.000000, 0.000000, 0.000000, - 34.390789, 8.282790, 71.222198, 0.012605, -0.981839, 0.189296, 0.219952, 0.435615, 1.000000, 0.000000, 0.000000, 0.000000, 20.000000, 0.000000, 0.000000, 0.000000, - 36.286201, 8.284970, 71.107292, 0.012605, -0.981839, 0.189296, 0.204127, 0.427865, 1.000000, 0.000000, 0.000000, 0.000000, 20.000000, 0.000000, 0.000000, 0.000000, - 37.034889, 8.789590, 73.674789, 0.012605, -0.981839, 0.189296, 0.191669, 0.447454, 0.750000, 0.250000, 0.000000, 0.000000, 20.000000, 17.000000, 0.000000, 0.000000, - 36.387482, 3.029900, 74.997902, 0.818494, -0.094855, 0.566630, 0.927545, 0.187666, 0.750000, 0.250000, 0.000000, 0.000000, 18.000000, 19.000000, 0.000000, 0.000000, - 34.447392, 3.648400, 77.903893, 0.818494, -0.094855, 0.566630, 0.927093, 0.217591, 0.477273, 0.272727, 0.250000, 0.000000, 18.000000, 17.000000, 16.000000, 0.000000, - 34.281101, 2.053990, 77.877190, 0.818494, -0.094855, 0.566630, 0.913688, 0.218094, 0.750000, 0.250000, 0.000000, 0.000000, 18.000000, 16.000000, 0.000000, 0.000000, - 34.281101, 2.053990, 77.877190, 0.646070, -0.729213, 0.225481, 0.913688, 0.218094, 0.750000, 0.250000, 0.000000, 0.000000, 18.000000, 16.000000, 0.000000, 0.000000, - 35.562599, 2.167900, 74.573700, 0.646070, -0.729213, 0.225481, 0.916791, 0.184692, 0.500000, 0.500000, 0.000000, 0.000000, 18.000000, 19.000000, 0.000000, 0.000000, - 36.387482, 3.029900, 74.997902, 0.646070, -0.729213, 0.225481, 0.927545, 0.187666, 0.750000, 0.250000, 0.000000, 0.000000, 18.000000, 19.000000, 0.000000, 0.000000, - 36.384289, 1.289400, 75.129997, 0.615202, 0.742759, 0.264263, 0.905232, 0.187244, 0.750000, 0.250000, 0.000000, 0.000000, 18.000000, 19.000000, 0.000000, 0.000000, - 35.562599, 2.167900, 74.573700, 0.615203, 0.742759, 0.264263, 0.916791, 0.184692, 0.500000, 0.500000, 0.000000, 0.000000, 18.000000, 19.000000, 0.000000, 0.000000, - 34.281101, 2.053990, 77.877190, 0.615202, 0.742759, 0.264263, 0.913688, 0.218094, 0.750000, 0.250000, 0.000000, 0.000000, 18.000000, 16.000000, 0.000000, 0.000000, - 34.281101, 2.053990, 77.877190, 0.551545, 0.810637, 0.196637, 0.913688, 0.218094, 0.750000, 0.250000, 0.000000, 0.000000, 18.000000, 16.000000, 0.000000, 0.000000, - 35.421589, 1.108290, 78.576897, 0.551545, 0.810637, 0.196637, 0.899241, 0.217212, 0.750000, 0.250000, 0.000000, 0.000000, 18.000000, 16.000000, 0.000000, 0.000000, - 36.384289, 1.289400, 75.129997, 0.551545, 0.810637, 0.196637, 0.905232, 0.187244, 0.750000, 0.250000, 0.000000, 0.000000, 18.000000, 19.000000, 0.000000, 0.000000, - 36.473400, 1.249090, 73.979790, 0.719943, 0.693319, 0.031479, 0.905877, 0.177689, 0.750000, 0.250000, 0.000000, 0.000000, 19.000000, 18.000000, 0.000000, 0.000000, - 35.562599, 2.167900, 74.573700, 0.719943, 0.693319, 0.031479, 0.916791, 0.184692, 0.500000, 0.500000, 0.000000, 0.000000, 18.000000, 19.000000, 0.000000, 0.000000, - 36.384289, 1.289400, 75.129997, 0.719943, 0.693319, 0.031479, 0.905232, 0.187244, 0.750000, 0.250000, 0.000000, 0.000000, 18.000000, 19.000000, 0.000000, 0.000000, - 36.387482, 3.029900, 74.997902, 0.687668, -0.716310, 0.118372, 0.927545, 0.187666, 0.750000, 0.250000, 0.000000, 0.000000, 18.000000, 19.000000, 0.000000, 0.000000, - 35.562599, 2.167900, 74.573700, 0.687668, -0.716310, 0.118372, 0.916791, 0.184692, 0.500000, 0.500000, 0.000000, 0.000000, 18.000000, 19.000000, 0.000000, 0.000000, - 36.476601, 2.926190, 73.852592, 0.687668, -0.716310, 0.118372, 0.927666, 0.178504, 0.750000, 0.250000, 0.000000, 0.000000, 19.000000, 18.000000, 0.000000, 0.000000, - 36.473400, 1.249090, 73.979790, 0.782343, 0.600271, -0.166175, 0.905877, 0.177689, 0.750000, 0.250000, 0.000000, 0.000000, 19.000000, 18.000000, 0.000000, 0.000000, - 35.893188, 1.117400, 70.772491, 0.782343, 0.600271, -0.166175, 0.910388, 0.149216, 1.000000, 0.000000, 0.000000, 0.000000, 19.000000, 0.000000, 0.000000, 0.000000, - 35.441292, 1.929990, 71.580292, 0.782343, 0.600271, -0.166175, 0.917201, 0.157500, 0.659481, 0.248582, 0.080745, 0.011192, 19.000000, 20.000000, 17.000000, 16.000000, - 35.441292, 1.929990, 71.580292, 0.679432, 0.728745, -0.085453, 0.917201, 0.157500, 0.659481, 0.248582, 0.080745, 0.011192, 19.000000, 20.000000, 17.000000, 16.000000, - 35.562599, 2.167900, 74.573700, 0.679432, 0.728745, -0.085453, 0.916791, 0.184692, 0.500000, 0.500000, 0.000000, 0.000000, 18.000000, 19.000000, 0.000000, 0.000000, - 36.473400, 1.249090, 73.979790, 0.679432, 0.728745, -0.085453, 0.905877, 0.177689, 0.750000, 0.250000, 0.000000, 0.000000, 19.000000, 18.000000, 0.000000, 0.000000, - 36.476601, 2.926190, 73.852592, 0.653710, -0.756000, 0.033594, 0.927666, 0.178504, 0.750000, 0.250000, 0.000000, 0.000000, 19.000000, 18.000000, 0.000000, 0.000000, - 35.562599, 2.167900, 74.573700, 0.653709, -0.755999, 0.033594, 0.916791, 0.184692, 0.500000, 0.500000, 0.000000, 0.000000, 18.000000, 19.000000, 0.000000, 0.000000, - 35.441292, 1.929990, 71.580292, 0.653710, -0.756000, 0.033594, 0.917201, 0.157500, 0.659481, 0.248582, 0.080745, 0.011192, 19.000000, 20.000000, 17.000000, 16.000000, - 35.441292, 1.929990, 71.580292, 0.781451, -0.618144, -0.085045, 0.917201, 0.157500, 0.659481, 0.248582, 0.080745, 0.011192, 19.000000, 20.000000, 17.000000, 16.000000, - 35.884480, 2.617000, 70.659103, 0.781450, -0.618144, -0.085045, 0.924411, 0.149836, 1.000000, 0.000000, 0.000000, 0.000000, 19.000000, 0.000000, 0.000000, 0.000000, - 36.476601, 2.926190, 73.852592, 0.781450, -0.618145, -0.085045, 0.927666, 0.178504, 0.750000, 0.250000, 0.000000, 0.000000, 19.000000, 18.000000, 0.000000, 0.000000, - 35.884480, 2.617000, 70.659103, 0.888528, 0.039722, 0.457099, 0.924411, 0.149836, 1.000000, 0.000000, 0.000000, 0.000000, 19.000000, 0.000000, 0.000000, 0.000000, - 35.441292, 1.929990, 71.580292, 0.888528, 0.039722, 0.457099, 0.917201, 0.157500, 0.659481, 0.248582, 0.080745, 0.011192, 19.000000, 20.000000, 17.000000, 16.000000, - 35.893188, 1.117400, 70.772491, 0.888528, 0.039722, 0.457099, 0.910388, 0.149216, 1.000000, 0.000000, 0.000000, 0.000000, 19.000000, 0.000000, 0.000000, 0.000000, - 34.447392, 3.648400, 77.903893, 0.952792, 0.126359, 0.276082, 0.927093, 0.217591, 0.477273, 0.272727, 0.250000, 0.000000, 18.000000, 17.000000, 16.000000, 0.000000, - 35.521889, 3.394900, 74.311691, 0.952792, 0.126359, 0.276082, 0.933369, 0.191877, 0.500000, 0.500000, 0.000000, 0.000000, 17.000000, 20.000000, 0.000000, 0.000000, - 34.756001, 8.905390, 74.432793, 0.952792, 0.126359, 0.276082, 0.981625, 0.203781, 0.500000, 0.500000, 0.000000, 0.000000, 17.000000, 20.000000, 0.000000, 0.000000, - 34.756001, 8.905390, 74.432793, 0.936881, 0.152691, 0.314547, 0.981625, 0.203781, 0.500000, 0.500000, 0.000000, 0.000000, 17.000000, 20.000000, 0.000000, 0.000000, - 33.739792, 9.189680, 77.321579, 0.936881, 0.152691, 0.314547, 0.978982, 0.231142, 1.000000, 0.000000, 0.000000, 0.000000, 16.000000, 0.000000, 0.000000, 0.000000, - 34.447392, 3.648400, 77.903893, 0.936881, 0.152691, 0.314547, 0.927093, 0.217591, 0.477273, 0.272727, 0.250000, 0.000000, 18.000000, 17.000000, 16.000000, 0.000000, - 35.521889, 3.394900, 74.311691, 0.980539, 0.184518, -0.067060, 0.933369, 0.191877, 0.500000, 0.500000, 0.000000, 0.000000, 17.000000, 20.000000, 0.000000, 0.000000, - 35.327999, 3.108770, 70.689400, 0.980539, 0.184518, -0.067060, 0.938205, 0.159723, 1.000000, 0.000000, 0.000000, 0.000000, 20.000000, 0.000000, 0.000000, 0.000000, - 34.390789, 8.282790, 71.222198, 0.980539, 0.184518, -0.067060, 0.983055, 0.174425, 1.000000, 0.000000, 0.000000, 0.000000, 20.000000, 0.000000, 0.000000, 0.000000, - 34.390789, 8.282790, 71.222198, 0.980506, 0.139323, -0.138552, 0.983055, 0.174425, 1.000000, 0.000000, 0.000000, 0.000000, 20.000000, 0.000000, 0.000000, 0.000000, - 34.756001, 8.905390, 74.432793, 0.980506, 0.139323, -0.138552, 0.981625, 0.203781, 0.500000, 0.500000, 0.000000, 0.000000, 17.000000, 20.000000, 0.000000, 0.000000, - 35.521889, 3.394900, 74.311691, 0.980506, 0.139323, -0.138552, 0.933369, 0.191877, 0.500000, 0.500000, 0.000000, 0.000000, 17.000000, 20.000000, 0.000000, 0.000000, - 30.973391, -0.950900, 79.465790, 0.285675, 0.958226, -0.013879, 0.031860, 0.483312, 0.750000, 0.250000, 0.000000, 0.000000, 21.000000, 16.000000, 0.000000, 0.000000, - 32.861179, -1.503900, 80.142693, 0.285675, 0.958226, -0.013879, 0.049578, 0.478586, 0.750000, 0.250000, 0.000000, 0.000000, 21.000000, 16.000000, 0.000000, 0.000000, - 33.258999, -1.649890, 78.251801, 0.285675, 0.958226, -0.013879, 0.043861, 0.463033, 0.750000, 0.250000, 0.000000, 0.000000, 21.000000, 22.000000, 0.000000, 0.000000, - 33.258999, -1.649890, 78.251801, 0.286406, 0.958028, -0.012389, 0.043861, 0.463033, 0.750000, 0.250000, 0.000000, 0.000000, 21.000000, 22.000000, 0.000000, 0.000000, - 31.570789, -1.152790, 77.664391, 0.286406, 0.958028, -0.012389, 0.027914, 0.467032, 0.750000, 0.250000, 0.000000, 0.000000, 21.000000, 22.000000, 0.000000, 0.000000, - 30.973391, -0.950900, 79.465790, 0.286406, 0.958028, -0.012389, 0.031860, 0.483312, 0.750000, 0.250000, 0.000000, 0.000000, 21.000000, 16.000000, 0.000000, 0.000000, - 33.258999, -1.649890, 78.251801, 0.271475, 0.961957, 0.030663, 0.043861, 0.463033, 0.750000, 0.250000, 0.000000, 0.000000, 21.000000, 22.000000, 0.000000, 0.000000, - 33.701302, -1.733290, 76.952301, 0.271475, 0.961957, 0.030663, 0.040673, 0.451803, 0.750000, 0.250000, 0.000000, 0.000000, 22.000000, 21.000000, 0.000000, 0.000000, - 32.046188, -1.246390, 76.330902, 0.271475, 0.961957, 0.030663, 0.025117, 0.454743, 0.750000, 0.250000, 0.000000, 0.000000, 22.000000, 21.000000, 0.000000, 0.000000, - 32.046188, -1.246390, 76.330902, 0.272796, 0.961611, 0.029757, 0.025117, 0.454743, 0.750000, 0.250000, 0.000000, 0.000000, 22.000000, 21.000000, 0.000000, 0.000000, - 31.570789, -1.152790, 77.664391, 0.272796, 0.961611, 0.029757, 0.027914, 0.467032, 0.750000, 0.250000, 0.000000, 0.000000, 21.000000, 22.000000, 0.000000, 0.000000, - 33.258999, -1.649890, 78.251801, 0.272796, 0.961611, 0.029757, 0.043861, 0.463033, 0.750000, 0.250000, 0.000000, 0.000000, 21.000000, 22.000000, 0.000000, 0.000000, - 32.046188, -1.246390, 76.330902, 0.201857, 0.956275, 0.211641, 0.025117, 0.454743, 0.750000, 0.250000, 0.000000, 0.000000, 22.000000, 21.000000, 0.000000, 0.000000, - 33.701302, -1.733290, 76.952301, 0.201857, 0.956275, 0.211641, 0.040673, 0.451803, 0.750000, 0.250000, 0.000000, 0.000000, 22.000000, 21.000000, 0.000000, 0.000000, - 34.354389, -1.441590, 75.011391, 0.201857, 0.956275, 0.211641, 0.036936, 0.434394, 1.000000, 0.000000, 0.000000, 0.000000, 22.000000, 0.000000, 0.000000, 0.000000, - 34.354389, -1.441590, 75.011391, 0.201371, 0.956575, 0.210746, 0.036936, 0.434394, 1.000000, 0.000000, 0.000000, 0.000000, 22.000000, 0.000000, 0.000000, 0.000000, - 32.916801, -1.010100, 74.426498, 0.201371, 0.956575, 0.210746, 0.022777, 0.436258, 1.000000, 0.000000, 0.000000, 0.000000, 22.000000, 0.000000, 0.000000, 0.000000, - 32.046188, -1.246390, 76.330902, 0.201371, 0.956575, 0.210746, 0.025117, 0.454743, 0.750000, 0.250000, 0.000000, 0.000000, 22.000000, 21.000000, 0.000000, 0.000000, - 33.258999, -1.649890, 78.251801, -0.832378, 0.510985, -0.214573, 0.043861, 0.463033, 0.750000, 0.250000, 0.000000, 0.000000, 21.000000, 22.000000, 0.000000, 0.000000, - 32.861179, -1.503900, 80.142693, -0.832378, 0.510985, -0.214573, 0.049578, 0.478586, 0.750000, 0.250000, 0.000000, 0.000000, 21.000000, 16.000000, 0.000000, 0.000000, - 33.792992, -0.144990, 79.764091, -0.832378, 0.510985, -0.214573, 0.062246, 0.470721, 0.750000, 0.250000, 0.000000, 0.000000, 21.000000, 16.000000, 0.000000, 0.000000, - 33.792992, -0.144990, 79.764091, -0.845423, 0.496866, -0.195917, 0.062246, 0.470721, 0.750000, 0.250000, 0.000000, 0.000000, 21.000000, 16.000000, 0.000000, 0.000000, - 34.049191, -0.487500, 77.789902, -0.845423, 0.496866, -0.195917, 0.053886, 0.454475, 0.750000, 0.250000, 0.000000, 0.000000, 21.000000, 22.000000, 0.000000, 0.000000, - 33.258999, -1.649890, 78.251801, -0.845423, 0.496866, -0.195917, 0.043861, 0.463033, 0.750000, 0.250000, 0.000000, 0.000000, 21.000000, 22.000000, 0.000000, 0.000000, - 31.570789, -1.152790, 77.664391, 0.907213, -0.058683, 0.416559, 0.873606, 0.242021, 0.750000, 0.250000, 0.000000, 0.000000, 21.000000, 22.000000, 0.000000, 0.000000, - 31.956591, 0.127290, 77.004494, 0.907213, -0.058683, 0.416559, 0.884441, 0.233765, 0.750000, 0.250000, 0.000000, 0.000000, 21.000000, 22.000000, 0.000000, 0.000000, - 31.166491, 0.625380, 78.795403, 0.907213, -0.058683, 0.416558, 0.890658, 0.250768, 0.750000, 0.250000, 0.000000, 0.000000, 21.000000, 16.000000, 0.000000, 0.000000, - 31.166491, 0.625380, 78.795403, 0.949594, 0.016803, 0.313031, 0.890658, 0.250768, 0.750000, 0.250000, 0.000000, 0.000000, 21.000000, 16.000000, 0.000000, 0.000000, - 30.973391, -0.950900, 79.465790, 0.949594, 0.016803, 0.313031, 0.877385, 0.258453, 0.750000, 0.250000, 0.000000, 0.000000, 21.000000, 16.000000, 0.000000, 0.000000, - 31.570789, -1.152790, 77.664391, 0.949594, 0.016803, 0.313031, 0.873606, 0.242021, 0.750000, 0.250000, 0.000000, 0.000000, 21.000000, 22.000000, 0.000000, 0.000000, - 32.046188, -1.246390, 76.330902, 0.913257, -0.129787, 0.386156, 0.871021, 0.229683, 0.750000, 0.250000, 0.000000, 0.000000, 22.000000, 21.000000, 0.000000, 0.000000, - 32.256901, 0.051800, 76.268890, 0.913257, -0.129787, 0.386156, 0.882421, 0.227009, 0.750000, 0.250000, 0.000000, 0.000000, 22.000000, 21.000000, 0.000000, 0.000000, - 31.956591, 0.127290, 77.004494, 0.913257, -0.129787, 0.386156, 0.884441, 0.233765, 0.750000, 0.250000, 0.000000, 0.000000, 21.000000, 22.000000, 0.000000, 0.000000, - 31.956591, 0.127290, 77.004494, 0.934244, -0.106034, 0.340508, 0.884441, 0.233765, 0.750000, 0.250000, 0.000000, 0.000000, 21.000000, 22.000000, 0.000000, 0.000000, - 31.570789, -1.152790, 77.664391, 0.934244, -0.106034, 0.340508, 0.873606, 0.242021, 0.750000, 0.250000, 0.000000, 0.000000, 21.000000, 22.000000, 0.000000, 0.000000, - 32.046188, -1.246390, 76.330902, 0.934244, -0.106034, 0.340508, 0.871021, 0.229683, 0.750000, 0.250000, 0.000000, 0.000000, 22.000000, 21.000000, 0.000000, 0.000000, - 33.701302, -1.733290, 76.952301, -0.838539, 0.445270, -0.313985, 0.040673, 0.451803, 0.750000, 0.250000, 0.000000, 0.000000, 22.000000, 21.000000, 0.000000, 0.000000, - 33.258999, -1.649890, 78.251801, -0.838539, 0.445270, -0.313985, 0.043861, 0.463033, 0.750000, 0.250000, 0.000000, 0.000000, 21.000000, 22.000000, 0.000000, 0.000000, - 34.049191, -0.487500, 77.789902, -0.838539, 0.445270, -0.313985, 0.053886, 0.454475, 0.750000, 0.250000, 0.000000, 0.000000, 21.000000, 22.000000, 0.000000, 0.000000, - 34.049191, -0.487500, 77.789902, -0.888324, 0.399874, -0.225789, 0.053886, 0.454475, 0.750000, 0.250000, 0.000000, 0.000000, 21.000000, 22.000000, 0.000000, 0.000000, - 34.229900, -0.528800, 77.005791, -0.888324, 0.399874, -0.225789, 0.051082, 0.447747, 0.750000, 0.250000, 0.000000, 0.000000, 22.000000, 21.000000, 0.000000, 0.000000, - 33.701302, -1.733290, 76.952301, -0.888324, 0.399874, -0.225789, 0.040673, 0.451803, 0.750000, 0.250000, 0.000000, 0.000000, 22.000000, 21.000000, 0.000000, 0.000000, - 32.916801, -1.010100, 74.426498, 0.728851, -0.446949, 0.518665, 0.870227, 0.210980, 1.000000, 0.000000, 0.000000, 0.000000, 22.000000, 0.000000, 0.000000, 0.000000, - 33.280800, 0.017590, 74.800583, 0.728851, -0.446949, 0.518665, 0.880360, 0.211114, 1.000000, 0.000000, 0.000000, 0.000000, 22.000000, 0.000000, 0.000000, 0.000000, - 32.256901, 0.051800, 76.268890, 0.728851, -0.446949, 0.518665, 0.882421, 0.227009, 0.750000, 0.250000, 0.000000, 0.000000, 22.000000, 21.000000, 0.000000, 0.000000, - 32.256901, 0.051800, 76.268890, 0.907877, -0.128294, 0.399125, 0.882421, 0.227009, 0.750000, 0.250000, 0.000000, 0.000000, 22.000000, 21.000000, 0.000000, 0.000000, - 32.046188, -1.246390, 76.330902, 0.907877, -0.128294, 0.399125, 0.871021, 0.229683, 0.750000, 0.250000, 0.000000, 0.000000, 22.000000, 21.000000, 0.000000, 0.000000, - 32.916801, -1.010100, 74.426498, 0.907877, -0.128294, 0.399125, 0.870227, 0.210980, 1.000000, 0.000000, 0.000000, 0.000000, 22.000000, 0.000000, 0.000000, 0.000000, - 34.354389, -1.441590, 75.011391, -0.973199, 0.179998, -0.143127, 0.036936, 0.434394, 1.000000, 0.000000, 0.000000, 0.000000, 22.000000, 0.000000, 0.000000, 0.000000, - 34.229900, -0.528800, 77.005791, -0.973199, 0.179998, -0.143127, 0.051082, 0.447747, 0.750000, 0.250000, 0.000000, 0.000000, 22.000000, 21.000000, 0.000000, 0.000000, - 34.512402, -0.349590, 75.310287, -0.973199, 0.179998, -0.143127, 0.046858, 0.433097, 1.000000, 0.000000, 0.000000, 0.000000, 22.000000, 0.000000, 0.000000, 0.000000, - 34.354389, -1.441590, 75.011391, -0.421863, -0.182068, 0.888191, 0.036936, 0.434394, 1.000000, 0.000000, 0.000000, 0.000000, 22.000000, 0.000000, 0.000000, 0.000000, - 34.512402, -0.349590, 75.310287, -0.421863, -0.182068, 0.888191, 0.046858, 0.433097, 1.000000, 0.000000, 0.000000, 0.000000, 22.000000, 0.000000, 0.000000, 0.000000, - 33.280800, 0.017590, 74.800583, -0.421863, -0.182068, 0.888191, 0.045699, 0.421056, 1.000000, 0.000000, 0.000000, 0.000000, 22.000000, 0.000000, 0.000000, 0.000000, - 33.280800, 0.017590, 74.800583, -0.416078, -0.177278, 0.891881, 0.045699, 0.421056, 1.000000, 0.000000, 0.000000, 0.000000, 22.000000, 0.000000, 0.000000, 0.000000, - 32.916801, -1.010100, 74.426498, -0.416078, -0.177278, 0.891881, 0.035638, 0.420360, 1.000000, 0.000000, 0.000000, 0.000000, 22.000000, 0.000000, 0.000000, 0.000000, - 34.354389, -1.441590, 75.011391, -0.416078, -0.177278, 0.891881, 0.036936, 0.434394, 1.000000, 0.000000, 0.000000, 0.000000, 22.000000, 0.000000, 0.000000, 0.000000, - 34.049191, -0.487500, 77.789902, -0.837335, -0.546514, -0.013848, 0.053886, 0.454475, 0.750000, 0.250000, 0.000000, 0.000000, 21.000000, 22.000000, 0.000000, 0.000000, - 33.792992, -0.144990, 79.764091, -0.837335, -0.546514, -0.013848, 0.062246, 0.470721, 0.750000, 0.250000, 0.000000, 0.000000, 21.000000, 16.000000, 0.000000, 0.000000, - 33.007099, 1.092200, 78.458000, -0.837335, -0.546514, -0.013848, 0.071412, 0.456058, 0.750000, 0.250000, 0.000000, 0.000000, 21.000000, 16.000000, 0.000000, 0.000000, - 33.007099, 1.092200, 78.458000, -0.841145, -0.539600, -0.036137, 0.071412, 0.456058, 0.750000, 0.250000, 0.000000, 0.000000, 21.000000, 16.000000, 0.000000, 0.000000, - 33.407089, 0.570580, 76.936493, -0.841145, -0.539601, -0.036137, 0.062622, 0.444328, 0.500000, 0.500000, 0.000000, 0.000000, 21.000000, 22.000000, 0.000000, 0.000000, - 34.049191, -0.487500, 77.789902, -0.841145, -0.539600, -0.036137, 0.053886, 0.454475, 0.750000, 0.250000, 0.000000, 0.000000, 21.000000, 22.000000, 0.000000, 0.000000, - 31.956591, 0.127290, 77.004494, 0.286800, -0.880570, 0.377284, 0.884441, 0.233765, 0.750000, 0.250000, 0.000000, 0.000000, 21.000000, 22.000000, 0.000000, 0.000000, - 33.407089, 0.570580, 76.936493, 0.286800, -0.880570, 0.377284, 0.889317, 0.227516, 0.500000, 0.500000, 0.000000, 0.000000, 21.000000, 22.000000, 0.000000, 0.000000, - 33.007099, 1.092200, 78.458000, 0.286800, -0.880569, 0.377284, 0.894880, 0.240238, 0.750000, 0.250000, 0.000000, 0.000000, 21.000000, 16.000000, 0.000000, 0.000000, - 33.007099, 1.092200, 78.458000, 0.291800, -0.880490, 0.373617, 0.894880, 0.240238, 0.750000, 0.250000, 0.000000, 0.000000, 21.000000, 16.000000, 0.000000, 0.000000, - 31.166491, 0.625380, 78.795403, 0.291800, -0.880490, 0.373617, 0.890658, 0.250768, 0.750000, 0.250000, 0.000000, 0.000000, 21.000000, 16.000000, 0.000000, 0.000000, - 31.956591, 0.127290, 77.004494, 0.291800, -0.880490, 0.373617, 0.884441, 0.233765, 0.750000, 0.250000, 0.000000, 0.000000, 21.000000, 22.000000, 0.000000, 0.000000, - 32.256901, 0.051800, 76.268890, 0.294620, -0.930926, 0.215813, 0.882421, 0.227009, 0.750000, 0.250000, 0.000000, 0.000000, 22.000000, 21.000000, 0.000000, 0.000000, - 33.407089, 0.570580, 76.936493, 0.294620, -0.930926, 0.215813, 0.889317, 0.227516, 0.500000, 0.500000, 0.000000, 0.000000, 21.000000, 22.000000, 0.000000, 0.000000, - 31.956591, 0.127290, 77.004494, 0.294620, -0.930926, 0.215813, 0.884441, 0.233765, 0.750000, 0.250000, 0.000000, 0.000000, 21.000000, 22.000000, 0.000000, 0.000000, - 34.049191, -0.487500, 77.789902, -0.787007, -0.598467, -0.149855, 0.053886, 0.454475, 0.750000, 0.250000, 0.000000, 0.000000, 21.000000, 22.000000, 0.000000, 0.000000, - 33.407089, 0.570580, 76.936493, -0.787007, -0.598467, -0.149855, 0.062622, 0.444328, 0.500000, 0.500000, 0.000000, 0.000000, 21.000000, 22.000000, 0.000000, 0.000000, - 34.229900, -0.528800, 77.005791, -0.787007, -0.598467, -0.149855, 0.051082, 0.447747, 0.750000, 0.250000, 0.000000, 0.000000, 22.000000, 21.000000, 0.000000, 0.000000, - 32.256901, 0.051800, 76.268890, 0.235344, -0.953882, 0.186338, 0.882421, 0.227009, 0.750000, 0.250000, 0.000000, 0.000000, 22.000000, 21.000000, 0.000000, 0.000000, - 33.280800, 0.017590, 74.800583, 0.235344, -0.953882, 0.186338, 0.880360, 0.211114, 1.000000, 0.000000, 0.000000, 0.000000, 22.000000, 0.000000, 0.000000, 0.000000, - 33.908089, 0.295800, 75.432503, 0.235344, -0.953882, 0.186338, 0.886118, 0.212776, 1.000000, 0.000000, 0.000000, 0.000000, 22.000000, 0.000000, 0.000000, 0.000000, - 33.908089, 0.295800, 75.432503, 0.268256, -0.927909, 0.258889, 0.886118, 0.212776, 1.000000, 0.000000, 0.000000, 0.000000, 22.000000, 0.000000, 0.000000, 0.000000, - 33.407089, 0.570580, 76.936493, 0.268256, -0.927909, 0.258889, 0.889317, 0.227516, 0.500000, 0.500000, 0.000000, 0.000000, 21.000000, 22.000000, 0.000000, 0.000000, - 32.256901, 0.051800, 76.268890, 0.268256, -0.927909, 0.258889, 0.882421, 0.227009, 0.750000, 0.250000, 0.000000, 0.000000, 22.000000, 21.000000, 0.000000, 0.000000, - 34.229900, -0.528800, 77.005791, -0.786571, -0.598320, -0.152704, 0.051082, 0.447747, 0.750000, 0.250000, 0.000000, 0.000000, 22.000000, 21.000000, 0.000000, 0.000000, - 33.407089, 0.570580, 76.936493, -0.786571, -0.598320, -0.152704, 0.062622, 0.444328, 0.500000, 0.500000, 0.000000, 0.000000, 21.000000, 22.000000, 0.000000, 0.000000, - 33.908089, 0.295800, 75.432503, -0.786571, -0.598320, -0.152704, 0.054365, 0.433020, 1.000000, 0.000000, 0.000000, 0.000000, 22.000000, 0.000000, 0.000000, 0.000000, - 33.908089, 0.295800, 75.432503, -0.734293, -0.651352, -0.191192, 0.054365, 0.433020, 1.000000, 0.000000, 0.000000, 0.000000, 22.000000, 0.000000, 0.000000, 0.000000, - 34.512402, -0.349590, 75.310287, -0.734293, -0.651352, -0.191192, 0.046858, 0.433097, 1.000000, 0.000000, 0.000000, 0.000000, 22.000000, 0.000000, 0.000000, 0.000000, - 34.229900, -0.528800, 77.005791, -0.734293, -0.651352, -0.191192, 0.051082, 0.447747, 0.750000, 0.250000, 0.000000, 0.000000, 22.000000, 21.000000, 0.000000, 0.000000, - 34.512402, -0.349590, 75.310287, -0.453904, -0.556756, 0.695696, 0.884545, 0.205138, 1.000000, 0.000000, 0.000000, 0.000000, 22.000000, 0.000000, 0.000000, 0.000000, - 33.908089, 0.295800, 75.432503, -0.453904, -0.556756, 0.695696, 0.886118, 0.212776, 1.000000, 0.000000, 0.000000, 0.000000, 22.000000, 0.000000, 0.000000, 0.000000, - 33.280800, 0.017590, 74.800583, -0.453904, -0.556756, 0.695696, 0.880360, 0.211114, 1.000000, 0.000000, 0.000000, 0.000000, 22.000000, 0.000000, 0.000000, 0.000000, - 35.421589, 1.108290, 78.576897, 0.349002, 0.791778, 0.501283, 0.899241, 0.217212, 0.750000, 0.250000, 0.000000, 0.000000, 18.000000, 16.000000, 0.000000, 0.000000, - 34.281101, 2.053990, 77.877190, 0.349002, 0.791778, 0.501283, 0.913688, 0.218094, 0.750000, 0.250000, 0.000000, 0.000000, 18.000000, 16.000000, 0.000000, 0.000000, - 33.672501, 1.777200, 78.738098, 0.349002, 0.791778, 0.501283, 0.911340, 0.231132, 0.500000, 0.500000, 0.000000, 0.000000, 16.000000, 21.000000, 0.000000, 0.000000, - 33.672501, 1.777200, 78.738098, 0.343879, 0.769491, 0.538173, 0.911340, 0.231132, 0.500000, 0.500000, 0.000000, 0.000000, 16.000000, 21.000000, 0.000000, 0.000000, - 34.897301, 0.765100, 79.402603, 0.343879, 0.769491, 0.538173, 0.898582, 0.221087, 0.500000, 0.500000, 0.000000, 0.000000, 16.000000, 21.000000, 0.000000, 0.000000, - 35.421589, 1.108290, 78.576897, 0.343879, 0.769491, 0.538173, 0.899241, 0.217212, 0.750000, 0.250000, 0.000000, 0.000000, 18.000000, 16.000000, 0.000000, 0.000000, - 34.897301, 0.765100, 79.402603, -0.438095, 0.058774, 0.897005, 0.898582, 0.221087, 0.500000, 0.500000, 0.000000, 0.000000, 16.000000, 21.000000, 0.000000, 0.000000, - 33.672501, 1.777200, 78.738098, -0.438095, 0.058774, 0.897005, 0.911340, 0.231132, 0.500000, 0.500000, 0.000000, 0.000000, 16.000000, 21.000000, 0.000000, 0.000000, - 33.007099, 1.092200, 78.458000, -0.438095, 0.058774, 0.897005, 0.904556, 0.236401, 0.750000, 0.250000, 0.000000, 0.000000, 21.000000, 16.000000, 0.000000, 0.000000, - 33.007099, 1.092200, 78.458000, -0.264413, 0.615685, 0.742306, 0.904556, 0.236401, 0.750000, 0.250000, 0.000000, 0.000000, 21.000000, 16.000000, 0.000000, 0.000000, - 33.792992, -0.144990, 79.764091, -0.264413, 0.615685, 0.742306, 0.892385, 0.227509, 0.750000, 0.250000, 0.000000, 0.000000, 21.000000, 16.000000, 0.000000, 0.000000, - 34.897301, 0.765100, 79.402603, -0.264413, 0.615685, 0.742306, 0.898582, 0.221087, 0.500000, 0.500000, 0.000000, 0.000000, 16.000000, 21.000000, 0.000000, 0.000000, - 37.302181, 3.471190, 79.003990, -0.945727, 0.066060, -0.318176, 0.111636, 0.456491, 0.497899, 0.252101, 0.250000, 0.000000, 16.000000, 17.000000, 18.000000, 0.000000, - 37.103100, 1.384990, 79.162590, -0.945727, 0.066060, -0.318176, 0.095001, 0.446598, 0.750000, 0.250000, 0.000000, 0.000000, 18.000000, 16.000000, 0.000000, 0.000000, - 36.559292, 1.472800, 80.797203, -0.945727, 0.066060, -0.318176, 0.099681, 0.474772, 1.000000, 0.000000, 0.000000, 0.000000, 16.000000, 0.000000, 0.000000, 0.000000, - 36.559292, 1.472800, 80.797203, -0.912940, -0.026066, -0.407260, 0.099681, 0.474772, 1.000000, 0.000000, 0.000000, 0.000000, 16.000000, 0.000000, 0.000000, 0.000000, - 36.570202, 3.803400, 80.623581, -0.912940, -0.026066, -0.407260, 0.118565, 0.476132, 1.000000, 0.000000, 0.000000, 0.000000, 16.000000, 0.000000, 0.000000, 0.000000, - 37.302181, 3.471190, 79.003990, -0.912940, -0.026066, -0.407260, 0.111636, 0.456491, 0.497899, 0.252101, 0.250000, 0.000000, 16.000000, 17.000000, 18.000000, 0.000000, - 36.669979, 9.265290, 78.420082, -0.912835, -0.138318, -0.384187, 0.171699, 0.481266, 0.750000, 0.250000, 0.000000, 0.000000, 17.000000, 16.000000, 0.000000, 0.000000, - 37.302181, 3.471190, 79.003990, -0.912835, -0.138318, -0.384187, 0.111636, 0.456491, 0.497899, 0.252101, 0.250000, 0.000000, 16.000000, 17.000000, 18.000000, 0.000000, - 36.570202, 3.803400, 80.623581, -0.912835, -0.138318, -0.384187, 0.118565, 0.476132, 1.000000, 0.000000, 0.000000, 0.000000, 16.000000, 0.000000, 0.000000, 0.000000, - 36.570202, 3.803400, 80.623581, -0.905572, -0.144373, -0.398868, 0.118565, 0.476132, 1.000000, 0.000000, 0.000000, 0.000000, 16.000000, 0.000000, 0.000000, 0.000000, - 35.931091, 9.390500, 80.052299, -0.905572, -0.144373, -0.398868, 0.163544, 0.494080, 1.000000, 0.000000, 0.000000, 0.000000, 16.000000, 0.000000, 0.000000, 0.000000, - 36.669979, 9.265290, 78.420082, -0.905572, -0.144373, -0.398868, 0.171699, 0.481266, 0.750000, 0.250000, 0.000000, 0.000000, 17.000000, 16.000000, 0.000000, 0.000000, - 36.570202, 3.803400, 80.623581, -0.861941, -0.033652, -0.505891, 0.118565, 0.476132, 1.000000, 0.000000, 0.000000, 0.000000, 16.000000, 0.000000, 0.000000, 0.000000, - 36.559292, 1.472800, 80.797203, -0.861941, -0.033652, -0.505891, 0.099681, 0.474772, 1.000000, 0.000000, 0.000000, 0.000000, 16.000000, 0.000000, 0.000000, 0.000000, - 33.099991, 2.152070, 86.646004, -0.861941, -0.033652, -0.505891, 0.083089, 0.532741, 0.960986, 0.039014, 0.000000, 0.000000, 16.000000, 23.000000, 0.000000, 0.000000, - 33.099991, 2.152070, 86.646004, -0.874076, 0.120972, -0.470486, 0.083089, 0.532741, 0.960986, 0.039014, 0.000000, 0.000000, 16.000000, 23.000000, 0.000000, 0.000000, - 33.609501, 6.028290, 86.696091, -0.874076, 0.120972, -0.470486, 0.115462, 0.541545, 1.000000, 0.000000, 0.000000, 0.000000, 16.000000, 0.000000, 0.000000, 0.000000, - 36.570202, 3.803400, 80.623581, -0.874076, 0.120972, -0.470486, 0.118565, 0.476132, 1.000000, 0.000000, 0.000000, 0.000000, 16.000000, 0.000000, 0.000000, 0.000000, - 36.570202, 3.803400, 80.623581, -0.909249, -0.143945, -0.390572, 0.118565, 0.476132, 1.000000, 0.000000, 0.000000, 0.000000, 16.000000, 0.000000, 0.000000, 0.000000, - 33.609501, 6.028290, 86.696091, -0.909249, -0.143945, -0.390572, 0.115462, 0.541545, 1.000000, 0.000000, 0.000000, 0.000000, 16.000000, 0.000000, 0.000000, 0.000000, - 35.931091, 9.390500, 80.052299, -0.909249, -0.143945, -0.390572, 0.163544, 0.494080, 1.000000, 0.000000, 0.000000, 0.000000, 16.000000, 0.000000, 0.000000, 0.000000, - 32.861179, -1.503900, 80.142693, -0.805174, 0.582752, 0.109977, 0.049578, 0.478586, 0.750000, 0.250000, 0.000000, 0.000000, 21.000000, 16.000000, 0.000000, 0.000000, - 34.184700, -0.000690, 81.867287, -0.805174, 0.582752, 0.109977, 0.071045, 0.487618, 0.500000, 0.500000, 0.000000, 0.000000, 16.000000, 21.000000, 0.000000, 0.000000, - 33.792992, -0.144990, 79.764091, -0.805174, 0.582752, 0.109977, 0.062246, 0.470721, 0.750000, 0.250000, 0.000000, 0.000000, 21.000000, 16.000000, 0.000000, 0.000000, - 33.792992, -0.144990, 79.764091, -0.622496, 0.780131, 0.062412, 0.062246, 0.470721, 0.750000, 0.250000, 0.000000, 0.000000, 21.000000, 16.000000, 0.000000, 0.000000, - 34.184700, -0.000690, 81.867287, -0.622496, 0.780131, 0.062412, 0.071045, 0.487618, 0.500000, 0.500000, 0.000000, 0.000000, 16.000000, 21.000000, 0.000000, 0.000000, - 34.897301, 0.765100, 79.402603, -0.622496, 0.780131, 0.062412, 0.074341, 0.466756, 0.500000, 0.500000, 0.000000, 0.000000, 16.000000, 21.000000, 0.000000, 0.000000, - 32.861179, -1.503900, 80.142693, 0.311247, 0.945510, -0.095585, 0.049578, 0.478586, 0.750000, 0.250000, 0.000000, 0.000000, 21.000000, 16.000000, 0.000000, 0.000000, - 30.973391, -0.950900, 79.465790, 0.311247, 0.945510, -0.095585, 0.031860, 0.483312, 0.750000, 0.250000, 0.000000, 0.000000, 21.000000, 16.000000, 0.000000, 0.000000, - 29.890791, -0.306600, 82.313904, 0.311247, 0.945510, -0.095585, 0.037657, 0.510416, 0.500000, 0.500000, 0.000000, 0.000000, 16.000000, 21.000000, 0.000000, 0.000000, - 29.890791, -0.306600, 82.313904, 0.254560, 0.950888, -0.176102, 0.037657, 0.510416, 0.500000, 0.500000, 0.000000, 0.000000, 16.000000, 21.000000, 0.000000, 0.000000, - 32.395981, -0.797990, 83.281891, 0.254560, 0.950888, -0.176102, 0.059808, 0.504033, 0.500000, 0.500000, 0.000000, 0.000000, 16.000000, 21.000000, 0.000000, 0.000000, - 32.861179, -1.503900, 80.142693, 0.254560, 0.950888, -0.176102, 0.049578, 0.478586, 0.750000, 0.250000, 0.000000, 0.000000, 21.000000, 16.000000, 0.000000, 0.000000, - 32.395981, -0.797990, 83.281891, 0.353398, 0.777781, -0.519775, 0.059808, 0.504033, 0.500000, 0.500000, 0.000000, 0.000000, 16.000000, 21.000000, 0.000000, 0.000000, - 29.890791, -0.306600, 82.313904, 0.353398, 0.777781, -0.519775, 0.037657, 0.510416, 0.500000, 0.500000, 0.000000, 0.000000, 16.000000, 21.000000, 0.000000, 0.000000, - 29.082790, 1.682300, 84.740692, 0.353398, 0.777781, -0.519775, 0.040621, 0.530198, 1.000000, 0.000000, 0.000000, 0.000000, 16.000000, 0.000000, 0.000000, 0.000000, - 29.082790, 1.682300, 84.740692, 0.382149, 0.791249, -0.477375, 0.040621, 0.530198, 1.000000, 0.000000, 0.000000, 0.000000, 16.000000, 0.000000, 0.000000, 0.000000, - 31.695601, 1.217380, 86.061699, 0.382149, 0.791249, -0.477375, 0.066937, 0.530589, 1.000000, 0.000000, 0.000000, 0.000000, 16.000000, 0.000000, 0.000000, 0.000000, - 32.395981, -0.797990, 83.281891, 0.382149, 0.791249, -0.477375, 0.059808, 0.504033, 0.500000, 0.500000, 0.000000, 0.000000, 16.000000, 21.000000, 0.000000, 0.000000, - 32.395981, -0.797990, 83.281891, -0.557114, 0.788713, -0.259916, 0.059808, 0.504033, 0.500000, 0.500000, 0.000000, 0.000000, 16.000000, 21.000000, 0.000000, 0.000000, - 34.184700, -0.000690, 81.867287, -0.557114, 0.788713, -0.259916, 0.071045, 0.487618, 0.500000, 0.500000, 0.000000, 0.000000, 16.000000, 21.000000, 0.000000, 0.000000, - 32.861179, -1.503900, 80.142693, -0.557113, 0.788713, -0.259916, 0.049578, 0.478586, 0.750000, 0.250000, 0.000000, 0.000000, 21.000000, 16.000000, 0.000000, 0.000000, - 32.395981, -0.797990, 83.281891, -0.629970, 0.644487, -0.433330, 0.059808, 0.504033, 0.500000, 0.500000, 0.000000, 0.000000, 16.000000, 21.000000, 0.000000, 0.000000, - 33.099991, 2.152070, 86.646004, -0.629970, 0.644487, -0.433330, 0.083089, 0.532741, 0.960986, 0.039014, 0.000000, 0.000000, 16.000000, 23.000000, 0.000000, 0.000000, - 34.184700, -0.000690, 81.867287, -0.629970, 0.644487, -0.433330, 0.071045, 0.487618, 0.500000, 0.500000, 0.000000, 0.000000, 16.000000, 21.000000, 0.000000, 0.000000, - 37.103100, 1.384990, 79.162590, -0.238384, 0.941103, 0.239789, 0.095001, 0.446598, 0.750000, 0.250000, 0.000000, 0.000000, 18.000000, 16.000000, 0.000000, 0.000000, - 35.421589, 1.108290, 78.576897, -0.238384, 0.941103, 0.239789, 0.079285, 0.437406, 0.750000, 0.250000, 0.000000, 0.000000, 18.000000, 16.000000, 0.000000, 0.000000, - 34.897301, 0.765100, 79.402603, -0.238384, 0.941103, 0.239789, 0.074341, 0.466756, 0.500000, 0.500000, 0.000000, 0.000000, 16.000000, 21.000000, 0.000000, 0.000000, - 34.897301, 0.765100, 79.402603, -0.282270, 0.948337, -0.144850, 0.074341, 0.466756, 0.500000, 0.500000, 0.000000, 0.000000, 16.000000, 21.000000, 0.000000, 0.000000, - 36.559292, 1.472800, 80.797203, -0.282270, 0.948337, -0.144850, 0.099681, 0.474772, 1.000000, 0.000000, 0.000000, 0.000000, 16.000000, 0.000000, 0.000000, 0.000000, - 37.103100, 1.384990, 79.162590, -0.282270, 0.948337, -0.144850, 0.095001, 0.446598, 0.750000, 0.250000, 0.000000, 0.000000, 18.000000, 16.000000, 0.000000, 0.000000, - 36.559292, 1.472800, 80.797203, -0.479425, 0.867750, 0.131001, 0.099681, 0.474772, 1.000000, 0.000000, 0.000000, 0.000000, 16.000000, 0.000000, 0.000000, 0.000000, - 34.897301, 0.765100, 79.402603, -0.479425, 0.867750, 0.131001, 0.074341, 0.466756, 0.500000, 0.500000, 0.000000, 0.000000, 16.000000, 21.000000, 0.000000, 0.000000, - 34.184700, -0.000690, 81.867287, -0.479425, 0.867750, 0.131001, 0.071045, 0.487618, 0.500000, 0.500000, 0.000000, 0.000000, 16.000000, 21.000000, 0.000000, 0.000000, - 34.184700, -0.000690, 81.867287, -0.608146, 0.662924, -0.436682, 0.071045, 0.487618, 0.500000, 0.500000, 0.000000, 0.000000, 16.000000, 21.000000, 0.000000, 0.000000, - 33.099991, 2.152070, 86.646004, -0.608146, 0.662924, -0.436682, 0.083089, 0.532741, 0.960986, 0.039014, 0.000000, 0.000000, 16.000000, 23.000000, 0.000000, 0.000000, - 36.559292, 1.472800, 80.797203, -0.608146, 0.662924, -0.436681, 0.099681, 0.474772, 1.000000, 0.000000, 0.000000, 0.000000, 16.000000, 0.000000, 0.000000, 0.000000, - 31.695601, 1.217380, 86.061699, -0.248184, 0.753491, -0.608815, 0.066937, 0.530589, 1.000000, 0.000000, 0.000000, 0.000000, 16.000000, 0.000000, 0.000000, 0.000000, - 33.099991, 2.152070, 86.646004, -0.248184, 0.753491, -0.608815, 0.083089, 0.532741, 0.960986, 0.039014, 0.000000, 0.000000, 16.000000, 23.000000, 0.000000, 0.000000, - 32.395981, -0.797990, 83.281891, -0.248184, 0.753491, -0.608815, 0.059808, 0.504033, 0.500000, 0.500000, 0.000000, 0.000000, 16.000000, 21.000000, 0.000000, 0.000000, - 33.672501, 1.777200, 78.738098, 0.491370, -0.266974, 0.829024, 0.911340, 0.231132, 0.500000, 0.500000, 0.000000, 0.000000, 16.000000, 21.000000, 0.000000, 0.000000, - 32.737701, 3.983890, 80.002792, 0.491370, -0.266974, 0.829024, 0.929345, 0.249566, 1.000000, 0.000000, 0.000000, 0.000000, 16.000000, 0.000000, 0.000000, 0.000000, - 32.069592, 3.540490, 80.255997, 0.491370, -0.266974, 0.829024, 0.924263, 0.255331, 1.000000, 0.000000, 0.000000, 0.000000, 16.000000, 0.000000, 0.000000, 0.000000, - 32.069592, 3.540490, 80.255997, 0.198198, -0.529740, 0.824678, 0.924263, 0.255331, 1.000000, 0.000000, 0.000000, 0.000000, 16.000000, 0.000000, 0.000000, 0.000000, - 33.007099, 1.092200, 78.458000, 0.198198, -0.529740, 0.824678, 0.904556, 0.236401, 0.750000, 0.250000, 0.000000, 0.000000, 21.000000, 16.000000, 0.000000, 0.000000, - 33.672501, 1.777200, 78.738098, 0.198198, -0.529740, 0.824678, 0.911340, 0.231132, 0.500000, 0.500000, 0.000000, 0.000000, 16.000000, 21.000000, 0.000000, 0.000000, - 32.737701, 3.983890, 80.002792, 0.521466, -0.338444, 0.783281, 0.929345, 0.249566, 1.000000, 0.000000, 0.000000, 0.000000, 16.000000, 0.000000, 0.000000, 0.000000, - 28.363300, 6.512700, 84.007690, 0.521466, -0.338444, 0.783281, 0.945239, 0.304844, 1.000000, 0.000000, 0.000000, 0.000000, 16.000000, 0.000000, 0.000000, 0.000000, - 32.069592, 3.540490, 80.255997, 0.521466, -0.338444, 0.783281, 0.924263, 0.255331, 1.000000, 0.000000, 0.000000, 0.000000, 16.000000, 0.000000, 0.000000, 0.000000, - 34.447392, 3.648400, 77.903893, 0.771924, -0.036728, 0.634653, 0.927093, 0.217591, 0.477273, 0.272727, 0.250000, 0.000000, 18.000000, 17.000000, 16.000000, 0.000000, - 32.737701, 3.983890, 80.002792, 0.771924, -0.036728, 0.634653, 0.929345, 0.249566, 1.000000, 0.000000, 0.000000, 0.000000, 16.000000, 0.000000, 0.000000, 0.000000, - 33.672501, 1.777200, 78.738098, 0.771924, -0.036728, 0.634653, 0.911340, 0.231132, 0.500000, 0.500000, 0.000000, 0.000000, 16.000000, 21.000000, 0.000000, 0.000000, - 33.672501, 1.777200, 78.738098, 0.827050, -0.095535, 0.553950, 0.911340, 0.231132, 0.500000, 0.500000, 0.000000, 0.000000, 16.000000, 21.000000, 0.000000, 0.000000, - 34.281101, 2.053990, 77.877190, 0.827050, -0.095535, 0.553950, 0.913688, 0.218094, 0.750000, 0.250000, 0.000000, 0.000000, 18.000000, 16.000000, 0.000000, 0.000000, - 34.447392, 3.648400, 77.903893, 0.827050, -0.095535, 0.553950, 0.927093, 0.217591, 0.477273, 0.272727, 0.250000, 0.000000, 18.000000, 17.000000, 16.000000, 0.000000, - 34.447392, 3.648400, 77.903893, 0.777552, 0.163109, 0.607295, 0.927093, 0.217591, 0.477273, 0.272727, 0.250000, 0.000000, 18.000000, 17.000000, 16.000000, 0.000000, - 33.739792, 9.189680, 77.321579, 0.777552, 0.163109, 0.607295, 0.978982, 0.231142, 1.000000, 0.000000, 0.000000, 0.000000, 16.000000, 0.000000, 0.000000, 0.000000, - 32.737701, 3.983890, 80.002792, 0.777552, 0.163109, 0.607296, 0.929345, 0.249566, 1.000000, 0.000000, 0.000000, 0.000000, 16.000000, 0.000000, 0.000000, 0.000000, - 31.166491, 0.625380, 78.795403, 0.882254, 0.088564, 0.462368, 0.890658, 0.250768, 0.750000, 0.250000, 0.000000, 0.000000, 21.000000, 16.000000, 0.000000, 0.000000, - 29.920000, 1.984690, 80.913490, 0.882254, 0.088564, 0.462368, 0.905279, 0.271426, 0.500000, 0.500000, 0.000000, 0.000000, 16.000000, 21.000000, 0.000000, 0.000000, - 30.973391, -0.950900, 79.465790, 0.882254, 0.088564, 0.462368, 0.877385, 0.258453, 0.750000, 0.250000, 0.000000, 0.000000, 21.000000, 16.000000, 0.000000, 0.000000, - 31.166491, 0.625380, 78.795403, 0.276894, -0.497639, 0.822001, 0.890658, 0.250768, 0.750000, 0.250000, 0.000000, 0.000000, 21.000000, 16.000000, 0.000000, 0.000000, - 33.007099, 1.092200, 78.458000, 0.276894, -0.497639, 0.822001, 0.904556, 0.236401, 0.750000, 0.250000, 0.000000, 0.000000, 21.000000, 16.000000, 0.000000, 0.000000, - 32.069592, 3.540490, 80.255997, 0.276894, -0.497639, 0.822001, 0.924263, 0.255331, 1.000000, 0.000000, 0.000000, 0.000000, 16.000000, 0.000000, 0.000000, 0.000000, - 32.069592, 3.540490, 80.255997, 0.564244, -0.502878, 0.654785, 0.924263, 0.255331, 1.000000, 0.000000, 0.000000, 0.000000, 16.000000, 0.000000, 0.000000, 0.000000, - 29.920000, 1.984690, 80.913490, 0.564244, -0.502878, 0.654785, 0.905279, 0.271426, 0.500000, 0.500000, 0.000000, 0.000000, 16.000000, 21.000000, 0.000000, 0.000000, - 31.166491, 0.625380, 78.795403, 0.564244, -0.502878, 0.654785, 0.890658, 0.250768, 0.750000, 0.250000, 0.000000, 0.000000, 21.000000, 16.000000, 0.000000, 0.000000, - 29.920000, 1.984690, 80.913490, 0.887326, 0.232197, 0.398418, 0.905279, 0.271426, 0.500000, 0.500000, 0.000000, 0.000000, 16.000000, 21.000000, 0.000000, 0.000000, - 28.123791, 3.438690, 84.066483, 0.887326, 0.232197, 0.398418, 0.918338, 0.304978, 1.000000, 0.000000, 0.000000, 0.000000, 16.000000, 0.000000, 0.000000, 0.000000, - 29.890791, -0.306600, 82.313904, 0.887326, 0.232197, 0.398418, 0.885337, 0.284695, 0.500000, 0.500000, 0.000000, 0.000000, 16.000000, 21.000000, 0.000000, 0.000000, - 32.069592, 3.540490, 80.255997, 0.694637, -0.040386, 0.718226, 0.924263, 0.255331, 1.000000, 0.000000, 0.000000, 0.000000, 16.000000, 0.000000, 0.000000, 0.000000, - 28.363300, 6.512700, 84.007690, 0.694637, -0.040386, 0.718226, 0.945239, 0.304844, 1.000000, 0.000000, 0.000000, 0.000000, 16.000000, 0.000000, 0.000000, 0.000000, - 28.123791, 3.438690, 84.066483, 0.694637, -0.040386, 0.718226, 0.918338, 0.304978, 1.000000, 0.000000, 0.000000, 0.000000, 16.000000, 0.000000, 0.000000, 0.000000, - 28.123791, 3.438690, 84.066483, 0.584027, -0.557645, 0.589868, 0.918338, 0.304978, 1.000000, 0.000000, 0.000000, 0.000000, 16.000000, 0.000000, 0.000000, 0.000000, - 29.920000, 1.984690, 80.913490, 0.584027, -0.557645, 0.589868, 0.905279, 0.271426, 0.500000, 0.500000, 0.000000, 0.000000, 16.000000, 21.000000, 0.000000, 0.000000, - 32.069592, 3.540490, 80.255997, 0.584027, -0.557645, 0.589868, 0.924263, 0.255331, 1.000000, 0.000000, 0.000000, 0.000000, 16.000000, 0.000000, 0.000000, 0.000000, - 35.931091, 9.390500, 80.052299, -0.002519, -0.997154, 0.075353, 0.163544, 0.494080, 1.000000, 0.000000, 0.000000, 0.000000, 16.000000, 0.000000, 0.000000, 0.000000, - 33.739792, 9.189680, 77.321579, -0.002519, -0.997154, 0.075353, 0.198453, 0.488377, 1.000000, 0.000000, 0.000000, 0.000000, 16.000000, 0.000000, 0.000000, 0.000000, - 36.669979, 9.265290, 78.420082, -0.002519, -0.997154, 0.075353, 0.171699, 0.481266, 0.750000, 0.250000, 0.000000, 0.000000, 17.000000, 16.000000, 0.000000, 0.000000, - 35.931091, 9.390500, 80.052299, 0.072717, -0.997252, 0.014166, 0.163544, 0.494080, 1.000000, 0.000000, 0.000000, 0.000000, 16.000000, 0.000000, 0.000000, 0.000000, - 32.705688, 9.240980, 86.083298, 0.072717, -0.997252, 0.014166, 0.143564, 0.549932, 1.000000, 0.000000, 0.000000, 0.000000, 16.000000, 0.000000, 0.000000, 0.000000, - 29.860991, 9.012290, 84.586502, 0.072717, -0.997252, 0.014166, 0.169935, 0.558730, 1.000000, 0.000000, 0.000000, 0.000000, 16.000000, 0.000000, 0.000000, 0.000000, - 29.860991, 9.012290, 84.586502, 0.073098, -0.997217, 0.014678, 0.169935, 0.558730, 1.000000, 0.000000, 0.000000, 0.000000, 16.000000, 0.000000, 0.000000, 0.000000, - 33.739792, 9.189680, 77.321579, 0.073098, -0.997217, 0.014678, 0.198453, 0.488377, 1.000000, 0.000000, 0.000000, 0.000000, 16.000000, 0.000000, 0.000000, 0.000000, - 35.931091, 9.390500, 80.052299, 0.073098, -0.997217, 0.014678, 0.163544, 0.494080, 1.000000, 0.000000, 0.000000, 0.000000, 16.000000, 0.000000, 0.000000, 0.000000, - 29.860991, 9.012290, 84.586502, 0.448883, -0.447998, 0.773177, 0.970074, 0.302908, 1.000000, 0.000000, 0.000000, 0.000000, 16.000000, 0.000000, 0.000000, 0.000000, - 28.363300, 6.512700, 84.007690, 0.448883, -0.447998, 0.773177, 0.945239, 0.304844, 1.000000, 0.000000, 0.000000, 0.000000, 16.000000, 0.000000, 0.000000, 0.000000, - 32.737701, 3.983890, 80.002792, 0.448883, -0.447998, 0.773177, 0.929345, 0.249566, 1.000000, 0.000000, 0.000000, 0.000000, 16.000000, 0.000000, 0.000000, 0.000000, - 32.737701, 3.983890, 80.002792, 0.879014, 0.073434, 0.471106, 0.929345, 0.249566, 1.000000, 0.000000, 0.000000, 0.000000, 16.000000, 0.000000, 0.000000, 0.000000, - 33.739792, 9.189680, 77.321579, 0.879014, 0.073434, 0.471106, 0.978982, 0.231142, 1.000000, 0.000000, 0.000000, 0.000000, 16.000000, 0.000000, 0.000000, 0.000000, - 29.860991, 9.012290, 84.586502, 0.879015, 0.073434, 0.471106, 0.970074, 0.302908, 1.000000, 0.000000, 0.000000, 0.000000, 16.000000, 0.000000, 0.000000, 0.000000, - 30.973391, -0.950900, 79.465790, 0.932333, 0.179848, 0.313705, 0.877385, 0.258453, 0.750000, 0.250000, 0.000000, 0.000000, 21.000000, 16.000000, 0.000000, 0.000000, - 29.920000, 1.984690, 80.913490, 0.932333, 0.179848, 0.313705, 0.905279, 0.271426, 0.500000, 0.500000, 0.000000, 0.000000, 16.000000, 21.000000, 0.000000, 0.000000, - 29.890791, -0.306600, 82.313904, 0.932333, 0.179848, 0.313705, 0.885337, 0.284695, 0.500000, 0.500000, 0.000000, 0.000000, 16.000000, 21.000000, 0.000000, 0.000000, - 34.229900, -0.528800, 77.005791, -0.885465, 0.399160, -0.237956, 0.051082, 0.447747, 0.750000, 0.250000, 0.000000, 0.000000, 22.000000, 21.000000, 0.000000, 0.000000, - 34.354389, -1.441590, 75.011391, -0.885465, 0.399160, -0.237956, 0.036936, 0.434394, 1.000000, 0.000000, 0.000000, 0.000000, 22.000000, 0.000000, 0.000000, 0.000000, - 33.701302, -1.733290, 76.952301, -0.885465, 0.399160, -0.237956, 0.040673, 0.451803, 0.750000, 0.250000, 0.000000, 0.000000, 22.000000, 21.000000, 0.000000, 0.000000, - 35.931091, 9.390500, 80.052299, -0.831987, -0.320445, -0.452894, 0.163544, 0.494080, 1.000000, 0.000000, 0.000000, 0.000000, 16.000000, 0.000000, 0.000000, 0.000000, - 33.609501, 6.028290, 86.696091, -0.831987, -0.320445, -0.452894, 0.115462, 0.541545, 1.000000, 0.000000, 0.000000, 0.000000, 16.000000, 0.000000, 0.000000, 0.000000, - 32.705688, 9.240980, 86.083298, -0.831987, -0.320445, -0.452894, 0.143564, 0.549932, 1.000000, 0.000000, 0.000000, 0.000000, 16.000000, 0.000000, 0.000000, 0.000000, - 29.890791, -0.306600, 82.313904, 0.887248, 0.454770, -0.077302, 0.885337, 0.284695, 0.500000, 0.500000, 0.000000, 0.000000, 16.000000, 21.000000, 0.000000, 0.000000, - 28.123791, 3.438690, 84.066483, 0.887248, 0.454770, -0.077302, 0.918338, 0.304978, 1.000000, 0.000000, 0.000000, 0.000000, 16.000000, 0.000000, 0.000000, 0.000000, - 29.082790, 1.682300, 84.740692, 0.887248, 0.454770, -0.077302, 0.899671, 0.306861, 1.000000, 0.000000, 0.000000, 0.000000, 16.000000, 0.000000, 0.000000, 0.000000, - 33.609501, 6.028290, 86.696091, -0.804262, 0.113255, -0.583383, 0.115462, 0.541545, 1.000000, 0.000000, 0.000000, 0.000000, 16.000000, 0.000000, 0.000000, 0.000000, - 33.099991, 2.152070, 86.646004, -0.804262, 0.113255, -0.583383, 0.083089, 0.532741, 0.960986, 0.039014, 0.000000, 0.000000, 16.000000, 23.000000, 0.000000, 0.000000, - 31.348600, 2.615100, 89.150391, -0.804262, 0.113255, -0.583383, 0.077016, 0.559978, 0.500000, 0.500000, 0.000000, 0.000000, 16.000000, 23.000000, 0.000000, 0.000000, - 31.348600, 2.615100, 89.150391, -0.841465, 0.195075, -0.503867, 0.077016, 0.559978, 0.500000, 0.500000, 0.000000, 0.000000, 16.000000, 23.000000, 0.000000, 0.000000, - 32.078091, 6.090890, 89.277802, -0.841465, 0.195075, -0.503867, 0.108422, 0.567815, 0.500000, 0.500000, 0.000000, 0.000000, 16.000000, 23.000000, 0.000000, 0.000000, - 33.609501, 6.028290, 86.696091, -0.841465, 0.195075, -0.503867, 0.115462, 0.541545, 1.000000, 0.000000, 0.000000, 0.000000, 16.000000, 0.000000, 0.000000, 0.000000, - 33.609501, 6.028290, 86.696091, -0.803347, -0.368778, -0.467585, 0.115462, 0.541545, 1.000000, 0.000000, 0.000000, 0.000000, 16.000000, 0.000000, 0.000000, 0.000000, - 32.078091, 6.090890, 89.277802, -0.803347, -0.368778, -0.467585, 0.108422, 0.567815, 0.500000, 0.500000, 0.000000, 0.000000, 16.000000, 23.000000, 0.000000, 0.000000, - 31.165890, 8.961400, 88.581100, -0.803347, -0.368778, -0.467585, 0.136111, 0.575224, 0.500000, 0.500000, 0.000000, 0.000000, 16.000000, 23.000000, 0.000000, 0.000000, - 31.165890, 8.961400, 88.581100, -0.789459, -0.321793, -0.522689, 0.136111, 0.575224, 0.500000, 0.500000, 0.000000, 0.000000, 16.000000, 23.000000, 0.000000, 0.000000, - 32.705688, 9.240980, 86.083298, -0.789459, -0.321793, -0.522689, 0.143564, 0.549932, 1.000000, 0.000000, 0.000000, 0.000000, 16.000000, 0.000000, 0.000000, 0.000000, - 33.609501, 6.028290, 86.696091, -0.789459, -0.321793, -0.522689, 0.115462, 0.541545, 1.000000, 0.000000, 0.000000, 0.000000, 16.000000, 0.000000, 0.000000, 0.000000, - 29.082790, 1.682300, 84.740692, 0.220864, 0.971769, -0.082969, 0.040621, 0.530198, 1.000000, 0.000000, 0.000000, 0.000000, 16.000000, 0.000000, 0.000000, 0.000000, - 27.839090, 2.180800, 87.268593, 0.220864, 0.971769, -0.082969, 0.039169, 0.552415, 0.500000, 0.500000, 0.000000, 0.000000, 16.000000, 23.000000, 0.000000, 0.000000, - 30.120701, 1.772990, 88.565804, 0.220864, 0.971769, -0.082969, 0.062225, 0.557204, 0.500000, 0.500000, 0.000000, 0.000000, 16.000000, 23.000000, 0.000000, 0.000000, - 30.120701, 1.772990, 88.565804, 0.214267, 0.973393, -0.081218, 0.062225, 0.557204, 0.500000, 0.500000, 0.000000, 0.000000, 16.000000, 23.000000, 0.000000, 0.000000, - 31.695601, 1.217380, 86.061699, 0.214267, 0.973393, -0.081218, 0.066937, 0.530589, 1.000000, 0.000000, 0.000000, 0.000000, 16.000000, 0.000000, 0.000000, 0.000000, - 29.082790, 1.682300, 84.740692, 0.214267, 0.973393, -0.081218, 0.040621, 0.530198, 1.000000, 0.000000, 0.000000, 0.000000, 16.000000, 0.000000, 0.000000, 0.000000, - 31.695601, 1.217380, 86.061699, -0.370528, 0.829869, -0.417166, 0.066937, 0.530589, 1.000000, 0.000000, 0.000000, 0.000000, 16.000000, 0.000000, 0.000000, 0.000000, - 30.120701, 1.772990, 88.565804, -0.370528, 0.829869, -0.417166, 0.062225, 0.557204, 0.500000, 0.500000, 0.000000, 0.000000, 16.000000, 23.000000, 0.000000, 0.000000, - 31.348600, 2.615100, 89.150391, -0.370528, 0.829869, -0.417166, 0.077016, 0.559978, 0.500000, 0.500000, 0.000000, 0.000000, 16.000000, 23.000000, 0.000000, 0.000000, - 31.348600, 2.615100, 89.150391, -0.377139, 0.827134, -0.416671, 0.077016, 0.559978, 0.500000, 0.500000, 0.000000, 0.000000, 16.000000, 23.000000, 0.000000, 0.000000, - 33.099991, 2.152070, 86.646004, -0.377139, 0.827134, -0.416671, 0.083089, 0.532741, 0.960986, 0.039014, 0.000000, 0.000000, 16.000000, 23.000000, 0.000000, 0.000000, - 31.695601, 1.217380, 86.061699, -0.377139, 0.827134, -0.416671, 0.066937, 0.530589, 1.000000, 0.000000, 0.000000, 0.000000, 16.000000, 0.000000, 0.000000, 0.000000, - 28.123791, 3.438690, 84.066483, 0.794377, 0.538010, 0.281976, 0.918338, 0.304978, 1.000000, 0.000000, 0.000000, 0.000000, 16.000000, 0.000000, 0.000000, 0.000000, - 27.004700, 3.751300, 86.622704, 0.794377, 0.538011, 0.281976, 0.919952, 0.330921, 0.500006, 0.499994, 0.000000, 0.000000, 23.000000, 16.000000, 0.000000, 0.000000, - 27.839090, 2.180800, 87.268593, 0.794377, 0.538010, 0.281976, 0.902834, 0.330946, 0.500000, 0.500000, 0.000000, 0.000000, 16.000000, 23.000000, 0.000000, 0.000000, - 27.839090, 2.180800, 87.268593, 0.791972, 0.541035, 0.282950, 0.902834, 0.330946, 0.500000, 0.500000, 0.000000, 0.000000, 16.000000, 23.000000, 0.000000, 0.000000, - 29.082790, 1.682300, 84.740692, 0.791972, 0.541035, 0.282950, 0.899671, 0.306861, 1.000000, 0.000000, 0.000000, 0.000000, 16.000000, 0.000000, 0.000000, 0.000000, - 28.123791, 3.438690, 84.066483, 0.791972, 0.541035, 0.282950, 0.918338, 0.304978, 1.000000, 0.000000, 0.000000, 0.000000, 16.000000, 0.000000, 0.000000, 0.000000, - 28.363300, 6.512700, 84.007690, 0.910973, -0.062040, 0.407773, 0.945239, 0.304844, 1.000000, 0.000000, 0.000000, 0.000000, 16.000000, 0.000000, 0.000000, 0.000000, - 27.211390, 6.506190, 86.580093, 0.910973, -0.062040, 0.407773, 0.945248, 0.330402, 0.500000, 0.500000, 0.000000, 0.000000, 16.000000, 23.000000, 0.000000, 0.000000, - 27.004700, 3.751300, 86.622704, 0.910973, -0.062040, 0.407773, 0.919952, 0.330921, 0.500006, 0.499994, 0.000000, 0.000000, 23.000000, 16.000000, 0.000000, 0.000000, - 27.004700, 3.751300, 86.622704, 0.911363, -0.063230, 0.406719, 0.919952, 0.330921, 0.500006, 0.499994, 0.000000, 0.000000, 23.000000, 16.000000, 0.000000, 0.000000, - 28.123791, 3.438690, 84.066483, 0.911362, -0.063230, 0.406719, 0.918338, 0.304978, 1.000000, 0.000000, 0.000000, 0.000000, 16.000000, 0.000000, 0.000000, 0.000000, - 28.363300, 6.512700, 84.007690, 0.911362, -0.063230, 0.406719, 0.945239, 0.304844, 1.000000, 0.000000, 0.000000, 0.000000, 16.000000, 0.000000, 0.000000, 0.000000, - 29.860991, 9.012290, 84.586502, 0.104481, -0.993426, -0.046786, 0.169935, 0.558730, 1.000000, 0.000000, 0.000000, 0.000000, 16.000000, 0.000000, 0.000000, 0.000000, - 32.705688, 9.240980, 86.083298, 0.104481, -0.993426, -0.046786, 0.143564, 0.549932, 1.000000, 0.000000, 0.000000, 0.000000, 16.000000, 0.000000, 0.000000, 0.000000, - 31.165890, 8.961400, 88.581100, 0.104481, -0.993426, -0.046786, 0.136111, 0.575224, 0.500000, 0.500000, 0.000000, 0.000000, 16.000000, 23.000000, 0.000000, 0.000000, - 31.165890, 8.961400, 88.581100, 0.058247, -0.997797, -0.031739, 0.136111, 0.575224, 0.500000, 0.500000, 0.000000, 0.000000, 16.000000, 23.000000, 0.000000, 0.000000, - 28.381800, 8.848190, 87.030792, 0.058247, -0.997797, -0.031739, 0.164324, 0.580608, 0.500000, 0.500000, 0.000000, 0.000000, 23.000000, 16.000000, 0.000000, 0.000000, - 29.860991, 9.012290, 84.586502, 0.058247, -0.997797, -0.031739, 0.169935, 0.558730, 1.000000, 0.000000, 0.000000, 0.000000, 16.000000, 0.000000, 0.000000, 0.000000, - 28.363300, 6.512700, 84.007690, 0.737325, -0.536765, 0.410165, 0.945239, 0.304844, 1.000000, 0.000000, 0.000000, 0.000000, 16.000000, 0.000000, 0.000000, 0.000000, - 29.860991, 9.012290, 84.586502, 0.737325, -0.536765, 0.410165, 0.970074, 0.302908, 1.000000, 0.000000, 0.000000, 0.000000, 16.000000, 0.000000, 0.000000, 0.000000, - 28.381800, 8.848190, 87.030792, 0.737325, -0.536765, 0.410165, 0.969071, 0.327614, 0.500000, 0.500000, 0.000000, 0.000000, 23.000000, 16.000000, 0.000000, 0.000000, - 28.381800, 8.848190, 87.030792, 0.805257, -0.471588, 0.359397, 0.969071, 0.327614, 0.500000, 0.500000, 0.000000, 0.000000, 23.000000, 16.000000, 0.000000, 0.000000, - 27.211390, 6.506190, 86.580093, 0.805257, -0.471588, 0.359397, 0.945248, 0.330402, 0.500000, 0.500000, 0.000000, 0.000000, 16.000000, 23.000000, 0.000000, 0.000000, - 28.363300, 6.512700, 84.007690, 0.805257, -0.471588, 0.359397, 0.945239, 0.304844, 1.000000, 0.000000, 0.000000, 0.000000, 16.000000, 0.000000, 0.000000, 0.000000, - 32.078091, 6.090890, 89.277802, -0.876736, 0.200041, -0.437398, 0.108422, 0.567815, 0.500000, 0.500000, 0.000000, 0.000000, 16.000000, 23.000000, 0.000000, 0.000000, - 31.348600, 2.615100, 89.150391, -0.876736, 0.200041, -0.437398, 0.077016, 0.559978, 0.500000, 0.500000, 0.000000, 0.000000, 16.000000, 23.000000, 0.000000, 0.000000, - 28.548189, 2.410570, 94.670090, -0.876736, 0.200041, -0.437398, 0.060372, 0.611992, 0.850000, 0.150000, 0.000000, 0.000000, 23.000000, 16.000000, 0.000000, 0.000000, - 28.548189, 2.410570, 94.670090, -0.878102, 0.218647, -0.425594, 0.060372, 0.611992, 0.850000, 0.150000, 0.000000, 0.000000, 23.000000, 16.000000, 0.000000, 0.000000, - 29.601700, 7.109300, 94.910393, -0.878102, 0.218647, -0.425594, 0.099344, 0.621854, 0.850000, 0.150000, 0.000000, 0.000000, 23.000000, 16.000000, 0.000000, 0.000000, - 32.078091, 6.090890, 89.277802, -0.878102, 0.218647, -0.425594, 0.108422, 0.567815, 0.500000, 0.500000, 0.000000, 0.000000, 16.000000, 23.000000, 0.000000, 0.000000, - 31.165890, 8.961400, 88.581100, -0.877256, -0.356733, -0.321189, 0.136111, 0.575224, 0.500000, 0.500000, 0.000000, 0.000000, 16.000000, 23.000000, 0.000000, 0.000000, - 32.078091, 6.090890, 89.277802, -0.877256, -0.356734, -0.321189, 0.108422, 0.567815, 0.500000, 0.500000, 0.000000, 0.000000, 16.000000, 23.000000, 0.000000, 0.000000, - 29.601700, 7.109300, 94.910393, -0.877256, -0.356733, -0.321189, 0.099344, 0.621854, 0.850000, 0.150000, 0.000000, 0.000000, 23.000000, 16.000000, 0.000000, 0.000000, - 29.601700, 7.109300, 94.910393, -0.865686, -0.380498, -0.325284, 0.099344, 0.621854, 0.850000, 0.150000, 0.000000, 0.000000, 23.000000, 16.000000, 0.000000, 0.000000, - 28.394791, 10.760590, 93.851303, -0.865686, -0.380498, -0.325284, 0.131313, 0.630170, 0.850000, 0.150000, 0.000000, 0.000000, 23.000000, 16.000000, 0.000000, 0.000000, - 31.165890, 8.961400, 88.581100, -0.865686, -0.380498, -0.325284, 0.136111, 0.575224, 0.500000, 0.500000, 0.000000, 0.000000, 16.000000, 23.000000, 0.000000, 0.000000, - 27.839090, 2.180800, 87.268593, 0.070376, 0.986102, 0.150502, 0.039169, 0.552415, 0.500000, 0.500000, 0.000000, 0.000000, 16.000000, 23.000000, 0.000000, 0.000000, - 23.704700, 1.796490, 91.719910, 0.070376, 0.986102, 0.150502, 0.012398, 0.596754, 0.850000, 0.150000, 0.000000, 0.000000, 23.000000, 16.000000, 0.000000, 0.000000, - 26.842400, 1.263880, 93.742401, 0.070376, 0.986102, 0.150502, 0.042745, 0.607755, 0.850000, 0.150000, 0.000000, 0.000000, 23.000000, 16.000000, 0.000000, 0.000000, - 26.842400, 1.263880, 93.742401, 0.088880, 0.984208, 0.153082, 0.042745, 0.607755, 0.850000, 0.150000, 0.000000, 0.000000, 23.000000, 16.000000, 0.000000, 0.000000, - 30.120701, 1.772990, 88.565804, 0.088880, 0.984208, 0.153082, 0.062225, 0.557204, 0.500000, 0.500000, 0.000000, 0.000000, 16.000000, 23.000000, 0.000000, 0.000000, - 27.839090, 2.180800, 87.268593, 0.088880, 0.984208, 0.153082, 0.039169, 0.552415, 0.500000, 0.500000, 0.000000, 0.000000, 16.000000, 23.000000, 0.000000, 0.000000, - 30.120701, 1.772990, 88.565804, -0.464472, 0.860445, -0.209523, 0.062225, 0.557204, 0.500000, 0.500000, 0.000000, 0.000000, 16.000000, 23.000000, 0.000000, 0.000000, - 26.842400, 1.263880, 93.742401, -0.464472, 0.860445, -0.209523, 0.042745, 0.607755, 0.850000, 0.150000, 0.000000, 0.000000, 23.000000, 16.000000, 0.000000, 0.000000, - 28.548189, 2.410570, 94.670090, -0.464472, 0.860445, -0.209523, 0.060372, 0.611992, 0.850000, 0.150000, 0.000000, 0.000000, 23.000000, 16.000000, 0.000000, 0.000000, - 28.548189, 2.410570, 94.670090, -0.481668, 0.850106, -0.212873, 0.060372, 0.611992, 0.850000, 0.150000, 0.000000, 0.000000, 23.000000, 16.000000, 0.000000, 0.000000, - 31.348600, 2.615100, 89.150391, -0.481668, 0.850106, -0.212873, 0.077016, 0.559978, 0.500000, 0.500000, 0.000000, 0.000000, 16.000000, 23.000000, 0.000000, 0.000000, - 30.120701, 1.772990, 88.565804, -0.481668, 0.850106, -0.212873, 0.062225, 0.557204, 0.500000, 0.500000, 0.000000, 0.000000, 16.000000, 23.000000, 0.000000, 0.000000, - 27.839090, 2.180800, 87.268593, 0.610618, 0.556239, 0.563687, 0.902834, 0.330946, 0.500000, 0.500000, 0.000000, 0.000000, 16.000000, 23.000000, 0.000000, 0.000000, - 27.004700, 3.751300, 86.622704, 0.610618, 0.556239, 0.563687, 0.919952, 0.330921, 0.500006, 0.499994, 0.000000, 0.000000, 23.000000, 16.000000, 0.000000, 0.000000, - 22.825327, 3.911090, 90.992363, 0.610618, 0.556239, 0.563687, 0.920263, 0.376645, 0.850000, 0.150000, 0.000000, 0.000000, 23.000000, 16.000000, 0.000000, 0.000000, - 22.825327, 3.911090, 90.992363, 0.624637, 0.473434, 0.621038, 0.920263, 0.376645, 0.850000, 0.150000, 0.000000, 0.000000, 23.000000, 16.000000, 0.000000, 0.000000, - 23.704700, 1.796490, 91.719910, 0.624637, 0.473434, 0.621038, 0.897741, 0.384242, 0.850000, 0.150000, 0.000000, 0.000000, 23.000000, 16.000000, 0.000000, 0.000000, - 27.839090, 2.180800, 87.268593, 0.624637, 0.473434, 0.621038, 0.902834, 0.330946, 0.500000, 0.500000, 0.000000, 0.000000, 16.000000, 23.000000, 0.000000, 0.000000, - 27.211390, 6.506190, 86.580093, 0.695654, 0.043425, 0.717063, 0.945248, 0.330402, 0.500000, 0.500000, 0.000000, 0.000000, 16.000000, 23.000000, 0.000000, 0.000000, - 22.900000, 7.631700, 90.694603, 0.695654, 0.043425, 0.717063, 0.952668, 0.384378, 0.850000, 0.150000, 0.000000, 0.000000, 23.000000, 16.000000, 0.000000, 0.000000, - 22.825327, 3.911090, 90.992363, 0.695654, 0.043425, 0.717063, 0.920263, 0.376645, 0.850000, 0.150000, 0.000000, 0.000000, 23.000000, 16.000000, 0.000000, 0.000000, - 22.825327, 3.911090, 90.992363, 0.721192, -0.043415, 0.691374, 0.920263, 0.376645, 0.850000, 0.150000, 0.000000, 0.000000, 23.000000, 16.000000, 0.000000, 0.000000, - 27.004700, 3.751300, 86.622704, 0.721192, -0.043415, 0.691374, 0.919952, 0.330921, 0.500006, 0.499994, 0.000000, 0.000000, 23.000000, 16.000000, 0.000000, 0.000000, - 27.211390, 6.506190, 86.580093, 0.721192, -0.043415, 0.691374, 0.945248, 0.330402, 0.500000, 0.500000, 0.000000, 0.000000, 16.000000, 23.000000, 0.000000, 0.000000, - 28.381800, 8.848190, 87.030792, -0.110611, -0.956903, 0.268516, 0.164324, 0.580608, 0.500000, 0.500000, 0.000000, 0.000000, 23.000000, 16.000000, 0.000000, 0.000000, - 31.165890, 8.961400, 88.581100, -0.110611, -0.956903, 0.268516, 0.136111, 0.575224, 0.500000, 0.500000, 0.000000, 0.000000, 16.000000, 23.000000, 0.000000, 0.000000, - 28.394791, 10.760590, 93.851303, -0.110611, -0.956903, 0.268516, 0.131313, 0.630170, 0.850000, 0.150000, 0.000000, 0.000000, 23.000000, 16.000000, 0.000000, 0.000000, - 28.394791, 10.760590, 93.851303, -0.083638, -0.959451, 0.269179, 0.131313, 0.630170, 0.850000, 0.150000, 0.000000, 0.000000, 23.000000, 16.000000, 0.000000, 0.000000, - 24.741800, 10.455690, 91.629494, -0.083638, -0.959451, 0.269179, 0.167826, 0.632055, 0.850000, 0.150000, 0.000000, 0.000000, 23.000000, 16.000000, 0.000000, 0.000000, - 28.381800, 8.848190, 87.030792, -0.083638, -0.959451, 0.269179, 0.164324, 0.580608, 0.500000, 0.500000, 0.000000, 0.000000, 23.000000, 16.000000, 0.000000, 0.000000, - 28.381800, 8.848190, 87.030792, 0.542475, -0.560852, 0.625433, 0.969071, 0.327614, 0.500000, 0.500000, 0.000000, 0.000000, 23.000000, 16.000000, 0.000000, 0.000000, - 24.741800, 10.455690, 91.629494, 0.542475, -0.560852, 0.625433, 0.983167, 0.379419, 0.850000, 0.150000, 0.000000, 0.000000, 23.000000, 16.000000, 0.000000, 0.000000, - 22.900000, 7.631700, 90.694603, 0.542475, -0.560852, 0.625433, 0.952668, 0.384378, 0.850000, 0.150000, 0.000000, 0.000000, 23.000000, 16.000000, 0.000000, 0.000000, - 22.900000, 7.631700, 90.694603, 0.566903, -0.419719, 0.708842, 0.952668, 0.384378, 0.850000, 0.150000, 0.000000, 0.000000, 23.000000, 16.000000, 0.000000, 0.000000, - 27.211390, 6.506190, 86.580093, 0.566903, -0.419719, 0.708842, 0.945248, 0.330402, 0.500000, 0.500000, 0.000000, 0.000000, 16.000000, 23.000000, 0.000000, 0.000000, - 28.381800, 8.848190, 87.030792, 0.566903, -0.419719, 0.708842, 0.969071, 0.327614, 0.500000, 0.500000, 0.000000, 0.000000, 23.000000, 16.000000, 0.000000, 0.000000, - -3.081790, -4.465400, 137.182205, 0.140495, 0.984252, -0.107283, 0.050904, 0.832811, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -3.322990, -4.168590, 139.589386, 0.140495, 0.984252, -0.107283, 0.054742, 0.867255, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -4.633190, 139.678696, 0.140495, 0.984252, -0.107283, 0.005730, 0.868711, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -4.633190, 139.678696, 0.158307, 0.978843, -0.129634, 0.005730, 0.868711, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -4.962190, 137.194473, 0.158307, 0.978843, -0.129634, 0.005317, 0.832365, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -3.081790, -4.465400, 137.182205, 0.158307, 0.978843, -0.129634, 0.050904, 0.832811, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -1.546000, -4.618300, 135.609192, 0.158640, 0.985567, 0.059087, 0.028085, 0.810025, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -3.081790, -4.465400, 137.182205, 0.158640, 0.985567, 0.059087, 0.050904, 0.832811, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -4.962190, 137.194473, 0.158640, 0.985567, 0.059087, 0.005317, 0.832365, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -4.962190, 137.194473, 0.124085, 0.987877, 0.093287, 0.005317, 0.832365, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -4.805690, 135.537186, 0.124085, 0.987877, 0.093287, 0.005020, 0.808898, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -1.546000, -4.618300, 135.609192, 0.124085, 0.987877, 0.093287, 0.028085, 0.810025, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -1.126170, -4.287700, 134.387192, 0.128544, 0.945272, 0.299896, 0.022679, 0.791759, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -1.546000, -4.618300, 135.609192, 0.128544, 0.945272, 0.299896, 0.028085, 0.810025, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -4.805690, 135.537186, 0.128544, 0.945272, 0.299896, 0.005020, 0.808898, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -4.805690, 135.537186, 0.125786, 0.944844, 0.302404, 0.005020, 0.808898, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -4.430300, 134.364304, 0.125786, 0.944844, 0.302404, 0.004767, 0.791829, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -1.126170, -4.287700, 134.387192, 0.125786, 0.944844, 0.302404, 0.022679, 0.791759, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -1.126170, -4.287700, 134.387192, 0.127097, 0.972053, 0.197382, 0.022679, 0.791759, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -4.430300, 134.364304, 0.127097, 0.972053, 0.197382, 0.004767, 0.791829, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -4.219590, 133.326614, 0.127097, 0.972053, 0.197382, 0.004524, 0.777647, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -4.219590, 133.326614, 0.171941, 0.954444, 0.243869, 0.004524, 0.777647, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -1.524770, -3.924290, 133.245926, 0.171941, 0.954445, 0.243869, 0.029939, 0.775120, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -1.126170, -4.287700, 134.387192, 0.171941, 0.954444, 0.243869, 0.022679, 0.791759, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -4.219590, 133.326614, 0.196836, 0.947517, -0.251925, 0.004524, 0.777647, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -4.408500, 132.616104, 0.196836, 0.947517, -0.251925, 0.004298, 0.769247, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -1.524770, -3.924290, 133.245926, 0.196836, 0.947517, -0.251925, 0.029939, 0.775120, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -4.931500, 131.660416, 0.166413, 0.865001, -0.473371, 0.003874, 0.755120, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.458490, -4.837390, 131.671204, 0.166413, 0.865001, -0.473371, 0.011353, 0.754962, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -4.408500, 132.616104, 0.166413, 0.865001, -0.473371, 0.004298, 0.769247, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.324280, -5.527690, 130.985107, 0.129808, 0.711561, -0.690529, 0.005673, 0.744370, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.458490, -4.837390, 131.671204, 0.129808, 0.711561, -0.690529, 0.011353, 0.754962, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -4.931500, 131.660416, 0.129808, 0.711561, -0.690529, 0.003874, 0.755120, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -4.931500, 131.660416, 0.222879, 0.675220, -0.703138, 0.003874, 0.755120, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -5.648490, 130.971893, 0.222879, 0.675220, -0.703138, 0.002040, 0.743056, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.324280, -5.527690, 130.985107, 0.222879, 0.675220, -0.703138, 0.005673, 0.744370, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.319690, -5.644000, 130.523499, 0.331789, 0.915539, -0.227386, 0.006982, 0.738285, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.324280, -5.527690, 130.985107, 0.331789, 0.915539, -0.227386, 0.005673, 0.744370, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -5.648490, 130.971893, 0.331789, 0.915539, -0.227386, 0.002040, 0.743056, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -5.648490, 130.971893, 0.224172, 0.962908, -0.150185, 0.002040, 0.743056, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -5.719690, 130.515396, 0.224172, 0.962908, -0.150185, 0.002238, 0.737315, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.319690, -5.644000, 130.523499, 0.224172, 0.962908, -0.150185, 0.006982, 0.738285, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.319690, -5.644000, 130.523499, 0.194996, 0.756821, 0.623857, 0.006982, 0.738285, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -5.719690, 130.515396, 0.194996, 0.756821, 0.623857, 0.002238, 0.737315, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -5.056200, 129.710495, 0.194996, 0.756821, 0.623857, 0.003657, 0.723406, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -5.056200, 129.710495, 0.093743, 0.788947, 0.607269, 0.003657, 0.723406, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.415790, -5.010390, 129.715164, 0.093743, 0.788947, 0.607269, 0.009010, 0.723979, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.319690, -5.644000, 130.523499, 0.093743, 0.788947, 0.607269, 0.006982, 0.738285, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.523290, -4.700200, 128.863907, 0.107082, 0.938437, 0.328434, 0.010640, 0.711812, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.415790, -5.010390, 129.715164, 0.107082, 0.938437, 0.328434, 0.009010, 0.723979, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -5.056200, 129.710495, 0.107082, 0.938437, 0.328434, 0.003657, 0.723406, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -5.056200, 129.710495, 0.096597, 0.937434, 0.334493, 0.003657, 0.723406, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -4.718400, 128.763794, 0.096597, 0.937434, 0.334493, 0.003840, 0.709965, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.523290, -4.700200, 128.863907, 0.096597, 0.937434, 0.334493, 0.010640, 0.711812, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.393700, -4.105790, 128.500107, 0.180606, 0.484495, 0.855947, 0.010120, 0.702087, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.523290, -4.700200, 128.863907, 0.180606, 0.484495, 0.855947, 0.010640, 0.711812, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -4.718400, 128.763794, 0.180606, 0.484496, 0.855947, 0.003840, 0.709965, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -4.718400, 128.763794, 0.082351, 0.438202, 0.895096, 0.003840, 0.709965, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -4.168900, 128.494781, 0.082351, 0.438202, 0.895096, 0.003879, 0.702104, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.393700, -4.105790, 128.500107, 0.082351, 0.438202, 0.895096, 0.010120, 0.702087, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.393700, -4.105790, 128.500107, 0.156138, 0.951745, 0.264200, 0.010120, 0.702087, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -4.168900, 128.494781, 0.156138, 0.951745, 0.264200, 0.003879, 0.702104, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -4.069800, 128.137787, 0.156138, 0.951745, 0.264200, 0.003880, 0.697663, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -4.069800, 128.137787, 0.123667, 0.965240, 0.230258, 0.003880, 0.697663, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.501290, -4.006790, 128.142883, 0.123667, 0.965240, 0.230258, 0.011487, 0.697451, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.393700, -4.105790, 128.500107, 0.123667, 0.965240, 0.230257, 0.010120, 0.702087, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.501290, -4.006790, 128.142883, 0.083006, 0.595757, 0.798864, 0.011487, 0.697451, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -4.069800, 128.137787, 0.083006, 0.595757, 0.798864, 0.003880, 0.697663, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -3.690200, 127.854698, 0.083006, 0.595757, 0.798864, 0.003864, 0.691543, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -3.690200, 127.854698, 0.036616, 0.640376, 0.767188, 0.003864, 0.691543, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.440800, -3.667390, 127.856697, 0.036616, 0.640376, 0.767188, 0.011019, 0.691563, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.501290, -4.006790, 128.142883, 0.036616, 0.640376, 0.767188, 0.011487, 0.697451, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.366680, -3.459500, 127.770699, 0.023605, 0.374953, 0.926743, 0.010106, 0.689005, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.440800, -3.667390, 127.856697, 0.023605, 0.374953, 0.926743, 0.011019, 0.691563, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -3.690200, 127.854698, 0.023605, 0.374953, 0.926743, 0.003864, 0.691543, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -3.690200, 127.854698, 0.000660, 0.343060, 0.939313, 0.003864, 0.691543, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -3.459600, 127.770477, 0.000660, 0.343060, 0.939313, 0.003848, 0.688999, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.366680, -3.459500, 127.770699, 0.000660, 0.343060, 0.939313, 0.010106, 0.689005, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.366680, -3.459500, 127.770699, 0.000582, 0.795334, 0.606171, 0.010106, 0.689005, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -3.459600, 127.770477, 0.000582, 0.795334, 0.606171, 0.003848, 0.688999, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -2.836700, 126.953194, 0.000582, 0.795334, 0.606171, 0.003738, 0.674634, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -2.836700, 126.953194, 0.083572, 0.774253, 0.627334, 0.003738, 0.674634, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.945100, -2.883690, 127.137093, 0.083572, 0.774253, 0.627334, 0.020759, 0.677651, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.366680, -3.459500, 127.770699, 0.083572, 0.774253, 0.627334, 0.010106, 0.689005, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.918600, -2.280990, 126.055702, 0.051444, 0.871802, 0.487149, 0.021414, 0.660122, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.945100, -2.883690, 127.137093, 0.051444, 0.871802, 0.487149, 0.020759, 0.677651, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -2.836700, 126.953194, 0.051444, 0.871802, 0.487149, 0.003738, 0.674634, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -2.836700, 126.953194, 0.197479, 0.911032, 0.361971, 0.003738, 0.674634, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -2.367990, 125.773514, 0.197479, 0.911032, 0.361971, 0.003607, 0.657195, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.918600, -2.280990, 126.055702, 0.197479, 0.911032, 0.361971, 0.021414, 0.660122, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.918600, -2.280990, 126.055702, 0.297732, 0.051744, 0.953246, 0.021414, 0.660122, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -2.367990, 125.773514, 0.297732, 0.051744, 0.953246, 0.003607, 0.657195, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -0.661690, 125.680893, 0.297732, 0.051744, 0.953246, 0.003411, 0.632502, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -0.661690, 125.680893, 0.213351, 0.103824, 0.971443, 0.003411, 0.632502, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.882300, -0.362500, 125.842690, 0.213351, 0.103824, 0.971443, 0.031807, 0.633193, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.918600, -2.280990, 126.055702, 0.213351, 0.103824, 0.971443, 0.021414, 0.660122, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.882300, -0.362500, 125.842690, 0.106795, -0.210560, 0.971730, 0.654883, 0.841062, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -0.661690, 125.680893, 0.106795, -0.210560, 0.971730, 0.652331, 0.838118, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, 3.111500, 126.498489, 0.106795, -0.210560, 0.971730, 0.676609, 0.819210, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, 3.111500, 126.498489, 0.093286, -0.207515, 0.973774, 0.676609, 0.819210, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -1.828770, 3.733800, 126.806297, 0.093286, -0.207515, 0.973774, 0.688083, 0.836980, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.882300, -0.362500, 125.842690, 0.093286, -0.207515, 0.973774, 0.654883, 0.841062, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -2.153870, 4.774090, 122.373901, 0.339373, 0.937765, 0.073639, 0.722084, 0.813841, 0.900000, 0.100000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000, 0.000000, - -1.840100, 4.478890, 124.687103, 0.339373, 0.937765, 0.073639, 0.704178, 0.824880, 0.500000, 0.500000, 0.000000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000, - 0.000000, 3.835590, 124.398987, 0.339373, 0.937765, 0.073639, 0.692418, 0.806898, 0.500000, 0.500000, 0.000000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000, - 0.000000, 3.835590, 124.398987, 0.444857, 0.893657, -0.058994, 0.692418, 0.806898, 0.500000, 0.500000, 0.000000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000, - 0.000000, 3.684200, 122.105690, 0.444857, 0.893657, -0.058994, 0.709467, 0.793621, 0.700000, 0.300000, 0.000000, 0.000000, 1.000000, 2.000000, 0.000000, 0.000000, - -2.153870, 4.774090, 122.373901, 0.444857, 0.893656, -0.058994, 0.722084, 0.813841, 0.900000, 0.100000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -3.155600, 143.175095, 0.137917, 0.912321, -0.385550, 0.006335, 0.925455, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -4.633190, 139.678696, 0.137917, 0.912321, -0.385550, 0.005730, 0.868711, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -3.322990, -4.168590, 139.589386, 0.137917, 0.912321, -0.385550, 0.054742, 0.867255, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -3.322990, -4.168590, 139.589386, 0.147075, 0.907804, -0.392760, 0.054742, 0.867255, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -3.589200, -2.677900, 142.935196, 0.147075, 0.907804, -0.392760, 0.064197, 0.920673, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -3.155600, 143.175095, 0.147075, 0.907804, -0.392760, 0.006335, 0.925455, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -0.028590, 147.132431, 0.144339, 0.776397, -0.613493, 0.007055, 0.995545, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -3.155600, 143.175095, 0.144339, 0.776397, -0.613494, 0.006335, 0.925455, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -3.589200, -2.677900, 142.935196, 0.144339, 0.776397, -0.613494, 0.064197, 0.920673, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -3.589200, -2.677900, 142.935196, 0.167580, 0.762669, -0.624702, 0.064197, 0.920673, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -3.681690, 0.370280, 146.631760, 0.167580, 0.762669, -0.624702, 0.081111, 0.984505, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -0.028590, 147.132431, 0.167580, 0.762669, -0.624703, 0.007055, 0.995545, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -1.022790, -4.311354, 128.714615, 0.130257, 0.496763, 0.858056, 0.018068, 0.709414, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.523290, -4.700200, 128.863907, 0.130257, 0.496763, 0.858056, 0.010640, 0.711812, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.393700, -4.105790, 128.500107, 0.130257, 0.496763, 0.858056, 0.010120, 0.702087, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.393700, -4.105790, 128.500107, 0.113244, 0.530245, 0.840248, 0.010120, 0.702087, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.893890, -3.851590, 128.407104, 0.113244, 0.530245, 0.840248, 0.018568, 0.700107, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -1.022790, -4.311354, 128.714615, 0.113244, 0.530245, 0.840248, 0.018068, 0.709414, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -1.438590, -3.927344, 128.557098, 0.159514, 0.517546, 0.840656, 0.025562, 0.706482, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -1.022790, -4.311354, 128.714615, 0.159514, 0.517546, 0.840656, 0.018068, 0.709414, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.893890, -3.851590, 128.407104, 0.159514, 0.517546, 0.840656, 0.018568, 0.700107, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.893890, -3.851590, 128.407104, 0.178519, 0.449454, 0.875284, 0.018568, 0.700107, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -1.326770, -3.593300, 128.362762, 0.178519, 0.449454, 0.875284, 0.025948, 0.698831, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -1.438590, -3.927344, 128.557098, 0.178519, 0.449454, 0.875284, 0.025562, 0.706482, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.893890, -3.851590, 128.407104, 0.432470, 0.893960, 0.117496, 0.018568, 0.700107, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.393700, -4.105790, 128.500107, 0.432470, 0.893960, 0.117496, 0.010120, 0.702087, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.501290, -4.006790, 128.142883, 0.432470, 0.893960, 0.117496, 0.011487, 0.697451, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.501290, -4.006790, 128.142883, 0.349605, 0.936399, -0.030559, 0.011487, 0.697451, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.926700, -3.846390, 128.191086, 0.349605, 0.936399, -0.030559, 0.018344, 0.697470, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.893890, -3.851590, 128.407104, 0.349605, 0.936399, -0.030559, 0.018568, 0.700107, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.926700, -3.846390, 128.191086, 0.515899, 0.854699, -0.057783, 0.018344, 0.697470, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -1.326770, -3.593300, 128.362762, 0.515899, 0.854699, -0.057783, 0.025948, 0.698831, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.893890, -3.851590, 128.407104, 0.515899, 0.854699, -0.057783, 0.018568, 0.700107, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.501290, -4.006790, 128.142883, 0.238672, 0.600789, 0.762947, 0.011487, 0.697451, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.440800, -3.667390, 127.856697, 0.238672, 0.600789, 0.762947, 0.011019, 0.691563, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.904100, -3.598400, 127.947304, 0.238672, 0.600789, 0.762947, 0.018519, 0.693026, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.904100, -3.598400, 127.947304, 0.322620, 0.648431, 0.689532, 0.018519, 0.693026, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.926700, -3.846390, 128.191086, 0.322620, 0.648431, 0.689532, 0.018344, 0.697470, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.501290, -4.006790, 128.142883, 0.322620, 0.648431, 0.689532, 0.011487, 0.697451, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.904100, -3.598400, 127.947304, 0.595562, 0.534889, 0.599333, 0.018519, 0.693026, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -1.326770, -3.593300, 128.362762, 0.595562, 0.534889, 0.599333, 0.025948, 0.698831, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.926700, -3.846390, 128.191086, 0.595562, 0.534889, 0.599333, 0.018344, 0.697470, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.324280, -5.527690, 130.985107, 0.863361, 0.491261, -0.115197, 0.005673, 0.744370, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.319690, -5.644000, 130.523499, 0.863361, 0.491261, -0.115197, 0.006982, 0.738285, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.692600, -5.011590, 130.425598, 0.863361, 0.491261, -0.115197, 0.013973, 0.734840, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.692600, -5.011590, 130.425598, 0.844638, 0.531256, -0.065979, 0.013973, 0.734840, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.700900, -4.941500, 130.883698, 0.844638, 0.531256, -0.065979, 0.014018, 0.741843, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.324280, -5.527690, 130.985107, 0.844638, 0.531256, -0.065979, 0.005673, 0.744370, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.324280, -5.527690, 130.985107, 0.822194, 0.473634, -0.315703, 0.005673, 0.744370, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.700900, -4.941500, 130.883698, 0.822194, 0.473634, -0.315703, 0.014018, 0.741843, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.458490, -4.837390, 131.671204, 0.822194, 0.473634, -0.315703, 0.011353, 0.754962, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.415790, -5.010390, 129.715164, 0.796725, 0.517993, 0.311307, 0.009010, 0.723979, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.692600, -5.011590, 130.425598, 0.796725, 0.517993, 0.311307, 0.013973, 0.734840, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.319690, -5.644000, 130.523499, 0.796725, 0.517993, 0.311307, 0.006982, 0.738285, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.523290, -4.700200, 128.863907, 0.460924, 0.850947, 0.251869, 0.010640, 0.711812, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -1.422100, -4.421100, 129.565796, 0.460925, 0.850947, 0.251869, 0.025325, 0.721688, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.415790, -5.010390, 129.715164, 0.460925, 0.850947, 0.251869, 0.009010, 0.723979, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -1.422100, -4.421100, 129.565796, 0.556765, 0.749640, 0.357846, 0.025325, 0.721688, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -1.022790, -4.311354, 128.714615, 0.556765, 0.749640, 0.357846, 0.018068, 0.709414, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -1.438590, -3.927344, 128.557098, 0.556765, 0.749640, 0.357846, 0.025562, 0.706482, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -1.326770, -3.593300, 128.362762, 0.213264, 0.436974, 0.873826, 0.025948, 0.698831, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -2.008100, -3.376790, 128.420776, 0.213264, 0.436974, 0.873826, 0.036674, 0.700049, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -1.438590, -3.927344, 128.557098, 0.213264, 0.436974, 0.873826, 0.025562, 0.706482, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -2.008100, -3.376790, 128.420776, 0.311887, 0.899406, 0.306259, 0.036674, 0.700049, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -1.326770, -3.593300, 128.362762, 0.311887, 0.899406, 0.306260, 0.025948, 0.698831, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.904100, -3.598400, 127.947304, 0.311887, 0.899406, 0.306260, 0.018519, 0.693026, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.904100, -3.598400, 127.947304, 0.395877, 0.698502, 0.596135, 0.018519, 0.693026, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.945100, -2.883690, 127.137093, 0.395877, 0.698502, 0.596135, 0.020759, 0.677651, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -2.008100, -3.376790, 128.420776, 0.395877, 0.698502, 0.596135, 0.036674, 0.700049, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.366680, -3.459500, 127.770699, 0.226123, 0.302425, 0.925963, 0.010106, 0.689005, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.904100, -3.598400, 127.947304, 0.226123, 0.302425, 0.925963, 0.018519, 0.693026, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.440800, -3.667390, 127.856697, 0.226123, 0.302425, 0.925963, 0.011019, 0.691563, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.945100, -2.883690, 127.137093, 0.023192, 0.750302, 0.660689, 0.020759, 0.677651, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.904100, -3.598400, 127.947304, 0.023192, 0.750302, 0.660689, 0.018519, 0.693026, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.366680, -3.459500, 127.770699, 0.023192, 0.750302, 0.660689, 0.010106, 0.689005, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -1.022790, -4.311354, 128.714615, 0.511608, 0.788371, 0.341656, 0.018068, 0.709414, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -1.422100, -4.421100, 129.565796, 0.511608, 0.788371, 0.341656, 0.025325, 0.721688, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.523290, -4.700200, 128.863907, 0.511608, 0.788371, 0.341656, 0.010640, 0.711812, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.692600, -5.011590, 130.425598, 0.577900, 0.808220, -0.113188, 0.013973, 0.734840, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -1.748700, -4.257990, 130.414597, 0.577900, 0.808220, -0.113188, 0.031714, 0.733700, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.700900, -4.941500, 130.883698, 0.577900, 0.808220, -0.113188, 0.014018, 0.741843, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.692600, -5.011590, 130.425598, 0.475642, 0.859580, 0.186779, 0.013973, 0.734840, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.415790, -5.010390, 129.715164, 0.475642, 0.859580, 0.186779, 0.009010, 0.723979, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -1.422100, -4.421100, 129.565796, 0.475642, 0.859580, 0.186779, 0.025325, 0.721688, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -1.422100, -4.421100, 129.565796, 0.579098, 0.812526, 0.066685, 0.025325, 0.721688, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -1.748700, -4.257990, 130.414597, 0.579098, 0.812526, 0.066685, 0.031714, 0.733700, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.692600, -5.011590, 130.425598, 0.579098, 0.812526, 0.066685, 0.013973, 0.734840, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -2.610070, -1.040180, 126.759300, 0.438629, 0.090969, 0.894052, 0.058962, 0.662445, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.918600, -2.280990, 126.055702, 0.438629, 0.090969, 0.894052, 0.021414, 0.660122, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.882300, -0.362500, 125.842690, 0.438629, 0.090969, 0.894052, 0.031807, 0.633193, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.882300, -0.362500, 125.842690, 0.431616, 0.110490, 0.895265, 0.031807, 0.633193, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -2.396070, 0.558700, 126.458801, 0.431616, 0.110490, 0.895265, 0.072360, 0.641149, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -2.610070, -1.040180, 126.759300, 0.431616, 0.110490, 0.895265, 0.058962, 0.662445, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -4.392790, 0.595270, 127.926781, 0.591666, 0.071725, 0.802986, 0.103185, 0.675093, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -2.610070, -1.040180, 126.759300, 0.591666, 0.071725, 0.802987, 0.058962, 0.662445, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -2.396070, 0.558700, 126.458801, 0.591666, 0.071725, 0.802986, 0.072360, 0.641149, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -2.396070, 0.558700, 126.458801, 0.592433, 0.029203, 0.805090, 0.072360, 0.641149, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -4.065590, 2.139590, 127.629990, 0.592433, 0.029203, 0.805090, 0.119619, 0.657320, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -4.392790, 0.595270, 127.926781, 0.592433, 0.029203, 0.805090, 0.103185, 0.675093, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -5.872500, 2.210690, 129.773697, 0.763449, -0.037843, 0.644759, 0.145208, 0.701028, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -4.392790, 0.595270, 127.926781, 0.763449, -0.037843, 0.644759, 0.103185, 0.675093, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -4.065590, 2.139590, 127.629990, 0.763449, -0.037843, 0.644759, 0.119619, 0.657320, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -4.065590, 2.139590, 127.629990, 0.760747, 0.123871, 0.637118, 0.119619, 0.657320, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -5.777100, 3.697590, 129.370697, 0.760747, 0.123871, 0.637118, 0.163520, 0.686215, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -5.872500, 2.210690, 129.773697, 0.760747, 0.123871, 0.637118, 0.145208, 0.701028, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.781400, 3.167000, 131.485703, 0.895476, 0.062009, 0.440769, 0.171526, 0.727793, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -5.872500, 2.210690, 129.773697, 0.895476, 0.062009, 0.440769, 0.145208, 0.701028, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -5.777100, 3.697590, 129.370697, 0.895476, 0.062009, 0.440769, 0.163520, 0.686215, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -5.777100, 3.697590, 129.370697, 0.888575, 0.101421, 0.447379, 0.163520, 0.686215, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.581590, 4.576200, 130.769379, 0.888575, 0.101421, 0.447379, 0.188096, 0.708864, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.781400, 3.167000, 131.485703, 0.888575, 0.101421, 0.447379, 0.171526, 0.727793, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.581590, 4.576200, 130.769379, 0.905617, 0.083000, 0.415894, 0.188096, 0.708864, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.972290, 4.712690, 131.592896, 0.905617, 0.083000, 0.415894, 0.195948, 0.724942, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.781400, 3.167000, 131.485703, 0.905617, 0.083000, 0.415894, 0.171526, 0.727793, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.918600, -2.280990, 126.055702, 0.465052, 0.768396, 0.439653, 0.021414, 0.660122, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -2.422600, -1.873380, 126.934196, 0.465052, 0.768396, 0.439653, 0.049371, 0.671108, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.945100, -2.883690, 127.137093, 0.465052, 0.768396, 0.439653, 0.020759, 0.677651, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -2.610070, -1.040180, 126.759300, 0.539979, 0.287541, 0.791039, 0.058962, 0.662445, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -2.422600, -1.873380, 126.934196, 0.539979, 0.287542, 0.791039, 0.049371, 0.671108, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.918600, -2.280990, 126.055702, 0.539979, 0.287542, 0.791039, 0.021414, 0.660122, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -3.322990, -4.168590, 139.589386, 0.470765, 0.880123, -0.061350, 0.054742, 0.867255, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -3.081790, -4.465400, 137.182205, 0.470765, 0.880123, -0.061350, 0.050904, 0.832811, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -5.656890, -3.105400, 136.932816, 0.470765, 0.880123, -0.061350, 0.093337, 0.828675, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -5.656890, -3.105400, 136.932816, 0.506505, 0.856141, -0.102347, 0.093337, 0.828675, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.121890, -2.569000, 139.118607, 0.506505, 0.856141, -0.102347, 0.102469, 0.860777, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -3.322990, -4.168590, 139.589386, 0.506505, 0.856141, -0.102347, 0.054742, 0.867255, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -5.656890, -3.105400, 136.932816, 0.822528, 0.566662, -0.048401, 0.093337, 0.828675, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -7.004200, -1.221090, 136.097427, 0.822528, 0.566662, -0.048401, 0.126505, 0.814319, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -7.446100, -0.447200, 137.648193, 0.822528, 0.566662, -0.048401, 0.140008, 0.837352, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -7.446100, -0.447200, 137.648193, 0.834091, 0.549989, 0.042474, 0.140008, 0.837352, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.121890, -2.569000, 139.118607, 0.834091, 0.549989, 0.042474, 0.102469, 0.860777, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -5.656890, -3.105400, 136.932816, 0.834091, 0.549989, 0.042474, 0.093337, 0.828675, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.961400, 0.292190, 134.663193, 0.935617, 0.275874, 0.220259, 0.143680, 0.787763, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -7.616390, 1.848090, 135.496704, 0.935617, 0.275874, 0.220259, 0.170224, 0.798081, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -7.446100, -0.447200, 137.648193, 0.935617, 0.275874, 0.220259, 0.140008, 0.837352, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -7.446100, -0.447200, 137.648193, 0.967564, 0.158826, 0.196453, 0.140008, 0.837352, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -7.004200, -1.221090, 136.097427, 0.967564, 0.158826, 0.196453, 0.126505, 0.814319, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.961400, 0.292190, 134.663193, 0.967564, 0.158826, 0.196453, 0.143680, 0.787763, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -3.560619, -3.835083, 135.917526, 0.385025, 0.875903, 0.290774, 0.064681, 0.817214, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -3.081790, -4.465400, 137.182205, 0.385025, 0.875903, 0.290774, 0.050904, 0.832811, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -1.546000, -4.618300, 135.609192, 0.385025, 0.875903, 0.290774, 0.028085, 0.810025, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -4.408500, 132.616104, 0.261694, 0.959517, -0.104133, 0.004298, 0.769247, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -2.122990, -3.950790, 131.498383, 0.261694, 0.959517, -0.104133, 0.038696, 0.749368, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -1.524770, -3.924290, 133.245926, 0.261694, 0.959517, -0.104133, 0.029939, 0.775120, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.458490, -4.837390, 131.671204, 0.474961, 0.841505, -0.257451, 0.011353, 0.754962, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.700900, -4.941500, 130.883698, 0.474961, 0.841505, -0.257451, 0.014018, 0.741843, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -2.122990, -3.950790, 131.498383, 0.474961, 0.841505, -0.257451, 0.038696, 0.749368, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -2.122990, -3.950790, 131.498383, 0.438853, 0.718796, -0.539204, 0.038696, 0.749368, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -4.408500, 132.616104, 0.438853, 0.718796, -0.539204, 0.004298, 0.769247, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.458490, -4.837390, 131.671204, 0.438853, 0.718796, -0.539204, 0.011353, 0.754962, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -1.748700, -4.257990, 130.414597, 0.558919, 0.828172, -0.041721, 0.031714, 0.733700, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -2.122990, -3.950790, 131.498383, 0.558919, 0.828172, -0.041721, 0.038696, 0.749368, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.700900, -4.941500, 130.883698, 0.558919, 0.828172, -0.041721, 0.014018, 0.741843, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -1.546000, -4.618300, 135.609192, 0.260510, 0.905666, 0.334520, 0.028085, 0.810025, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -1.126170, -4.287700, 134.387192, 0.260510, 0.905666, 0.334520, 0.022679, 0.791759, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -2.718590, -3.805200, 134.320999, 0.260510, 0.905666, 0.334520, 0.048686, 0.790327, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -2.718590, -3.805200, 134.320999, 0.382463, 0.897759, 0.218520, 0.048686, 0.790327, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -3.560619, -3.835083, 135.917526, 0.382463, 0.897759, 0.218520, 0.064681, 0.817214, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -1.546000, -4.618300, 135.609192, 0.382463, 0.897759, 0.218520, 0.028085, 0.810025, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -1.524770, -3.924290, 133.245926, 0.276235, 0.939477, 0.202677, 0.029939, 0.775120, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -2.718590, -3.805200, 134.320999, 0.276235, 0.939477, 0.202677, 0.048686, 0.790327, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -1.126170, -4.287700, 134.387192, 0.276235, 0.939477, 0.202677, 0.022679, 0.791759, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -2.122990, -3.950790, 131.498383, 0.443761, 0.880775, -0.165265, 0.038696, 0.749368, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -3.041290, -3.330790, 132.336884, 0.443761, 0.880775, -0.165265, 0.055550, 0.760246, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -1.524770, -3.924290, 133.245926, 0.443761, 0.880775, -0.165265, 0.029939, 0.775120, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -3.041290, -3.330790, 132.336884, 0.529580, 0.846995, -0.046301, 0.055550, 0.760246, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -2.122990, -3.950790, 131.498383, 0.529580, 0.846996, -0.046301, 0.038696, 0.749368, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -3.916800, -2.872290, 130.710480, 0.529580, 0.846995, -0.046301, 0.069171, 0.733758, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -3.916800, -2.872290, 130.710480, 0.591931, 0.800612, -0.092942, 0.069171, 0.733758, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -4.148500, -2.562570, 131.902786, 0.591931, 0.800612, -0.092942, 0.076015, 0.751705, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -3.041290, -3.330790, 132.336884, 0.591931, 0.800612, -0.092942, 0.055550, 0.760246, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -4.148500, -2.562570, 131.902786, 0.578538, 0.809756, -0.097920, 0.076015, 0.751705, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -3.916800, -2.872290, 130.710480, 0.578538, 0.809756, -0.097920, 0.069171, 0.733758, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -5.189890, -1.914700, 131.107574, 0.578538, 0.809756, -0.097920, 0.093347, 0.738352, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -5.189890, -1.914700, 131.107574, 0.584698, 0.803624, -0.110983, 0.093347, 0.738352, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -4.995190, -1.953690, 131.850998, 0.584698, 0.803624, -0.110983, 0.091939, 0.749917, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -4.148500, -2.562570, 131.902786, 0.584698, 0.803624, -0.110983, 0.076015, 0.751705, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -4.995190, -1.953690, 131.850998, 0.608578, 0.784636, -0.118233, 0.091939, 0.749917, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -5.189890, -1.914700, 131.107574, 0.608578, 0.784636, -0.118233, 0.093347, 0.738352, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.075690, -1.045600, 132.315781, 0.608578, 0.784636, -0.118233, 0.113821, 0.755044, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.075690, -1.045600, 132.315781, 0.677043, 0.713722, 0.179484, 0.113821, 0.755044, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -5.644090, -1.589990, 132.852493, 0.677043, 0.713722, 0.179484, 0.104709, 0.764527, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -4.995190, -1.953690, 131.850998, 0.677043, 0.713722, 0.179484, 0.091939, 0.749917, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -5.656890, -3.105400, 136.932816, 0.429662, 0.862546, 0.267217, 0.093337, 0.828675, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -3.081790, -4.465400, 137.182205, 0.429662, 0.862546, 0.267217, 0.050904, 0.832811, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -3.560619, -3.835083, 135.917526, 0.429662, 0.862546, 0.267217, 0.064681, 0.817214, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -3.560619, -3.835083, 135.917526, 0.446186, 0.835470, 0.320794, 0.064681, 0.817214, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -4.983219, -2.952283, 135.597046, 0.446186, 0.835470, 0.320794, 0.089424, 0.811521, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -5.656890, -3.105400, 136.932816, 0.446186, 0.835470, 0.320794, 0.093337, 0.828675, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.220200, -1.675990, 134.945084, 0.732569, 0.633832, 0.248193, 0.113145, 0.796718, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -7.004200, -1.221090, 136.097427, 0.732569, 0.633832, 0.248193, 0.126505, 0.814319, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -5.656890, -3.105400, 136.932816, 0.732569, 0.633832, 0.248193, 0.093337, 0.828675, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -5.656890, -3.105400, 136.932816, 0.565643, 0.737104, 0.369764, 0.093337, 0.828675, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -4.983219, -2.952283, 135.597046, 0.565643, 0.737104, 0.369764, 0.089424, 0.811521, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.220200, -1.675990, 134.945084, 0.565643, 0.737104, 0.369764, 0.113145, 0.796718, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.961400, 0.292190, 134.663193, 0.829155, 0.372015, 0.417261, 0.143680, 0.787763, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -7.004200, -1.221090, 136.097427, 0.829155, 0.372015, 0.417261, 0.126505, 0.814319, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.220200, -1.675990, 134.945084, 0.829155, 0.372015, 0.417261, 0.113145, 0.796718, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.220200, -1.675990, 134.945084, 0.886385, 0.373066, 0.274122, 0.113145, 0.796718, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.201700, -0.988380, 133.949463, 0.886385, 0.373066, 0.274122, 0.119853, 0.779626, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.961400, 0.292190, 134.663193, 0.886385, 0.373066, 0.274122, 0.143680, 0.787763, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.075690, -1.045600, 132.315781, 0.765248, 0.642699, 0.036515, 0.113821, 0.755044, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.201700, -0.988380, 133.949463, 0.765248, 0.642699, 0.036515, 0.119853, 0.779626, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -5.644090, -1.589990, 132.852493, 0.765248, 0.642699, 0.036515, 0.104709, 0.764527, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -3.560619, -3.835083, 135.917526, 0.435080, 0.866225, 0.245680, 0.064681, 0.817214, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -2.718590, -3.805200, 134.320999, 0.435080, 0.866226, 0.245680, 0.048686, 0.790327, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -4.453990, -2.819290, 133.918106, 0.435080, 0.866226, 0.245680, 0.079590, 0.782940, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -4.453990, -2.819290, 133.918106, 0.478604, 0.850478, 0.218233, 0.079590, 0.782940, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -4.983219, -2.952283, 135.597046, 0.478604, 0.850478, 0.218233, 0.089424, 0.811521, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -3.560619, -3.835083, 135.917526, 0.478604, 0.850478, 0.218232, 0.064681, 0.817214, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -2.718590, -3.805200, 134.320999, 0.260462, 0.947741, 0.184247, 0.048686, 0.790327, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -1.524770, -3.924290, 133.245926, 0.260462, 0.947741, 0.184247, 0.029939, 0.775120, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -3.041290, -3.330790, 132.336884, 0.260462, 0.947741, 0.184247, 0.055550, 0.760246, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -3.041290, -3.330790, 132.336884, 0.465968, 0.874694, 0.133357, 0.055550, 0.760246, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -4.453990, -2.819290, 133.918106, 0.465968, 0.874694, 0.133357, 0.079590, 0.782940, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -2.718590, -3.805200, 134.320999, 0.465968, 0.874694, 0.133357, 0.048686, 0.790327, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -4.995190, -1.953690, 131.850998, 0.578717, 0.811571, 0.080241, 0.091939, 0.749917, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -5.644090, -1.589990, 132.852493, 0.578717, 0.811571, 0.080241, 0.104709, 0.764527, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -4.148500, -2.562570, 131.902786, 0.578717, 0.811571, 0.080241, 0.076015, 0.751705, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -3.041290, -3.330790, 132.336884, 0.510467, 0.839900, 0.184369, 0.055550, 0.760246, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -4.148500, -2.562570, 131.902786, 0.510467, 0.839900, 0.184369, 0.076015, 0.751705, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -4.453990, -2.819290, 133.918106, 0.510467, 0.839900, 0.184368, 0.079590, 0.782940, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -3.916800, -2.872290, 130.710480, 0.532302, 0.844726, -0.055606, 0.069171, 0.733758, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -2.122990, -3.950790, 131.498383, 0.532302, 0.844726, -0.055606, 0.038696, 0.749368, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -1.748700, -4.257990, 130.414597, 0.532302, 0.844726, -0.055606, 0.031714, 0.733700, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -1.748700, -4.257990, 130.414597, 0.546508, 0.827248, 0.130342, 0.031714, 0.733700, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -3.627700, -2.884590, 129.576385, 0.546508, 0.827248, 0.130342, 0.063407, 0.716612, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -3.916800, -2.872290, 130.710480, 0.546508, 0.827248, 0.130342, 0.069171, 0.733758, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -3.627700, -2.884590, 129.576385, 0.623841, 0.766883, 0.150710, 0.063407, 0.716612, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -5.189890, -1.914700, 131.107574, 0.623841, 0.766883, 0.150710, 0.093347, 0.738352, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -3.916800, -2.872290, 130.710480, 0.623841, 0.766883, 0.150710, 0.069171, 0.733758, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -5.382900, -1.311190, 130.023788, 0.801144, 0.572046, 0.175871, 0.098617, 0.720436, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.075690, -1.045600, 132.315781, 0.801144, 0.572046, 0.175871, 0.113821, 0.755044, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -5.189890, -1.914700, 131.107574, 0.801144, 0.572046, 0.175871, 0.093347, 0.738352, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.201700, -0.988380, 133.949463, 0.969842, 0.234458, 0.066595, 0.119853, 0.779626, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.075690, -1.045600, 132.315781, 0.969842, 0.234458, 0.066595, 0.113821, 0.755044, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.287700, -0.003500, 131.734467, 0.969842, 0.234458, 0.066595, 0.126807, 0.743123, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.287700, -0.003500, 131.734467, 0.885502, 0.436350, 0.159639, 0.126807, 0.743123, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.961400, 0.292190, 134.663193, 0.885502, 0.436350, 0.159639, 0.143680, 0.787763, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.201700, -0.988380, 133.949463, 0.885502, 0.436350, 0.159639, 0.119853, 0.779626, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -1.748700, -4.257990, 130.414597, 0.764365, 0.620623, 0.174849, 0.031714, 0.733700, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -1.422100, -4.421100, 129.565796, 0.764365, 0.620623, 0.174849, 0.025325, 0.721688, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -2.008100, -3.376790, 128.420776, 0.764365, 0.620624, 0.174849, 0.036674, 0.700049, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -2.008100, -3.376790, 128.420776, 0.469494, 0.828544, 0.305106, 0.036674, 0.700049, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -3.627700, -2.884590, 129.576385, 0.469494, 0.828544, 0.305106, 0.063407, 0.716612, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -1.748700, -4.257990, 130.414597, 0.469494, 0.828544, 0.305106, 0.031714, 0.733700, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -3.106190, -2.375090, 128.199295, 0.543844, 0.698887, 0.464532, 0.057630, 0.693354, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -3.627700, -2.884590, 129.576385, 0.543844, 0.698887, 0.464532, 0.063407, 0.716612, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -2.008100, -3.376790, 128.420776, 0.543844, 0.698887, 0.464532, 0.036674, 0.700049, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -2.008100, -3.376790, 128.420776, 0.395815, 0.698562, 0.596106, 0.036674, 0.700049, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.945100, -2.883690, 127.137093, 0.395815, 0.698562, 0.596106, 0.020759, 0.677651, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -2.422600, -1.873380, 126.934196, 0.395815, 0.698561, 0.596106, 0.049371, 0.671108, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -2.422600, -1.873380, 126.934196, 0.505204, 0.673207, 0.539964, 0.049371, 0.671108, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -3.106190, -2.375090, 128.199295, 0.505204, 0.673207, 0.539964, 0.057630, 0.693354, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -2.008100, -3.376790, 128.420776, 0.505204, 0.673207, 0.539964, 0.036674, 0.700049, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -4.502790, -1.177680, 128.527893, 0.658622, 0.609078, 0.441861, 0.086059, 0.695783, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -5.382900, -1.311190, 130.023788, 0.658622, 0.609078, 0.441861, 0.098617, 0.720436, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -3.627700, -2.884590, 129.576385, 0.658622, 0.609078, 0.441861, 0.063407, 0.716612, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -3.627700, -2.884590, 129.576385, 0.636118, 0.613535, 0.467898, 0.063407, 0.716612, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -3.106190, -2.375090, 128.199295, 0.636118, 0.613535, 0.467898, 0.057630, 0.693354, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -4.502790, -1.177680, 128.527893, 0.636118, 0.613535, 0.467898, 0.086059, 0.695783, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.619490, 1.699200, 131.503891, 0.921799, 0.222603, 0.317388, 0.150388, 0.733413, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.287700, -0.003500, 131.734467, 0.921799, 0.222603, 0.317388, 0.126807, 0.743123, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -5.382900, -1.311190, 130.023788, 0.921799, 0.222603, 0.317388, 0.098617, 0.720436, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -5.382900, -1.311190, 130.023788, 0.853724, 0.099369, 0.511157, 0.098617, 0.720436, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -4.502790, -1.177680, 128.527893, 0.853724, 0.099369, 0.511157, 0.086059, 0.695783, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.619490, 1.699200, 131.503891, 0.853724, 0.099369, 0.511157, 0.150388, 0.733413, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.961400, 0.292190, 134.663193, 0.956608, 0.213288, 0.198516, 0.143680, 0.787763, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.287700, -0.003500, 131.734467, 0.956608, 0.213288, 0.198516, 0.126807, 0.743123, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.619490, 1.699200, 131.503891, 0.956608, 0.213288, 0.198516, 0.150388, 0.733413, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.619490, 1.699200, 131.503891, 0.935400, 0.274141, 0.223322, 0.150388, 0.733413, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -7.616390, 1.848090, 135.496704, 0.935400, 0.274141, 0.223322, 0.170224, 0.798081, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.961400, 0.292190, 134.663193, 0.935400, 0.274141, 0.223322, 0.143680, 0.787763, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -2.422600, -1.873380, 126.934196, 0.613020, 0.562841, 0.554452, 0.049371, 0.671108, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -4.502790, -1.177680, 128.527893, 0.613020, 0.562841, 0.554452, 0.086059, 0.695783, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -3.106190, -2.375090, 128.199295, 0.613020, 0.562841, 0.554452, 0.057630, 0.693354, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -4.392790, 0.595270, 127.926781, 0.827195, 0.133720, 0.545772, 0.103185, 0.675093, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -5.872500, 2.210690, 129.773697, 0.827195, 0.133720, 0.545772, 0.145208, 0.701028, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -4.502790, -1.177680, 128.527893, 0.827195, 0.133720, 0.545772, 0.086059, 0.695783, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -4.502790, -1.177680, 128.527893, 0.641294, 0.293136, 0.709093, 0.086059, 0.695783, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -2.422600, -1.873380, 126.934196, 0.641294, 0.293136, 0.709093, 0.049371, 0.671108, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -2.610070, -1.040180, 126.759300, 0.641294, 0.293136, 0.709093, 0.058962, 0.662445, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -2.610070, -1.040180, 126.759300, 0.660426, 0.204033, 0.722640, 0.058962, 0.662445, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -4.392790, 0.595270, 127.926781, 0.660426, 0.204033, 0.722640, 0.103185, 0.675093, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -4.502790, -1.177680, 128.527893, 0.660426, 0.204033, 0.722640, 0.086059, 0.695783, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.781400, 3.167000, 131.485703, 0.901420, 0.104640, 0.420111, 0.171526, 0.727793, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.619490, 1.699200, 131.503891, 0.901420, 0.104640, 0.420111, 0.150388, 0.733413, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -5.872500, 2.210690, 129.773697, 0.901420, 0.104640, 0.420111, 0.145208, 0.701028, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.619490, 1.699200, 131.503891, 0.878329, 0.194491, 0.436705, 0.150388, 0.733413, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -4.502790, -1.177680, 128.527893, 0.878329, 0.194491, 0.436705, 0.086059, 0.695783, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -5.872500, 2.210690, 129.773697, 0.878329, 0.194491, 0.436705, 0.145208, 0.701028, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.287700, -0.003500, 131.734467, 0.916448, 0.320269, 0.239898, 0.126807, 0.743123, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.075690, -1.045600, 132.315781, 0.916448, 0.320269, 0.239898, 0.113821, 0.755044, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -5.382900, -1.311190, 130.023788, 0.916448, 0.320269, 0.239898, 0.098617, 0.720436, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -5.382900, -1.311190, 130.023788, 0.680426, 0.685033, 0.260287, 0.098617, 0.720436, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -5.189890, -1.914700, 131.107574, 0.680426, 0.685033, 0.260287, 0.093347, 0.738352, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -3.627700, -2.884590, 129.576385, 0.680426, 0.685033, 0.260287, 0.063407, 0.716612, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.781400, 3.167000, 131.485703, 0.957190, 0.099357, 0.271873, 0.171526, 0.727793, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.972290, 4.712690, 131.592896, 0.957190, 0.099357, 0.271873, 0.195948, 0.724942, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -8.117100, 4.052890, 135.864578, 0.957190, 0.099357, 0.271873, 0.204991, 0.800440, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -8.117100, 4.052890, 135.864578, 0.951237, 0.173468, 0.255064, 0.204991, 0.800440, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -7.616390, 1.848090, 135.496704, 0.951237, 0.173468, 0.255064, 0.170224, 0.798081, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.781400, 3.167000, 131.485703, 0.951237, 0.173468, 0.255064, 0.171526, 0.727793, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.781400, 3.167000, 131.485703, 0.965343, 0.109421, 0.236940, 0.171526, 0.727793, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -7.616390, 1.848090, 135.496704, 0.965343, 0.109421, 0.236940, 0.170224, 0.798081, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.619490, 1.699200, 131.503891, 0.965343, 0.109421, 0.236940, 0.150388, 0.733413, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -3.589200, -2.677900, 142.935196, 0.510282, 0.799927, -0.315798, 0.064197, 0.920673, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -3.322990, -4.168590, 139.589386, 0.510282, 0.799927, -0.315798, 0.054742, 0.867255, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.121890, -2.569000, 139.118607, 0.510282, 0.799928, -0.315798, 0.102469, 0.860777, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.121890, -2.569000, 139.118607, 0.503249, 0.806257, -0.310951, 0.102469, 0.860777, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.480780, -1.310500, 141.800903, 0.503249, 0.806257, -0.310951, 0.115535, 0.902494, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -3.589200, -2.677900, 142.935196, 0.503249, 0.806257, -0.310951, 0.064197, 0.920673, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -7.899380, 0.608390, 139.058304, 0.868249, 0.483613, -0.110734, 0.155524, 0.859073, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.480780, -1.310500, 141.800903, 0.868249, 0.483613, -0.110734, 0.115535, 0.902494, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.121890, -2.569000, 139.118607, 0.868249, 0.483613, -0.110734, 0.102469, 0.860777, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.121890, -2.569000, 139.118607, 0.870348, 0.485303, -0.083518, 0.102469, 0.860777, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -7.446100, -0.447200, 137.648193, 0.870348, 0.485303, -0.083518, 0.140008, 0.837352, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -7.899380, 0.608390, 139.058304, 0.870348, 0.485303, -0.083518, 0.155524, 0.859073, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -7.446100, -0.447200, 137.648193, 0.965334, 0.213015, 0.150846, 0.140008, 0.837352, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -7.616390, 1.848090, 135.496704, 0.965334, 0.213015, 0.150846, 0.170224, 0.798081, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -7.899380, 0.608390, 139.058304, 0.965334, 0.213015, 0.150846, 0.155524, 0.859073, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -3.681690, 0.370280, 146.631760, 0.523456, 0.663763, -0.534240, 0.081111, 0.984505, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -3.589200, -2.677900, 142.935196, 0.523456, 0.663763, -0.534240, 0.064197, 0.920673, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.480780, -1.310500, 141.800903, 0.523456, 0.663763, -0.534241, 0.115535, 0.902494, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.480780, -1.310500, 141.800903, 0.552613, 0.634134, -0.540826, 0.115535, 0.902494, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.584600, 1.411200, 144.886093, 0.552613, 0.634134, -0.540826, 0.143048, 0.953690, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -3.681690, 0.370280, 146.631760, 0.552613, 0.634134, -0.540826, 0.081111, 0.984505, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -8.277890, 3.089000, 140.970688, 0.911007, 0.323980, -0.255153, 0.191716, 0.890578, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.584600, 1.411200, 144.886093, 0.911007, 0.323980, -0.255153, 0.143048, 0.953690, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.480780, -1.310500, 141.800903, 0.911007, 0.323980, -0.255153, 0.115535, 0.902494, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.480780, -1.310500, 141.800903, 0.913105, 0.327039, -0.243484, 0.115535, 0.902494, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -7.899380, 0.608390, 139.058304, 0.913105, 0.327039, -0.243484, 0.155524, 0.859073, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -8.277890, 3.089000, 140.970688, 0.913105, 0.327039, -0.243484, 0.191716, 0.890578, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -8.117100, 4.052890, 135.864578, 0.992429, 0.111162, 0.052236, 0.204991, 0.800440, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -8.277890, 3.089000, 140.970688, 0.992429, 0.111162, 0.052236, 0.191716, 0.890578, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -7.899380, 0.608390, 139.058304, 0.992429, 0.111162, 0.052236, 0.155524, 0.859073, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -7.899380, 0.608390, 139.058304, 0.969783, 0.195998, 0.145277, 0.155524, 0.859073, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -7.616390, 1.848090, 135.496704, 0.969783, 0.195998, 0.145277, 0.170224, 0.798081, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -8.117100, 4.052890, 135.864578, 0.969783, 0.195998, 0.145277, 0.204991, 0.800440, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -9.370090, 5.002600, 136.636185, 0.697053, 0.510938, 0.503050, 0.643427, 0.934774, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -8.117100, 4.052890, 135.864578, 0.697053, 0.510938, 0.503050, 0.635919, 0.925250, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -9.349790, 6.747000, 134.836304, 0.697053, 0.510938, 0.503050, 0.660233, 0.928448, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -7.752900, 5.998000, 131.914307, 0.837032, 0.420949, 0.349541, 0.666156, 0.903551, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -9.349790, 6.747000, 134.836304, 0.837032, 0.420949, 0.349541, 0.660233, 0.928448, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.972290, 4.712690, 131.592896, 0.837032, 0.420949, 0.349541, 0.659321, 0.893358, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -8.117100, 4.052890, 135.864578, 0.821042, 0.488446, 0.295484, 0.635919, 0.925250, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.972290, 4.712690, 131.592896, 0.821042, 0.488446, 0.295484, 0.659321, 0.893358, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -9.349790, 6.747000, 134.836304, 0.821042, 0.488446, 0.295484, 0.660233, 0.928448, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -9.605290, 6.218590, 136.388885, 0.944620, 0.230264, 0.233820, 0.651670, 0.935714, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -9.370090, 5.002600, 136.636185, 0.944620, 0.230264, 0.233820, 0.643427, 0.934774, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -9.349790, 6.747000, 134.836304, 0.944620, 0.230264, 0.233820, 0.660233, 0.928448, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.972290, 4.712690, 131.592896, 0.338347, -0.029710, 0.940552, 0.659321, 0.893358, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -7.170280, 6.133500, 131.709000, 0.338347, -0.029710, 0.940552, 0.669440, 0.901191, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -7.752900, 5.998000, 131.914307, 0.338347, -0.029710, 0.940552, 0.666156, 0.903551, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -8.099390, 7.081600, 134.877914, 0.230256, -0.904962, 0.357807, 0.666934, 0.930436, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -9.349790, 6.747000, 134.836304, 0.230256, -0.904962, 0.357807, 0.660233, 0.928448, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -7.752900, 5.998000, 131.914307, 0.230256, -0.904962, 0.357807, 0.666156, 0.903551, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -7.752900, 5.998000, 131.914307, 0.329345, -0.873722, 0.357969, 0.666156, 0.903551, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -7.170280, 6.133500, 131.709000, 0.329345, -0.873722, 0.357969, 0.669440, 0.901191, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -8.099390, 7.081600, 134.877914, 0.329345, -0.873722, 0.357969, 0.666934, 0.930436, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -9.370090, 5.002600, 136.636185, 0.303879, -0.133079, -0.943371, 0.643427, 0.934774, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -9.605290, 6.218590, 136.388885, 0.303879, -0.133079, -0.943371, 0.651670, 0.935714, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -8.408100, 6.381190, 136.751587, 0.303879, -0.133079, -0.943371, 0.653297, 0.943021, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -8.408100, 6.381190, 136.751587, 0.204116, -0.060643, -0.977066, 0.653297, 0.943021, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -8.304590, 4.791100, 136.871902, 0.204116, -0.060643, -0.977066, 0.638684, 0.938101, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -9.370090, 5.002600, 136.636185, 0.204116, -0.060643, -0.977066, 0.643427, 0.934774, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -8.408100, 6.381190, 136.751587, 0.212820, -0.935136, -0.283244, 0.653297, 0.943021, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -9.605290, 6.218590, 136.388885, 0.212820, -0.935136, -0.283244, 0.651670, 0.935714, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -9.349790, 6.747000, 134.836304, 0.212820, -0.935136, -0.283244, 0.660233, 0.928448, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -9.349790, 6.747000, 134.836304, 0.255834, -0.918590, -0.301233, 0.660233, 0.928448, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -8.099390, 7.081600, 134.877914, 0.255834, -0.918590, -0.301233, 0.666934, 0.930436, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -8.408100, 6.381190, 136.751587, 0.255834, -0.918590, -0.301233, 0.653297, 0.943021, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -8.304590, 4.791100, 136.871902, 0.276718, 0.798929, -0.533984, 0.638684, 0.938101, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -8.117100, 4.052890, 135.864578, 0.276718, 0.798929, -0.533984, 0.635919, 0.925250, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -9.370090, 5.002600, 136.636185, 0.276718, 0.798929, -0.533984, 0.643427, 0.934774, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -7.170280, 6.133500, 131.709000, 0.905458, 0.092322, 0.414274, 0.669440, 0.901191, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.972290, 4.712690, 131.592896, 0.905458, 0.092322, 0.414274, 0.659321, 0.893358, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.581590, 4.576200, 130.769379, 0.905458, 0.092322, 0.414274, 0.664696, 0.885638, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.581590, 4.576200, 130.769379, 0.645128, -0.200921, 0.737184, 0.664696, 0.885638, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.106500, 6.699400, 130.932297, 0.645128, -0.200921, 0.737184, 0.678957, 0.895348, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -7.170280, 6.133500, 131.709000, 0.645128, -0.200921, 0.737184, 0.669440, 0.901191, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -7.470190, 8.966200, 134.994888, 0.880758, -0.315949, 0.352762, 0.679739, 0.936060, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -8.099390, 7.081600, 134.877914, 0.880758, -0.315949, 0.352762, 0.666934, 0.930436, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -7.170280, 6.133500, 131.709000, 0.880758, -0.315949, 0.352762, 0.669440, 0.901191, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -7.170280, 6.133500, 131.709000, 0.665098, -0.534503, 0.521490, 0.669440, 0.901191, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.106500, 6.699400, 130.932297, 0.665098, -0.534503, 0.521490, 0.678957, 0.895348, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -7.470190, 8.966200, 134.994888, 0.665098, -0.534503, 0.521490, 0.679739, 0.936060, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -8.304590, 4.791100, 136.871902, 0.994586, 0.070520, 0.076330, 0.638684, 0.938101, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -8.408100, 6.381190, 136.751587, 0.994586, 0.070520, 0.076330, 0.653297, 0.943021, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -8.716190, 7.940200, 139.325684, 0.994586, 0.070520, 0.076330, 0.656588, 0.966445, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -8.716190, 7.940200, 139.325684, 0.994139, 0.101984, 0.035875, 0.656588, 0.966445, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -8.277890, 3.089000, 140.970688, 0.994139, 0.101984, 0.035875, 0.614558, 0.963397, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -8.304590, 4.791100, 136.871902, 0.994139, 0.101984, 0.035875, 0.638684, 0.938101, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -8.408100, 6.381190, 136.751587, 0.947191, -0.318529, 0.036990, 0.653297, 0.943021, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -8.099390, 7.081600, 134.877914, 0.947191, -0.318529, 0.036990, 0.666934, 0.930436, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -7.470190, 8.966200, 134.994888, 0.947191, -0.318529, 0.036990, 0.679739, 0.936060, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -7.470190, 8.966200, 134.994888, 0.954509, -0.190342, 0.229525, 0.679739, 0.936060, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -8.716190, 7.940200, 139.325684, 0.954509, -0.190342, 0.229525, 0.656588, 0.966445, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -8.408100, 6.381190, 136.751587, 0.954509, -0.190342, 0.229525, 0.653297, 0.943021, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -8.304590, 4.791100, 136.871902, 0.984306, 0.165156, 0.062172, 0.638684, 0.938101, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -8.277890, 3.089000, 140.970688, 0.984306, 0.165156, 0.062172, 0.614558, 0.963397, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -8.117100, 4.052890, 135.864578, 0.984306, 0.165156, 0.062172, 0.635919, 0.925250, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -7.470190, 8.966200, 134.994888, 0.710967, -0.484967, 0.509247, 0.679739, 0.936060, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.106500, 6.699400, 130.932297, 0.710967, -0.484967, 0.509247, 0.678957, 0.895348, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -3.863690, 9.354200, 130.329300, 0.710967, -0.484967, 0.509247, 0.705338, 0.898151, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -3.863690, 9.354200, 130.329300, 0.651624, -0.608337, 0.453114, 0.705338, 0.898151, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -4.502490, 11.761190, 134.479507, 0.651624, -0.608337, 0.453114, 0.710990, 0.936780, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -7.470190, 8.966200, 134.994888, 0.651624, -0.608337, 0.453114, 0.679739, 0.936060, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, 12.565090, 134.254303, 0.175620, -0.839627, 0.513989, 0.746498, 0.929265, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -4.502490, 11.761190, 134.479507, 0.175620, -0.839627, 0.513989, 0.710990, 0.936780, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -3.863690, 9.354200, 130.329300, 0.175620, -0.839627, 0.513989, 0.705338, 0.898151, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -3.863690, 9.354200, 130.329300, 0.187318, -0.842603, 0.504908, 0.705338, 0.898151, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, 10.139300, 130.206085, 0.187318, -0.842603, 0.504908, 0.735612, 0.893486, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, 12.565090, 134.254303, 0.187318, -0.842603, 0.504908, 0.746498, 0.929265, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -1.732100, 8.210380, 127.882301, 0.285545, -0.831170, 0.477096, 0.715155, 0.872183, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, 8.894690, 128.037796, 0.285545, -0.831170, 0.477096, 0.727550, 0.878809, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, 10.139300, 130.206085, 0.285545, -0.831170, 0.477096, 0.735612, 0.893486, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, 10.139300, 130.206085, 0.183803, -0.819311, 0.543089, 0.735612, 0.893486, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -3.863690, 9.354200, 130.329300, 0.183803, -0.819311, 0.543089, 0.705338, 0.898151, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -1.732100, 8.210380, 127.882301, 0.183803, -0.819311, 0.543089, 0.715155, 0.872183, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, 8.894690, 128.037796, 0.372847, -0.871114, -0.319603, 0.727550, 0.878809, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -1.732100, 8.210380, 127.882301, 0.372847, -0.871114, -0.319603, 0.715155, 0.872183, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -1.721500, 8.932590, 125.926201, 0.372847, -0.871114, -0.319603, 0.727689, 0.862166, 0.450000, 0.450000, 0.100000, 0.000000, 0.000000, 1.000000, 2.000000, 0.000000, - -1.721500, 8.932590, 125.926201, 0.343384, -0.891349, -0.295945, 0.727689, 0.862166, 0.450000, 0.450000, 0.100000, 0.000000, 0.000000, 1.000000, 2.000000, 0.000000, - 0.000000, 9.581600, 125.968910, 0.343384, -0.891349, -0.295945, 0.734184, 0.873810, 0.500000, 0.500000, 0.000000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000, - 0.000000, 8.894690, 128.037796, 0.343384, -0.891350, -0.295946, 0.727550, 0.878809, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -1.828770, 3.733800, 126.806297, 0.927711, 0.353692, 0.119395, 0.688083, 0.836980, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -1.840100, 4.478890, 124.687103, 0.927711, 0.353692, 0.119395, 0.704178, 0.824880, 0.500000, 0.500000, 0.000000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000, - -2.675700, 6.447990, 125.346603, 0.927711, 0.353692, 0.119395, 0.715632, 0.843506, 0.650000, 0.350000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000, 0.000000, - -2.675700, 6.447990, 125.346603, 0.921747, 0.362170, 0.138620, 0.715632, 0.843506, 0.650000, 0.350000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000, 0.000000, - -2.714090, 5.707900, 127.535492, 0.921747, 0.362170, 0.138620, 0.698156, 0.856592, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -1.828770, 3.733800, 126.806297, 0.921747, 0.362170, 0.138620, 0.688083, 0.836980, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -2.675700, 6.447990, 125.346603, 0.935922, -0.332024, -0.117514, 0.715632, 0.843506, 0.650000, 0.350000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000, 0.000000, - -1.721500, 8.932590, 125.926201, 0.935922, -0.332024, -0.117514, 0.727689, 0.862166, 0.450000, 0.450000, 0.100000, 0.000000, 0.000000, 1.000000, 2.000000, 0.000000, - -1.732100, 8.210380, 127.882301, 0.935922, -0.332024, -0.117514, 0.715155, 0.872183, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -1.732100, 8.210380, 127.882301, 0.930746, -0.351044, -0.102368, 0.715155, 0.872183, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -2.714090, 5.707900, 127.535492, 0.930746, -0.351044, -0.102368, 0.698156, 0.856592, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -2.675700, 6.447990, 125.346603, 0.930746, -0.351044, -0.102368, 0.715632, 0.843506, 0.650000, 0.350000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000, 0.000000, - -5.777100, 3.697590, 129.370697, 0.669158, -0.392154, 0.631224, 0.669035, 0.871677, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -5.221600, 4.397900, 129.216888, 0.669158, -0.392154, 0.631224, 0.675468, 0.871319, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.581590, 4.576200, 130.769379, 0.669158, -0.392154, 0.631224, 0.664696, 0.885638, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -4.065590, 2.139590, 127.629990, 0.511883, -0.302863, 0.803896, 0.670215, 0.852502, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -1.828770, 3.733800, 126.806297, 0.511883, -0.302863, 0.803896, 0.688083, 0.836980, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -5.221600, 4.397900, 129.216888, 0.511883, -0.302863, 0.803896, 0.675468, 0.871319, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -5.221600, 4.397900, 129.216888, 0.555980, -0.268226, 0.786728, 0.675468, 0.871319, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -5.777100, 3.697590, 129.370697, 0.555980, -0.268226, 0.786728, 0.669035, 0.871677, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -4.065590, 2.139590, 127.629990, 0.555980, -0.268226, 0.786728, 0.670215, 0.852502, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.882300, -0.362500, 125.842690, 0.289945, -0.155162, 0.944382, 0.654883, 0.841062, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -1.828770, 3.733800, 126.806297, 0.289945, -0.155162, 0.944382, 0.688083, 0.836980, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -2.396070, 0.558700, 126.458801, 0.289945, -0.155162, 0.944382, 0.661248, 0.846480, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -2.396070, 0.558700, 126.458801, 0.448182, -0.175999, 0.876446, 0.661248, 0.846480, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -1.828770, 3.733800, 126.806297, 0.448182, -0.175999, 0.876446, 0.688083, 0.836980, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -4.065590, 2.139590, 127.629990, 0.448182, -0.175999, 0.876446, 0.670215, 0.852502, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -5.221600, 4.397900, 129.216888, 0.722861, -0.212208, 0.657602, 0.675468, 0.871319, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.106500, 6.699400, 130.932297, 0.722861, -0.212208, 0.657602, 0.678957, 0.895348, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.581590, 4.576200, 130.769379, 0.722861, -0.212208, 0.657602, 0.664696, 0.885638, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -5.221600, 4.397900, 129.216888, 0.633067, -0.291185, 0.717243, 0.675468, 0.871319, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -2.714090, 5.707900, 127.535492, 0.633067, -0.291185, 0.717243, 0.698156, 0.856592, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.106500, 6.699400, 130.932297, 0.633067, -0.291185, 0.717243, 0.678957, 0.895348, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -1.828770, 3.733800, 126.806297, 0.572652, -0.045535, 0.818533, 0.688083, 0.836980, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -2.714090, 5.707900, 127.535492, 0.572652, -0.045535, 0.818533, 0.698156, 0.856592, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -5.221600, 4.397900, 129.216888, 0.572652, -0.045535, 0.818533, 0.675468, 0.871319, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -2.714090, 5.707900, 127.535492, 0.623484, -0.342089, 0.703024, 0.698156, 0.856592, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -1.732100, 8.210380, 127.882301, 0.623484, -0.342089, 0.703024, 0.715155, 0.872183, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -3.863690, 9.354200, 130.329300, 0.623484, -0.342089, 0.703024, 0.705338, 0.898151, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -3.863690, 9.354200, 130.329300, 0.608603, -0.352715, 0.710770, 0.705338, 0.898151, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.106500, 6.699400, 130.932297, 0.608603, -0.352715, 0.710770, 0.678957, 0.895348, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -2.714090, 5.707900, 127.535492, 0.608603, -0.352715, 0.710770, 0.698156, 0.856592, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.201700, -0.988380, 133.949463, 0.885970, 0.403093, 0.229287, 0.119853, 0.779626, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -5.682190, -2.135990, 133.959595, 0.885970, 0.403093, 0.229287, 0.100958, 0.782986, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -5.644090, -1.589990, 132.852493, 0.885970, 0.403093, 0.229287, 0.104709, 0.764527, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -4.453990, -2.819290, 133.918106, 0.617428, 0.763136, 0.190804, 0.079590, 0.782940, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -4.148500, -2.562570, 131.902786, 0.617428, 0.763136, 0.190804, 0.076015, 0.751705, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -5.644090, -1.589990, 132.852493, 0.617428, 0.763136, 0.190804, 0.104709, 0.764527, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -5.644090, -1.589990, 132.852493, 0.454637, 0.792507, 0.406494, 0.104709, 0.764527, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -5.682190, -2.135990, 133.959595, 0.454637, 0.792507, 0.406494, 0.100958, 0.782986, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -4.453990, -2.819290, 133.918106, 0.454637, 0.792507, 0.406494, 0.079590, 0.782940, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -1.840100, 4.478890, 124.687103, 0.352566, 0.883399, 0.308711, 0.704178, 0.824880, 0.500000, 0.500000, 0.000000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000, - -1.828770, 3.733800, 126.806297, 0.352567, 0.883400, 0.308711, 0.688083, 0.836980, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, 3.111500, 126.498489, 0.352566, 0.883399, 0.308711, 0.676609, 0.819210, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, 3.111500, 126.498489, 0.356481, 0.883249, 0.304620, 0.676609, 0.819210, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, 3.835590, 124.398987, 0.356481, 0.883249, 0.304620, 0.692418, 0.806898, 0.500000, 0.500000, 0.000000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000, - -1.840100, 4.478890, 124.687103, 0.356481, 0.883249, 0.304620, 0.704178, 0.824880, 0.500000, 0.500000, 0.000000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000, - -2.013500, 9.711190, 123.491302, 0.473974, -0.770902, -0.425510, 0.747185, 0.858948, 0.553767, 0.231458, 0.200000, 0.014775, 1.000000, 24.000000, 0.000000, 25.000000, - 0.000000, 10.830590, 123.706100, 0.473974, -0.770902, -0.425510, 0.748995, 0.877750, 0.800000, 0.200000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000, 0.000000, - 0.000000, 9.581600, 125.968910, 0.473974, -0.770902, -0.425510, 0.734184, 0.873810, 0.500000, 0.500000, 0.000000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000, - 0.000000, 9.581600, 125.968910, 0.340846, -0.882826, -0.323174, 0.734184, 0.873810, 0.500000, 0.500000, 0.000000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000, - -1.721500, 8.932590, 125.926201, 0.340846, -0.882826, -0.323174, 0.727689, 0.862166, 0.450000, 0.450000, 0.100000, 0.000000, 0.000000, 1.000000, 2.000000, 0.000000, - -2.013500, 9.711190, 123.491302, 0.340846, -0.882827, -0.323174, 0.747185, 0.858948, 0.553767, 0.231458, 0.200000, 0.014775, 1.000000, 24.000000, 0.000000, 25.000000, - -1.840100, 4.478890, 124.687103, 0.893845, 0.443695, -0.064622, 0.704178, 0.824880, 0.500000, 0.500000, 0.000000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000, - -2.153870, 4.774090, 122.373901, 0.893845, 0.443695, -0.064622, 0.722084, 0.813841, 0.900000, 0.100000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000, 0.000000, - -3.156090, 6.980190, 123.658401, 0.893845, 0.443695, -0.064622, 0.731760, 0.837254, 0.900000, 0.100000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000, 0.000000, - -3.156090, 6.980190, 123.658401, 0.898196, 0.422182, -0.122497, 0.731760, 0.837254, 0.900000, 0.100000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000, 0.000000, - -2.675700, 6.447990, 125.346603, 0.898196, 0.422182, -0.122497, 0.715632, 0.843506, 0.650000, 0.350000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000, 0.000000, - -1.840100, 4.478890, 124.687103, 0.898196, 0.422182, -0.122497, 0.704178, 0.824880, 0.500000, 0.500000, 0.000000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000, - -3.156090, 6.980190, 123.658401, 0.892466, -0.387518, -0.230943, 0.731760, 0.837254, 0.900000, 0.100000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000, 0.000000, - -2.013500, 9.711190, 123.491302, 0.892466, -0.387518, -0.230943, 0.747185, 0.858948, 0.553767, 0.231458, 0.200000, 0.014775, 1.000000, 24.000000, 0.000000, 25.000000, - -1.721500, 8.932590, 125.926201, 0.892466, -0.387518, -0.230943, 0.727689, 0.862166, 0.450000, 0.450000, 0.100000, 0.000000, 0.000000, 1.000000, 2.000000, 0.000000, - -1.721500, 8.932590, 125.926201, 0.901551, -0.266773, -0.340642, 0.727689, 0.862166, 0.450000, 0.450000, 0.100000, 0.000000, 0.000000, 1.000000, 2.000000, 0.000000, - -2.675700, 6.447990, 125.346603, 0.901551, -0.266773, -0.340642, 0.715632, 0.843506, 0.650000, 0.350000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000, 0.000000, - -3.156090, 6.980190, 123.658401, 0.901551, -0.266773, -0.340642, 0.731760, 0.837254, 0.900000, 0.100000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000, 0.000000, - -6.220200, -1.675990, 134.945084, 0.870831, 0.396778, 0.290209, 0.113145, 0.796718, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -5.682190, -2.135990, 133.959595, 0.870831, 0.396778, 0.290209, 0.100958, 0.782986, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.201700, -0.988380, 133.949463, 0.870831, 0.396778, 0.290209, 0.119853, 0.779626, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -4.983219, -2.952283, 135.597046, 0.480038, 0.849572, 0.218613, 0.089424, 0.811521, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -4.453990, -2.819290, 133.918106, 0.480038, 0.849572, 0.218613, 0.079590, 0.782940, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -5.682190, -2.135990, 133.959595, 0.480038, 0.849572, 0.218613, 0.100958, 0.782986, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -5.682190, -2.135990, 133.959595, 0.703367, 0.708839, 0.053124, 0.100958, 0.782986, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.220200, -1.675990, 134.945084, 0.703367, 0.708839, 0.053124, 0.113145, 0.796718, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -4.983219, -2.952283, 135.597046, 0.703367, 0.708839, 0.053124, 0.089424, 0.811521, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -5.277790, 1.799490, 119.997787, 0.154249, 0.512682, -0.844609, 0.757208, 0.796121, 0.595727, 0.210221, 0.194052, 0.000000, 2.000000, 25.000000, 24.000000, 0.000000, - -2.153870, 4.774090, 122.373901, 0.154249, 0.512682, -0.844609, 0.722084, 0.813841, 0.900000, 0.100000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000, 0.000000, - 0.000000, 3.684200, 122.105690, 0.154249, 0.512682, -0.844609, 0.709467, 0.793621, 0.700000, 0.300000, 0.000000, 0.000000, 1.000000, 2.000000, 0.000000, 0.000000, - 0.000000, 3.684200, 122.105690, 0.150503, 0.519360, -0.841198, 0.709467, 0.793621, 0.700000, 0.300000, 0.000000, 0.000000, 1.000000, 2.000000, 0.000000, 0.000000, - 0.000000, -0.609580, 119.454689, 0.150503, 0.519360, -0.841198, 0.741798, 0.768441, 1.000000, 0.000000, 0.000000, 0.000000, 2.000000, 0.000000, 0.000000, 0.000000, - -5.277790, 1.799490, 119.997787, 0.150503, 0.519360, -0.841198, 0.757208, 0.796121, 0.595727, 0.210221, 0.194052, 0.000000, 2.000000, 25.000000, 24.000000, 0.000000, - 0.000000, 11.819690, 122.129089, 0.466676, -0.749252, -0.469930, 0.760808, 0.883957, 1.000000, 0.000000, 0.000000, 0.000000, 2.000000, 0.000000, 0.000000, 0.000000, - 0.000000, 10.830590, 123.706100, 0.466676, -0.749252, -0.469930, 0.748995, 0.877750, 0.800000, 0.200000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000, 0.000000, - -2.013500, 9.711190, 123.491302, 0.466676, -0.749252, -0.469930, 0.747185, 0.858948, 0.553767, 0.231458, 0.200000, 0.014775, 1.000000, 24.000000, 0.000000, 25.000000, - -2.013500, 9.711190, 123.491302, 0.244192, -0.679905, -0.691448, 0.747185, 0.858948, 0.553767, 0.231458, 0.200000, 0.014775, 1.000000, 24.000000, 0.000000, 25.000000, - -5.458890, 9.787290, 122.199699, 0.244192, -0.679905, -0.691448, 0.768126, 0.840398, 0.425000, 0.425000, 0.150000, 0.000000, 2.000000, 24.000000, 1.000000, 0.000000, - 0.000000, 11.819690, 122.129089, 0.244192, -0.679905, -0.691448, 0.760808, 0.883957, 1.000000, 0.000000, 0.000000, 0.000000, 2.000000, 0.000000, 0.000000, 0.000000, - -6.244400, 5.333000, 120.907593, 0.343427, 0.584190, -0.735377, 0.757604, 0.813466, 0.391313, 0.391313, 0.217375, 0.000000, 24.000000, 25.000000, 2.000000, 0.000000, - -3.156090, 6.980190, 123.658401, 0.343427, 0.584190, -0.735377, 0.731760, 0.837254, 0.900000, 0.100000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000, 0.000000, - -2.153870, 4.774090, 122.373901, 0.343427, 0.584190, -0.735377, 0.722084, 0.813841, 0.900000, 0.100000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000, 0.000000, - -2.153870, 4.774090, 122.373901, 0.358154, 0.323484, -0.875833, 0.722084, 0.813841, 0.900000, 0.100000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000, 0.000000, - -5.277790, 1.799490, 119.997787, 0.358154, 0.323484, -0.875833, 0.757208, 0.796121, 0.595727, 0.210221, 0.194052, 0.000000, 2.000000, 25.000000, 24.000000, 0.000000, - -6.244400, 5.333000, 120.907593, 0.358154, 0.323484, -0.875833, 0.757604, 0.813466, 0.391313, 0.391313, 0.217375, 0.000000, 24.000000, 25.000000, 2.000000, 0.000000, - -5.458890, 9.787290, 122.199699, 0.340186, -0.198566, -0.919155, 0.768126, 0.840398, 0.425000, 0.425000, 0.150000, 0.000000, 2.000000, 24.000000, 1.000000, 0.000000, - -2.013500, 9.711190, 123.491302, 0.340186, -0.198566, -0.919155, 0.747185, 0.858948, 0.553767, 0.231458, 0.200000, 0.014775, 1.000000, 24.000000, 0.000000, 25.000000, - -3.156090, 6.980190, 123.658401, 0.340186, -0.198566, -0.919155, 0.731760, 0.837254, 0.900000, 0.100000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000, 0.000000, - -3.156090, 6.980190, 123.658401, 0.626497, 0.113216, -0.771157, 0.731760, 0.837254, 0.900000, 0.100000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000, 0.000000, - -6.244400, 5.333000, 120.907593, 0.626497, 0.113216, -0.771157, 0.757604, 0.813466, 0.391313, 0.391313, 0.217375, 0.000000, 24.000000, 25.000000, 2.000000, 0.000000, - -5.458890, 9.787290, 122.199699, 0.626497, 0.113216, -0.771157, 0.768126, 0.840398, 0.425000, 0.425000, 0.150000, 0.000000, 2.000000, 24.000000, 1.000000, 0.000000, - 0.000000, -7.036400, 92.380791, 0.151139, 0.981341, -0.118855, 0.321384, 0.664017, 0.500000, 0.500000, 0.000000, 0.000000, 5.000000, 6.000000, 0.000000, 0.000000, - -4.825790, -6.264500, 92.617493, 0.151139, 0.981341, -0.118855, 0.327461, 0.640259, 0.500000, 0.499472, 0.000528, 0.000000, 6.000000, 5.000000, 7.000000, 0.000000, - -3.709390, -5.634100, 99.242104, 0.151139, 0.981341, -0.118855, 0.359453, 0.652327, 0.530700, 0.469300, 0.000000, 0.000000, 7.000000, 5.000000, 0.000000, 0.000000, - -3.709390, -5.634100, 99.242104, 0.208411, 0.974214, -0.086436, 0.359453, 0.652327, 0.530700, 0.469300, 0.000000, 0.000000, 7.000000, 5.000000, 0.000000, 0.000000, - 0.000000, -6.406100, 99.484894, 0.208411, 0.974214, -0.086436, 0.355395, 0.671121, 0.569640, 0.430360, 0.000000, 0.000000, 7.000000, 5.000000, 0.000000, 0.000000, - 0.000000, -7.036400, 92.380791, 0.208411, 0.974214, -0.086436, 0.321384, 0.664017, 0.500000, 0.500000, 0.000000, 0.000000, 5.000000, 6.000000, 0.000000, 0.000000, - 0.000000, -7.428190, 87.661690, 0.134966, 0.985786, -0.100050, 0.298567, 0.660440, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - -5.662000, -6.638600, 87.803490, 0.134966, 0.985786, -0.100050, 0.303795, 0.632199, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - -4.825790, -6.264500, 92.617493, 0.134966, 0.985786, -0.100050, 0.327461, 0.640259, 0.500000, 0.499472, 0.000528, 0.000000, 6.000000, 5.000000, 7.000000, 0.000000, - -4.825790, -6.264500, 92.617493, 0.153505, 0.984760, -0.081757, 0.327461, 0.640259, 0.500000, 0.499472, 0.000528, 0.000000, 6.000000, 5.000000, 7.000000, 0.000000, - 0.000000, -7.036400, 92.380791, 0.153505, 0.984760, -0.081757, 0.321384, 0.664017, 0.500000, 0.500000, 0.000000, 0.000000, 5.000000, 6.000000, 0.000000, 0.000000, - 0.000000, -7.428190, 87.661690, 0.153505, 0.984760, -0.081757, 0.298567, 0.660440, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - 0.000000, 8.269890, 90.548500, 0.156413, -0.922982, -0.351625, 0.387989, 0.554986, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - 0.000000, 6.230500, 95.901703, 0.156413, -0.922982, -0.351625, 0.402539, 0.581110, 0.500566, 0.382654, 0.076630, 0.040150, 6.000000, 5.000000, 7.000000, 8.000000, - -4.704690, 5.477000, 95.786789, 0.156413, -0.922982, -0.351625, 0.379509, 0.588085, 0.500000, 0.394355, 0.085658, 0.019987, 6.000000, 5.000000, 7.000000, 8.000000, - -4.704690, 5.477000, 95.786789, 0.097850, -0.911993, -0.398364, 0.379509, 0.588085, 0.500000, 0.394355, 0.085658, 0.019987, 6.000000, 5.000000, 7.000000, 8.000000, - -7.255490, 7.509300, 90.507591, 0.097850, -0.911993, -0.398364, 0.360087, 0.563980, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - 0.000000, 8.269890, 90.548500, 0.097850, -0.911993, -0.398364, 0.387989, 0.554986, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - -6.335590, -1.997000, 98.768501, 0.929855, 0.175899, -0.323156, 0.365176, 0.629928, 0.536170, 0.463305, 0.000525, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - -8.138200, -2.319500, 93.406090, 0.929855, 0.175899, -0.323156, 0.339147, 0.616701, 0.500000, 0.480327, 0.019673, 0.000000, 6.000000, 5.000000, 7.000000, 0.000000, - -8.633000, 2.245590, 94.467201, 0.929855, 0.175899, -0.323156, 0.354786, 0.598233, 0.500000, 0.437489, 0.061784, 0.000726, 6.000000, 5.000000, 7.000000, 8.000000, - -8.633000, 2.245590, 94.467201, 0.906075, 0.067109, -0.417760, 0.354786, 0.598233, 0.500000, 0.437489, 0.061784, 0.000726, 6.000000, 5.000000, 7.000000, 8.000000, - -7.244800, 2.567690, 97.529793, 0.906075, 0.067109, -0.417760, 0.369250, 0.606203, 0.649612, 0.343663, 0.006725, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - -6.335590, -1.997000, 98.768501, 0.906075, 0.067109, -0.417760, 0.365176, 0.629928, 0.536170, 0.463305, 0.000525, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - -7.244800, 2.567690, 97.529793, 0.991439, -0.073166, -0.108143, 0.369250, 0.606203, 0.649612, 0.343663, 0.006725, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - -6.506490, 3.943900, 103.367401, 0.991439, -0.073166, -0.108143, 0.398194, 0.610122, 0.847942, 0.138720, 0.013338, 0.000000, 7.000000, 5.000000, 2.000000, 0.000000, - -6.862280, -1.351990, 103.688591, 0.991439, -0.073166, -0.108143, 0.390142, 0.635499, 0.916197, 0.079688, 0.004115, 0.000000, 7.000000, 5.000000, 2.000000, 0.000000, - -6.862280, -1.351990, 103.688591, 0.973732, 0.214603, 0.076103, 0.390142, 0.635499, 0.916197, 0.079688, 0.004115, 0.000000, 7.000000, 5.000000, 2.000000, 0.000000, - -6.335590, -1.997000, 98.768501, 0.973732, 0.214603, 0.076103, 0.365176, 0.629928, 0.536170, 0.463305, 0.000525, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - -7.244800, 2.567690, 97.529793, 0.973732, 0.214603, 0.076103, 0.369250, 0.606203, 0.649612, 0.343663, 0.006725, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - -6.335590, -1.997000, 98.768501, 0.807622, 0.558508, -0.189251, 0.365176, 0.629928, 0.536170, 0.463305, 0.000525, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - -3.709390, -5.634100, 99.242104, 0.807622, 0.558508, -0.189251, 0.359453, 0.652327, 0.530700, 0.469300, 0.000000, 0.000000, 7.000000, 5.000000, 0.000000, 0.000000, - -4.825790, -6.264500, 92.617493, 0.807622, 0.558507, -0.189251, 0.327461, 0.640259, 0.500000, 0.499472, 0.000528, 0.000000, 6.000000, 5.000000, 7.000000, 0.000000, - -4.825790, -6.264500, 92.617493, 0.707875, 0.649743, -0.277033, 0.327461, 0.640259, 0.500000, 0.499472, 0.000528, 0.000000, 6.000000, 5.000000, 7.000000, 0.000000, - -8.138200, -2.319500, 93.406090, 0.707875, 0.649743, -0.277033, 0.339147, 0.616701, 0.500000, 0.480327, 0.019673, 0.000000, 6.000000, 5.000000, 7.000000, 0.000000, - -6.335590, -1.997000, 98.768501, 0.707874, 0.649743, -0.277033, 0.365176, 0.629928, 0.536170, 0.463305, 0.000525, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - -7.244800, 2.567690, 97.529793, 0.662973, -0.713897, -0.225428, 0.369250, 0.606203, 0.649612, 0.343663, 0.006725, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - -8.633000, 2.245590, 94.467201, 0.662973, -0.713897, -0.225428, 0.354786, 0.598233, 0.500000, 0.437489, 0.061784, 0.000726, 6.000000, 5.000000, 7.000000, 8.000000, - -4.704690, 5.477000, 95.786789, 0.662973, -0.713897, -0.225428, 0.379509, 0.588085, 0.500000, 0.394355, 0.085658, 0.019987, 6.000000, 5.000000, 7.000000, 8.000000, - -8.633000, 2.245590, 94.467201, 0.869458, 0.199306, -0.452018, 0.354786, 0.598233, 0.500000, 0.437489, 0.061784, 0.000726, 6.000000, 5.000000, 7.000000, 8.000000, - -8.138200, -2.319500, 93.406090, 0.869458, 0.199306, -0.452018, 0.339147, 0.616701, 0.500000, 0.480327, 0.019673, 0.000000, 6.000000, 5.000000, 7.000000, 0.000000, - -10.686400, -1.521700, 88.856392, 0.869458, 0.199306, -0.452018, 0.319021, 0.598976, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - -10.686400, -1.521700, 88.856392, 0.884030, 0.167872, -0.436245, 0.319021, 0.598976, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - -11.093600, 3.121800, 89.818092, 0.884030, 0.167872, -0.436245, 0.334809, 0.580480, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - -8.633000, 2.245590, 94.467201, 0.884030, 0.167872, -0.436245, 0.354786, 0.598233, 0.500000, 0.437489, 0.061784, 0.000726, 6.000000, 5.000000, 7.000000, 8.000000, - -3.709390, -5.634100, 99.242104, 0.257263, 0.960104, -0.109617, 0.359453, 0.652327, 0.530700, 0.469300, 0.000000, 0.000000, 7.000000, 5.000000, 0.000000, 0.000000, - -4.437190, -4.900400, 103.960289, 0.257263, 0.960104, -0.109617, 0.383721, 0.656332, 0.955715, 0.044285, 0.000000, 0.000000, 7.000000, 5.000000, 0.000000, 0.000000, - 0.000000, -6.053500, 104.274391, 0.257263, 0.960104, -0.109617, 0.377315, 0.678638, 0.981149, 0.018851, 0.000000, 0.000000, 7.000000, 5.000000, 0.000000, 0.000000, - 0.000000, -6.053500, 104.274391, 0.207732, 0.975546, -0.071819, 0.377315, 0.678638, 0.981149, 0.018851, 0.000000, 0.000000, 7.000000, 5.000000, 0.000000, 0.000000, - 0.000000, -6.406100, 99.484894, 0.207732, 0.975546, -0.071819, 0.355395, 0.671121, 0.569640, 0.430360, 0.000000, 0.000000, 7.000000, 5.000000, 0.000000, 0.000000, - -3.709390, -5.634100, 99.242104, 0.207732, 0.975546, -0.071819, 0.359453, 0.652327, 0.530700, 0.469300, 0.000000, 0.000000, 7.000000, 5.000000, 0.000000, 0.000000, - -6.335590, -1.997000, 98.768501, 0.825015, 0.564931, 0.014256, 0.365176, 0.629928, 0.536170, 0.463305, 0.000525, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - -6.862280, -1.351990, 103.688591, 0.825015, 0.564931, 0.014256, 0.390142, 0.635499, 0.916197, 0.079688, 0.004115, 0.000000, 7.000000, 5.000000, 2.000000, 0.000000, - -4.437190, -4.900400, 103.960289, 0.825015, 0.564931, 0.014256, 0.383721, 0.656332, 0.955715, 0.044285, 0.000000, 0.000000, 7.000000, 5.000000, 0.000000, 0.000000, - -4.437190, -4.900400, 103.960289, 0.808234, 0.587922, 0.033249, 0.383721, 0.656332, 0.955715, 0.044285, 0.000000, 0.000000, 7.000000, 5.000000, 0.000000, 0.000000, - -3.709390, -5.634100, 99.242104, 0.808234, 0.587922, 0.033249, 0.359453, 0.652327, 0.530700, 0.469300, 0.000000, 0.000000, 7.000000, 5.000000, 0.000000, 0.000000, - -6.335590, -1.997000, 98.768501, 0.808234, 0.587922, 0.033249, 0.365176, 0.629928, 0.536170, 0.463305, 0.000525, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - -8.138200, -2.319500, 93.406090, 0.735661, 0.653390, -0.178562, 0.339147, 0.616701, 0.500000, 0.480327, 0.019673, 0.000000, 6.000000, 5.000000, 7.000000, 0.000000, - -4.825790, -6.264500, 92.617493, 0.735661, 0.653390, -0.178562, 0.327461, 0.640259, 0.500000, 0.499472, 0.000528, 0.000000, 6.000000, 5.000000, 7.000000, 0.000000, - -5.662000, -6.638600, 87.803490, 0.735661, 0.653390, -0.178562, 0.303795, 0.632199, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - -5.662000, -6.638600, 87.803490, 0.664960, 0.704166, -0.248954, 0.303795, 0.632199, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - -10.686400, -1.521700, 88.856392, 0.664960, 0.704166, -0.248954, 0.319021, 0.598976, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - -8.138200, -2.319500, 93.406090, 0.664960, 0.704166, -0.248954, 0.339147, 0.616701, 0.500000, 0.480327, 0.019673, 0.000000, 6.000000, 5.000000, 7.000000, 0.000000, - -8.633000, 2.245590, 94.467201, 0.699180, -0.537556, -0.471362, 0.354786, 0.598233, 0.500000, 0.437489, 0.061784, 0.000726, 6.000000, 5.000000, 7.000000, 8.000000, - -11.093600, 3.121800, 89.818092, 0.699180, -0.537556, -0.471362, 0.334809, 0.580480, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - -7.255490, 7.509300, 90.507591, 0.699180, -0.537556, -0.471362, 0.360087, 0.563980, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - -7.255490, 7.509300, 90.507591, 0.638874, -0.562215, -0.525123, 0.360087, 0.563980, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - -4.704690, 5.477000, 95.786789, 0.638874, -0.562215, -0.525123, 0.379509, 0.588085, 0.500000, 0.394355, 0.085658, 0.019987, 6.000000, 5.000000, 7.000000, 8.000000, - -8.633000, 2.245590, 94.467201, 0.638874, -0.562215, -0.525123, 0.354786, 0.598233, 0.500000, 0.437489, 0.061784, 0.000726, 6.000000, 5.000000, 7.000000, 8.000000, - 0.000000, -7.695790, 83.062401, 0.154098, 0.987088, -0.043726, 0.276128, 0.657277, 1.000000, 0.000000, 0.000000, 0.000000, 6.000000, 0.000000, 0.000000, 0.000000, - -7.102380, -6.574490, 83.345100, 0.154098, 0.987088, -0.043726, 0.281096, 0.621323, 1.000000, 0.000000, 0.000000, 0.000000, 6.000000, 0.000000, 0.000000, 0.000000, - -6.636300, -6.463490, 87.493393, 0.154098, 0.987088, -0.043726, 0.302087, 0.627250, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - -6.636300, -6.463490, 87.493393, 0.212604, 0.976008, 0.046980, 0.302087, 0.627250, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - 0.000000, -7.901280, 87.331490, 0.212604, 0.976009, 0.046980, 0.296388, 0.660461, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - 0.000000, -7.695790, 83.062401, 0.212604, 0.976009, 0.046980, 0.276128, 0.657277, 1.000000, 0.000000, 0.000000, 0.000000, 6.000000, 0.000000, 0.000000, 0.000000, - -7.135800, 10.410180, 86.686890, 0.164244, -0.796300, -0.582177, 0.355142, 0.538989, 1.000000, 0.000000, 0.000000, 0.000000, 6.000000, 0.000000, 0.000000, 0.000000, - 0.000000, 11.811300, 86.783600, 0.164244, -0.796300, -0.582177, 0.388713, 0.525234, 0.716619, 0.194051, 0.044665, 0.044665, 8.000000, 6.000000, 9.000000, 10.000000, - 0.000000, 9.147680, 90.426888, 0.164244, -0.796300, -0.582177, 0.387478, 0.549942, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - 0.000000, 9.147680, 90.426888, 0.094386, -0.874713, -0.475361, 0.387478, 0.549942, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - -7.255490, 8.387000, 90.385986, 0.094386, -0.874713, -0.475361, 0.360500, 0.559455, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - -7.135800, 10.410180, 86.686890, 0.094386, -0.874713, -0.475361, 0.355142, 0.538989, 1.000000, 0.000000, 0.000000, 0.000000, 6.000000, 0.000000, 0.000000, 0.000000, - -7.102380, -6.574490, 83.345100, 0.665528, 0.731376, -0.148867, 0.281096, 0.621323, 1.000000, 0.000000, 0.000000, 0.000000, 6.000000, 0.000000, 0.000000, 0.000000, - -12.658590, -1.294000, 84.448189, 0.665528, 0.731376, -0.148867, 0.297581, 0.585244, 1.000000, 0.000000, 0.000000, 0.000000, 6.000000, 0.000000, 0.000000, 0.000000, - -11.185780, -1.802000, 88.536789, 0.665528, 0.731376, -0.148867, 0.315682, 0.597922, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - -11.185780, -1.802000, 88.536789, 0.701213, 0.706228, -0.097682, 0.315682, 0.597922, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - -6.636300, -6.463490, 87.493393, 0.701213, 0.706228, -0.097682, 0.302087, 0.627250, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - -7.102380, -6.574490, 83.345100, 0.701213, 0.706228, -0.097682, 0.281096, 0.621323, 1.000000, 0.000000, 0.000000, 0.000000, 6.000000, 0.000000, 0.000000, 0.000000, - -12.658590, -1.294000, 84.448189, 0.926720, 0.151909, -0.343677, 0.297581, 0.585244, 1.000000, 0.000000, 0.000000, 0.000000, 6.000000, 0.000000, 0.000000, 0.000000, - -13.304900, 5.546700, 85.729088, 0.926720, 0.151909, -0.343677, 0.320408, 0.558146, 1.000000, 0.000000, 0.000000, 0.000000, 6.000000, 0.000000, 0.000000, 0.000000, - -11.611590, 4.097490, 89.654503, 0.926720, 0.151909, -0.343677, 0.334614, 0.575135, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - -11.611590, 4.097490, 89.654503, 0.937988, 0.128688, -0.321896, 0.334614, 0.575135, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - -11.185780, -1.802000, 88.536789, 0.937988, 0.128688, -0.321896, 0.315682, 0.597922, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - -12.658590, -1.294000, 84.448189, 0.937988, 0.128688, -0.321896, 0.297581, 0.585244, 1.000000, 0.000000, 0.000000, 0.000000, 6.000000, 0.000000, 0.000000, 0.000000, - -13.304900, 5.546700, 85.729088, 0.610732, -0.702869, -0.364665, 0.320408, 0.558146, 1.000000, 0.000000, 0.000000, 0.000000, 6.000000, 0.000000, 0.000000, 0.000000, - -7.135800, 10.410180, 86.686890, 0.610732, -0.702869, -0.364665, 0.355142, 0.538989, 1.000000, 0.000000, 0.000000, 0.000000, 6.000000, 0.000000, 0.000000, 0.000000, - -7.255490, 8.387000, 90.385986, 0.610732, -0.702869, -0.364665, 0.360500, 0.559455, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - -7.255490, 8.387000, 90.385986, 0.650851, -0.576767, -0.493693, 0.360500, 0.559455, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - -11.611590, 4.097490, 89.654503, 0.650851, -0.576767, -0.493693, 0.334614, 0.575135, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - -13.304900, 5.546700, 85.729088, 0.650851, -0.576767, -0.493693, 0.320408, 0.558146, 1.000000, 0.000000, 0.000000, 0.000000, 6.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -7.901280, 87.331490, 0.208134, 0.972470, -0.104793, 0.296388, 0.660461, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - -6.636300, -6.463490, 87.493393, 0.208134, 0.972470, -0.104793, 0.302087, 0.627250, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - -5.662000, -6.638600, 87.803490, 0.208134, 0.972470, -0.104793, 0.303795, 0.632199, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - -5.662000, -6.638600, 87.803490, 0.059175, 0.571339, -0.818578, 0.303795, 0.632199, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - 0.000000, -7.428190, 87.661690, 0.059175, 0.571339, -0.818578, 0.298567, 0.660440, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - 0.000000, -7.901280, 87.331490, 0.059175, 0.571339, -0.818578, 0.296388, 0.660461, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - -7.255490, 8.387000, 90.385986, 0.019968, -0.137206, -0.990341, 0.360500, 0.559455, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - 0.000000, 9.147680, 90.426888, 0.019968, -0.137206, -0.990341, 0.387478, 0.549942, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - 0.000000, 8.269890, 90.548500, 0.019968, -0.137206, -0.990341, 0.387989, 0.554986, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - 0.000000, 8.269890, 90.548500, 0.019968, -0.137211, -0.990341, 0.387989, 0.554986, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - -7.255490, 7.509300, 90.507591, 0.019968, -0.137211, -0.990341, 0.360087, 0.563980, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - -7.255490, 8.387000, 90.385986, 0.019968, -0.137211, -0.990340, 0.360500, 0.559455, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - -6.636300, -6.463490, 87.493393, 0.279770, 0.461488, -0.841877, 0.302087, 0.627250, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - -11.185780, -1.802000, 88.536789, 0.279770, 0.461488, -0.841877, 0.315682, 0.597922, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - -10.686400, -1.521700, 88.856392, 0.279770, 0.461488, -0.841877, 0.319021, 0.598976, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - -10.686400, -1.521700, 88.856392, 0.342958, 0.500346, -0.795005, 0.319021, 0.598976, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - -5.662000, -6.638600, 87.803490, 0.342958, 0.500346, -0.795005, 0.303795, 0.632199, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - -6.636300, -6.463490, 87.493393, 0.342958, 0.500346, -0.795005, 0.302087, 0.627250, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - -11.185780, -1.802000, 88.536789, 0.603084, 0.190293, -0.774647, 0.315682, 0.597922, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - -11.611590, 4.097490, 89.654503, 0.603084, 0.190293, -0.774647, 0.334614, 0.575135, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - -11.093600, 3.121800, 89.818092, 0.603084, 0.190293, -0.774647, 0.334809, 0.580480, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - -11.093600, 3.121800, 89.818092, 0.435784, 0.219019, -0.872997, 0.334809, 0.580480, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - -10.686400, -1.521700, 88.856392, 0.435784, 0.219019, -0.872997, 0.319021, 0.598976, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - -11.185780, -1.802000, 88.536789, 0.435784, 0.219019, -0.872997, 0.315682, 0.597922, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - -11.611590, 4.097490, 89.654503, 0.288642, -0.131397, -0.948378, 0.334614, 0.575135, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - -7.255490, 8.387000, 90.385986, 0.288642, -0.131397, -0.948378, 0.360500, 0.559455, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - -7.255490, 7.509300, 90.507591, 0.288642, -0.131397, -0.948378, 0.360087, 0.563980, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - -7.255490, 7.509300, 90.507591, 0.224926, -0.043792, -0.973391, 0.360087, 0.563980, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - -11.093600, 3.121800, 89.818092, 0.224926, -0.043792, -0.973391, 0.334809, 0.580480, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - -11.611590, 4.097490, 89.654503, 0.224926, -0.043792, -0.973391, 0.334614, 0.575135, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 5.000000, 0.000000, 0.000000, - 0.000000, -7.695790, 83.062401, 0.148098, 0.985310, 0.085031, 0.276128, 0.657277, 1.000000, 0.000000, 0.000000, 0.000000, 6.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -7.496690, 80.755302, 0.148098, 0.985310, 0.085031, 0.266121, 0.656252, 1.000000, 0.000000, 0.000000, 0.000000, 6.000000, 0.000000, 0.000000, 0.000000, - -3.659390, -6.982690, 81.172798, 0.148098, 0.985310, 0.085031, 0.267528, 0.637728, 0.850000, 0.150000, 0.000000, 0.000000, 6.000000, 10.000000, 0.000000, 0.000000, - -3.659390, -6.982690, 81.172798, 0.158154, 0.985238, 0.065529, 0.267528, 0.637728, 0.850000, 0.150000, 0.000000, 0.000000, 6.000000, 10.000000, 0.000000, 0.000000, - -7.102380, -6.574490, 83.345100, 0.158154, 0.985238, 0.065529, 0.281096, 0.621323, 1.000000, 0.000000, 0.000000, 0.000000, 6.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -7.695790, 83.062401, 0.158154, 0.985238, 0.065529, 0.276128, 0.657277, 1.000000, 0.000000, 0.000000, 0.000000, 6.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -7.496690, 80.755302, 0.041638, 0.825547, 0.562796, 0.266121, 0.656252, 1.000000, 0.000000, 0.000000, 0.000000, 6.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -4.979480, 77.062889, 0.041638, 0.825547, 0.562796, 0.245957, 0.656144, 0.950000, 0.050000, 0.000000, 0.000000, 6.000000, 10.000000, 0.000000, 0.000000, - -2.639300, -4.583490, 76.677292, 0.041638, 0.825547, 0.562796, 0.240813, 0.643563, 0.800000, 0.200000, 0.000000, 0.000000, 6.000000, 10.000000, 0.000000, 0.000000, - -2.639300, -4.583490, 76.677292, 0.175966, 0.851315, 0.494266, 0.240813, 0.643563, 0.800000, 0.200000, 0.000000, 0.000000, 6.000000, 10.000000, 0.000000, 0.000000, - -3.659390, -6.982690, 81.172798, 0.175966, 0.851315, 0.494266, 0.267528, 0.637728, 0.850000, 0.150000, 0.000000, 0.000000, 6.000000, 10.000000, 0.000000, 0.000000, - 0.000000, -7.496690, 80.755302, 0.175966, 0.851315, 0.494266, 0.266121, 0.656252, 1.000000, 0.000000, 0.000000, 0.000000, 6.000000, 0.000000, 0.000000, 0.000000, - -2.639300, -4.583490, 76.677292, -0.072021, 0.406765, 0.910690, 0.240813, 0.643563, 0.800000, 0.200000, 0.000000, 0.000000, 6.000000, 10.000000, 0.000000, 0.000000, - 0.000000, -4.979480, 77.062889, -0.072021, 0.406765, 0.910690, 0.245957, 0.656144, 0.950000, 0.050000, 0.000000, 0.000000, 6.000000, 10.000000, 0.000000, 0.000000, - 0.000000, 1.066090, 74.362602, -0.072021, 0.406765, 0.910690, 0.216407, 0.668004, 0.900000, 0.100000, 0.000000, 0.000000, 6.000000, 10.000000, 0.000000, 0.000000, - 0.000000, 1.066090, 74.362602, -0.007995, 0.382307, 0.924001, 0.216407, 0.668004, 0.900000, 0.100000, 0.000000, 0.000000, 6.000000, 10.000000, 0.000000, 0.000000, - -1.526690, 1.231190, 74.281082, -0.007995, 0.382307, 0.924001, 0.213184, 0.661578, 0.600000, 0.400000, 0.000000, 0.000000, 6.000000, 10.000000, 0.000000, 0.000000, - -2.639300, -4.583490, 76.677292, -0.007995, 0.382307, 0.924001, 0.240813, 0.643563, 0.800000, 0.200000, 0.000000, 0.000000, 6.000000, 10.000000, 0.000000, 0.000000, - 0.000000, 1.066090, 74.362602, -0.287405, -0.483650, 0.826729, 0.383516, 0.434691, 0.900000, 0.100000, 0.000000, 0.000000, 6.000000, 10.000000, 0.000000, 0.000000, - 0.000000, 7.529490, 78.143791, -0.287405, -0.483650, 0.826729, 0.379610, 0.472345, 0.539465, 0.153631, 0.153631, 0.153273, 6.000000, 10.000000, 9.000000, 8.000000, - -3.078590, 7.203090, 76.882599, -0.287405, -0.483650, 0.826729, 0.364065, 0.465636, 0.800000, 0.200000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -3.078590, 7.203090, 76.882599, -0.093449, -0.417940, 0.903655, 0.364065, 0.465636, 0.800000, 0.200000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -1.526690, 1.231190, 74.281082, -0.093449, -0.417940, 0.903655, 0.375780, 0.434234, 0.600000, 0.400000, 0.000000, 0.000000, 6.000000, 10.000000, 0.000000, 0.000000, - 0.000000, 1.066090, 74.362602, -0.093449, -0.417940, 0.903655, 0.383516, 0.434691, 0.900000, 0.100000, 0.000000, 0.000000, 6.000000, 10.000000, 0.000000, 0.000000, - -3.078590, 7.203090, 76.882599, -0.316173, -0.378770, 0.869809, 0.364065, 0.465636, 0.800000, 0.200000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - 0.000000, 7.529490, 78.143791, -0.316173, -0.378769, 0.869809, 0.379610, 0.472345, 0.539465, 0.153631, 0.153631, 0.153273, 6.000000, 10.000000, 9.000000, 8.000000, - 0.000000, 10.504280, 79.439201, -0.316173, -0.378769, 0.869809, 0.376676, 0.489425, 0.445398, 0.363990, 0.095306, 0.095306, 8.000000, 6.000000, 9.000000, 10.000000, - 0.000000, 10.504280, 79.439201, -0.250520, -0.435846, 0.864452, 0.376676, 0.489425, 0.445398, 0.363990, 0.095306, 0.095306, 8.000000, 6.000000, 9.000000, 10.000000, - -4.300280, 13.359590, 79.632584, -0.250520, -0.435846, 0.864452, 0.353286, 0.498103, 0.850000, 0.150000, 0.000000, 0.000000, 6.000000, 10.000000, 0.000000, 0.000000, - -3.078590, 7.203090, 76.882599, -0.250520, -0.435846, 0.864452, 0.364065, 0.465636, 0.800000, 0.200000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -4.300280, 13.359590, 79.632584, -0.522386, -0.805665, 0.279315, 0.353286, 0.498103, 0.850000, 0.150000, 0.000000, 0.000000, 6.000000, 10.000000, 0.000000, 0.000000, - 0.000000, 10.504280, 79.439201, -0.522386, -0.805665, 0.279315, 0.376676, 0.489425, 0.445398, 0.363990, 0.095306, 0.095306, 8.000000, 6.000000, 9.000000, 10.000000, - 0.000000, 11.878000, 83.401604, -0.522386, -0.805665, 0.279315, 0.381646, 0.509014, 0.617984, 0.254734, 0.063641, 0.063641, 8.000000, 6.000000, 9.000000, 10.000000, - 0.000000, 11.878000, 83.401604, 0.068867, -0.899215, -0.432052, 0.381646, 0.509014, 0.617984, 0.254734, 0.063641, 0.063641, 8.000000, 6.000000, 9.000000, 10.000000, - -5.276800, 11.467100, 83.415703, 0.068867, -0.899215, -0.432052, 0.357475, 0.519003, 1.000000, 0.000000, 0.000000, 0.000000, 6.000000, 0.000000, 0.000000, 0.000000, - -4.300280, 13.359590, 79.632584, 0.068867, -0.899215, -0.432052, 0.353286, 0.498103, 0.850000, 0.150000, 0.000000, 0.000000, 6.000000, 10.000000, 0.000000, 0.000000, - -5.276800, 11.467100, 83.415703, 0.077567, -0.996793, -0.019659, 0.357475, 0.519003, 1.000000, 0.000000, 0.000000, 0.000000, 6.000000, 0.000000, 0.000000, 0.000000, - 0.000000, 11.878000, 83.401604, 0.077567, -0.996793, -0.019659, 0.381646, 0.509014, 0.617984, 0.254734, 0.063641, 0.063641, 8.000000, 6.000000, 9.000000, 10.000000, - 0.000000, 11.811300, 86.783600, 0.077567, -0.996793, -0.019659, 0.388713, 0.525234, 0.716619, 0.194051, 0.044665, 0.044665, 8.000000, 6.000000, 9.000000, 10.000000, - 0.000000, 11.811300, 86.783600, 0.191345, -0.960590, -0.201626, 0.388713, 0.525234, 0.716619, 0.194051, 0.044665, 0.044665, 8.000000, 6.000000, 9.000000, 10.000000, - -7.135800, 10.410180, 86.686890, 0.191345, -0.960590, -0.201626, 0.355142, 0.538989, 1.000000, 0.000000, 0.000000, 0.000000, 6.000000, 0.000000, 0.000000, 0.000000, - -5.276800, 11.467100, 83.415703, 0.191345, -0.960590, -0.201626, 0.357475, 0.519003, 1.000000, 0.000000, 0.000000, 0.000000, 6.000000, 0.000000, 0.000000, 0.000000, - -12.658590, -1.294000, 84.448189, 0.824791, 0.096044, -0.557222, 0.297581, 0.585244, 1.000000, 0.000000, 0.000000, 0.000000, 6.000000, 0.000000, 0.000000, 0.000000, - -15.044500, -1.294000, 80.916603, 0.824791, 0.096044, -0.557222, 0.280829, 0.572128, 0.652963, 0.347037, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -15.051400, 6.219900, 82.201500, 0.824791, 0.096044, -0.557222, 0.306191, 0.545226, 0.406329, 0.331289, 0.262070, 0.000313, 6.000000, 26.000000, 10.000000, 5.000000, - -15.051400, 6.219900, 82.201500, 0.896286, 0.161983, -0.412836, 0.306191, 0.545226, 0.406329, 0.331289, 0.262070, 0.000313, 6.000000, 26.000000, 10.000000, 5.000000, - -13.304900, 5.546700, 85.729088, 0.896286, 0.161983, -0.412836, 0.320408, 0.558146, 1.000000, 0.000000, 0.000000, 0.000000, 6.000000, 0.000000, 0.000000, 0.000000, - -12.658590, -1.294000, 84.448189, 0.896286, 0.161983, -0.412836, 0.297581, 0.585244, 1.000000, 0.000000, 0.000000, 0.000000, 6.000000, 0.000000, 0.000000, 0.000000, - -15.044500, -1.294000, 80.916603, 0.950078, -0.001491, -0.312010, 0.280829, 0.572128, 0.652963, 0.347037, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -16.610600, -1.294000, 76.147789, 0.950078, -0.001491, -0.312010, 0.260250, 0.558061, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -16.522690, 6.528200, 76.378090, 0.950078, -0.001491, -0.312010, 0.283100, 0.526295, 0.870182, 0.129818, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -16.522690, 6.528200, 76.378090, 0.969194, 0.042379, -0.242624, 0.283100, 0.526295, 0.870182, 0.129818, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -15.051400, 6.219900, 82.201500, 0.969194, 0.042379, -0.242624, 0.306191, 0.545226, 0.406329, 0.331289, 0.262070, 0.000313, 6.000000, 26.000000, 10.000000, 5.000000, - -15.044500, -1.294000, 80.916603, 0.969194, 0.042379, -0.242624, 0.280829, 0.572128, 0.652963, 0.347037, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -16.522690, 6.528200, 76.378090, 0.985404, -0.006066, -0.170123, 0.283100, 0.526295, 0.870182, 0.129818, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -16.610600, -1.294000, 76.147789, 0.985404, -0.006066, -0.170123, 0.260250, 0.558061, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -17.137100, -0.829690, 73.081589, 0.985404, -0.006066, -0.170123, 0.248114, 0.548130, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -17.137100, -0.829690, 73.081589, 0.953325, 0.053530, -0.297164, 0.248114, 0.548130, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -17.652889, 6.494200, 72.746201, 0.953325, 0.053530, -0.297164, 0.267614, 0.514864, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -16.522690, 6.528200, 76.378090, 0.953325, 0.053530, -0.297164, 0.283100, 0.526295, 0.870182, 0.129818, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -1.526690, 1.231190, 74.281082, -0.972240, -0.225589, -0.062127, 0.375780, 0.434234, 0.600000, 0.400000, 0.000000, 0.000000, 6.000000, 10.000000, 0.000000, 0.000000, - -3.078590, 7.203090, 76.882599, -0.972240, -0.225589, -0.062127, 0.364065, 0.465636, 0.800000, 0.200000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -2.878090, 7.203090, 73.744904, -0.972240, -0.225589, -0.062127, 0.352737, 0.454505, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -2.878090, 7.203090, 73.744904, -0.911918, -0.172948, 0.372148, 0.352737, 0.454505, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -2.168290, 1.231190, 72.708893, -0.911918, -0.172948, 0.372148, 0.369099, 0.428976, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -1.526690, 1.231190, 74.281082, -0.911918, -0.172948, 0.372148, 0.375780, 0.434234, 0.600000, 0.400000, 0.000000, 0.000000, 6.000000, 10.000000, 0.000000, 0.000000, - -2.168290, 1.231190, 72.708893, -0.933816, -0.165971, 0.316925, 0.369099, 0.428976, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -2.878090, 7.203090, 73.744904, -0.933816, -0.165971, 0.316925, 0.352737, 0.454505, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -3.767200, 7.204690, 71.125992, -0.933816, -0.165971, 0.316925, 0.341444, 0.446219, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -3.767200, 7.204690, 71.125992, -0.941509, -0.175833, 0.287479, 0.341444, 0.446219, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -2.850500, 1.233270, 70.475891, -0.941509, -0.175833, 0.287479, 0.359898, 0.421436, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -2.168290, 1.231190, 72.708893, -0.941509, -0.175833, 0.287479, 0.369099, 0.428976, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -12.658590, -1.294000, 84.448189, 0.551921, 0.681213, -0.480970, 0.297581, 0.585244, 1.000000, 0.000000, 0.000000, 0.000000, 6.000000, 0.000000, 0.000000, 0.000000, - -7.102380, -6.574490, 83.345100, 0.551921, 0.681213, -0.480970, 0.281096, 0.621323, 1.000000, 0.000000, 0.000000, 0.000000, 6.000000, 0.000000, 0.000000, 0.000000, - -10.359380, -6.548400, 79.644592, 0.551921, 0.681213, -0.480970, 0.263824, 0.603145, 0.544761, 0.455239, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -10.359380, -6.548400, 79.644592, 0.623797, 0.658235, -0.421432, 0.263824, 0.603145, 0.544761, 0.455239, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -15.044500, -1.294000, 80.916603, 0.623797, 0.658235, -0.421432, 0.280829, 0.572128, 0.652963, 0.347037, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -12.658590, -1.294000, 84.448189, 0.623797, 0.658235, -0.421432, 0.297581, 0.585244, 1.000000, 0.000000, 0.000000, 0.000000, 6.000000, 0.000000, 0.000000, 0.000000, - -7.102380, -6.574490, 83.345100, 0.147122, 0.987976, 0.047530, 0.281096, 0.621323, 1.000000, 0.000000, 0.000000, 0.000000, 6.000000, 0.000000, 0.000000, 0.000000, - -3.659390, -6.982690, 81.172798, 0.147122, 0.987976, 0.047530, 0.267528, 0.637728, 0.850000, 0.150000, 0.000000, 0.000000, 6.000000, 10.000000, 0.000000, 0.000000, - -4.759800, -6.652100, 77.707199, 0.147122, 0.987976, 0.047530, 0.250454, 0.630078, 0.540601, 0.459399, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -4.759800, -6.652100, 77.707199, 0.016064, 0.999846, -0.007089, 0.250454, 0.630078, 0.540601, 0.459399, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -10.359380, -6.548400, 79.644592, 0.016064, 0.999846, -0.007089, 0.263824, 0.603145, 0.544761, 0.455239, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -7.102380, -6.574490, 83.345100, 0.016064, 0.999846, -0.007089, 0.281096, 0.621323, 1.000000, 0.000000, 0.000000, 0.000000, 6.000000, 0.000000, 0.000000, 0.000000, - -3.659390, -6.982690, 81.172798, -0.604886, 0.751368, 0.263740, 0.267528, 0.637728, 0.850000, 0.150000, 0.000000, 0.000000, 6.000000, 10.000000, 0.000000, 0.000000, - -2.639300, -4.583490, 76.677292, -0.604886, 0.751368, 0.263740, 0.240813, 0.643563, 0.800000, 0.200000, 0.000000, 0.000000, 6.000000, 10.000000, 0.000000, 0.000000, - -4.759800, -6.652100, 77.707199, -0.604886, 0.751368, 0.263740, 0.250454, 0.630078, 0.540601, 0.459399, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -10.359380, -6.548400, 79.644592, 0.043630, 0.996394, 0.072771, 0.263824, 0.603145, 0.544761, 0.455239, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -4.759800, -6.652100, 77.707199, 0.043630, 0.996394, 0.072771, 0.250454, 0.630078, 0.540601, 0.459399, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -5.661900, -6.311990, 73.591202, 0.043630, 0.996394, 0.072771, 0.230457, 0.622279, 0.850000, 0.150000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -5.661900, -6.311990, 73.591202, 0.116322, 0.984834, 0.128728, 0.230457, 0.622279, 0.850000, 0.150000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -12.701390, -5.694820, 75.230591, 0.116322, 0.984834, 0.128728, 0.243271, 0.588549, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -10.359380, -6.548400, 79.644592, 0.116322, 0.984834, 0.128728, 0.263824, 0.603145, 0.544761, 0.455239, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -12.701390, -5.694820, 75.230591, 0.078803, 0.996216, -0.036662, 0.243271, 0.588549, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -5.661900, -6.311990, 73.591202, 0.078803, 0.996216, -0.036662, 0.230457, 0.622279, 0.850000, 0.150000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -6.719700, -6.325500, 70.950401, 0.078803, 0.996216, -0.036662, 0.218362, 0.614238, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -6.719700, -6.325500, 70.950401, 0.093175, 0.995514, -0.016473, 0.218362, 0.614238, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -13.376090, -5.677410, 72.466583, 0.093175, 0.995514, -0.016473, 0.230742, 0.582084, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -12.701390, -5.694820, 75.230591, 0.093175, 0.995513, -0.016473, 0.243271, 0.588549, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -5.276800, 11.467100, 83.415703, 0.166657, -0.962037, -0.216124, 0.357475, 0.519003, 1.000000, 0.000000, 0.000000, 0.000000, 6.000000, 0.000000, 0.000000, 0.000000, - -7.135800, 10.410180, 86.686890, 0.166657, -0.962037, -0.216124, 0.355142, 0.538989, 1.000000, 0.000000, 0.000000, 0.000000, 6.000000, 0.000000, 0.000000, 0.000000, - -9.960800, 10.779800, 82.863190, 0.166657, -0.962037, -0.216124, 0.334718, 0.527421, 0.443982, 0.428812, 0.126630, 0.000576, 6.000000, 10.000000, 8.000000, 12.000000, - -13.304900, 5.546700, 85.729088, 0.631463, -0.641815, -0.435119, 0.320408, 0.558146, 1.000000, 0.000000, 0.000000, 0.000000, 6.000000, 0.000000, 0.000000, 0.000000, - -15.051400, 6.219900, 82.201500, 0.631463, -0.641815, -0.435119, 0.306191, 0.545226, 0.406329, 0.331289, 0.262070, 0.000313, 6.000000, 26.000000, 10.000000, 5.000000, - -9.960800, 10.779800, 82.863190, 0.631463, -0.641815, -0.435119, 0.334718, 0.527421, 0.443982, 0.428812, 0.126630, 0.000576, 6.000000, 10.000000, 8.000000, 12.000000, - -9.960800, 10.779800, 82.863190, 0.584312, -0.643897, -0.493940, 0.334718, 0.527421, 0.443982, 0.428812, 0.126630, 0.000576, 6.000000, 10.000000, 8.000000, 12.000000, - -7.135800, 10.410180, 86.686890, 0.584312, -0.643897, -0.493940, 0.355142, 0.538989, 1.000000, 0.000000, 0.000000, 0.000000, 6.000000, 0.000000, 0.000000, 0.000000, - -13.304900, 5.546700, 85.729088, 0.584312, -0.643897, -0.493940, 0.320408, 0.558146, 1.000000, 0.000000, 0.000000, 0.000000, 6.000000, 0.000000, 0.000000, 0.000000, - -5.276800, 11.467100, 83.415703, 0.179215, -0.897591, -0.402756, 0.357475, 0.519003, 1.000000, 0.000000, 0.000000, 0.000000, 6.000000, 0.000000, 0.000000, 0.000000, - -9.960800, 10.779800, 82.863190, 0.179215, -0.897591, -0.402756, 0.334718, 0.527421, 0.443982, 0.428812, 0.126630, 0.000576, 6.000000, 10.000000, 8.000000, 12.000000, - -4.300280, 13.359590, 79.632584, 0.179215, -0.897591, -0.402756, 0.353286, 0.498103, 0.850000, 0.150000, 0.000000, 0.000000, 6.000000, 10.000000, 0.000000, 0.000000, - -9.960800, 10.779800, 82.863190, 0.068626, -0.953024, -0.295018, 0.334718, 0.527421, 0.443982, 0.428812, 0.126630, 0.000576, 6.000000, 10.000000, 8.000000, 12.000000, - -12.881980, 12.562390, 76.425201, 0.068626, -0.953024, -0.295018, 0.308304, 0.503217, 0.572119, 0.379365, 0.039371, 0.009145, 10.000000, 6.000000, 8.000000, 12.000000, - -6.484800, 13.491690, 74.911293, 0.068626, -0.953024, -0.295018, 0.332375, 0.483405, 0.650000, 0.350000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -6.484800, 13.491690, 74.911293, 0.323480, -0.929782, -0.175688, 0.332375, 0.483405, 0.650000, 0.350000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -4.300280, 13.359590, 79.632584, 0.323480, -0.929782, -0.175688, 0.353286, 0.498103, 0.850000, 0.150000, 0.000000, 0.000000, 6.000000, 10.000000, 0.000000, 0.000000, - -9.960800, 10.779800, 82.863190, 0.323480, -0.929782, -0.175688, 0.334718, 0.527421, 0.443982, 0.428812, 0.126630, 0.000576, 6.000000, 10.000000, 8.000000, 12.000000, - -12.881980, 12.562390, 76.425201, 0.105487, -0.970138, 0.218416, 0.308304, 0.503217, 0.572119, 0.379365, 0.039371, 0.009145, 10.000000, 6.000000, 8.000000, 12.000000, - -13.855600, 11.535090, 72.332474, 0.105487, -0.970138, 0.218416, 0.291815, 0.490252, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -8.501090, 11.866100, 71.216690, 0.105487, -0.970138, 0.218416, 0.315058, 0.469632, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -8.501090, 11.866100, 71.216690, 0.205885, -0.932167, 0.297785, 0.315058, 0.469632, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -6.484800, 13.491690, 74.911293, 0.205885, -0.932167, 0.297785, 0.332375, 0.483405, 0.650000, 0.350000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -12.881980, 12.562390, 76.425201, 0.205885, -0.932167, 0.297785, 0.308304, 0.503217, 0.572119, 0.379365, 0.039371, 0.009145, 10.000000, 6.000000, 8.000000, 12.000000, - -4.759800, -6.652100, 77.707199, -0.632506, 0.748169, 0.200448, 0.250454, 0.630078, 0.540601, 0.459399, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -2.639300, -4.583490, 76.677292, -0.632506, 0.748169, 0.200448, 0.240813, 0.643563, 0.800000, 0.200000, 0.000000, 0.000000, 6.000000, 10.000000, 0.000000, 0.000000, - -5.661900, -6.311990, 73.591202, -0.632506, 0.748169, 0.200448, 0.230457, 0.622279, 0.850000, 0.150000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -2.639300, -4.583490, 76.677292, -0.878480, 0.315830, 0.358502, 0.240813, 0.643563, 0.800000, 0.200000, 0.000000, 0.000000, 6.000000, 10.000000, 0.000000, 0.000000, - -1.526690, 1.231190, 74.281082, -0.878480, 0.315830, 0.358502, 0.213184, 0.661578, 0.600000, 0.400000, 0.000000, 0.000000, 6.000000, 10.000000, 0.000000, 0.000000, - -2.168290, 1.231190, 72.708893, -0.878480, 0.315830, 0.358502, 0.207032, 0.657052, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -2.168290, 1.231190, 72.708893, -0.755798, 0.409785, 0.510731, 0.207032, 0.657052, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -5.661900, -6.311990, 73.591202, -0.755798, 0.409785, 0.510731, 0.230457, 0.622279, 0.850000, 0.150000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -2.639300, -4.583490, 76.677292, -0.755798, 0.409785, 0.510731, 0.240813, 0.643563, 0.800000, 0.200000, 0.000000, 0.000000, 6.000000, 10.000000, 0.000000, 0.000000, - -5.661900, -6.311990, 73.591202, -0.863044, 0.430605, 0.264072, 0.230457, 0.622279, 0.850000, 0.150000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -2.168290, 1.231190, 72.708893, -0.863044, 0.430605, 0.264072, 0.207032, 0.657052, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -2.850500, 1.233270, 70.475891, -0.863044, 0.430605, 0.264072, 0.197384, 0.650764, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -2.850500, 1.233270, 70.475891, -0.831468, 0.446378, 0.330769, 0.197384, 0.650764, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -6.719700, -6.325500, 70.950401, -0.831468, 0.446378, 0.330769, 0.218362, 0.614238, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -5.661900, -6.311990, 73.591202, -0.831468, 0.446378, 0.330769, 0.230457, 0.622279, 0.850000, 0.150000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -12.701390, -5.694820, 75.230591, 0.703042, 0.672625, -0.230882, 0.243271, 0.588549, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -16.610600, -1.294000, 76.147789, 0.703042, 0.672625, -0.230882, 0.260250, 0.558061, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -15.044500, -1.294000, 80.916603, 0.703042, 0.672626, -0.230882, 0.280829, 0.572128, 0.652963, 0.347037, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -15.044500, -1.294000, 80.916603, 0.695606, 0.677857, -0.237995, 0.280829, 0.572128, 0.652963, 0.347037, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -10.359380, -6.548400, 79.644592, 0.695606, 0.677857, -0.237995, 0.263824, 0.603145, 0.544761, 0.455239, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -12.701390, -5.694820, 75.230591, 0.695606, 0.677857, -0.237995, 0.243271, 0.588549, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -13.376090, -5.677410, 72.466583, 0.786825, 0.615754, -0.041864, 0.230742, 0.582084, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -17.137100, -0.829690, 73.081589, 0.786825, 0.615754, -0.041864, 0.248114, 0.548130, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -16.610600, -1.294000, 76.147789, 0.786825, 0.615754, -0.041864, 0.260250, 0.558061, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -16.610600, -1.294000, 76.147789, 0.718615, 0.674013, -0.171170, 0.260250, 0.558061, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -12.701390, -5.694820, 75.230591, 0.718615, 0.674013, -0.171170, 0.243271, 0.588549, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -13.376090, -5.677410, 72.466583, 0.718615, 0.674013, -0.171170, 0.230742, 0.582084, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -12.881980, 12.562390, 76.425201, 0.625259, -0.631488, -0.458556, 0.308304, 0.503217, 0.572119, 0.379365, 0.039371, 0.009145, 10.000000, 6.000000, 8.000000, 12.000000, - -9.960800, 10.779800, 82.863190, 0.625259, -0.631488, -0.458556, 0.334718, 0.527421, 0.443982, 0.428812, 0.126630, 0.000576, 6.000000, 10.000000, 8.000000, 12.000000, - -15.051400, 6.219900, 82.201500, 0.625259, -0.631488, -0.458556, 0.306191, 0.545226, 0.406329, 0.331289, 0.262070, 0.000313, 6.000000, 26.000000, 10.000000, 5.000000, - -15.051400, 6.219900, 82.201500, 0.832675, -0.500542, -0.236875, 0.306191, 0.545226, 0.406329, 0.331289, 0.262070, 0.000313, 6.000000, 26.000000, 10.000000, 5.000000, - -16.522690, 6.528200, 76.378090, 0.832675, -0.500542, -0.236875, 0.283100, 0.526295, 0.870182, 0.129818, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -12.881980, 12.562390, 76.425201, 0.832675, -0.500542, -0.236875, 0.308304, 0.503217, 0.572119, 0.379365, 0.039371, 0.009145, 10.000000, 6.000000, 8.000000, 12.000000, - -13.855600, 11.535090, 72.332474, 0.854135, -0.514762, -0.073982, 0.291815, 0.490252, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -12.881980, 12.562390, 76.425201, 0.854135, -0.514762, -0.073982, 0.308304, 0.503217, 0.572119, 0.379365, 0.039371, 0.009145, 10.000000, 6.000000, 8.000000, 12.000000, - -16.522690, 6.528200, 76.378090, 0.854135, -0.514762, -0.073982, 0.283100, 0.526295, 0.870182, 0.129818, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -16.522690, 6.528200, 76.378090, 0.767413, -0.597232, -0.233219, 0.283100, 0.526295, 0.870182, 0.129818, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -17.652889, 6.494200, 72.746201, 0.767413, -0.597232, -0.233219, 0.267614, 0.514864, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -13.855600, 11.535090, 72.332474, 0.767413, -0.597232, -0.233219, 0.291815, 0.490252, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -3.078590, 7.203090, 76.882599, -0.856252, -0.342599, 0.386598, 0.364065, 0.465636, 0.800000, 0.200000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -4.300280, 13.359590, 79.632584, -0.856252, -0.342600, 0.386598, 0.353286, 0.498103, 0.850000, 0.150000, 0.000000, 0.000000, 6.000000, 10.000000, 0.000000, 0.000000, - -6.484800, 13.491690, 74.911293, -0.856252, -0.342599, 0.386598, 0.332375, 0.483405, 0.650000, 0.350000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -6.484800, 13.491690, 74.911293, -0.870531, -0.488959, -0.055627, 0.332375, 0.483405, 0.650000, 0.350000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -2.878090, 7.203090, 73.744904, -0.870531, -0.488959, -0.055627, 0.352737, 0.454505, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -3.078590, 7.203090, 76.882599, -0.870531, -0.488959, -0.055627, 0.364065, 0.465636, 0.800000, 0.200000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -2.878090, 7.203090, 73.744904, -0.660102, -0.484985, 0.573633, 0.352737, 0.454505, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -6.484800, 13.491690, 74.911293, -0.660102, -0.484985, 0.573633, 0.332375, 0.483405, 0.650000, 0.350000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -8.501090, 11.866100, 71.216690, -0.660102, -0.484985, 0.573633, 0.315058, 0.469632, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -8.501090, 11.866100, 71.216690, -0.680475, -0.695543, 0.230594, 0.315058, 0.469632, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -3.767200, 7.204690, 71.125992, -0.680475, -0.695543, 0.230594, 0.341444, 0.446219, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -2.878090, 7.203090, 73.744904, -0.680475, -0.695543, 0.230594, 0.352737, 0.454505, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -7.008690, 3.943900, 105.614403, 0.974598, -0.052251, 0.217781, 0.408847, 0.613878, 0.875410, 0.090885, 0.033705, 0.000000, 7.000000, 2.000000, 5.000000, 0.000000, - -7.364390, -1.351990, 105.935593, 0.974598, -0.052251, 0.217781, 0.401270, 0.638861, 0.937523, 0.047160, 0.015317, 0.000000, 7.000000, 2.000000, 5.000000, 0.000000, - -6.862280, -1.351990, 103.688591, 0.974598, -0.052251, 0.217782, 0.390142, 0.635499, 0.916197, 0.079688, 0.004115, 0.000000, 7.000000, 5.000000, 2.000000, 0.000000, - -6.862280, -1.351990, 103.688591, 0.974589, -0.052265, 0.217818, 0.390142, 0.635499, 0.916197, 0.079688, 0.004115, 0.000000, 7.000000, 5.000000, 2.000000, 0.000000, - -6.506490, 3.943900, 103.367401, 0.974589, -0.052265, 0.217818, 0.398194, 0.610122, 0.847942, 0.138720, 0.013338, 0.000000, 7.000000, 5.000000, 2.000000, 0.000000, - -7.008690, 3.943900, 105.614403, 0.974589, -0.052265, 0.217818, 0.408847, 0.613878, 0.875410, 0.090885, 0.033705, 0.000000, 7.000000, 2.000000, 5.000000, 0.000000, - 0.000000, -6.053500, 106.521500, 0.251518, 0.967853, 0.000000, 0.387454, 0.682907, 0.992731, 0.007269, 0.000000, 0.000000, 7.000000, 2.000000, 0.000000, 0.000000, - 0.000000, -6.053500, 104.274391, 0.251518, 0.967853, 0.000000, 0.377315, 0.678638, 0.981149, 0.018851, 0.000000, 0.000000, 7.000000, 5.000000, 0.000000, 0.000000, - -4.437190, -4.900400, 103.960289, 0.251518, 0.967853, 0.000000, 0.383721, 0.656332, 0.955715, 0.044285, 0.000000, 0.000000, 7.000000, 5.000000, 0.000000, 0.000000, - -4.437190, -4.900400, 103.960289, 0.205968, 0.975102, 0.082177, 0.383721, 0.656332, 0.955715, 0.044285, 0.000000, 0.000000, 7.000000, 5.000000, 0.000000, 0.000000, - -5.333700, -4.900400, 106.207291, 0.205968, 0.975102, 0.082177, 0.395899, 0.657461, 0.982096, 0.016358, 0.001546, 0.000000, 7.000000, 2.000000, 5.000000, 0.000000, - 0.000000, -6.053500, 106.521500, 0.205968, 0.975102, 0.082177, 0.387454, 0.682907, 0.992731, 0.007269, 0.000000, 0.000000, 7.000000, 2.000000, 0.000000, 0.000000, - -5.333700, -4.900400, 106.207291, 0.774066, 0.552667, 0.308837, 0.395899, 0.657461, 0.982096, 0.016358, 0.001546, 0.000000, 7.000000, 2.000000, 5.000000, 0.000000, - -4.437190, -4.900400, 103.960289, 0.774066, 0.552667, 0.308837, 0.383721, 0.656332, 0.955715, 0.044285, 0.000000, 0.000000, 7.000000, 5.000000, 0.000000, 0.000000, - -6.862280, -1.351990, 103.688591, 0.774066, 0.552667, 0.308837, 0.390142, 0.635499, 0.916197, 0.079688, 0.004115, 0.000000, 7.000000, 5.000000, 2.000000, 0.000000, - -6.862280, -1.351990, 103.688591, 0.845966, 0.498605, 0.189038, 0.390142, 0.635499, 0.916197, 0.079688, 0.004115, 0.000000, 7.000000, 5.000000, 2.000000, 0.000000, - -7.364390, -1.351990, 105.935593, 0.845966, 0.498605, 0.189038, 0.401270, 0.638861, 0.937523, 0.047160, 0.015317, 0.000000, 7.000000, 2.000000, 5.000000, 0.000000, - -5.333700, -4.900400, 106.207291, 0.845966, 0.498605, 0.189038, 0.395899, 0.657461, 0.982096, 0.016358, 0.001546, 0.000000, 7.000000, 2.000000, 5.000000, 0.000000, - -17.877800, -1.258700, 75.823189, -0.394610, -0.020093, -0.918629, 0.899786, 0.613617, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -18.451200, 6.883800, 75.891403, -0.394610, -0.020093, -0.918629, 0.897084, 0.575074, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -17.652889, 6.494200, 75.556999, -0.394610, -0.020093, -0.918629, 0.909836, 0.574199, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -17.652889, 6.494200, 75.556999, -0.606503, -0.009702, -0.795022, 0.909836, 0.574199, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -17.137100, -0.829690, 75.252892, -0.606503, -0.009702, -0.795022, 0.912541, 0.612718, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -17.877800, -1.258700, 75.823189, -0.606503, -0.009702, -0.795022, 0.899786, 0.613617, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -2.749990, 7.673690, 72.840889, -0.382490, 0.027522, -0.923550, 0.890527, 0.478184, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -1.482190, 1.034780, 72.117989, -0.382490, 0.027522, -0.923550, 0.888452, 0.446461, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -2.338390, 1.233270, 72.478500, -0.382490, 0.027522, -0.923550, 0.901032, 0.445773, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -2.338390, 1.233270, 72.478500, -0.204696, 0.041944, -0.977927, 0.901032, 0.445773, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -3.767200, 7.204690, 73.033691, -0.204696, 0.041944, -0.977927, 0.903204, 0.477681, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -2.749990, 7.673690, 72.840889, -0.204696, 0.041944, -0.977927, 0.890527, 0.478184, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -6.295990, -7.368800, 72.814392, -0.205954, 0.175731, -0.962653, 0.905099, 0.688952, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -13.696390, -6.808221, 74.500000, -0.205954, 0.175731, -0.962653, 0.902481, 0.652546, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -13.376090, -5.677411, 74.637901, -0.205954, 0.175731, -0.962653, 0.915249, 0.651636, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -13.376090, -5.677411, 74.637901, -0.198782, 0.201851, -0.959032, 0.915249, 0.651636, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -6.719700, -6.325500, 73.121803, -0.198782, 0.201851, -0.959032, 0.917831, 0.687968, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -6.295990, -7.368800, 72.814392, -0.198782, 0.201851, -0.959032, 0.905099, 0.688952, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -14.229600, 12.488200, 74.350899, -0.185300, -0.226102, -0.956317, 0.894655, 0.541284, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -8.276480, 12.856200, 73.110390, -0.185300, -0.226102, -0.956317, 0.892671, 0.512240, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -8.501090, 11.866100, 73.388000, -0.185300, -0.226102, -0.956317, 0.905455, 0.511556, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -8.501090, 11.866100, 73.388000, -0.185302, -0.226126, -0.956311, 0.905455, 0.511556, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -13.855600, 11.535090, 74.503799, -0.185302, -0.226127, -0.956311, 0.907461, 0.540604, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -14.229600, 12.488200, 74.350899, -0.185302, -0.226127, -0.956311, 0.894655, 0.541284, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -1.482190, 1.034780, 72.117989, -0.356864, 0.127735, -0.925382, 0.908476, 0.732975, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -6.295990, -7.368800, 72.814392, -0.356864, 0.127735, -0.925382, 0.905099, 0.688952, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -6.719700, -6.325500, 73.121803, -0.356864, 0.127735, -0.925382, 0.917831, 0.687968, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -6.719700, -6.325500, 73.121803, -0.359142, 0.129510, -0.924253, 0.917831, 0.687968, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -2.338390, 1.233270, 72.478500, -0.359142, 0.129510, -0.924253, 0.921039, 0.731952, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -1.482190, 1.034780, 72.117989, -0.359142, 0.129510, -0.924253, 0.908476, 0.732975, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -17.877800, -1.258700, 75.823189, -0.484265, -0.270137, -0.832174, 0.899786, 0.613617, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -17.137100, -0.829690, 75.252892, -0.484265, -0.270137, -0.832174, 0.912541, 0.612718, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -13.376090, -5.677411, 74.637901, -0.484265, -0.270137, -0.832174, 0.915249, 0.651636, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -13.376090, -5.677411, 74.637901, -0.110374, 0.151059, -0.982343, 0.915249, 0.651636, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -13.696390, -6.808221, 74.500000, -0.110374, 0.151059, -0.982343, 0.902481, 0.652546, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -17.877800, -1.258700, 75.823189, -0.110374, 0.151059, -0.982343, 0.899786, 0.613617, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -18.451200, 6.883800, 75.891403, -0.097500, -0.194828, -0.975979, 0.897084, 0.575074, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -14.229600, 12.488200, 74.350899, -0.097500, -0.194828, -0.975979, 0.894655, 0.541284, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -13.855600, 11.535090, 74.503799, -0.097500, -0.194828, -0.975979, 0.907461, 0.540604, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -13.855600, 11.535090, 74.503799, -0.354966, 0.072660, -0.932051, 0.907461, 0.540604, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -17.652889, 6.494200, 75.556999, -0.354966, 0.072660, -0.932051, 0.909836, 0.574199, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -18.451200, 6.883800, 75.891403, -0.354966, 0.072660, -0.932051, 0.897084, 0.575074, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -2.749990, 7.673690, 72.840889, -0.150742, -0.078180, -0.985477, 0.890527, 0.478184, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -3.767200, 7.204690, 73.033691, -0.150742, -0.078180, -0.985477, 0.903204, 0.477681, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -8.501090, 11.866100, 73.388000, -0.150742, -0.078180, -0.985477, 0.905455, 0.511556, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -8.501090, 11.866100, 73.388000, -0.243366, -0.210280, -0.946866, 0.905455, 0.511556, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -8.276480, 12.856200, 73.110390, -0.243366, -0.210280, -0.946866, 0.892671, 0.512240, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -2.749990, 7.673690, 72.840889, -0.243366, -0.210280, -0.946866, 0.890527, 0.478184, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -19.026779, 6.883800, 71.279800, 0.989815, 0.070738, -0.123540, 0.864165, 0.577387, 1.000000, 0.000000, 0.000000, 0.000000, 10.000000, 0.000000, 0.000000, 0.000000, - -18.451200, 6.883800, 75.891403, 0.989815, 0.070738, -0.123540, 0.897084, 0.575074, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -17.877800, -1.258700, 75.823189, 0.989815, 0.070738, -0.123540, 0.899786, 0.613617, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -17.877800, -1.258700, 75.823189, 0.989815, 0.070736, -0.123544, 0.899786, 0.613617, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -18.453400, -1.258700, 71.211594, 0.989815, 0.070736, -0.123544, 0.866876, 0.616123, 1.000000, 0.000000, 0.000000, 0.000000, 10.000000, 0.000000, 0.000000, 0.000000, - -19.026779, 6.883800, 71.279800, 0.989815, 0.070736, -0.123544, 0.864165, 0.577387, 1.000000, 0.000000, 0.000000, 0.000000, 10.000000, 0.000000, 0.000000, 0.000000, - -3.644900, 7.673690, 68.366989, -0.960950, -0.213736, 0.175761, 0.857516, 0.480611, 1.000000, 0.000000, 0.000000, 0.000000, 10.000000, 0.000000, 0.000000, 0.000000, - -2.373570, 1.034780, 67.244492, -0.960950, -0.213736, 0.175761, 0.855339, 0.448824, 1.000000, 0.000000, 0.000000, 0.000000, 10.000000, 0.000000, 0.000000, 0.000000, - -1.482190, 1.034780, 72.117989, -0.960950, -0.213736, 0.175761, 0.888452, 0.446461, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -1.482190, 1.034780, 72.117989, -0.959910, -0.204217, 0.192010, 0.888452, 0.446461, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -2.749990, 7.673690, 72.840889, -0.959910, -0.204217, 0.192010, 0.890527, 0.478184, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -3.644900, 7.673690, 68.366989, -0.959910, -0.204217, 0.192010, 0.857516, 0.480611, 1.000000, 0.000000, 0.000000, 0.000000, 10.000000, 0.000000, 0.000000, 0.000000, - -14.395900, -6.808220, 69.721397, 0.073105, 0.997267, -0.010701, 0.869564, 0.654856, 1.000000, 0.000000, 0.000000, 0.000000, 10.000000, 0.000000, 0.000000, 0.000000, - -13.696390, -6.808221, 74.500000, 0.073105, 0.997267, -0.010701, 0.902481, 0.652546, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -6.295990, -7.368800, 72.814392, 0.073105, 0.997267, -0.010701, 0.905099, 0.688952, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -6.295990, -7.368800, 72.814392, 0.072140, 0.997361, -0.008155, 0.905099, 0.688952, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -6.836200, -7.368800, 68.035690, 0.072140, 0.997361, -0.008155, 0.872156, 0.691320, 1.000000, 0.000000, 0.000000, 0.000000, 10.000000, 0.000000, 0.000000, 0.000000, - -14.395900, -6.808220, 69.721397, 0.072140, 0.997361, -0.008155, 0.869564, 0.654856, 1.000000, 0.000000, 0.000000, 0.000000, 10.000000, 0.000000, 0.000000, 0.000000, - -14.929090, 12.488200, 69.931580, 0.058719, -0.998248, -0.007322, 0.861787, 0.543690, 1.000000, 0.000000, 0.000000, 0.000000, 10.000000, 0.000000, 0.000000, 0.000000, - -8.816690, 12.856200, 68.778389, 0.058719, -0.998248, -0.007322, 0.859785, 0.514598, 1.000000, 0.000000, 0.000000, 0.000000, 10.000000, 0.000000, 0.000000, 0.000000, - -8.276480, 12.856200, 73.110390, 0.058719, -0.998248, -0.007322, 0.892671, 0.512240, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -8.276480, 12.856200, 73.110390, 0.059733, -0.998170, -0.009455, 0.892671, 0.512240, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -14.229600, 12.488200, 74.350899, 0.059733, -0.998170, -0.009455, 0.894655, 0.541284, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -14.929090, 12.488200, 69.931580, 0.059733, -0.998170, -0.009455, 0.861787, 0.543690, 1.000000, 0.000000, 0.000000, 0.000000, 10.000000, 0.000000, 0.000000, 0.000000, - -6.836200, -7.368800, 68.035690, -0.860112, 0.500753, 0.097232, 0.872156, 0.691320, 1.000000, 0.000000, 0.000000, 0.000000, 10.000000, 0.000000, 0.000000, 0.000000, - -6.295990, -7.368800, 72.814392, -0.860112, 0.500753, 0.097232, 0.905099, 0.688952, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -1.482190, 1.034780, 72.117989, -0.860112, 0.500753, 0.097232, 0.908476, 0.732975, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -1.482190, 1.034780, 72.117989, -0.865795, 0.474681, 0.158357, 0.908476, 0.732975, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -2.373570, 1.034780, 67.244492, -0.865795, 0.474681, 0.158357, 0.875367, 0.735300, 1.000000, 0.000000, 0.000000, 0.000000, 10.000000, 0.000000, 0.000000, 0.000000, - -6.836200, -7.368800, 68.035690, -0.865795, 0.474681, 0.158357, 0.872156, 0.691320, 1.000000, 0.000000, 0.000000, 0.000000, 10.000000, 0.000000, 0.000000, 0.000000, - -18.453400, -1.258700, 71.211594, 0.783493, 0.613657, -0.097792, 0.866876, 0.616123, 1.000000, 0.000000, 0.000000, 0.000000, 10.000000, 0.000000, 0.000000, 0.000000, - -17.877800, -1.258700, 75.823189, 0.783493, 0.613657, -0.097792, 0.899786, 0.613617, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -13.696390, -6.808221, 74.500000, 0.783493, 0.613657, -0.097792, 0.902481, 0.652546, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -13.696390, -6.808221, 74.500000, 0.786884, 0.606256, -0.115187, 0.902481, 0.652546, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -14.395900, -6.808220, 69.721397, 0.786883, 0.606256, -0.115187, 0.869564, 0.654856, 1.000000, 0.000000, 0.000000, 0.000000, 10.000000, 0.000000, 0.000000, 0.000000, - -18.453400, -1.258700, 71.211594, 0.786883, 0.606256, -0.115187, 0.866876, 0.616123, 1.000000, 0.000000, 0.000000, 0.000000, 10.000000, 0.000000, 0.000000, 0.000000, - -19.026779, 6.883800, 71.279800, 0.786458, -0.604969, -0.124481, 0.864165, 0.577387, 1.000000, 0.000000, 0.000000, 0.000000, 10.000000, 0.000000, 0.000000, 0.000000, - -14.929090, 12.488200, 69.931580, 0.786458, -0.604969, -0.124481, 0.861787, 0.543690, 1.000000, 0.000000, 0.000000, 0.000000, 10.000000, 0.000000, 0.000000, 0.000000, - -14.229600, 12.488200, 74.350899, 0.786458, -0.604969, -0.124481, 0.894655, 0.541284, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -14.229600, 12.488200, 74.350899, 0.781859, -0.615771, -0.097585, 0.894655, 0.541284, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -18.451200, 6.883800, 75.891403, 0.781859, -0.615771, -0.097585, 0.897084, 0.575074, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -19.026779, 6.883800, 71.279800, 0.781859, -0.615771, -0.097585, 0.864165, 0.577387, 1.000000, 0.000000, 0.000000, 0.000000, 10.000000, 0.000000, 0.000000, 0.000000, - -3.644900, 7.673690, 68.366989, -0.674283, -0.726051, 0.134876, 0.857516, 0.480611, 1.000000, 0.000000, 0.000000, 0.000000, 10.000000, 0.000000, 0.000000, 0.000000, - -2.749990, 7.673690, 72.840889, -0.674283, -0.726051, 0.134876, 0.890527, 0.478184, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -8.276480, 12.856200, 73.110390, -0.674283, -0.726051, 0.134876, 0.892671, 0.512240, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -8.276480, 12.856200, 73.110390, -0.701642, -0.707137, 0.087496, 0.892671, 0.512240, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -8.816690, 12.856200, 68.778389, -0.701642, -0.707137, 0.087496, 0.859785, 0.514598, 1.000000, 0.000000, 0.000000, 0.000000, 10.000000, 0.000000, 0.000000, 0.000000, - -3.644900, 7.673690, 68.366989, -0.701642, -0.707137, 0.087496, 0.857516, 0.480611, 1.000000, 0.000000, 0.000000, 0.000000, 10.000000, 0.000000, 0.000000, 0.000000, - -17.149200, 7.517190, 22.389700, 0.541978, 0.830647, 0.127615, 0.432831, 0.602063, 0.500000, 0.500000, 0.000000, 0.000000, 27.000000, 28.000000, 0.000000, 0.000000, - -17.398399, 5.051790, 39.495399, 0.541978, 0.830647, 0.127615, 0.526377, 0.630591, 1.000000, 0.000000, 0.000000, 0.000000, 27.000000, 0.000000, 0.000000, 0.000000, - -14.434200, 3.293400, 38.351891, 0.541978, 0.830647, 0.127615, 0.516971, 0.647442, 1.000000, 0.000000, 0.000000, 0.000000, 27.000000, 0.000000, 0.000000, 0.000000, - -14.434200, 3.293400, 38.351891, 0.716344, 0.694982, 0.062058, 0.516971, 0.647442, 1.000000, 0.000000, 0.000000, 0.000000, 27.000000, 0.000000, 0.000000, 0.000000, - -15.858190, 6.210000, 22.126490, 0.716344, 0.694982, 0.062058, 0.429994, 0.612200, 0.500000, 0.500000, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -17.149200, 7.517190, 22.389700, 0.716344, 0.694982, 0.062058, 0.432831, 0.602063, 0.500000, 0.500000, 0.000000, 0.000000, 27.000000, 28.000000, 0.000000, 0.000000, - -18.093691, 9.878300, 22.735991, 0.987289, 0.158863, 0.004791, 0.436478, 0.587608, 0.500000, 0.500000, 0.000000, 0.000000, 27.000000, 28.000000, 0.000000, 0.000000, - -18.111601, 9.402990, 42.185379, 0.987289, 0.158864, 0.004791, 0.543586, 0.609829, 1.000000, 0.000000, 0.000000, 0.000000, 27.000000, 0.000000, 0.000000, 0.000000, - -17.398399, 5.051790, 39.495399, 0.987289, 0.158863, 0.004791, 0.526377, 0.630591, 1.000000, 0.000000, 0.000000, 0.000000, 27.000000, 0.000000, 0.000000, 0.000000, - -17.398399, 5.051790, 39.495399, 0.929749, 0.362274, 0.065758, 0.526377, 0.630591, 1.000000, 0.000000, 0.000000, 0.000000, 27.000000, 0.000000, 0.000000, 0.000000, - -17.149200, 7.517190, 22.389700, 0.929749, 0.362274, 0.065758, 0.432831, 0.602063, 0.500000, 0.500000, 0.000000, 0.000000, 27.000000, 28.000000, 0.000000, 0.000000, - -18.093691, 9.878300, 22.735991, 0.929749, 0.362274, 0.065758, 0.436478, 0.587608, 0.500000, 0.500000, 0.000000, 0.000000, 27.000000, 28.000000, 0.000000, 0.000000, - -18.093691, 9.878300, 22.735991, 0.678970, -0.733253, -0.036607, 0.436478, 0.587608, 0.500000, 0.500000, 0.000000, 0.000000, 27.000000, 28.000000, 0.000000, 0.000000, - -15.791900, 12.021400, 22.501390, 0.678970, -0.733253, -0.036607, 0.438964, 0.569045, 0.500000, 0.500000, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -14.176200, 12.555290, 41.774792, 0.678970, -0.733253, -0.036607, 0.546014, 0.584386, 1.000000, 0.000000, 0.000000, 0.000000, 27.000000, 0.000000, 0.000000, 0.000000, - -14.176200, 12.555290, 41.774792, 0.623891, -0.781292, -0.018519, 0.546014, 0.584386, 1.000000, 0.000000, 0.000000, 0.000000, 27.000000, 0.000000, 0.000000, 0.000000, - -18.111601, 9.402990, 42.185379, 0.623891, -0.781292, -0.018519, 0.543586, 0.609829, 1.000000, 0.000000, 0.000000, 0.000000, 27.000000, 0.000000, 0.000000, 0.000000, - -18.093691, 9.878300, 22.735991, 0.623891, -0.781292, -0.018519, 0.436478, 0.587608, 0.500000, 0.500000, 0.000000, 0.000000, 27.000000, 28.000000, 0.000000, 0.000000, - -15.858190, 6.210000, 22.126490, -0.537927, 0.820211, 0.194647, 0.429994, 0.612200, 0.500000, 0.500000, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -14.434200, 3.293400, 38.351891, -0.537927, 0.820211, 0.194647, 0.516971, 0.647442, 1.000000, 0.000000, 0.000000, 0.000000, 27.000000, 0.000000, 0.000000, 0.000000, - -11.407600, 5.360000, 38.007889, -0.537927, 0.820211, 0.194647, 0.507048, 0.665176, 1.000000, 0.000000, 0.000000, 0.000000, 27.000000, 0.000000, 0.000000, 0.000000, - -11.407600, 5.360000, 38.007889, -0.676124, 0.700949, 0.226993, 0.507048, 0.665176, 1.000000, 0.000000, 0.000000, 0.000000, 27.000000, 0.000000, 0.000000, 0.000000, - -14.548190, 7.524090, 21.970591, -0.676124, 0.700949, 0.226993, 0.424901, 0.621262, 0.500000, 0.500000, 0.000000, 0.000000, 27.000000, 28.000000, 0.000000, 0.000000, - -15.858190, 6.210000, 22.126490, -0.676124, 0.700949, 0.226993, 0.429994, 0.612200, 0.500000, 0.500000, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -11.407600, 5.360000, 38.007889, -0.975476, 0.140399, 0.169513, 0.507048, 0.665176, 1.000000, 0.000000, 0.000000, 0.000000, 27.000000, 0.000000, 0.000000, 0.000000, - -10.376280, 9.800590, 40.264801, -0.975476, 0.140399, 0.169513, 0.503547, 0.693363, 1.000000, 0.000000, 0.000000, 0.000000, 27.000000, 0.000000, 0.000000, 0.000000, - -13.536980, 9.890380, 22.001890, -0.975476, 0.140399, 0.169513, 0.417672, 0.633621, 0.500000, 0.500000, 0.000000, 0.000000, 27.000000, 28.000000, 0.000000, 0.000000, - -13.536980, 9.890380, 22.001890, -0.896653, 0.380175, 0.226893, 0.417672, 0.633621, 0.500000, 0.500000, 0.000000, 0.000000, 27.000000, 28.000000, 0.000000, 0.000000, - -14.548190, 7.524090, 21.970591, -0.896653, 0.380175, 0.226893, 0.424901, 0.621262, 0.500000, 0.500000, 0.000000, 0.000000, 27.000000, 28.000000, 0.000000, 0.000000, - -11.407600, 5.360000, 38.007889, -0.896653, 0.380175, 0.226893, 0.507048, 0.665176, 1.000000, 0.000000, 0.000000, 0.000000, 27.000000, 0.000000, 0.000000, 0.000000, - -10.376280, 9.800590, 40.264801, -0.567029, -0.820695, 0.070268, 0.546396, 0.558312, 1.000000, 0.000000, 0.000000, 0.000000, 27.000000, 0.000000, 0.000000, 0.000000, - -14.176200, 12.555290, 41.774792, -0.567029, -0.820695, 0.070268, 0.546014, 0.584386, 1.000000, 0.000000, 0.000000, 0.000000, 27.000000, 0.000000, 0.000000, 0.000000, - -15.791900, 12.021400, 22.501390, -0.567029, -0.820695, 0.070268, 0.438964, 0.569045, 0.500000, 0.500000, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -15.791900, 12.021400, 22.501390, -0.669276, -0.734491, 0.112218, 0.438964, 0.569045, 0.500000, 0.500000, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -13.536980, 9.890380, 22.001890, -0.669276, -0.734491, 0.112218, 0.440047, 0.550948, 0.500000, 0.500000, 0.000000, 0.000000, 27.000000, 28.000000, 0.000000, 0.000000, - -10.376280, 9.800590, 40.264801, -0.669276, -0.734491, 0.112218, 0.546396, 0.558312, 1.000000, 0.000000, 0.000000, 0.000000, 27.000000, 0.000000, 0.000000, 0.000000, - -13.089090, 1.318300, 46.891701, 0.662855, 0.654949, 0.362856, 0.564731, 0.664003, 0.700000, 0.300000, 0.000000, 0.000000, 27.000000, 10.000000, 0.000000, 0.000000, - -15.536290, 2.877190, 48.548401, 0.662855, 0.654949, 0.362856, 0.577335, 0.647425, 0.700000, 0.300000, 0.000000, 0.000000, 27.000000, 10.000000, 0.000000, 0.000000, - -15.487390, 1.156000, 51.565788, 0.662855, 0.654949, 0.362856, 0.594239, 0.656420, 0.500000, 0.500000, 0.000000, 0.000000, 27.000000, 10.000000, 0.000000, 0.000000, - -15.487390, 1.156000, 51.565788, 0.556461, 0.769965, 0.312259, 0.594239, 0.656420, 0.500000, 0.500000, 0.000000, 0.000000, 27.000000, 10.000000, 0.000000, 0.000000, - -12.557200, -0.737690, 51.013489, 0.556461, 0.769965, 0.312259, 0.588509, 0.673496, 0.500000, 0.500000, 0.000000, 0.000000, 10.000000, 27.000000, 0.000000, 0.000000, - -13.089090, 1.318300, 46.891701, 0.556461, 0.769965, 0.312259, 0.564731, 0.664003, 0.700000, 0.300000, 0.000000, 0.000000, 27.000000, 10.000000, 0.000000, 0.000000, - -16.258801, 5.886590, 52.189388, 0.985946, 0.151492, 0.070436, 0.601452, 0.629855, 0.500000, 0.500000, 0.000000, 0.000000, 10.000000, 27.000000, 0.000000, 0.000000, - -15.487390, 1.156000, 51.565788, 0.985946, 0.151492, 0.070436, 0.594239, 0.656420, 0.500000, 0.500000, 0.000000, 0.000000, 27.000000, 10.000000, 0.000000, 0.000000, - -15.536290, 2.877190, 48.548401, 0.985946, 0.151492, 0.070436, 0.577335, 0.647425, 0.700000, 0.300000, 0.000000, 0.000000, 27.000000, 10.000000, 0.000000, 0.000000, - -12.423600, 8.846690, 51.768902, 0.543069, -0.755635, -0.366185, 0.605538, 0.598648, 0.500000, 0.500000, 0.000000, 0.000000, 27.000000, 10.000000, 0.000000, 0.000000, - -16.258801, 5.886590, 52.189388, 0.543069, -0.755635, -0.366185, 0.601452, 0.629855, 0.500000, 0.500000, 0.000000, 0.000000, 10.000000, 27.000000, 0.000000, 0.000000, - -18.111601, 9.402990, 42.185379, 0.543069, -0.755635, -0.366185, 0.543586, 0.609829, 1.000000, 0.000000, 0.000000, 0.000000, 27.000000, 0.000000, 0.000000, 0.000000, - -18.111601, 9.402990, 42.185379, 0.556006, -0.742728, -0.373113, 0.543586, 0.609829, 1.000000, 0.000000, 0.000000, 0.000000, 27.000000, 0.000000, 0.000000, 0.000000, - -14.176200, 12.555290, 41.774792, 0.556006, -0.742728, -0.373113, 0.546014, 0.584386, 1.000000, 0.000000, 0.000000, 0.000000, 27.000000, 0.000000, 0.000000, 0.000000, - -12.423600, 8.846690, 51.768902, 0.556005, -0.742728, -0.373113, 0.605538, 0.598648, 0.500000, 0.500000, 0.000000, 0.000000, 27.000000, 10.000000, 0.000000, 0.000000, - -13.089090, 1.318300, 46.891701, -0.442860, 0.778184, 0.445314, 0.564731, 0.664003, 0.700000, 0.300000, 0.000000, 0.000000, 27.000000, 10.000000, 0.000000, 0.000000, - -12.557200, -0.737690, 51.013489, -0.442860, 0.778184, 0.445314, 0.588509, 0.673496, 0.500000, 0.500000, 0.000000, 0.000000, 10.000000, 27.000000, 0.000000, 0.000000, - -9.599380, 1.172370, 50.617191, -0.442860, 0.778184, 0.445314, 0.579124, 0.688514, 0.500000, 0.500000, 0.000000, 0.000000, 10.000000, 27.000000, 0.000000, 0.000000, - -9.599380, 1.172370, 50.617191, -0.523738, 0.676976, 0.517109, 0.579124, 0.688514, 0.500000, 0.500000, 0.000000, 0.000000, 10.000000, 27.000000, 0.000000, 0.000000, - -10.443390, 2.749390, 47.697800, -0.523738, 0.676976, 0.517109, 0.561210, 0.682423, 0.700000, 0.300000, 0.000000, 0.000000, 27.000000, 10.000000, 0.000000, 0.000000, - -13.089090, 1.318300, 46.891701, -0.523738, 0.676976, 0.517109, 0.564731, 0.664003, 0.700000, 0.300000, 0.000000, 0.000000, 27.000000, 10.000000, 0.000000, 0.000000, - -10.443390, 2.749390, 47.697800, -0.902653, 0.316270, 0.291875, 0.561210, 0.682423, 0.700000, 0.300000, 0.000000, 0.000000, 27.000000, 10.000000, 0.000000, 0.000000, - -8.656200, 4.835400, 50.964500, -0.902653, 0.316270, 0.291875, 0.568758, 0.705268, 0.500000, 0.500000, 0.000000, 0.000000, 10.000000, 27.000000, 0.000000, 0.000000, - -10.376280, 9.800590, 40.264801, -0.902653, 0.316270, 0.291875, 0.503547, 0.693363, 1.000000, 0.000000, 0.000000, 0.000000, 27.000000, 0.000000, 0.000000, 0.000000, - -10.376280, 9.800590, 40.264801, -0.977831, 0.156252, 0.139397, 0.503547, 0.693363, 1.000000, 0.000000, 0.000000, 0.000000, 27.000000, 0.000000, 0.000000, 0.000000, - -11.407600, 5.360000, 38.007889, -0.977831, 0.156252, 0.139397, 0.507048, 0.665176, 1.000000, 0.000000, 0.000000, 0.000000, 27.000000, 0.000000, 0.000000, 0.000000, - -10.443390, 2.749390, 47.697800, -0.977831, 0.156252, 0.139397, 0.561210, 0.682423, 0.700000, 0.300000, 0.000000, 0.000000, 27.000000, 10.000000, 0.000000, 0.000000, - -12.423600, 8.846690, 51.768902, -0.622375, -0.763125, -0.174038, 0.605538, 0.598648, 0.500000, 0.500000, 0.000000, 0.000000, 27.000000, 10.000000, 0.000000, 0.000000, - -14.176200, 12.555290, 41.774792, -0.622375, -0.763125, -0.174038, 0.546014, 0.584386, 1.000000, 0.000000, 0.000000, 0.000000, 27.000000, 0.000000, 0.000000, 0.000000, - -10.376280, 9.800590, 40.264801, -0.622375, -0.763125, -0.174038, 0.546396, 0.558312, 1.000000, 0.000000, 0.000000, 0.000000, 27.000000, 0.000000, 0.000000, 0.000000, - -10.376280, 9.800590, 40.264801, -0.734584, -0.652849, -0.184863, 0.546396, 0.558312, 1.000000, 0.000000, 0.000000, 0.000000, 27.000000, 0.000000, 0.000000, 0.000000, - -8.656200, 4.835400, 50.964500, -0.734584, -0.652849, -0.184863, 0.611650, 0.566587, 0.500000, 0.500000, 0.000000, 0.000000, 10.000000, 27.000000, 0.000000, 0.000000, - -12.423600, 8.846690, 51.768902, -0.734584, -0.652849, -0.184863, 0.605538, 0.598648, 0.500000, 0.500000, 0.000000, 0.000000, 27.000000, 10.000000, 0.000000, 0.000000, - -12.557200, -0.737690, 51.013489, 0.501959, 0.838519, -0.211952, 0.588509, 0.673496, 0.500000, 0.500000, 0.000000, 0.000000, 10.000000, 27.000000, 0.000000, 0.000000, - -15.487390, 1.156000, 51.565788, 0.501959, 0.838519, -0.211952, 0.594239, 0.656420, 0.500000, 0.500000, 0.000000, 0.000000, 27.000000, 10.000000, 0.000000, 0.000000, - -14.728300, 1.538590, 54.877102, 0.501959, 0.838519, -0.211952, 0.612644, 0.660915, 0.700000, 0.300000, 0.000000, 0.000000, 10.000000, 27.000000, 0.000000, 0.000000, - -14.728300, 1.538590, 54.877102, 0.617862, 0.778358, -0.111378, 0.612644, 0.660915, 0.700000, 0.300000, 0.000000, 0.000000, 10.000000, 27.000000, 0.000000, 0.000000, - -12.134980, -0.490700, 55.081791, 0.617862, 0.778358, -0.111378, 0.609131, 0.682551, 0.700000, 0.300000, 0.000000, 0.000000, 10.000000, 27.000000, 0.000000, 0.000000, - -12.557200, -0.737690, 51.013489, 0.617862, 0.778358, -0.111378, 0.588509, 0.673496, 0.500000, 0.500000, 0.000000, 0.000000, 10.000000, 27.000000, 0.000000, 0.000000, - -15.487390, 1.156000, 51.565788, 0.952602, 0.186974, -0.239979, 0.594239, 0.656420, 0.500000, 0.500000, 0.000000, 0.000000, 27.000000, 10.000000, 0.000000, 0.000000, - -16.258801, 5.886590, 52.189388, 0.952602, 0.186974, -0.239979, 0.601452, 0.629855, 0.500000, 0.500000, 0.000000, 0.000000, 10.000000, 27.000000, 0.000000, 0.000000, - -14.728300, 1.538590, 54.877102, 0.952602, 0.186974, -0.239979, 0.612644, 0.660915, 0.700000, 0.300000, 0.000000, 0.000000, 10.000000, 27.000000, 0.000000, 0.000000, - -16.258801, 5.886590, 52.189388, 0.607933, -0.793073, -0.038120, 0.601452, 0.629855, 0.500000, 0.500000, 0.000000, 0.000000, 10.000000, 27.000000, 0.000000, 0.000000, - -12.423600, 8.846690, 51.768902, 0.607933, -0.793073, -0.038120, 0.605538, 0.598648, 0.500000, 0.500000, 0.000000, 0.000000, 27.000000, 10.000000, 0.000000, 0.000000, - -10.706590, 9.592600, 63.633190, 0.607933, -0.793073, -0.038120, 0.675005, 0.603664, 0.999685, 0.000315, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -10.706590, 9.592600, 63.633190, 0.529923, -0.847866, 0.017473, 0.675005, 0.603664, 0.999685, 0.000315, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -16.593901, 5.936800, 64.789101, 0.529923, -0.847866, 0.017473, 0.673173, 0.642347, 0.999045, 0.000955, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -16.258801, 5.886590, 52.189388, 0.529923, -0.847866, 0.017473, 0.601452, 0.629855, 0.500000, 0.500000, 0.000000, 0.000000, 10.000000, 27.000000, 0.000000, 0.000000, - -9.263500, 1.479400, 54.230701, -0.544322, 0.838622, -0.020660, 0.595162, 0.700563, 0.700000, 0.300000, 0.000000, 0.000000, 10.000000, 27.000000, 0.000000, 0.000000, - -9.599380, 1.172370, 50.617191, -0.544322, 0.838622, -0.020660, 0.579124, 0.688514, 0.500000, 0.500000, 0.000000, 0.000000, 10.000000, 27.000000, 0.000000, 0.000000, - -12.557200, -0.737690, 51.013489, -0.544322, 0.838622, -0.020660, 0.588509, 0.673496, 0.500000, 0.500000, 0.000000, 0.000000, 10.000000, 27.000000, 0.000000, 0.000000, - -12.557200, -0.737690, 51.013489, -0.564025, 0.825715, 0.008406, 0.588509, 0.673496, 0.500000, 0.500000, 0.000000, 0.000000, 10.000000, 27.000000, 0.000000, 0.000000, - -12.134980, -0.490700, 55.081791, -0.564025, 0.825715, 0.008406, 0.609131, 0.682551, 0.700000, 0.300000, 0.000000, 0.000000, 10.000000, 27.000000, 0.000000, 0.000000, - -9.263500, 1.479400, 54.230701, -0.564025, 0.825715, 0.008406, 0.595162, 0.700563, 0.700000, 0.300000, 0.000000, 0.000000, 10.000000, 27.000000, 0.000000, 0.000000, - -9.263500, 1.479400, 54.230701, -0.967650, 0.242583, 0.069332, 0.595162, 0.700563, 0.700000, 0.300000, 0.000000, 0.000000, 10.000000, 27.000000, 0.000000, 0.000000, - -8.656200, 4.835400, 50.964500, -0.967650, 0.242583, 0.069332, 0.568758, 0.705268, 0.500000, 0.500000, 0.000000, 0.000000, 10.000000, 27.000000, 0.000000, 0.000000, - -9.599380, 1.172370, 50.617191, -0.967650, 0.242583, 0.069332, 0.579124, 0.688514, 0.500000, 0.500000, 0.000000, 0.000000, 10.000000, 27.000000, 0.000000, 0.000000, - -5.648190, 4.884390, 61.870789, -0.647794, -0.748688, 0.140819, 0.671228, 0.564066, 0.994270, 0.005314, 0.000416, 0.000000, 10.000000, 9.000000, 27.000000, 0.000000, - -10.706590, 9.592600, 63.633190, -0.647794, -0.748688, 0.140819, 0.675005, 0.603664, 0.999685, 0.000315, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -12.423600, 8.846690, 51.768902, -0.647794, -0.748688, 0.140819, 0.605538, 0.598648, 0.500000, 0.500000, 0.000000, 0.000000, 27.000000, 10.000000, 0.000000, 0.000000, - -12.423600, 8.846690, 51.768902, -0.695152, -0.691957, 0.194835, 0.605538, 0.598648, 0.500000, 0.500000, 0.000000, 0.000000, 27.000000, 10.000000, 0.000000, 0.000000, - -8.656200, 4.835400, 50.964500, -0.695152, -0.691957, 0.194835, 0.611650, 0.566587, 0.500000, 0.500000, 0.000000, 0.000000, 10.000000, 27.000000, 0.000000, 0.000000, - -5.648190, 4.884390, 61.870789, -0.695152, -0.691957, 0.194835, 0.671228, 0.564066, 0.994270, 0.005314, 0.000416, 0.000000, 10.000000, 9.000000, 27.000000, 0.000000, - -9.345480, -5.654490, 75.020081, 0.535922, 0.841865, 0.063644, 0.713315, 0.736603, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -10.966300, -3.682990, 62.589890, 0.535922, 0.841865, 0.063644, 0.649362, 0.705258, 1.000000, 0.000000, 0.000000, 0.000000, 10.000000, 0.000000, 0.000000, 0.000000, - -15.847800, -0.668490, 63.820190, 0.535922, 0.841865, 0.063644, 0.662211, 0.676944, 1.000000, 0.000000, 0.000000, 0.000000, 10.000000, 0.000000, 0.000000, 0.000000, - -15.847800, -0.668490, 63.820190, 0.524726, 0.848140, 0.072937, 0.662211, 0.676944, 1.000000, 0.000000, 0.000000, 0.000000, 10.000000, 0.000000, 0.000000, 0.000000, - -14.933690, -2.276200, 75.938904, 0.524726, 0.848141, 0.072937, 0.726886, 0.701308, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -9.345480, -5.654490, 75.020081, 0.524726, 0.848141, 0.072937, 0.713315, 0.736603, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -14.933690, -2.276200, 75.938904, 0.990967, 0.120553, -0.058755, 0.726886, 0.701308, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -15.847800, -0.668490, 63.820190, 0.990967, 0.120553, -0.058755, 0.662211, 0.676944, 1.000000, 0.000000, 0.000000, 0.000000, 10.000000, 0.000000, 0.000000, 0.000000, - -16.593901, 5.936800, 64.789101, 0.990967, 0.120553, -0.058755, 0.673173, 0.642347, 0.999045, 0.000955, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -16.593901, 5.936800, 64.789101, 0.988760, 0.143664, -0.041403, 0.673173, 0.642347, 0.999045, 0.000955, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -16.179991, 6.591700, 76.946289, 0.988760, 0.143664, -0.041403, 0.741809, 0.653018, 0.750000, 0.250000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -14.933690, -2.276200, 75.938904, 0.988760, 0.143664, -0.041403, 0.726886, 0.701308, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -16.593901, 5.936800, 64.789101, 0.527339, -0.849654, -0.001348, 0.673173, 0.642347, 0.999045, 0.000955, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -10.706590, 9.592600, 63.633190, 0.527339, -0.849654, -0.001348, 0.675005, 0.603664, 0.999685, 0.000315, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -9.163700, 10.530190, 76.240402, 0.527339, -0.849654, -0.001348, 0.747238, 0.608641, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -9.163700, 10.530190, 76.240402, 0.491572, -0.870315, 0.030147, 0.747238, 0.608641, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -16.179991, 6.591700, 76.946289, 0.491571, -0.870315, 0.030147, 0.741809, 0.653018, 0.750000, 0.250000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -16.593901, 5.936800, 64.789101, 0.491571, -0.870315, 0.030147, 0.673173, 0.642347, 0.999045, 0.000955, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -10.966300, -3.682990, 62.589890, -0.454939, 0.868446, 0.197062, 0.649362, 0.705258, 1.000000, 0.000000, 0.000000, 0.000000, 10.000000, 0.000000, 0.000000, 0.000000, - -9.345480, -5.654490, 75.020081, -0.454939, 0.868445, 0.197062, 0.713315, 0.736603, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -3.761600, -2.578390, 74.354790, -0.454939, 0.868446, 0.197062, 0.694216, 0.768210, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -3.761600, -2.578390, 74.354790, -0.499057, 0.836282, 0.227099, 0.694216, 0.768210, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -7.001200, -1.029890, 61.533401, -0.499057, 0.836282, 0.227099, 0.632830, 0.725089, 1.000000, 0.000000, 0.000000, 0.000000, 10.000000, 0.000000, 0.000000, 0.000000, - -10.966300, -3.682990, 62.589890, -0.499057, 0.836282, 0.227099, 0.649362, 0.705258, 1.000000, 0.000000, 0.000000, 0.000000, 10.000000, 0.000000, 0.000000, 0.000000, - -5.648190, 4.884390, 61.870789, -0.943724, 0.200909, 0.262717, 0.612151, 0.751552, 0.994270, 0.005314, 0.000416, 0.000000, 10.000000, 9.000000, 27.000000, 0.000000, - -7.001200, -1.029890, 61.533401, -0.943724, 0.200909, 0.262717, 0.632830, 0.725089, 1.000000, 0.000000, 0.000000, 0.000000, 10.000000, 0.000000, 0.000000, 0.000000, - -3.761600, -2.578390, 74.354790, -0.943724, 0.200909, 0.262717, 0.694216, 0.768210, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -3.761600, -2.578390, 74.354790, -0.956780, 0.162066, 0.241470, 0.694216, 0.768210, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -2.368200, 4.805780, 74.919899, -0.956779, 0.162066, 0.241470, 0.669089, 0.802964, 0.700000, 0.300000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -5.648190, 4.884390, 61.870789, -0.956779, 0.162066, 0.241470, 0.612151, 0.751552, 0.994270, 0.005314, 0.000416, 0.000000, 10.000000, 9.000000, 27.000000, 0.000000, - -10.706590, 9.592600, 63.633190, -0.642973, -0.749603, 0.157100, 0.675005, 0.603664, 0.999685, 0.000315, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -5.648190, 4.884390, 61.870789, -0.642973, -0.749603, 0.157100, 0.671228, 0.564066, 0.994270, 0.005314, 0.000416, 0.000000, 10.000000, 9.000000, 27.000000, 0.000000, - -2.368200, 4.805780, 74.919899, -0.642973, -0.749603, 0.157100, 0.746208, 0.558395, 0.700000, 0.300000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -2.368200, 4.805780, 74.919899, -0.623176, -0.770591, 0.133574, 0.746208, 0.558395, 0.700000, 0.300000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -9.163700, 10.530190, 76.240402, -0.623176, -0.770591, 0.133574, 0.747238, 0.608641, 0.900000, 0.100000, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -10.706590, 9.592600, 63.633190, -0.623176, -0.770590, 0.133574, 0.675005, 0.603664, 0.999685, 0.000315, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -14.728300, 1.538590, 54.877102, 0.938351, 0.344878, 0.023582, 0.612644, 0.660915, 0.700000, 0.300000, 0.000000, 0.000000, 10.000000, 27.000000, 0.000000, 0.000000, - -16.258801, 5.886590, 52.189388, 0.938351, 0.344878, 0.023582, 0.601452, 0.629855, 0.500000, 0.500000, 0.000000, 0.000000, 10.000000, 27.000000, 0.000000, 0.000000, - -16.593901, 5.936800, 64.789101, 0.938351, 0.344878, 0.023582, 0.673173, 0.642347, 0.999045, 0.000955, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -16.593901, 5.936800, 64.789101, 0.985257, 0.089942, 0.145532, 0.673173, 0.642347, 0.999045, 0.000955, 0.000000, 0.000000, 10.000000, 6.000000, 0.000000, 0.000000, - -15.847800, -0.668490, 63.820190, 0.985257, 0.089942, 0.145532, 0.662211, 0.676944, 1.000000, 0.000000, 0.000000, 0.000000, 10.000000, 0.000000, 0.000000, 0.000000, - -14.728300, 1.538590, 54.877102, 0.985257, 0.089942, 0.145532, 0.612644, 0.660915, 0.700000, 0.300000, 0.000000, 0.000000, 10.000000, 27.000000, 0.000000, 0.000000, - -12.134980, -0.490700, 55.081791, 0.581648, 0.769821, 0.262796, 0.609131, 0.682551, 0.700000, 0.300000, 0.000000, 0.000000, 10.000000, 27.000000, 0.000000, 0.000000, - -14.728300, 1.538590, 54.877102, 0.581648, 0.769821, 0.262796, 0.612644, 0.660915, 0.700000, 0.300000, 0.000000, 0.000000, 10.000000, 27.000000, 0.000000, 0.000000, - -15.847800, -0.668490, 63.820190, 0.581648, 0.769821, 0.262796, 0.662211, 0.676944, 1.000000, 0.000000, 0.000000, 0.000000, 10.000000, 0.000000, 0.000000, 0.000000, - -15.847800, -0.668490, 63.820190, 0.553628, 0.793916, 0.251382, 0.662211, 0.676944, 1.000000, 0.000000, 0.000000, 0.000000, 10.000000, 0.000000, 0.000000, 0.000000, - -10.966300, -3.682990, 62.589890, 0.553628, 0.793916, 0.251381, 0.649362, 0.705258, 1.000000, 0.000000, 0.000000, 0.000000, 10.000000, 0.000000, 0.000000, 0.000000, - -12.134980, -0.490700, 55.081791, 0.553628, 0.793916, 0.251381, 0.609131, 0.682551, 0.700000, 0.300000, 0.000000, 0.000000, 10.000000, 27.000000, 0.000000, 0.000000, - -12.134980, -0.490700, 55.081791, -0.429622, 0.805001, 0.409143, 0.609131, 0.682551, 0.700000, 0.300000, 0.000000, 0.000000, 10.000000, 27.000000, 0.000000, 0.000000, - -10.966300, -3.682990, 62.589890, -0.429622, 0.805001, 0.409143, 0.649362, 0.705258, 1.000000, 0.000000, 0.000000, 0.000000, 10.000000, 0.000000, 0.000000, 0.000000, - -7.001200, -1.029890, 61.533401, -0.429622, 0.805001, 0.409143, 0.632830, 0.725089, 1.000000, 0.000000, 0.000000, 0.000000, 10.000000, 0.000000, 0.000000, 0.000000, - -7.001200, -1.029890, 61.533401, -0.430395, 0.804305, 0.409700, 0.632830, 0.725089, 1.000000, 0.000000, 0.000000, 0.000000, 10.000000, 0.000000, 0.000000, 0.000000, - -9.263500, 1.479400, 54.230701, -0.430395, 0.804305, 0.409700, 0.595162, 0.700563, 0.700000, 0.300000, 0.000000, 0.000000, 10.000000, 27.000000, 0.000000, 0.000000, - -12.134980, -0.490700, 55.081791, -0.430395, 0.804305, 0.409700, 0.609131, 0.682551, 0.700000, 0.300000, 0.000000, 0.000000, 10.000000, 27.000000, 0.000000, 0.000000, - -5.648190, 4.884390, 61.870789, -0.885561, 0.396225, 0.242462, 0.612151, 0.751552, 0.994270, 0.005314, 0.000416, 0.000000, 10.000000, 9.000000, 27.000000, 0.000000, - -8.656200, 4.835400, 50.964500, -0.885561, 0.396225, 0.242462, 0.568758, 0.705268, 0.500000, 0.500000, 0.000000, 0.000000, 10.000000, 27.000000, 0.000000, 0.000000, - -9.263500, 1.479400, 54.230701, -0.885561, 0.396225, 0.242462, 0.595162, 0.700563, 0.700000, 0.300000, 0.000000, 0.000000, 10.000000, 27.000000, 0.000000, 0.000000, - -9.263500, 1.479400, 54.230701, -0.917480, 0.189955, 0.349496, 0.595162, 0.700563, 0.700000, 0.300000, 0.000000, 0.000000, 10.000000, 27.000000, 0.000000, 0.000000, - -7.001200, -1.029890, 61.533401, -0.917480, 0.189955, 0.349496, 0.632830, 0.725089, 1.000000, 0.000000, 0.000000, 0.000000, 10.000000, 0.000000, 0.000000, 0.000000, - -5.648190, 4.884390, 61.870789, -0.917480, 0.189955, 0.349496, 0.612151, 0.751552, 0.994270, 0.005314, 0.000416, 0.000000, 10.000000, 9.000000, 27.000000, 0.000000, - -10.443390, 2.749390, 47.697800, -0.907659, 0.198655, 0.369719, 0.561210, 0.682423, 0.700000, 0.300000, 0.000000, 0.000000, 27.000000, 10.000000, 0.000000, 0.000000, - -9.599380, 1.172370, 50.617191, -0.907659, 0.198655, 0.369719, 0.579124, 0.688514, 0.500000, 0.500000, 0.000000, 0.000000, 10.000000, 27.000000, 0.000000, 0.000000, - -8.656200, 4.835400, 50.964500, -0.907659, 0.198655, 0.369719, 0.568758, 0.705268, 0.500000, 0.500000, 0.000000, 0.000000, 10.000000, 27.000000, 0.000000, 0.000000, - -13.089090, 1.318300, 46.891701, -0.520451, 0.810070, 0.270033, 0.564731, 0.664003, 0.700000, 0.300000, 0.000000, 0.000000, 27.000000, 10.000000, 0.000000, 0.000000, - -10.443390, 2.749390, 47.697800, -0.520451, 0.810070, 0.270033, 0.561210, 0.682423, 0.700000, 0.300000, 0.000000, 0.000000, 27.000000, 10.000000, 0.000000, 0.000000, - -11.407600, 5.360000, 38.007889, -0.520451, 0.810070, 0.270033, 0.507048, 0.665176, 1.000000, 0.000000, 0.000000, 0.000000, 27.000000, 0.000000, 0.000000, 0.000000, - -11.407600, 5.360000, 38.007889, -0.521980, 0.809299, 0.269393, 0.507048, 0.665176, 1.000000, 0.000000, 0.000000, 0.000000, 27.000000, 0.000000, 0.000000, 0.000000, - -14.434200, 3.293400, 38.351891, -0.521980, 0.809299, 0.269393, 0.516971, 0.647442, 1.000000, 0.000000, 0.000000, 0.000000, 27.000000, 0.000000, 0.000000, 0.000000, - -13.089090, 1.318300, 46.891701, -0.521980, 0.809299, 0.269393, 0.564731, 0.664003, 0.700000, 0.300000, 0.000000, 0.000000, 27.000000, 10.000000, 0.000000, 0.000000, - -17.398399, 5.051790, 39.495399, 0.572740, 0.815998, 0.078202, 0.526377, 0.630591, 1.000000, 0.000000, 0.000000, 0.000000, 27.000000, 0.000000, 0.000000, 0.000000, - -15.536290, 2.877190, 48.548401, 0.572740, 0.815998, 0.078202, 0.577335, 0.647425, 0.700000, 0.300000, 0.000000, 0.000000, 27.000000, 10.000000, 0.000000, 0.000000, - -13.089090, 1.318300, 46.891701, 0.572740, 0.815998, 0.078202, 0.564731, 0.664003, 0.700000, 0.300000, 0.000000, 0.000000, 27.000000, 10.000000, 0.000000, 0.000000, - -13.089090, 1.318300, 46.891701, 0.537842, 0.836016, 0.108639, 0.564731, 0.664003, 0.700000, 0.300000, 0.000000, 0.000000, 27.000000, 10.000000, 0.000000, 0.000000, - -14.434200, 3.293400, 38.351891, 0.537843, 0.836016, 0.108639, 0.516971, 0.647442, 1.000000, 0.000000, 0.000000, 0.000000, 27.000000, 0.000000, 0.000000, 0.000000, - -17.398399, 5.051790, 39.495399, 0.537842, 0.836016, 0.108639, 0.526377, 0.630591, 1.000000, 0.000000, 0.000000, 0.000000, 27.000000, 0.000000, 0.000000, 0.000000, - -15.536290, 2.877190, 48.548401, 0.959942, 0.243283, -0.139012, 0.577335, 0.647425, 0.700000, 0.300000, 0.000000, 0.000000, 27.000000, 10.000000, 0.000000, 0.000000, - -17.398399, 5.051790, 39.495399, 0.959942, 0.243283, -0.139012, 0.526377, 0.630591, 1.000000, 0.000000, 0.000000, 0.000000, 27.000000, 0.000000, 0.000000, 0.000000, - -18.111601, 9.402990, 42.185379, 0.959942, 0.243283, -0.139012, 0.543586, 0.609829, 1.000000, 0.000000, 0.000000, 0.000000, 27.000000, 0.000000, 0.000000, 0.000000, - -18.111601, 9.402990, 42.185379, 0.948705, 0.308960, -0.067107, 0.543586, 0.609829, 1.000000, 0.000000, 0.000000, 0.000000, 27.000000, 0.000000, 0.000000, 0.000000, - -16.258801, 5.886590, 52.189388, 0.948705, 0.308960, -0.067107, 0.601452, 0.629855, 0.500000, 0.500000, 0.000000, 0.000000, 10.000000, 27.000000, 0.000000, 0.000000, - -15.536290, 2.877190, 48.548401, 0.948705, 0.308960, -0.067107, 0.577335, 0.647425, 0.700000, 0.300000, 0.000000, 0.000000, 27.000000, 10.000000, 0.000000, 0.000000, - -18.782499, 5.618698, 16.876896, 0.428485, 0.896812, -0.110134, 0.514942, 0.433887, 0.598788, 0.401212, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -18.258699, 6.043300, 22.372297, 0.428485, 0.896812, -0.110134, 0.540385, 0.430422, 0.500000, 0.500000, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -15.856799, 4.856800, 22.055500, 0.428485, 0.896812, -0.110134, 0.541751, 0.442967, 0.500000, 0.500000, 0.000000, 0.000000, 27.000000, 28.000000, 0.000000, 0.000000, - -15.856799, 4.856800, 22.055500, 0.507111, 0.846528, -0.161952, 0.541751, 0.442967, 0.500000, 0.500000, 0.000000, 0.000000, 27.000000, 28.000000, 0.000000, 0.000000, - -16.614897, 4.320200, 16.876896, 0.507111, 0.846528, -0.161952, 0.517109, 0.447610, 0.659751, 0.340249, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -18.782499, 5.618698, 16.876896, 0.507111, 0.846528, -0.161952, 0.514942, 0.433887, 0.598788, 0.401212, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -19.748102, 1.964200, 10.146900, 0.427014, 0.803545, -0.414698, 0.480668, 0.443233, 0.981907, 0.018093, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -17.563993, 0.912998, 10.358999, 0.427014, 0.803545, -0.414698, 0.483048, 0.454680, 0.987984, 0.012016, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -17.630400, -0.642700, 7.276198, 0.427014, 0.803545, -0.414698, 0.466377, 0.459148, 0.750000, 0.250000, 0.000000, 0.000000, 28.000000, 29.000000, 0.000000, 0.000000, - -17.630400, -0.642700, 7.276198, 0.349406, 0.807387, -0.475438, 0.466377, 0.459148, 0.750000, 0.250000, 0.000000, 0.000000, 28.000000, 29.000000, 0.000000, 0.000000, - -20.275198, 0.082599, 6.564199, 0.349406, 0.807387, -0.475438, 0.461261, 0.445588, 0.750000, 0.250000, 0.000000, 0.000000, 28.000000, 29.000000, 0.000000, 0.000000, - -19.748102, 1.964200, 10.146900, 0.349406, 0.807387, -0.475438, 0.480668, 0.443233, 0.981907, 0.018093, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -20.736898, -2.723700, 4.664198, 0.348920, 0.485365, -0.801671, 0.445994, 0.449911, 0.850000, 0.150000, 0.000000, 0.000000, 29.000000, 28.000000, 0.000000, 0.000000, - -20.275198, 0.082599, 6.564199, 0.348920, 0.485365, -0.801671, 0.461261, 0.445588, 0.750000, 0.250000, 0.000000, 0.000000, 28.000000, 29.000000, 0.000000, 0.000000, - -17.630400, -0.642700, 7.276198, 0.348920, 0.485365, -0.801671, 0.466377, 0.459148, 0.750000, 0.250000, 0.000000, 0.000000, 28.000000, 29.000000, 0.000000, 0.000000, - -17.630400, -0.642700, 7.276198, 0.348446, 0.485914, -0.801544, 0.466377, 0.459148, 0.750000, 0.250000, 0.000000, 0.000000, 28.000000, 29.000000, 0.000000, 0.000000, - -17.630400, -3.471199, 5.561499, 0.348446, 0.485914, -0.801544, 0.451186, 0.463800, 0.850000, 0.150000, 0.000000, 0.000000, 29.000000, 28.000000, 0.000000, 0.000000, - -20.736898, -2.723700, 4.664198, 0.348446, 0.485914, -0.801544, 0.445994, 0.449911, 0.850000, 0.150000, 0.000000, 0.000000, 29.000000, 28.000000, 0.000000, 0.000000, - -20.763296, -6.813999, 3.768400, 0.316176, 0.201013, -0.927161, 0.430298, 0.458341, 1.000000, 0.000000, 0.000000, 0.000000, 29.000000, 0.000000, 0.000000, 0.000000, - -20.736898, -2.723700, 4.664198, 0.316176, 0.201013, -0.927161, 0.445994, 0.449911, 0.850000, 0.150000, 0.000000, 0.000000, 29.000000, 28.000000, 0.000000, 0.000000, - -17.630400, -3.471199, 5.561499, 0.316176, 0.201013, -0.927161, 0.451186, 0.463800, 0.850000, 0.150000, 0.000000, 0.000000, 29.000000, 28.000000, 0.000000, 0.000000, - -17.630400, -3.471199, 5.561499, 0.274683, 0.241769, -0.930643, 0.451186, 0.463800, 0.850000, 0.150000, 0.000000, 0.000000, 29.000000, 28.000000, 0.000000, 0.000000, - -17.630400, -7.604599, 4.487698, 0.274683, 0.241769, -0.930644, 0.433518, 0.469225, 1.000000, 0.000000, 0.000000, 0.000000, 29.000000, 0.000000, 0.000000, 0.000000, - -20.763296, -6.813999, 3.768400, 0.274683, 0.241769, -0.930643, 0.430298, 0.458341, 1.000000, 0.000000, 0.000000, 0.000000, 29.000000, 0.000000, 0.000000, 0.000000, - -21.313396, -8.093797, 1.152399, 0.315879, 0.824368, -0.469721, 0.417816, 0.458531, 1.000000, 0.000000, 0.000000, 0.000000, 29.000000, 0.000000, 0.000000, 0.000000, - -20.763296, -6.813999, 3.768400, 0.315879, 0.824368, -0.469721, 0.430298, 0.458341, 1.000000, 0.000000, 0.000000, 0.000000, 29.000000, 0.000000, 0.000000, 0.000000, - -17.630400, -7.604599, 4.487698, 0.315879, 0.824368, -0.469721, 0.433518, 0.469225, 1.000000, 0.000000, 0.000000, 0.000000, 29.000000, 0.000000, 0.000000, 0.000000, - -17.630400, -7.604599, 4.487698, 0.416487, 0.712704, -0.564439, 0.433518, 0.469225, 1.000000, 0.000000, 0.000000, 0.000000, 29.000000, 0.000000, 0.000000, 0.000000, - -17.630400, -10.353599, 1.016599, 0.416487, 0.712704, -0.564439, 0.416250, 0.474502, 1.000000, 0.000000, 0.000000, 0.000000, 29.000000, 0.000000, 0.000000, 0.000000, - -21.313396, -8.093797, 1.152399, 0.416487, 0.712704, -0.564439, 0.417816, 0.458531, 1.000000, 0.000000, 0.000000, 0.000000, 29.000000, 0.000000, 0.000000, 0.000000, - -17.630400, -9.388897, -1.604799, 0.412905, 0.901737, 0.127987, 0.406643, 0.477435, 1.000000, 0.000000, 0.000000, 0.000000, 29.000000, 0.000000, 0.000000, 0.000000, - -21.313396, -7.702299, -1.605900, 0.412905, 0.901737, 0.127987, 0.407012, 0.455274, 1.000000, 0.000000, 0.000000, 0.000000, 29.000000, 0.000000, 0.000000, 0.000000, - -21.313396, -8.093797, 1.152399, 0.412905, 0.901737, 0.127987, 0.417816, 0.458531, 1.000000, 0.000000, 0.000000, 0.000000, 29.000000, 0.000000, 0.000000, 0.000000, - -21.313396, -8.093797, 1.152399, 0.507226, 0.808784, 0.297641, 0.417816, 0.458531, 1.000000, 0.000000, 0.000000, 0.000000, 29.000000, 0.000000, 0.000000, 0.000000, - -17.630400, -10.353599, 1.016599, 0.507226, 0.808784, 0.297641, 0.416250, 0.474502, 1.000000, 0.000000, 0.000000, 0.000000, 29.000000, 0.000000, 0.000000, 0.000000, - -17.630400, -9.388897, -1.604799, 0.507226, 0.808784, 0.297641, 0.406643, 0.477435, 1.000000, 0.000000, 0.000000, 0.000000, 29.000000, 0.000000, 0.000000, 0.000000, - -18.259199, 12.477197, 22.368896, 0.509165, -0.837577, -0.198028, 0.541273, 0.398637, 0.500000, 0.500000, 0.000000, 0.000000, 27.000000, 28.000000, 0.000000, 0.000000, - -18.782499, 13.497199, 16.709200, 0.509165, -0.837577, -0.198028, 0.517639, 0.393253, 0.659227, 0.340773, 0.000000, 0.000000, 27.000000, 28.000000, 0.000000, 0.000000, - -16.614897, 14.749398, 16.986200, 0.509165, -0.837577, -0.198028, 0.522095, 0.383094, 0.679233, 0.320767, 0.000000, 0.000000, 27.000000, 28.000000, 0.000000, 0.000000, - -16.614897, 14.749398, 16.986200, 0.393479, -0.883863, -0.252906, 0.522095, 0.383094, 0.679233, 0.320767, 0.000000, 0.000000, 27.000000, 28.000000, 0.000000, 0.000000, - -15.856101, 13.635197, 22.060698, 0.393479, -0.883863, -0.252906, 0.541967, 0.386969, 0.500000, 0.500000, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -18.259199, 12.477197, 22.368896, 0.393479, -0.883863, -0.252906, 0.541273, 0.398637, 0.500000, 0.500000, 0.000000, 0.000000, 27.000000, 28.000000, 0.000000, 0.000000, - -19.417801, 14.814999, 13.283600, 0.639692, -0.588293, -0.494676, 0.504291, 0.385471, 0.586975, 0.413025, 0.000000, 0.000000, 27.000000, 28.000000, 0.000000, 0.000000, - -16.884001, 17.278900, 13.629999, 0.639692, -0.588293, -0.494676, 0.510086, 0.371129, 0.615463, 0.384537, 0.000000, 0.000000, 27.000000, 28.000000, 0.000000, 0.000000, - -16.614897, 14.749398, 16.986200, 0.639692, -0.588293, -0.494676, 0.522095, 0.383094, 0.679233, 0.320767, 0.000000, 0.000000, 27.000000, 28.000000, 0.000000, 0.000000, - -16.614897, 14.749398, 16.986200, 0.497437, -0.774745, -0.390291, 0.522095, 0.383094, 0.679233, 0.320767, 0.000000, 0.000000, 27.000000, 28.000000, 0.000000, 0.000000, - -18.782499, 13.497199, 16.709200, 0.497437, -0.774745, -0.390291, 0.517639, 0.393253, 0.659227, 0.340773, 0.000000, 0.000000, 27.000000, 28.000000, 0.000000, 0.000000, - -19.417801, 14.814999, 13.283600, 0.497437, -0.774745, -0.390291, 0.504291, 0.385471, 0.586975, 0.413025, 0.000000, 0.000000, 27.000000, 28.000000, 0.000000, 0.000000, - -17.630400, 16.448700, 7.983899, 0.696135, -0.717784, 0.013516, 0.485066, 0.367603, 0.887816, 0.112184, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -16.884001, 17.278900, 13.629999, 0.696135, -0.717784, 0.013516, 0.510086, 0.371129, 0.615463, 0.384537, 0.000000, 0.000000, 27.000000, 28.000000, 0.000000, 0.000000, - -19.417801, 14.814999, 13.283600, 0.696135, -0.717784, 0.013516, 0.504291, 0.385471, 0.586975, 0.413025, 0.000000, 0.000000, 27.000000, 28.000000, 0.000000, 0.000000, - -19.417801, 14.814999, 13.283600, 0.479791, -0.870878, -0.106643, 0.504291, 0.385471, 0.586975, 0.413025, 0.000000, 0.000000, 27.000000, 28.000000, 0.000000, 0.000000, - -21.395794, 14.353300, 8.154899, 0.479791, -0.870878, -0.106643, 0.481500, 0.385375, 0.904888, 0.095112, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -17.630400, 16.448700, 7.983899, 0.479791, -0.870878, -0.106643, 0.485066, 0.367603, 0.887816, 0.112184, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -17.630400, 14.964800, 5.484899, 0.448412, -0.768545, 0.456360, 0.471612, 0.368677, 0.992869, 0.007131, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -17.630400, 16.448700, 7.983899, 0.448412, -0.768545, 0.456360, 0.485066, 0.367603, 0.887816, 0.112184, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -21.395794, 14.353300, 8.154899, 0.448412, -0.768545, 0.456360, 0.481500, 0.385375, 0.904888, 0.095112, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -21.395794, 14.353300, 8.154899, 0.395540, -0.842908, 0.364767, 0.481500, 0.385375, 0.904888, 0.095112, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -21.395794, 13.197300, 5.483599, 0.395540, -0.842908, 0.364767, 0.469847, 0.386926, 0.997663, 0.002337, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -17.630400, 14.964800, 5.484899, 0.395540, -0.842908, 0.364767, 0.471612, 0.368677, 0.992869, 0.007131, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -22.666098, -3.346297, 1.198099, 0.961097, 0.273471, 0.038815, 0.429018, 0.442405, 0.850000, 0.150000, 0.000000, 0.000000, 29.000000, 28.000000, 0.000000, 0.000000, - -21.313396, -8.093797, 1.152399, 0.961097, 0.273471, 0.038815, 0.417816, 0.458531, 1.000000, 0.000000, 0.000000, 0.000000, 29.000000, 0.000000, 0.000000, 0.000000, - -21.313396, -7.702299, -1.605900, 0.961097, 0.273471, 0.038815, 0.407012, 0.455274, 1.000000, 0.000000, 0.000000, 0.000000, 29.000000, 0.000000, 0.000000, 0.000000, - -21.313396, -7.702299, -1.605900, 0.953931, 0.299971, -0.005809, 0.407012, 0.455274, 1.000000, 0.000000, 0.000000, 0.000000, 29.000000, 0.000000, 0.000000, 0.000000, - -22.666098, -3.400599, -1.605900, 0.953931, 0.299971, -0.005809, 0.417639, 0.436766, 1.000000, 0.000000, 0.000000, 0.000000, 29.000000, 0.000000, 0.000000, 0.000000, - -22.666098, -3.346297, 1.198099, 0.953931, 0.299971, -0.005809, 0.429018, 0.442405, 0.850000, 0.150000, 0.000000, 0.000000, 29.000000, 28.000000, 0.000000, 0.000000, - -22.469294, 2.208499, -0.781399, 0.999414, -0.033990, 0.003982, 0.433611, 0.419808, 0.750000, 0.250000, 0.000000, 0.000000, 28.000000, 29.000000, 0.000000, 0.000000, - -22.469294, 2.536997, 2.022700, 0.999414, -0.033990, 0.003982, 0.445608, 0.424832, 0.800000, 0.200000, 0.000000, 0.000000, 28.000000, 29.000000, 0.000000, 0.000000, - -22.666098, -3.346297, 1.198099, 0.999414, -0.033990, 0.003982, 0.429018, 0.442405, 0.850000, 0.150000, 0.000000, 0.000000, 29.000000, 28.000000, 0.000000, 0.000000, - -22.666098, -3.346297, 1.198099, 0.999381, -0.035165, 0.000681, 0.429018, 0.442405, 0.850000, 0.150000, 0.000000, 0.000000, 29.000000, 28.000000, 0.000000, 0.000000, - -22.666098, -3.400599, -1.605900, 0.999381, -0.035165, 0.000681, 0.417639, 0.436766, 1.000000, 0.000000, 0.000000, 0.000000, 29.000000, 0.000000, 0.000000, 0.000000, - -22.469294, 2.208499, -0.781399, 0.999381, -0.035165, 0.000681, 0.433611, 0.419808, 0.750000, 0.250000, 0.000000, 0.000000, 28.000000, 29.000000, 0.000000, 0.000000, - -22.666098, 8.060097, 6.581599, 0.999080, 0.042143, -0.007926, 0.471669, 0.410151, 0.994015, 0.005985, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -22.666098, 8.380999, 8.287799, 0.999080, 0.042143, -0.007926, 0.478732, 0.410798, 0.954867, 0.045133, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -22.469294, 2.536997, 2.022700, 0.999080, 0.042143, -0.007926, 0.445608, 0.424832, 0.800000, 0.200000, 0.000000, 0.000000, 28.000000, 29.000000, 0.000000, 0.000000, - -22.469294, 2.536997, 2.022700, 0.999212, 0.039416, -0.004618, 0.445608, 0.424832, 0.800000, 0.200000, 0.000000, 0.000000, 28.000000, 29.000000, 0.000000, 0.000000, - -22.469294, 2.208499, -0.781399, 0.999212, 0.039416, -0.004618, 0.433611, 0.419808, 0.750000, 0.250000, 0.000000, 0.000000, 28.000000, 29.000000, 0.000000, 0.000000, - -22.666098, 8.060097, 6.581599, 0.999212, 0.039416, -0.004618, 0.471669, 0.410151, 0.994015, 0.005985, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -22.666098, 8.380999, 8.287799, 0.998572, -0.052511, 0.009876, 0.478732, 0.410798, 0.954867, 0.045133, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -22.666098, 8.060097, 6.581599, 0.998571, -0.052511, 0.009876, 0.471669, 0.410151, 0.994015, 0.005985, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -22.652899, 8.104600, 5.483699, 0.998572, -0.052511, 0.009876, 0.466098, 0.409710, 0.999664, 0.000336, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -22.652899, 8.104600, 5.483699, 0.965680, -0.238371, 0.103155, 0.466098, 0.409710, 0.999664, 0.000336, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -21.395794, 13.197300, 5.483599, 0.965680, -0.238371, 0.103155, 0.469847, 0.386926, 0.997663, 0.002337, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -21.395794, 14.353300, 8.154899, 0.965680, -0.238371, 0.103155, 0.481500, 0.385375, 0.904888, 0.095112, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -22.666098, 8.380999, 8.287799, 0.977926, -0.207447, 0.025051, 0.478732, 0.410798, 0.954867, 0.045133, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -22.652899, 8.104600, 5.483699, 0.977926, -0.207447, 0.025051, 0.466098, 0.409710, 0.999664, 0.000336, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -21.395794, 14.353300, 8.154899, 0.977926, -0.207447, 0.025051, 0.481500, 0.385375, 0.904888, 0.095112, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -20.279299, 9.653599, 16.876896, 0.918819, 0.385513, -0.084570, 0.516058, 0.412547, 0.516662, 0.483338, 0.000000, 0.000000, 27.000000, 28.000000, 0.000000, 0.000000, - -19.688293, 9.491899, 22.560797, 0.918819, 0.385513, -0.084570, 0.540674, 0.413387, 0.500000, 0.500000, 0.000000, 0.000000, 27.000000, 28.000000, 0.000000, 0.000000, - -18.258699, 6.043300, 22.372297, 0.918819, 0.385513, -0.084570, 0.540385, 0.430422, 0.500000, 0.500000, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -18.258699, 6.043300, 22.372297, 0.931297, 0.345477, -0.115461, 0.540385, 0.430422, 0.500000, 0.500000, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -18.782499, 5.618698, 16.876896, 0.931297, 0.345477, -0.115461, 0.514942, 0.433887, 0.598788, 0.401212, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -20.279299, 9.653599, 16.876896, 0.931297, 0.345477, -0.115461, 0.516058, 0.412547, 0.516662, 0.483338, 0.000000, 0.000000, 27.000000, 28.000000, 0.000000, 0.000000, - -18.259199, 12.477197, 22.368896, 0.894301, -0.434884, -0.105360, 0.541273, 0.398637, 0.500000, 0.500000, 0.000000, 0.000000, 27.000000, 28.000000, 0.000000, 0.000000, - -19.688293, 9.491899, 22.560797, 0.894301, -0.434884, -0.105360, 0.540674, 0.413387, 0.500000, 0.500000, 0.000000, 0.000000, 27.000000, 28.000000, 0.000000, 0.000000, - -20.279299, 9.653599, 16.876896, 0.894301, -0.434884, -0.105360, 0.516058, 0.412547, 0.516662, 0.483338, 0.000000, 0.000000, 27.000000, 28.000000, 0.000000, 0.000000, - -20.279299, 9.653599, 16.876896, 0.918961, -0.364440, -0.150648, 0.516058, 0.412547, 0.516662, 0.483338, 0.000000, 0.000000, 27.000000, 28.000000, 0.000000, 0.000000, - -18.782499, 13.497199, 16.709200, 0.918961, -0.364440, -0.150648, 0.517639, 0.393253, 0.659227, 0.340773, 0.000000, 0.000000, 27.000000, 28.000000, 0.000000, 0.000000, - -18.259199, 12.477197, 22.368896, 0.918960, -0.364440, -0.150648, 0.541273, 0.398637, 0.500000, 0.500000, 0.000000, 0.000000, 27.000000, 28.000000, 0.000000, 0.000000, - -21.775400, 9.481700, 11.706999, 0.902165, 0.334670, -0.272203, 0.493629, 0.409729, 0.706395, 0.293605, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -20.279299, 9.653599, 16.876896, 0.902165, 0.334670, -0.272203, 0.516058, 0.412547, 0.516662, 0.483338, 0.000000, 0.000000, 27.000000, 28.000000, 0.000000, 0.000000, - -18.782499, 5.618698, 16.876896, 0.902165, 0.334670, -0.272203, 0.514942, 0.433887, 0.598788, 0.401212, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -18.782499, 5.618698, 16.876896, 0.907082, 0.264467, -0.327506, 0.514942, 0.433887, 0.598788, 0.401212, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -21.341997, 4.469200, 8.859698, 0.907082, 0.264467, -0.327506, 0.477127, 0.428749, 0.976286, 0.023714, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -21.775400, 9.481700, 11.706999, 0.907082, 0.264467, -0.327506, 0.493629, 0.409729, 0.706395, 0.293605, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -19.417801, 14.814999, 13.283600, 0.883975, -0.357394, -0.301426, 0.504291, 0.385471, 0.586975, 0.413025, 0.000000, 0.000000, 27.000000, 28.000000, 0.000000, 0.000000, - -18.782499, 13.497199, 16.709200, 0.883975, -0.357394, -0.301426, 0.517639, 0.393253, 0.659227, 0.340773, 0.000000, 0.000000, 27.000000, 28.000000, 0.000000, 0.000000, - -20.279299, 9.653599, 16.876896, 0.883975, -0.357394, -0.301426, 0.516058, 0.412547, 0.516662, 0.483338, 0.000000, 0.000000, 27.000000, 28.000000, 0.000000, 0.000000, - -20.279299, 9.653599, 16.876896, 0.910374, -0.327775, -0.252552, 0.516058, 0.412547, 0.516662, 0.483338, 0.000000, 0.000000, 27.000000, 28.000000, 0.000000, 0.000000, - -21.775400, 9.481700, 11.706999, 0.910374, -0.327775, -0.252552, 0.493629, 0.409729, 0.706395, 0.293605, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -19.417801, 14.814999, 13.283600, 0.910374, -0.327775, -0.252552, 0.504291, 0.385471, 0.586975, 0.413025, 0.000000, 0.000000, 27.000000, 28.000000, 0.000000, 0.000000, - -22.666098, 8.380999, 8.287799, 0.910287, 0.261163, -0.321202, 0.478732, 0.410798, 0.954867, 0.045133, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -21.775400, 9.481700, 11.706999, 0.910287, 0.261163, -0.321202, 0.493629, 0.409729, 0.706395, 0.293605, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -21.341997, 4.469200, 8.859698, 0.910287, 0.261163, -0.321202, 0.477127, 0.428749, 0.976286, 0.023714, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -21.341997, 4.469200, 8.859698, 0.930988, 0.281074, -0.232937, 0.477127, 0.428749, 0.976286, 0.023714, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -22.469294, 2.536997, 2.022700, 0.930988, 0.281074, -0.232937, 0.445608, 0.424832, 0.800000, 0.200000, 0.000000, 0.000000, 28.000000, 29.000000, 0.000000, 0.000000, - -22.666098, 8.380999, 8.287799, 0.930988, 0.281074, -0.232937, 0.478732, 0.410798, 0.954867, 0.045133, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -21.775400, 9.481700, 11.706999, 0.960733, -0.208423, -0.183175, 0.493629, 0.409729, 0.706395, 0.293605, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -22.666098, 8.380999, 8.287799, 0.960733, -0.208423, -0.183175, 0.478732, 0.410798, 0.954867, 0.045133, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -21.395794, 14.353300, 8.154899, 0.960733, -0.208423, -0.183175, 0.481500, 0.385375, 0.904888, 0.095112, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -21.395794, 14.353300, 8.154899, 0.898085, -0.302665, -0.319119, 0.481500, 0.385375, 0.904888, 0.095112, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -19.417801, 14.814999, 13.283600, 0.898085, -0.302665, -0.319119, 0.504291, 0.385471, 0.586975, 0.413025, 0.000000, 0.000000, 27.000000, 28.000000, 0.000000, 0.000000, - -21.775400, 9.481700, 11.706999, 0.898085, -0.302665, -0.319119, 0.493629, 0.409729, 0.706395, 0.293605, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -21.341997, 4.469200, 8.859698, 0.864321, 0.381624, -0.327586, 0.477127, 0.428749, 0.976286, 0.023714, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -19.748102, 1.964200, 10.146900, 0.864321, 0.381624, -0.327586, 0.480668, 0.443233, 0.981907, 0.018093, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -20.275198, 0.082599, 6.564199, 0.864321, 0.381624, -0.327586, 0.461261, 0.445588, 0.750000, 0.250000, 0.000000, 0.000000, 28.000000, 29.000000, 0.000000, 0.000000, - -20.275198, 0.082599, 6.564199, 0.903631, 0.349398, -0.247736, 0.461261, 0.445588, 0.750000, 0.250000, 0.000000, 0.000000, 28.000000, 29.000000, 0.000000, 0.000000, - -22.469294, 2.536997, 2.022700, 0.903631, 0.349398, -0.247735, 0.445608, 0.424832, 0.800000, 0.200000, 0.000000, 0.000000, 28.000000, 29.000000, 0.000000, 0.000000, - -21.341997, 4.469200, 8.859698, 0.903631, 0.349398, -0.247736, 0.477127, 0.428749, 0.976286, 0.023714, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -22.469294, 2.536997, 2.022700, 0.916869, 0.109129, -0.383982, 0.445608, 0.424832, 0.800000, 0.200000, 0.000000, 0.000000, 28.000000, 29.000000, 0.000000, 0.000000, - -20.275198, 0.082599, 6.564199, 0.916869, 0.109129, -0.383982, 0.461261, 0.445588, 0.750000, 0.250000, 0.000000, 0.000000, 28.000000, 29.000000, 0.000000, 0.000000, - -20.736898, -2.723700, 4.664198, 0.916869, 0.109129, -0.383982, 0.445994, 0.449911, 0.850000, 0.150000, 0.000000, 0.000000, 29.000000, 28.000000, 0.000000, 0.000000, - -20.736898, -2.723700, 4.664198, 0.870029, 0.039770, -0.491394, 0.445994, 0.449911, 0.850000, 0.150000, 0.000000, 0.000000, 29.000000, 28.000000, 0.000000, 0.000000, - -22.666098, -3.346297, 1.198099, 0.870029, 0.039770, -0.491394, 0.429018, 0.442405, 0.850000, 0.150000, 0.000000, 0.000000, 29.000000, 28.000000, 0.000000, 0.000000, - -22.469294, 2.536997, 2.022700, 0.870029, 0.039770, -0.491394, 0.445608, 0.424832, 0.800000, 0.200000, 0.000000, 0.000000, 28.000000, 29.000000, 0.000000, 0.000000, - -20.763296, -6.813999, 3.768400, 0.910387, 0.262475, -0.319847, 0.430298, 0.458341, 1.000000, 0.000000, 0.000000, 0.000000, 29.000000, 0.000000, 0.000000, 0.000000, - -21.313396, -8.093797, 1.152399, 0.910387, 0.262475, -0.319847, 0.417816, 0.458531, 1.000000, 0.000000, 0.000000, 0.000000, 29.000000, 0.000000, 0.000000, 0.000000, - -22.666098, -3.346297, 1.198099, 0.910387, 0.262475, -0.319847, 0.429018, 0.442405, 0.850000, 0.150000, 0.000000, 0.000000, 29.000000, 28.000000, 0.000000, 0.000000, - -22.666098, -3.346297, 1.198099, 0.861068, 0.103475, -0.497850, 0.429018, 0.442405, 0.850000, 0.150000, 0.000000, 0.000000, 29.000000, 28.000000, 0.000000, 0.000000, - -20.736898, -2.723700, 4.664198, 0.861068, 0.103475, -0.497849, 0.445994, 0.449911, 0.850000, 0.150000, 0.000000, 0.000000, 29.000000, 28.000000, 0.000000, 0.000000, - -20.763296, -6.813999, 3.768400, 0.861068, 0.103475, -0.497849, 0.430298, 0.458341, 1.000000, 0.000000, 0.000000, 0.000000, 29.000000, 0.000000, 0.000000, 0.000000, - -17.798698, 4.703199, 29.518997, 0.455336, 0.879781, 0.136578, 0.572459, 0.427456, 1.000000, 0.000000, 0.000000, 0.000000, 27.000000, 0.000000, 0.000000, 0.000000, - -14.855898, 3.253099, 29.048998, 0.455336, 0.879781, 0.136578, 0.573395, 0.436442, 1.000000, 0.000000, 0.000000, 0.000000, 27.000000, 0.000000, 0.000000, 0.000000, - -15.856799, 4.856800, 22.055500, 0.455336, 0.879782, 0.136578, 0.541751, 0.442967, 0.500000, 0.500000, 0.000000, 0.000000, 27.000000, 28.000000, 0.000000, 0.000000, - -15.856799, 4.856800, 22.055500, 0.453141, 0.880999, 0.136032, 0.541751, 0.442967, 0.500000, 0.500000, 0.000000, 0.000000, 27.000000, 28.000000, 0.000000, 0.000000, - -18.258699, 6.043300, 22.372297, 0.453141, 0.880999, 0.136032, 0.540385, 0.430422, 0.500000, 0.500000, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -17.798698, 4.703199, 29.518997, 0.453141, 0.880999, 0.136032, 0.572459, 0.427456, 1.000000, 0.000000, 0.000000, 0.000000, 27.000000, 0.000000, 0.000000, 0.000000, - -14.744999, 13.314299, 29.873997, 0.421258, -0.901774, -0.096669, 0.575119, 0.383967, 1.000000, 0.000000, 0.000000, 0.000000, 27.000000, 0.000000, 0.000000, 0.000000, - -17.720600, 11.899997, 30.100401, 0.421258, -0.901774, -0.096669, 0.574830, 0.397969, 1.000000, 0.000000, 0.000000, 0.000000, 27.000000, 0.000000, 0.000000, 0.000000, - -18.259199, 12.477197, 22.368896, 0.421258, -0.901774, -0.096669, 0.541273, 0.398637, 0.500000, 0.500000, 0.000000, 0.000000, 27.000000, 28.000000, 0.000000, 0.000000, - -18.259199, 12.477197, 22.368896, 0.421932, -0.901421, -0.097023, 0.541273, 0.398637, 0.500000, 0.500000, 0.000000, 0.000000, 27.000000, 28.000000, 0.000000, 0.000000, - -15.856101, 13.635197, 22.060698, 0.421932, -0.901421, -0.097023, 0.541967, 0.386969, 0.500000, 0.500000, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -14.744999, 13.314299, 29.873997, 0.421932, -0.901421, -0.097023, 0.575119, 0.383967, 1.000000, 0.000000, 0.000000, 0.000000, 27.000000, 0.000000, 0.000000, 0.000000, - -19.520899, 8.250698, 30.017200, 0.900636, 0.433944, 0.023400, 0.573596, 0.413939, 1.000000, 0.000000, 0.000000, 0.000000, 27.000000, 0.000000, 0.000000, 0.000000, - -17.798698, 4.703199, 29.518997, 0.900636, 0.433944, 0.023400, 0.572459, 0.427456, 1.000000, 0.000000, 0.000000, 0.000000, 27.000000, 0.000000, 0.000000, 0.000000, - -18.258699, 6.043300, 22.372297, 0.900636, 0.433944, 0.023400, 0.540385, 0.430422, 0.500000, 0.500000, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -18.258699, 6.043300, 22.372297, 0.923754, 0.380607, 0.042618, 0.540385, 0.430422, 0.500000, 0.500000, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -19.688293, 9.491899, 22.560797, 0.923754, 0.380607, 0.042618, 0.540674, 0.413387, 0.500000, 0.500000, 0.000000, 0.000000, 27.000000, 28.000000, 0.000000, 0.000000, - -19.520899, 8.250698, 30.017200, 0.923754, 0.380607, 0.042618, 0.573596, 0.413939, 1.000000, 0.000000, 0.000000, 0.000000, 27.000000, 0.000000, 0.000000, 0.000000, - -17.720600, 11.899997, 30.100401, 0.893753, -0.438790, -0.093106, 0.574830, 0.397969, 1.000000, 0.000000, 0.000000, 0.000000, 27.000000, 0.000000, 0.000000, 0.000000, - -19.520899, 8.250698, 30.017200, 0.893753, -0.438790, -0.093106, 0.573596, 0.413939, 1.000000, 0.000000, 0.000000, 0.000000, 27.000000, 0.000000, 0.000000, 0.000000, - -19.688293, 9.491899, 22.560797, 0.893753, -0.438790, -0.093106, 0.540674, 0.413387, 0.500000, 0.500000, 0.000000, 0.000000, 27.000000, 28.000000, 0.000000, 0.000000, - -19.688293, 9.491899, 22.560797, 0.895522, -0.434793, -0.094844, 0.540674, 0.413387, 0.500000, 0.500000, 0.000000, 0.000000, 27.000000, 28.000000, 0.000000, 0.000000, - -18.259199, 12.477197, 22.368896, 0.895522, -0.434793, -0.094844, 0.541273, 0.398637, 0.500000, 0.500000, 0.000000, 0.000000, 27.000000, 28.000000, 0.000000, 0.000000, - -17.720600, 11.899997, 30.100401, 0.895522, -0.434793, -0.094844, 0.574830, 0.397969, 1.000000, 0.000000, 0.000000, 0.000000, 27.000000, 0.000000, 0.000000, 0.000000, - -15.856799, 4.856800, 22.055500, -0.567688, 0.822562, -0.033493, 0.541751, 0.442967, 0.500000, 0.500000, 0.000000, 0.000000, 27.000000, 28.000000, 0.000000, 0.000000, - -14.103697, 6.053800, 21.738796, -0.567688, 0.822562, -0.033493, 0.544455, 0.452834, 0.500000, 0.500000, 0.000000, 0.000000, 27.000000, 28.000000, 0.000000, 0.000000, - -14.447299, 5.618698, 16.876896, -0.567688, 0.822562, -0.033493, 0.522758, 0.460197, 0.581534, 0.418466, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -14.447299, 5.618698, 16.876896, -0.513848, 0.857772, -0.013659, 0.522758, 0.460197, 0.581534, 0.418466, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -16.614897, 4.320200, 16.876896, -0.513848, 0.857772, -0.013659, 0.517109, 0.447610, 0.659751, 0.340249, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -15.856799, 4.856800, 22.055500, -0.513848, 0.857772, -0.013659, 0.541751, 0.442967, 0.500000, 0.500000, 0.000000, 0.000000, 27.000000, 28.000000, 0.000000, 0.000000, - -15.379999, 1.958800, 10.134499, -0.348457, 0.813330, -0.465910, 0.487569, 0.465529, 0.971473, 0.028527, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -14.985499, 0.082599, 6.564199, -0.348457, 0.813330, -0.465910, 0.469616, 0.473016, 0.750000, 0.250000, 0.000000, 0.000000, 28.000000, 29.000000, 0.000000, 0.000000, - -17.630400, -0.642700, 7.276198, -0.348457, 0.813330, -0.465910, 0.466377, 0.459148, 0.750000, 0.250000, 0.000000, 0.000000, 28.000000, 29.000000, 0.000000, 0.000000, - -17.630400, -0.642700, 7.276198, -0.428999, 0.810122, -0.399577, 0.466377, 0.459148, 0.750000, 0.250000, 0.000000, 0.000000, 28.000000, 29.000000, 0.000000, 0.000000, - -17.563993, 0.912998, 10.358999, -0.428999, 0.810122, -0.399577, 0.483048, 0.454680, 0.987984, 0.012016, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -15.379999, 1.958800, 10.134499, -0.428999, 0.810122, -0.399577, 0.487569, 0.465529, 0.971473, 0.028527, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -17.630400, -0.642700, 7.276198, -0.348908, 0.485369, -0.801673, 0.466377, 0.459148, 0.750000, 0.250000, 0.000000, 0.000000, 28.000000, 29.000000, 0.000000, 0.000000, - -14.985499, 0.082599, 6.564199, -0.348908, 0.485369, -0.801673, 0.469616, 0.473016, 0.750000, 0.250000, 0.000000, 0.000000, 28.000000, 29.000000, 0.000000, 0.000000, - -14.523799, -2.723700, 4.664198, -0.348908, 0.485369, -0.801673, 0.454656, 0.478259, 0.850000, 0.150000, 0.000000, 0.000000, 29.000000, 28.000000, 0.000000, 0.000000, - -14.523799, -2.723700, 4.664198, -0.348436, 0.485916, -0.801547, 0.454656, 0.478259, 0.850000, 0.150000, 0.000000, 0.000000, 29.000000, 28.000000, 0.000000, 0.000000, - -17.630400, -3.471199, 5.561499, -0.348436, 0.485916, -0.801547, 0.451186, 0.463800, 0.850000, 0.150000, 0.000000, 0.000000, 29.000000, 28.000000, 0.000000, 0.000000, - -17.630400, -0.642700, 7.276198, -0.348436, 0.485916, -0.801547, 0.466377, 0.459148, 0.750000, 0.250000, 0.000000, 0.000000, 28.000000, 29.000000, 0.000000, 0.000000, - -17.630400, -3.471199, 5.561499, -0.316166, 0.201013, -0.927164, 0.451186, 0.463800, 0.850000, 0.150000, 0.000000, 0.000000, 29.000000, 28.000000, 0.000000, 0.000000, - -14.523799, -2.723700, 4.664198, -0.316166, 0.201013, -0.927164, 0.454656, 0.478259, 0.850000, 0.150000, 0.000000, 0.000000, 29.000000, 28.000000, 0.000000, 0.000000, - -14.497398, -6.813999, 3.768400, -0.316166, 0.201013, -0.927164, 0.436965, 0.480059, 1.000000, 0.000000, 0.000000, 0.000000, 29.000000, 0.000000, 0.000000, 0.000000, - -14.497398, -6.813999, 3.768400, -0.274674, 0.241769, -0.930646, 0.436965, 0.480059, 1.000000, 0.000000, 0.000000, 0.000000, 29.000000, 0.000000, 0.000000, 0.000000, - -17.630400, -7.604599, 4.487698, -0.274674, 0.241769, -0.930646, 0.433518, 0.469225, 1.000000, 0.000000, 0.000000, 0.000000, 29.000000, 0.000000, 0.000000, 0.000000, - -17.630400, -3.471199, 5.561499, -0.274674, 0.241769, -0.930646, 0.451186, 0.463800, 0.850000, 0.150000, 0.000000, 0.000000, 29.000000, 28.000000, 0.000000, 0.000000, - -17.630400, -7.604599, 4.487698, -0.315869, 0.824372, -0.469720, 0.433518, 0.469225, 1.000000, 0.000000, 0.000000, 0.000000, 29.000000, 0.000000, 0.000000, 0.000000, - -14.497398, -6.813999, 3.768400, -0.315869, 0.824372, -0.469720, 0.436965, 0.480059, 1.000000, 0.000000, 0.000000, 0.000000, 29.000000, 0.000000, 0.000000, 0.000000, - -13.947299, -8.093797, 1.152399, -0.315869, 0.824372, -0.469720, 0.426534, 0.486856, 1.000000, 0.000000, 0.000000, 0.000000, 29.000000, 0.000000, 0.000000, 0.000000, - -13.947299, -8.093797, 1.152399, -0.416477, 0.712708, -0.564442, 0.426534, 0.486856, 1.000000, 0.000000, 0.000000, 0.000000, 29.000000, 0.000000, 0.000000, 0.000000, - -17.630400, -10.353599, 1.016599, -0.416477, 0.712708, -0.564442, 0.416250, 0.474502, 1.000000, 0.000000, 0.000000, 0.000000, 29.000000, 0.000000, 0.000000, 0.000000, - -17.630400, -7.604599, 4.487698, -0.416477, 0.712708, -0.564442, 0.433518, 0.469225, 1.000000, 0.000000, 0.000000, 0.000000, 29.000000, 0.000000, 0.000000, 0.000000, - -17.630400, -9.388897, -1.604799, -0.507215, 0.808790, 0.297643, 0.406643, 0.477435, 1.000000, 0.000000, 0.000000, 0.000000, 29.000000, 0.000000, 0.000000, 0.000000, - -17.630400, -10.353599, 1.016599, -0.507215, 0.808790, 0.297643, 0.416250, 0.474502, 1.000000, 0.000000, 0.000000, 0.000000, 29.000000, 0.000000, 0.000000, 0.000000, - -13.947299, -8.093797, 1.152399, -0.507215, 0.808790, 0.297643, 0.426534, 0.486856, 1.000000, 0.000000, 0.000000, 0.000000, 29.000000, 0.000000, 0.000000, 0.000000, - -13.947299, -8.093797, 1.152399, -0.412895, 0.901741, 0.127988, 0.426534, 0.486856, 1.000000, 0.000000, 0.000000, 0.000000, 29.000000, 0.000000, 0.000000, 0.000000, - -13.947299, -7.702299, -1.605900, -0.412895, 0.901741, 0.127988, 0.419358, 0.495539, 1.000000, 0.000000, 0.000000, 0.000000, 29.000000, 0.000000, 0.000000, 0.000000, - -17.630400, -9.388897, -1.604799, -0.412895, 0.901741, 0.127988, 0.406643, 0.477435, 1.000000, 0.000000, 0.000000, 0.000000, 29.000000, 0.000000, 0.000000, 0.000000, - -15.856101, 13.635197, 22.060698, -0.507752, -0.854239, -0.111640, 0.564035, 0.490250, 0.500000, 0.500000, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -16.614897, 14.749398, 16.986200, -0.507752, -0.854239, -0.111640, 0.548794, 0.503064, 0.679233, 0.320767, 0.000000, 0.000000, 27.000000, 28.000000, 0.000000, 0.000000, - -14.447299, 13.497199, 16.709200, -0.507752, -0.854239, -0.111640, 0.541723, 0.494333, 0.664829, 0.335171, 0.000000, 0.000000, 27.000000, 28.000000, 0.000000, 0.000000, - -14.447299, 13.497199, 16.709200, -0.439619, -0.893389, -0.092694, 0.541723, 0.494333, 0.664829, 0.335171, 0.000000, 0.000000, 27.000000, 28.000000, 0.000000, 0.000000, - -13.455398, 12.487600, 21.735497, -0.439619, -0.893389, -0.092694, 0.558388, 0.480132, 0.500000, 0.500000, 0.000000, 0.000000, 27.000000, 28.000000, 0.000000, 0.000000, - -15.856101, 13.635197, 22.060698, -0.439619, -0.893389, -0.092694, 0.564035, 0.490250, 0.500000, 0.500000, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -14.350198, 14.814999, 13.283600, -0.504057, -0.801198, -0.322502, 0.532895, 0.506750, 0.602108, 0.397892, 0.000000, 0.000000, 27.000000, 28.000000, 0.000000, 0.000000, - -14.447299, 13.497199, 16.709200, -0.504057, -0.801198, -0.322502, 0.541723, 0.494333, 0.664829, 0.335171, 0.000000, 0.000000, 27.000000, 28.000000, 0.000000, 0.000000, - -16.614897, 14.749398, 16.986200, -0.504057, -0.801198, -0.322502, 0.548794, 0.503064, 0.679233, 0.320767, 0.000000, 0.000000, 27.000000, 28.000000, 0.000000, 0.000000, - -16.614897, 14.749398, 16.986200, -0.662493, -0.622768, -0.416248, 0.548794, 0.503064, 0.679233, 0.320767, 0.000000, 0.000000, 27.000000, 28.000000, 0.000000, 0.000000, - -16.884001, 17.278900, 13.629999, -0.662493, -0.622768, -0.416248, 0.542663, 0.518661, 0.615463, 0.384537, 0.000000, 0.000000, 27.000000, 28.000000, 0.000000, 0.000000, - -14.350198, 14.814999, 13.283600, -0.662493, -0.622768, -0.416248, 0.532895, 0.506750, 0.602108, 0.397892, 0.000000, 0.000000, 27.000000, 28.000000, 0.000000, 0.000000, - -14.350198, 14.814999, 13.283600, -0.670157, -0.716435, 0.193937, 0.532895, 0.506750, 0.602108, 0.397892, 0.000000, 0.000000, 27.000000, 28.000000, 0.000000, 0.000000, - -16.884001, 17.278900, 13.629999, -0.670157, -0.716435, 0.193937, 0.542663, 0.518661, 0.615463, 0.384537, 0.000000, 0.000000, 27.000000, 28.000000, 0.000000, 0.000000, - -17.630400, 16.448700, 7.983899, -0.670157, -0.716435, 0.193937, 0.522420, 0.533306, 0.887816, 0.112184, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -17.630400, 16.448700, 7.983899, -0.487124, -0.872729, 0.032471, 0.522420, 0.533306, 0.887816, 0.112184, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -13.864899, 14.353300, 8.154899, -0.487125, -0.872729, 0.032471, 0.513987, 0.516962, 0.850937, 0.149063, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -14.350198, 14.814999, 13.283600, -0.487125, -0.872729, 0.032471, 0.532895, 0.506750, 0.602108, 0.397892, 0.000000, 0.000000, 27.000000, 28.000000, 0.000000, 0.000000, - -13.864899, 14.353300, 8.154899, -0.448402, -0.768550, 0.456363, 0.513987, 0.516962, 0.850937, 0.149063, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -17.630400, 16.448700, 7.983899, -0.448402, -0.768550, 0.456363, 0.522420, 0.533306, 0.887816, 0.112184, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -17.630400, 14.964800, 5.484899, -0.448402, -0.768550, 0.456363, 0.509674, 0.536257, 0.992869, 0.007131, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -17.630400, 14.964800, 5.484899, -0.395531, -0.842911, 0.364768, 0.509674, 0.536257, 0.992869, 0.007131, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -13.864899, 13.197300, 5.483599, -0.395531, -0.842911, 0.364768, 0.502230, 0.519577, 0.989801, 0.010199, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -13.864899, 14.353300, 8.154899, -0.395531, -0.842911, 0.364768, 0.513987, 0.516962, 0.850937, 0.149063, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -13.947299, -7.702299, -1.605900, -0.961102, 0.273452, 0.038812, 0.419358, 0.495539, 1.000000, 0.000000, 0.000000, 0.000000, 29.000000, 0.000000, 0.000000, 0.000000, - -13.947299, -8.093797, 1.152399, -0.961102, 0.273452, 0.038812, 0.426534, 0.486856, 1.000000, 0.000000, 0.000000, 0.000000, 29.000000, 0.000000, 0.000000, 0.000000, - -12.594699, -3.346297, 1.198099, -0.961102, 0.273452, 0.038812, 0.444978, 0.494098, 0.850000, 0.150000, 0.000000, 0.000000, 29.000000, 28.000000, 0.000000, 0.000000, - -12.594699, -3.346297, 1.198099, -0.953937, 0.299950, -0.005809, 0.444978, 0.494098, 0.850000, 0.150000, 0.000000, 0.000000, 29.000000, 28.000000, 0.000000, 0.000000, - -12.594699, -3.400599, -1.605900, -0.953937, 0.299950, -0.005809, 0.438263, 0.504862, 1.000000, 0.000000, 0.000000, 0.000000, 29.000000, 0.000000, 0.000000, 0.000000, - -13.947299, -7.702299, -1.605900, -0.953937, 0.299950, -0.005809, 0.419358, 0.495539, 1.000000, 0.000000, 0.000000, 0.000000, 29.000000, 0.000000, 0.000000, 0.000000, - -12.791398, 2.208400, -0.602599, -0.999381, -0.035169, 0.000681, 0.460316, 0.510249, 0.750000, 0.250000, 0.000000, 0.000000, 28.000000, 29.000000, 0.000000, 0.000000, - -12.594699, -3.400599, -1.605900, -0.999381, -0.035169, 0.000681, 0.438263, 0.504862, 1.000000, 0.000000, 0.000000, 0.000000, 29.000000, 0.000000, 0.000000, 0.000000, - -12.594699, -3.346297, 1.198099, -0.999381, -0.035169, 0.000681, 0.444978, 0.494098, 0.850000, 0.150000, 0.000000, 0.000000, 29.000000, 28.000000, 0.000000, 0.000000, - -12.594699, -3.346297, 1.198099, -0.999395, -0.034728, 0.002042, 0.444978, 0.494098, 0.850000, 0.150000, 0.000000, 0.000000, 29.000000, 28.000000, 0.000000, 0.000000, - -12.791398, 2.524300, 4.770400, -0.999395, -0.034728, 0.002042, 0.473699, 0.489789, 0.750000, 0.250000, 0.000000, 0.000000, 28.000000, 29.000000, 0.000000, 0.000000, - -12.791398, 2.208400, -0.602599, -0.999395, -0.034728, 0.002042, 0.460316, 0.510249, 0.750000, 0.250000, 0.000000, 0.000000, 28.000000, 29.000000, 0.000000, 0.000000, - -12.594699, 8.060097, 6.581599, -0.999342, 0.036205, -0.002129, 0.496266, 0.497570, 0.981322, 0.018678, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -12.791398, 2.208400, -0.602599, -0.999342, 0.036205, -0.002129, 0.460316, 0.510249, 0.750000, 0.250000, 0.000000, 0.000000, 28.000000, 29.000000, 0.000000, 0.000000, - -12.791398, 2.524300, 4.770400, -0.999342, 0.036205, -0.002129, 0.473699, 0.489789, 0.750000, 0.250000, 0.000000, 0.000000, 28.000000, 29.000000, 0.000000, 0.000000, - -12.791398, 2.524300, 4.770400, -0.999260, 0.037814, -0.007053, 0.473699, 0.489789, 0.750000, 0.250000, 0.000000, 0.000000, 28.000000, 29.000000, 0.000000, 0.000000, - -12.594599, 8.380999, 8.287799, -0.999260, 0.037814, -0.007053, 0.501837, 0.494128, 0.921648, 0.078352, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -12.594699, 8.060097, 6.581599, -0.999260, 0.037814, -0.007053, 0.496266, 0.497570, 0.981322, 0.018678, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -12.607799, 8.104600, 5.483699, -0.998606, -0.051862, 0.009813, 0.490879, 0.499555, 0.996037, 0.003963, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -12.594699, 8.060097, 6.581599, -0.998606, -0.051862, 0.009813, 0.496266, 0.497570, 0.981322, 0.018678, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -12.594599, 8.380999, 8.287799, -0.998606, -0.051862, 0.009813, 0.501837, 0.494128, 0.921648, 0.078352, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -12.607799, 8.104600, 5.483699, -0.977926, -0.207446, 0.025051, 0.490879, 0.499555, 0.996037, 0.003963, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -12.594599, 8.380999, 8.287799, -0.977926, -0.207446, 0.025051, 0.501837, 0.494128, 0.921648, 0.078352, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -13.864899, 14.353300, 8.154899, -0.977926, -0.207446, 0.025051, 0.513987, 0.516962, 0.850937, 0.149063, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -12.607799, 8.104600, 5.483699, -0.965680, -0.238370, 0.103154, 0.490879, 0.499555, 0.996037, 0.003963, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -13.864899, 14.353300, 8.154899, -0.965681, -0.238370, 0.103154, 0.513987, 0.516962, 0.850937, 0.149063, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -13.864899, 13.197300, 5.483599, -0.965681, -0.238370, 0.103154, 0.502230, 0.519577, 0.989801, 0.010199, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -13.636898, 9.653599, 16.876896, -0.979115, 0.196653, 0.051597, 0.533662, 0.477519, 0.504958, 0.495042, 0.000000, 0.000000, 27.000000, 28.000000, 0.000000, 0.000000, - -14.447299, 5.618698, 16.876896, -0.979115, 0.196653, 0.051597, 0.522758, 0.460197, 0.581534, 0.418466, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -14.103697, 6.053800, 21.738796, -0.979115, 0.196653, 0.051597, 0.544455, 0.452834, 0.500000, 0.500000, 0.000000, 0.000000, 27.000000, 28.000000, 0.000000, 0.000000, - -14.103697, 6.053800, 21.738796, -0.901895, 0.384032, 0.197748, 0.544455, 0.452834, 0.500000, 0.500000, 0.000000, 0.000000, 27.000000, 28.000000, 0.000000, 0.000000, - -12.673998, 9.508499, 21.550297, -0.901895, 0.384032, 0.197748, 0.551852, 0.468167, 0.500000, 0.500000, 0.000000, 0.000000, 27.000000, 28.000000, 0.000000, 0.000000, - -13.636898, 9.653599, 16.876896, -0.901895, 0.384032, 0.197749, 0.533662, 0.477519, 0.504958, 0.495042, 0.000000, 0.000000, 27.000000, 28.000000, 0.000000, 0.000000, - -13.636898, 9.653599, 16.876896, -0.947282, -0.260097, 0.187101, 0.533662, 0.477519, 0.504958, 0.495042, 0.000000, 0.000000, 27.000000, 28.000000, 0.000000, 0.000000, - -12.673998, 9.508499, 21.550297, -0.947282, -0.260097, 0.187101, 0.551852, 0.468167, 0.500000, 0.500000, 0.000000, 0.000000, 27.000000, 28.000000, 0.000000, 0.000000, - -13.455398, 12.487600, 21.735497, -0.947282, -0.260097, 0.187101, 0.558388, 0.480132, 0.500000, 0.500000, 0.000000, 0.000000, 27.000000, 28.000000, 0.000000, 0.000000, - -13.455398, 12.487600, 21.735497, -0.968515, -0.197599, 0.151439, 0.558388, 0.480132, 0.500000, 0.500000, 0.000000, 0.000000, 27.000000, 28.000000, 0.000000, 0.000000, - -14.447299, 13.497199, 16.709200, -0.968515, -0.197599, 0.151439, 0.541723, 0.494333, 0.664829, 0.335171, 0.000000, 0.000000, 27.000000, 28.000000, 0.000000, 0.000000, - -13.636898, 9.653599, 16.876896, -0.968515, -0.197599, 0.151439, 0.533662, 0.477519, 0.504958, 0.495042, 0.000000, 0.000000, 27.000000, 28.000000, 0.000000, 0.000000, - -13.352698, 9.481700, 11.706999, -0.981359, 0.176595, -0.075826, 0.515291, 0.489075, 0.647511, 0.352489, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -14.100197, 4.461400, 9.689299, -0.981359, 0.176595, -0.075826, 0.494326, 0.476942, 0.917328, 0.082672, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -14.447299, 5.618698, 16.876896, -0.981359, 0.176595, -0.075826, 0.522758, 0.460197, 0.581534, 0.418466, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -14.447299, 5.618698, 16.876896, -0.978635, 0.196557, -0.060333, 0.522758, 0.460197, 0.581534, 0.418466, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -13.636898, 9.653599, 16.876896, -0.978634, 0.196557, -0.060333, 0.533662, 0.477519, 0.504958, 0.495042, 0.000000, 0.000000, 27.000000, 28.000000, 0.000000, 0.000000, - -13.352698, 9.481700, 11.706999, -0.978634, 0.196557, -0.060333, 0.515291, 0.489075, 0.647511, 0.352489, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -13.636898, 9.653599, 16.876896, -0.971781, -0.209614, -0.108183, 0.533662, 0.477519, 0.504958, 0.495042, 0.000000, 0.000000, 27.000000, 28.000000, 0.000000, 0.000000, - -14.447299, 13.497199, 16.709200, -0.971781, -0.209614, -0.108183, 0.541723, 0.494333, 0.664829, 0.335171, 0.000000, 0.000000, 27.000000, 28.000000, 0.000000, 0.000000, - -14.350198, 14.814999, 13.283600, -0.971781, -0.209614, -0.108183, 0.532895, 0.506750, 0.602108, 0.397892, 0.000000, 0.000000, 27.000000, 28.000000, 0.000000, 0.000000, - -14.350198, 14.814999, 13.283600, -0.984292, -0.169768, -0.048464, 0.532895, 0.506750, 0.602108, 0.397892, 0.000000, 0.000000, 27.000000, 28.000000, 0.000000, 0.000000, - -13.352698, 9.481700, 11.706999, -0.984292, -0.169768, -0.048464, 0.515291, 0.489075, 0.647511, 0.352489, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -13.636898, 9.653599, 16.876896, -0.984292, -0.169768, -0.048464, 0.533662, 0.477519, 0.504958, 0.495042, 0.000000, 0.000000, 27.000000, 28.000000, 0.000000, 0.000000, - -14.100197, 4.461400, 9.689299, -0.924239, 0.252664, -0.286258, 0.494326, 0.476942, 0.917328, 0.082672, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -13.352698, 9.481700, 11.706999, -0.924239, 0.252664, -0.286258, 0.515291, 0.489075, 0.647511, 0.352489, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -12.594599, 8.380999, 8.287799, -0.924239, 0.252664, -0.286258, 0.501837, 0.494128, 0.921648, 0.078352, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -12.594599, 8.380999, 8.287799, -0.913632, 0.231435, -0.334236, 0.501837, 0.494128, 0.921648, 0.078352, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -12.791398, 2.524300, 4.770400, -0.913632, 0.231435, -0.334236, 0.473699, 0.489789, 0.750000, 0.250000, 0.000000, 0.000000, 28.000000, 29.000000, 0.000000, 0.000000, - -14.100197, 4.461400, 9.689299, -0.913632, 0.231435, -0.334236, 0.494326, 0.476942, 0.917328, 0.082672, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -13.352698, 9.481700, 11.706999, -0.983855, -0.160770, -0.078624, 0.515291, 0.489075, 0.647511, 0.352489, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -14.350198, 14.814999, 13.283600, -0.983855, -0.160771, -0.078624, 0.532895, 0.506750, 0.602108, 0.397892, 0.000000, 0.000000, 27.000000, 28.000000, 0.000000, 0.000000, - -13.864899, 14.353300, 8.154899, -0.983855, -0.160770, -0.078624, 0.513987, 0.516962, 0.850937, 0.149063, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -13.864899, 14.353300, 8.154899, -0.966807, -0.208912, -0.147106, 0.513987, 0.516962, 0.850937, 0.149063, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -12.594599, 8.380999, 8.287799, -0.966807, -0.208912, -0.147106, 0.501837, 0.494128, 0.921648, 0.078352, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -13.352698, 9.481700, 11.706999, -0.966807, -0.208912, -0.147106, 0.515291, 0.489075, 0.647511, 0.352489, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -14.985499, 0.082599, 6.564199, -0.869565, 0.391038, -0.301574, 0.469616, 0.473016, 0.750000, 0.250000, 0.000000, 0.000000, 28.000000, 29.000000, 0.000000, 0.000000, - -15.379999, 1.958800, 10.134499, -0.869565, 0.391037, -0.301574, 0.487569, 0.465529, 0.971473, 0.028527, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -14.100197, 4.461400, 9.689299, -0.869565, 0.391037, -0.301574, 0.494326, 0.476942, 0.917328, 0.082672, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -14.100197, 4.461400, 9.689299, -0.808820, 0.441088, -0.388911, 0.494326, 0.476942, 0.917328, 0.082672, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -12.791398, 2.524300, 4.770400, -0.808820, 0.441088, -0.388911, 0.473699, 0.489789, 0.750000, 0.250000, 0.000000, 0.000000, 28.000000, 29.000000, 0.000000, 0.000000, - -14.985499, 0.082599, 6.564199, -0.808820, 0.441088, -0.388911, 0.469616, 0.473016, 0.750000, 0.250000, 0.000000, 0.000000, 28.000000, 29.000000, 0.000000, 0.000000, - -14.523799, -2.723700, 4.664198, -0.770054, 0.265936, -0.579910, 0.454656, 0.478259, 0.850000, 0.150000, 0.000000, 0.000000, 29.000000, 28.000000, 0.000000, 0.000000, - -14.985499, 0.082599, 6.564199, -0.770054, 0.265936, -0.579910, 0.469616, 0.473016, 0.750000, 0.250000, 0.000000, 0.000000, 28.000000, 29.000000, 0.000000, 0.000000, - -12.791398, 2.524300, 4.770400, -0.770054, 0.265936, -0.579910, 0.473699, 0.489789, 0.750000, 0.250000, 0.000000, 0.000000, 28.000000, 29.000000, 0.000000, 0.000000, - -12.791398, 2.524300, 4.770400, -0.816649, 0.279797, -0.504775, 0.473699, 0.489789, 0.750000, 0.250000, 0.000000, 0.000000, 28.000000, 29.000000, 0.000000, 0.000000, - -12.594699, -3.346297, 1.198099, -0.816649, 0.279797, -0.504775, 0.444978, 0.494098, 0.850000, 0.150000, 0.000000, 0.000000, 29.000000, 28.000000, 0.000000, 0.000000, - -14.523799, -2.723700, 4.664198, -0.816649, 0.279797, -0.504775, 0.454656, 0.478259, 0.850000, 0.150000, 0.000000, 0.000000, 29.000000, 28.000000, 0.000000, 0.000000, - -14.497398, -6.813999, 3.768400, -0.861080, 0.103470, -0.497830, 0.436965, 0.480059, 1.000000, 0.000000, 0.000000, 0.000000, 29.000000, 0.000000, 0.000000, 0.000000, - -14.523799, -2.723700, 4.664198, -0.861080, 0.103470, -0.497830, 0.454656, 0.478259, 0.850000, 0.150000, 0.000000, 0.000000, 29.000000, 28.000000, 0.000000, 0.000000, - -12.594699, -3.346297, 1.198099, -0.861080, 0.103470, -0.497830, 0.444978, 0.494098, 0.850000, 0.150000, 0.000000, 0.000000, 29.000000, 28.000000, 0.000000, 0.000000, - -12.594699, -3.346297, 1.198099, -0.910395, 0.262458, -0.319839, 0.444978, 0.494098, 0.850000, 0.150000, 0.000000, 0.000000, 29.000000, 28.000000, 0.000000, 0.000000, - -13.947299, -8.093797, 1.152399, -0.910395, 0.262457, -0.319839, 0.426534, 0.486856, 1.000000, 0.000000, 0.000000, 0.000000, 29.000000, 0.000000, 0.000000, 0.000000, - -14.497398, -6.813999, 3.768400, -0.910395, 0.262457, -0.319839, 0.436965, 0.480059, 1.000000, 0.000000, 0.000000, 0.000000, 29.000000, 0.000000, 0.000000, 0.000000, - -12.524100, 4.716299, 28.815998, -0.509696, 0.817466, 0.268252, 0.575506, 0.442631, 1.000000, 0.000000, 0.000000, 0.000000, 27.000000, 0.000000, 0.000000, 0.000000, - -14.103697, 6.053800, 21.738796, -0.509696, 0.817466, 0.268252, 0.544455, 0.452834, 0.500000, 0.500000, 0.000000, 0.000000, 27.000000, 28.000000, 0.000000, 0.000000, - -15.856799, 4.856800, 22.055500, -0.509696, 0.817466, 0.268252, 0.541751, 0.442967, 0.500000, 0.500000, 0.000000, 0.000000, 27.000000, 28.000000, 0.000000, 0.000000, - -15.856799, 4.856800, 22.055500, -0.494274, 0.829233, 0.260894, 0.541751, 0.442967, 0.500000, 0.500000, 0.000000, 0.000000, 27.000000, 28.000000, 0.000000, 0.000000, - -14.855898, 3.253099, 29.048998, -0.494274, 0.829233, 0.260894, 0.573395, 0.436442, 1.000000, 0.000000, 0.000000, 0.000000, 27.000000, 0.000000, 0.000000, 0.000000, - -12.524100, 4.716299, 28.815998, -0.494274, 0.829233, 0.260894, 0.575506, 0.442631, 1.000000, 0.000000, 0.000000, 0.000000, 27.000000, 0.000000, 0.000000, 0.000000, - -15.856101, 13.635197, 22.060698, -0.432430, -0.901605, -0.010634, 0.564035, 0.490250, 0.500000, 0.500000, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -13.455398, 12.487600, 21.735497, -0.432430, -0.901605, -0.010634, 0.558388, 0.480132, 0.500000, 0.500000, 0.000000, 0.000000, 27.000000, 28.000000, 0.000000, 0.000000, - -12.445998, 11.913100, 29.397400, -0.432430, -0.901605, -0.010634, 0.589699, 0.468384, 1.000000, 0.000000, 0.000000, 0.000000, 27.000000, 0.000000, 0.000000, 0.000000, - -12.445998, 11.913100, 29.397400, -0.514313, -0.856762, 0.037951, 0.589699, 0.468384, 1.000000, 0.000000, 0.000000, 0.000000, 27.000000, 0.000000, 0.000000, 0.000000, - -14.744999, 13.314299, 29.873997, -0.514313, -0.856762, 0.037951, 0.595059, 0.478594, 1.000000, 0.000000, 0.000000, 0.000000, 27.000000, 0.000000, 0.000000, 0.000000, - -15.856101, 13.635197, 22.060698, -0.514313, -0.856762, 0.037951, 0.564035, 0.490250, 0.500000, 0.500000, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -10.724199, 8.271600, 28.895796, -0.876625, 0.378962, 0.296506, 0.582388, 0.454328, 1.000000, 0.000000, 0.000000, 0.000000, 27.000000, 0.000000, 0.000000, 0.000000, - -12.673998, 9.508499, 21.550297, -0.876625, 0.378962, 0.296506, 0.551852, 0.468167, 0.500000, 0.500000, 0.000000, 0.000000, 27.000000, 28.000000, 0.000000, 0.000000, - -14.103697, 6.053800, 21.738796, -0.876625, 0.378962, 0.296506, 0.544455, 0.452834, 0.500000, 0.500000, 0.000000, 0.000000, 27.000000, 28.000000, 0.000000, 0.000000, - -14.103697, 6.053800, 21.738796, -0.860678, 0.429591, 0.273286, 0.544455, 0.452834, 0.500000, 0.500000, 0.000000, 0.000000, 27.000000, 28.000000, 0.000000, 0.000000, - -12.524100, 4.716299, 28.815998, -0.860678, 0.429591, 0.273286, 0.575506, 0.442631, 1.000000, 0.000000, 0.000000, 0.000000, 27.000000, 0.000000, 0.000000, 0.000000, - -10.724199, 8.271600, 28.895796, -0.860678, 0.429591, 0.273286, 0.582388, 0.454328, 1.000000, 0.000000, 0.000000, 0.000000, 27.000000, 0.000000, 0.000000, 0.000000, - -12.445998, 11.913100, 29.397400, -0.960062, -0.258476, 0.107100, 0.589699, 0.468384, 1.000000, 0.000000, 0.000000, 0.000000, 27.000000, 0.000000, 0.000000, 0.000000, - -13.455398, 12.487600, 21.735497, -0.960062, -0.258476, 0.107100, 0.558388, 0.480132, 0.500000, 0.500000, 0.000000, 0.000000, 27.000000, 28.000000, 0.000000, 0.000000, - -12.673998, 9.508499, 21.550297, -0.960062, -0.258476, 0.107100, 0.551852, 0.468167, 0.500000, 0.500000, 0.000000, 0.000000, 27.000000, 28.000000, 0.000000, 0.000000, - -12.673998, 9.508499, 21.550297, -0.883597, -0.439893, 0.160470, 0.551852, 0.468167, 0.500000, 0.500000, 0.000000, 0.000000, 27.000000, 28.000000, 0.000000, 0.000000, - -10.724199, 8.271600, 28.895796, -0.883597, -0.439893, 0.160470, 0.582388, 0.454328, 1.000000, 0.000000, 0.000000, 0.000000, 27.000000, 0.000000, 0.000000, 0.000000, - -12.445998, 11.913100, 29.397400, -0.883597, -0.439893, 0.160470, 0.589699, 0.468384, 1.000000, 0.000000, 0.000000, 0.000000, 27.000000, 0.000000, 0.000000, 0.000000, - -21.313396, -7.702299, -1.605900, 0.000000, 0.000000, 1.000000, 0.866263, 0.976581, 1.000000, 0.000000, 0.000000, 0.000000, 29.000000, 0.000000, 0.000000, 0.000000, - -13.947299, -7.702299, -1.605900, 0.000000, 0.000000, 1.000000, 0.850793, 0.947977, 1.000000, 0.000000, 0.000000, 0.000000, 29.000000, 0.000000, 0.000000, 0.000000, - -12.594699, -3.400599, -1.605900, 0.000000, 0.000000, 1.000000, 0.864660, 0.933687, 1.000000, 0.000000, 0.000000, 0.000000, 29.000000, 0.000000, 0.000000, 0.000000, - -22.666098, -3.400599, -1.605900, 0.000000, 0.000000, 1.000000, 0.885801, 0.972799, 1.000000, 0.000000, 0.000000, 0.000000, 29.000000, 0.000000, 0.000000, 0.000000, - -21.313396, -7.702299, -1.605900, 0.000000, 0.000000, 1.000000, 0.866263, 0.976581, 1.000000, 0.000000, 0.000000, 0.000000, 29.000000, 0.000000, 0.000000, 0.000000, - -22.666098, -3.400599, -1.605900, 0.000000, -0.176079, 0.984376, 0.885801, 0.972799, 1.000000, 0.000000, 0.000000, 0.000000, 29.000000, 0.000000, 0.000000, 0.000000, - -12.594699, -3.400599, -1.605900, 0.000000, -0.176079, 0.984376, 0.864660, 0.933687, 1.000000, 0.000000, 0.000000, 0.000000, 29.000000, 0.000000, 0.000000, 0.000000, - -12.791398, 2.208400, -0.602599, 0.000000, -0.176079, 0.984376, 0.887212, 0.922484, 0.750000, 0.250000, 0.000000, 0.000000, 28.000000, 29.000000, 0.000000, 0.000000, - -12.791398, 2.208400, -0.602599, -0.018279, -0.144779, 0.989295, 0.887212, 0.922484, 0.750000, 0.250000, 0.000000, 0.000000, 28.000000, 29.000000, 0.000000, 0.000000, - -22.469294, 2.208499, -0.781399, -0.018279, -0.144779, 0.989295, 0.907393, 0.960148, 0.750000, 0.250000, 0.000000, 0.000000, 28.000000, 29.000000, 0.000000, 0.000000, - -22.666098, -3.400599, -1.605900, -0.018279, -0.144779, 0.989295, 0.885801, 0.972799, 1.000000, 0.000000, 0.000000, 0.000000, 29.000000, 0.000000, 0.000000, 0.000000, - -22.666098, 8.060097, 6.581599, 0.000000, 0.999179, 0.040502, 0.944121, 0.940789, 0.994015, 0.005985, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -12.594699, 8.060097, 6.581599, 0.000000, 0.999179, 0.040502, 0.922579, 0.901895, 0.981322, 0.018678, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -12.607799, 8.104600, 5.483699, 0.000000, 0.999179, 0.040502, 0.926853, 0.899591, 0.996037, 0.003963, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -12.607799, 8.104600, 5.483699, 0.000000, 0.999180, 0.040502, 0.926853, 0.899591, 0.996037, 0.003963, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -22.652899, 8.104600, 5.483699, 0.000000, 0.999179, 0.040502, 0.948331, 0.938388, 0.999664, 0.000336, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -22.652899, 8.317097, -1.151100, 0.000000, 0.000000, 1.000000, 0.973966, 0.924198, 1.000000, 0.000000, 0.000000, 0.000000, 28.000000, 0.000000, 0.000000, 0.000000, - -12.607799, 8.317097, -1.151100, 0.000000, 0.000000, 1.000000, 0.952497, 0.885396, 1.000000, 0.000000, 0.000000, 0.000000, 28.000000, 0.000000, 0.000000, 0.000000, - -13.864899, 11.616898, -1.151100, 0.000000, 0.000000, 1.000000, 0.967932, 0.883200, 1.000000, 0.000000, 0.000000, 0.000000, 28.000000, 0.000000, 0.000000, 0.000000, - -21.395794, 11.616898, -1.151100, 0.000000, 0.000000, 1.000000, 0.984024, 0.912292, 1.000000, 0.000000, 0.000000, 0.000000, 28.000000, 0.000000, 0.000000, 0.000000, - -22.652899, 8.317097, -1.151100, 0.000000, 0.000000, 1.000000, 0.973966, 0.924198, 1.000000, 0.000000, 0.000000, 0.000000, 28.000000, 0.000000, 0.000000, 0.000000, - -22.666098, 8.060097, 6.581599, -0.011499, -0.782975, 0.621947, 0.944121, 0.940789, 0.994015, 0.005985, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -22.469294, 2.208499, -0.781399, -0.011499, -0.782975, 0.621947, 0.907393, 0.960148, 0.750000, 0.250000, 0.000000, 0.000000, 28.000000, 29.000000, 0.000000, 0.000000, - -12.791398, 2.208400, -0.602599, -0.011499, -0.782975, 0.621947, 0.887212, 0.922484, 0.750000, 0.250000, 0.000000, 0.000000, 28.000000, 29.000000, 0.000000, 0.000000, - -12.791398, 2.208400, -0.602599, 0.000000, -0.775346, 0.631537, 0.887212, 0.922484, 0.750000, 0.250000, 0.000000, 0.000000, 28.000000, 29.000000, 0.000000, 0.000000, - -12.594699, 8.060097, 6.581599, 0.000000, -0.775346, 0.631537, 0.922579, 0.901895, 0.981322, 0.018678, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -22.666098, 8.060097, 6.581599, 0.000000, -0.775346, 0.631537, 0.944121, 0.940789, 0.994015, 0.005985, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -13.947299, -7.702299, -1.605900, 0.000000, 0.000653, 1.000000, 0.850793, 0.947977, 1.000000, 0.000000, 0.000000, 0.000000, 29.000000, 0.000000, 0.000000, 0.000000, - -21.313396, -7.702299, -1.605900, 0.000000, 0.000653, 1.000000, 0.866263, 0.976581, 1.000000, 0.000000, 0.000000, 0.000000, 29.000000, 0.000000, 0.000000, 0.000000, - -17.630400, -9.388897, -1.604799, 0.000000, 0.000653, 1.000000, 0.851979, 0.965822, 1.000000, 0.000000, 0.000000, 0.000000, 29.000000, 0.000000, 0.000000, 0.000000, - -21.395794, 11.616898, -1.151100, 0.000000, -0.001050, 0.999999, 0.984024, 0.912292, 1.000000, 0.000000, 0.000000, 0.000000, 28.000000, 0.000000, 0.000000, 0.000000, - -13.864899, 11.616898, -1.151100, 0.000000, -0.001050, 0.999999, 0.967932, 0.883200, 1.000000, 0.000000, 0.000000, 0.000000, 28.000000, 0.000000, 0.000000, 0.000000, - -17.630400, 12.762100, -1.149898, 0.000000, -0.001050, 0.999999, 0.980402, 0.895299, 1.000000, 0.000000, 0.000000, 0.000000, 28.000000, 0.000000, 0.000000, 0.000000, - -17.630400, 12.762100, -1.149898, 0.406858, -0.866962, 0.287825, 0.440886, 0.370710, 1.000000, 0.000000, 0.000000, 0.000000, 28.000000, 0.000000, 0.000000, 0.000000, - -17.630400, 14.964800, 5.484899, 0.406858, -0.866962, 0.287825, 0.471612, 0.368677, 0.992869, 0.007131, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -21.395794, 13.197300, 5.483599, 0.406858, -0.866962, 0.287825, 0.469847, 0.386926, 0.997663, 0.002337, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -21.395794, 13.197300, 5.483599, 0.283639, -0.932831, 0.222203, 0.469847, 0.386926, 0.997663, 0.002337, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -21.395794, 11.616898, -1.151100, 0.283639, -0.932832, 0.222203, 0.440308, 0.388025, 1.000000, 0.000000, 0.000000, 0.000000, 28.000000, 0.000000, 0.000000, 0.000000, - -17.630400, 12.762100, -1.149898, 0.283639, -0.932831, 0.222203, 0.440886, 0.370710, 1.000000, 0.000000, 0.000000, 0.000000, 28.000000, 0.000000, 0.000000, 0.000000, - -21.395794, 11.616898, -1.151100, 0.969281, -0.239261, 0.056992, 0.440308, 0.388025, 1.000000, 0.000000, 0.000000, 0.000000, 28.000000, 0.000000, 0.000000, 0.000000, - -21.395794, 13.197300, 5.483599, 0.969281, -0.239261, 0.056992, 0.469847, 0.386926, 0.997663, 0.002337, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -22.652899, 8.104600, 5.483699, 0.969281, -0.239261, 0.056993, 0.466098, 0.409710, 0.999664, 0.000336, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -22.652899, 8.104600, 5.483699, 0.934423, -0.355982, -0.011401, 0.466098, 0.409710, 0.999664, 0.000336, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -22.652899, 8.317097, -1.151100, 0.934423, -0.355982, -0.011401, 0.437537, 0.403334, 1.000000, 0.000000, 0.000000, 0.000000, 28.000000, 0.000000, 0.000000, 0.000000, - -21.395794, 11.616898, -1.151100, 0.934423, -0.355982, -0.011401, 0.440308, 0.388025, 1.000000, 0.000000, 0.000000, 0.000000, 28.000000, 0.000000, 0.000000, 0.000000, - -22.652899, 8.317097, -1.151100, 0.000000, 0.999488, 0.032011, 0.973966, 0.924198, 1.000000, 0.000000, 0.000000, 0.000000, 28.000000, 0.000000, 0.000000, 0.000000, - -22.652899, 8.104600, 5.483699, 0.000000, 0.999487, 0.032011, 0.948331, 0.938388, 0.999664, 0.000336, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -12.607799, 8.104600, 5.483699, 0.000000, 0.999488, 0.032011, 0.926853, 0.899591, 0.996037, 0.003963, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -12.607799, 8.317097, -1.151100, 0.000000, 0.999487, 0.032011, 0.952497, 0.885396, 1.000000, 0.000000, 0.000000, 0.000000, 28.000000, 0.000000, 0.000000, 0.000000, - -13.864899, 11.616898, -1.151100, -0.934424, -0.355980, -0.011401, 0.473914, 0.528452, 1.000000, 0.000000, 0.000000, 0.000000, 28.000000, 0.000000, 0.000000, 0.000000, - -12.607799, 8.317097, -1.151100, -0.934424, -0.355980, -0.011401, 0.466191, 0.515041, 1.000000, 0.000000, 0.000000, 0.000000, 28.000000, 0.000000, 0.000000, 0.000000, - -12.607799, 8.104600, 5.483699, -0.934424, -0.355980, -0.011401, 0.490879, 0.499555, 0.996037, 0.003963, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -12.607799, 8.104600, 5.483699, -0.969281, -0.239260, 0.056992, 0.490879, 0.499555, 0.996037, 0.003963, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -13.864899, 13.197300, 5.483599, -0.969281, -0.239260, 0.056992, 0.502230, 0.519577, 0.989801, 0.010199, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -13.864899, 11.616898, -1.151100, -0.969281, -0.239260, 0.056992, 0.473914, 0.528452, 1.000000, 0.000000, 0.000000, 0.000000, 28.000000, 0.000000, 0.000000, 0.000000, - -17.630400, 12.762100, -1.149898, -0.283632, -0.932834, 0.222203, 0.480158, 0.544525, 1.000000, 0.000000, 0.000000, 0.000000, 28.000000, 0.000000, 0.000000, 0.000000, - -13.864899, 11.616898, -1.151100, -0.283632, -0.932834, 0.222203, 0.473914, 0.528452, 1.000000, 0.000000, 0.000000, 0.000000, 28.000000, 0.000000, 0.000000, 0.000000, - -13.864899, 13.197300, 5.483599, -0.283632, -0.932834, 0.222203, 0.502230, 0.519577, 0.989801, 0.010199, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -13.864899, 13.197300, 5.483599, -0.406849, -0.866966, 0.287826, 0.502230, 0.519577, 0.989801, 0.010199, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -17.630400, 14.964800, 5.484899, -0.406849, -0.866966, 0.287826, 0.509674, 0.536257, 0.992869, 0.007131, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -17.630400, 12.762100, -1.149898, -0.406849, -0.866966, 0.287826, 0.480158, 0.544525, 1.000000, 0.000000, 0.000000, 0.000000, 28.000000, 0.000000, 0.000000, 0.000000, - -21.341997, 4.469200, 8.859698, 0.863992, 0.380012, -0.330316, 0.477127, 0.428749, 0.976286, 0.023714, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -18.782499, 5.618698, 16.876896, 0.863992, 0.380012, -0.330316, 0.514942, 0.433887, 0.598788, 0.401212, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -19.748102, 1.964200, 10.146900, 0.863992, 0.380012, -0.330316, 0.480668, 0.443233, 0.981907, 0.018093, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -16.614897, 4.320200, 16.876896, 0.419784, 0.777824, -0.467730, 0.517109, 0.447610, 0.659751, 0.340249, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -17.563993, 0.912998, 10.358999, 0.419784, 0.777823, -0.467730, 0.483048, 0.454680, 0.987984, 0.012016, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -19.748102, 1.964200, 10.146900, 0.419784, 0.777824, -0.467730, 0.480668, 0.443233, 0.981907, 0.018093, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -19.748102, 1.964200, 10.146900, 0.452262, 0.754968, -0.474849, 0.480668, 0.443233, 0.981907, 0.018093, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -18.782499, 5.618698, 16.876896, 0.452262, 0.754968, -0.474850, 0.514942, 0.433887, 0.598788, 0.401212, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -16.614897, 4.320200, 16.876896, 0.452262, 0.754968, -0.474849, 0.517109, 0.447610, 0.659751, 0.340249, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -15.379999, 1.958800, 10.134499, -0.432120, 0.823510, -0.367564, 0.487569, 0.465529, 0.971473, 0.028527, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -17.563993, 0.912998, 10.358999, -0.432120, 0.823510, -0.367564, 0.483048, 0.454680, 0.987984, 0.012016, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -16.614897, 4.320200, 16.876896, -0.432120, 0.823510, -0.367564, 0.517109, 0.447610, 0.659751, 0.340249, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -16.614897, 4.320200, 16.876896, -0.478030, 0.797982, -0.367032, 0.517109, 0.447610, 0.659751, 0.340249, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -14.447299, 5.618698, 16.876896, -0.478030, 0.797982, -0.367032, 0.522758, 0.460197, 0.581534, 0.418466, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -15.379999, 1.958800, 10.134499, -0.478030, 0.797982, -0.367032, 0.487569, 0.465529, 0.971473, 0.028527, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -15.379999, 1.958800, 10.134499, -0.892626, 0.436313, -0.113359, 0.487569, 0.465529, 0.971473, 0.028527, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -14.447299, 5.618698, 16.876896, -0.892626, 0.436313, -0.113359, 0.522758, 0.460197, 0.581534, 0.418466, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -14.100197, 4.461400, 9.689299, -0.892626, 0.436313, -0.113359, 0.494326, 0.476942, 0.917328, 0.082672, 0.000000, 0.000000, 28.000000, 27.000000, 0.000000, 0.000000, - -37.302181, 3.471190, 79.003990, 0.980598, 0.079970, -0.178975, 0.111636, 0.456491, 0.497899, 0.252101, 0.250000, 0.000000, 30.000000, 31.000000, 32.000000, 0.000000, - -37.103100, 1.384990, 79.162590, 0.980598, 0.079970, -0.178975, 0.095001, 0.446598, 0.750000, 0.250000, 0.000000, 0.000000, 32.000000, 30.000000, 0.000000, 0.000000, - -37.707691, 1.419990, 75.865700, 0.980598, 0.079970, -0.178975, 0.096392, 0.418069, 0.750000, 0.250000, 0.000000, 0.000000, 32.000000, 33.000000, 0.000000, 0.000000, - -37.707691, 1.419990, 75.865700, 0.992336, -0.007469, -0.123342, 0.096392, 0.418069, 0.750000, 0.250000, 0.000000, 0.000000, 32.000000, 33.000000, 0.000000, 0.000000, - -37.710701, 3.006890, 75.745392, 0.992336, -0.007469, -0.123342, 0.108018, 0.420697, 0.750000, 0.250000, 0.000000, 0.000000, 32.000000, 33.000000, 0.000000, 0.000000, - -37.302181, 3.471190, 79.003990, 0.992336, -0.007469, -0.123342, 0.111636, 0.456491, 0.497899, 0.252101, 0.250000, 0.000000, 30.000000, 31.000000, 32.000000, 0.000000, - -37.710701, 3.006890, 75.745392, 0.997751, -0.003184, -0.066955, 0.108018, 0.420697, 0.750000, 0.250000, 0.000000, 0.000000, 32.000000, 33.000000, 0.000000, 0.000000, - -37.707691, 1.419990, 75.865700, 0.997751, -0.003184, -0.066955, 0.096392, 0.418069, 0.750000, 0.250000, 0.000000, 0.000000, 32.000000, 33.000000, 0.000000, 0.000000, - -37.859600, 1.279000, 73.608688, 0.997751, -0.003184, -0.066955, 0.098897, 0.398862, 0.750000, 0.250000, 0.000000, 0.000000, 33.000000, 32.000000, 0.000000, 0.000000, - -37.859600, 1.279000, 73.608688, 0.997753, -0.003224, -0.066923, 0.098897, 0.398862, 0.750000, 0.250000, 0.000000, 0.000000, 33.000000, 32.000000, 0.000000, 0.000000, - -37.862492, 2.835590, 73.490593, 0.997753, -0.003224, -0.066923, 0.111076, 0.400859, 0.750000, 0.250000, 0.000000, 0.000000, 33.000000, 32.000000, 0.000000, 0.000000, - -37.710701, 3.006890, 75.745392, 0.997753, -0.003224, -0.066923, 0.108018, 0.420697, 0.750000, 0.250000, 0.000000, 0.000000, 32.000000, 33.000000, 0.000000, 0.000000, - -37.862492, 2.835590, 73.490593, 0.971210, 0.019815, 0.237401, 0.111076, 0.400859, 0.750000, 0.250000, 0.000000, 0.000000, 33.000000, 32.000000, 0.000000, 0.000000, - -37.859600, 1.279000, 73.608688, 0.971210, 0.019815, 0.237401, 0.098897, 0.398862, 0.750000, 0.250000, 0.000000, 0.000000, 33.000000, 32.000000, 0.000000, 0.000000, - -37.147480, 1.119800, 70.708687, 0.971210, 0.019815, 0.237401, 0.102799, 0.373382, 1.000000, 0.000000, 0.000000, 0.000000, 33.000000, 0.000000, 0.000000, 0.000000, - -37.147480, 1.119800, 70.708687, 0.970297, 0.012652, 0.241585, 0.102799, 0.373382, 1.000000, 0.000000, 0.000000, 0.000000, 33.000000, 0.000000, 0.000000, 0.000000, - -37.138802, 2.619370, 70.595299, 0.970297, 0.012652, 0.241585, 0.116117, 0.375566, 1.000000, 0.000000, 0.000000, 0.000000, 33.000000, 0.000000, 0.000000, 0.000000, - -37.862492, 2.835590, 73.490593, 0.970297, 0.012652, 0.241585, 0.111076, 0.400859, 0.750000, 0.250000, 0.000000, 0.000000, 33.000000, 32.000000, 0.000000, 0.000000, - -37.302181, 3.471190, 79.003990, 0.983663, -0.134719, -0.119408, 0.111636, 0.456491, 0.497899, 0.252101, 0.250000, 0.000000, 30.000000, 31.000000, 32.000000, 0.000000, - -37.712292, 3.390590, 75.716499, 0.983663, -0.134719, -0.119408, 0.142782, 0.434518, 0.750000, 0.250000, 0.000000, 0.000000, 31.000000, 34.000000, 0.000000, 0.000000, - -36.944801, 8.998390, 75.712090, 0.983663, -0.134719, -0.119408, 0.183131, 0.462501, 0.750000, 0.250000, 0.000000, 0.000000, 31.000000, 34.000000, 0.000000, 0.000000, - -36.944801, 8.998390, 75.712090, 0.989162, -0.116884, -0.088866, 0.183131, 0.462501, 0.750000, 0.250000, 0.000000, 0.000000, 31.000000, 34.000000, 0.000000, 0.000000, - -36.669979, 9.265290, 78.420082, 0.989162, -0.116884, -0.088866, 0.171699, 0.481266, 0.750000, 0.250000, 0.000000, 0.000000, 31.000000, 30.000000, 0.000000, 0.000000, - -37.302181, 3.471190, 79.003990, 0.989162, -0.116884, -0.088866, 0.111636, 0.456491, 0.497899, 0.252101, 0.250000, 0.000000, 30.000000, 31.000000, 32.000000, 0.000000, - -37.712292, 3.390590, 75.716499, 0.987185, -0.147181, -0.061669, 0.142782, 0.434518, 0.750000, 0.250000, 0.000000, 0.000000, 31.000000, 34.000000, 0.000000, 0.000000, - -37.863380, 3.325400, 73.453499, 0.987185, -0.147181, -0.061669, 0.155391, 0.418781, 0.750000, 0.250000, 0.000000, 0.000000, 34.000000, 31.000000, 0.000000, 0.000000, - -37.034889, 8.789590, 73.674789, 0.987185, -0.147181, -0.061669, 0.191669, 0.447454, 0.750000, 0.250000, 0.000000, 0.000000, 34.000000, 31.000000, 0.000000, 0.000000, - -37.034889, 8.789590, 73.674789, 0.990318, -0.135560, -0.029898, 0.191669, 0.447454, 0.750000, 0.250000, 0.000000, 0.000000, 34.000000, 31.000000, 0.000000, 0.000000, - -36.944801, 8.998390, 75.712090, 0.990318, -0.135560, -0.029898, 0.183131, 0.462501, 0.750000, 0.250000, 0.000000, 0.000000, 31.000000, 34.000000, 0.000000, 0.000000, - -37.712292, 3.390590, 75.716499, 0.990318, -0.135560, -0.029898, 0.142782, 0.434518, 0.750000, 0.250000, 0.000000, 0.000000, 31.000000, 34.000000, 0.000000, 0.000000, - -37.863380, 3.325400, 73.453499, 0.950211, -0.182790, 0.252362, 0.155391, 0.418781, 0.750000, 0.250000, 0.000000, 0.000000, 34.000000, 31.000000, 0.000000, 0.000000, - -37.136002, 3.109290, 70.558189, 0.950211, -0.182790, 0.252362, 0.169242, 0.396812, 1.000000, 0.000000, 0.000000, 0.000000, 34.000000, 0.000000, 0.000000, 0.000000, - -36.286201, 8.284970, 71.107292, 0.950211, -0.182790, 0.252362, 0.204127, 0.427865, 1.000000, 0.000000, 0.000000, 0.000000, 34.000000, 0.000000, 0.000000, 0.000000, - -36.286201, 8.284970, 71.107292, 0.939846, -0.154833, 0.304492, 0.204127, 0.427865, 1.000000, 0.000000, 0.000000, 0.000000, 34.000000, 0.000000, 0.000000, 0.000000, - -37.034889, 8.789590, 73.674789, 0.939846, -0.154833, 0.304492, 0.191669, 0.447454, 0.750000, 0.250000, 0.000000, 0.000000, 34.000000, 31.000000, 0.000000, 0.000000, - -37.863380, 3.325400, 73.453499, 0.939846, -0.154833, 0.304492, 0.155391, 0.418781, 0.750000, 0.250000, 0.000000, 0.000000, 34.000000, 31.000000, 0.000000, 0.000000, - -37.710701, 3.006890, 75.745392, 0.098403, -0.984690, 0.143882, 0.108018, 0.420697, 0.750000, 0.250000, 0.000000, 0.000000, 32.000000, 33.000000, 0.000000, 0.000000, - -36.387482, 3.029900, 74.997902, 0.098403, -0.984690, 0.143882, 0.119086, 0.416931, 0.750000, 0.250000, 0.000000, 0.000000, 32.000000, 33.000000, 0.000000, 0.000000, - -34.447392, 3.648400, 77.903893, 0.098403, -0.984690, 0.143882, 0.118464, 0.444956, 0.477273, 0.272727, 0.250000, 0.000000, 32.000000, 31.000000, 30.000000, 0.000000, - -34.447392, 3.648400, 77.903893, 0.110009, -0.985826, 0.126673, 0.118464, 0.444956, 0.477273, 0.272727, 0.250000, 0.000000, 32.000000, 31.000000, 30.000000, 0.000000, - -37.302181, 3.471190, 79.003990, 0.110009, -0.985825, 0.126673, 0.111636, 0.456491, 0.497899, 0.252101, 0.250000, 0.000000, 30.000000, 31.000000, 32.000000, 0.000000, - -37.710701, 3.006890, 75.745392, 0.110009, -0.985825, 0.126673, 0.108018, 0.420697, 0.750000, 0.250000, 0.000000, 0.000000, 32.000000, 33.000000, 0.000000, 0.000000, - -37.707691, 1.419990, 75.865700, 0.156183, 0.987561, -0.018157, 0.096392, 0.418069, 0.750000, 0.250000, 0.000000, 0.000000, 32.000000, 33.000000, 0.000000, 0.000000, - -37.103100, 1.384990, 79.162590, 0.156183, 0.987561, -0.018157, 0.095001, 0.446598, 0.750000, 0.250000, 0.000000, 0.000000, 32.000000, 30.000000, 0.000000, 0.000000, - -35.421589, 1.108290, 78.576897, 0.156183, 0.987561, -0.018157, 0.079285, 0.437406, 0.750000, 0.250000, 0.000000, 0.000000, 32.000000, 30.000000, 0.000000, 0.000000, - -35.421589, 1.108290, 78.576897, 0.110002, 0.993699, 0.021489, 0.079285, 0.437406, 0.750000, 0.250000, 0.000000, 0.000000, 32.000000, 30.000000, 0.000000, 0.000000, - -36.384289, 1.289400, 75.129997, 0.110002, 0.993699, 0.021489, 0.085753, 0.409941, 0.750000, 0.250000, 0.000000, 0.000000, 32.000000, 33.000000, 0.000000, 0.000000, - -37.707691, 1.419990, 75.865700, 0.110002, 0.993699, 0.021489, 0.096392, 0.418069, 0.750000, 0.250000, 0.000000, 0.000000, 32.000000, 33.000000, 0.000000, 0.000000, - -37.859600, 1.279000, 73.608688, 0.061392, 0.995906, -0.066344, 0.098897, 0.398862, 0.750000, 0.250000, 0.000000, 0.000000, 33.000000, 32.000000, 0.000000, 0.000000, - -37.707691, 1.419990, 75.865700, 0.061392, 0.995906, -0.066344, 0.096392, 0.418069, 0.750000, 0.250000, 0.000000, 0.000000, 32.000000, 33.000000, 0.000000, 0.000000, - -36.384289, 1.289400, 75.129997, 0.061392, 0.995906, -0.066344, 0.085753, 0.409941, 0.750000, 0.250000, 0.000000, 0.000000, 32.000000, 33.000000, 0.000000, 0.000000, - -36.384289, 1.289400, 75.129997, 0.031577, 0.998799, -0.037450, 0.085753, 0.409941, 0.750000, 0.250000, 0.000000, 0.000000, 32.000000, 33.000000, 0.000000, 0.000000, - -36.473400, 1.249090, 73.979790, 0.031577, 0.998799, -0.037450, 0.087022, 0.399243, 0.750000, 0.250000, 0.000000, 0.000000, 33.000000, 32.000000, 0.000000, 0.000000, - -37.859600, 1.279000, 73.608688, 0.031577, 0.998800, -0.037450, 0.098897, 0.398862, 0.750000, 0.250000, 0.000000, 0.000000, 33.000000, 32.000000, 0.000000, 0.000000, - -37.862492, 2.835590, 73.490593, 0.042387, -0.995321, 0.086830, 0.111076, 0.400859, 0.750000, 0.250000, 0.000000, 0.000000, 33.000000, 32.000000, 0.000000, 0.000000, - -36.476601, 2.926190, 73.852592, 0.042387, -0.995321, 0.086830, 0.121998, 0.405198, 0.750000, 0.250000, 0.000000, 0.000000, 33.000000, 32.000000, 0.000000, 0.000000, - -36.387482, 3.029900, 74.997902, 0.042387, -0.995321, 0.086830, 0.119086, 0.416931, 0.750000, 0.250000, 0.000000, 0.000000, 32.000000, 33.000000, 0.000000, 0.000000, - -36.387482, 3.029900, 74.997902, 0.057849, -0.995743, 0.071754, 0.119086, 0.416931, 0.750000, 0.250000, 0.000000, 0.000000, 32.000000, 33.000000, 0.000000, 0.000000, - -37.710701, 3.006890, 75.745392, 0.057849, -0.995743, 0.071754, 0.108018, 0.420697, 0.750000, 0.250000, 0.000000, 0.000000, 32.000000, 33.000000, 0.000000, 0.000000, - -37.862492, 2.835590, 73.490593, 0.057849, -0.995743, 0.071754, 0.111076, 0.400859, 0.750000, 0.250000, 0.000000, 0.000000, 33.000000, 32.000000, 0.000000, 0.000000, - -37.147480, 1.119800, 70.708687, 0.033980, 0.998342, -0.046462, 0.102799, 0.373382, 1.000000, 0.000000, 0.000000, 0.000000, 33.000000, 0.000000, 0.000000, 0.000000, - -37.859600, 1.279000, 73.608688, 0.033980, 0.998342, -0.046462, 0.098897, 0.398862, 0.750000, 0.250000, 0.000000, 0.000000, 33.000000, 32.000000, 0.000000, 0.000000, - -36.473400, 1.249090, 73.979790, 0.033980, 0.998342, -0.046462, 0.087022, 0.399243, 0.750000, 0.250000, 0.000000, 0.000000, 33.000000, 32.000000, 0.000000, 0.000000, - -36.473400, 1.249090, 73.979790, 0.003962, 0.999179, -0.040309, 0.087022, 0.399243, 0.750000, 0.250000, 0.000000, 0.000000, 33.000000, 32.000000, 0.000000, 0.000000, - -35.893188, 1.117400, 70.772491, 0.003962, 0.999179, -0.040309, 0.091763, 0.370265, 1.000000, 0.000000, 0.000000, 0.000000, 33.000000, 0.000000, 0.000000, 0.000000, - -37.147480, 1.119800, 70.708687, 0.003962, 0.999179, -0.040309, 0.102799, 0.373382, 1.000000, 0.000000, 0.000000, 0.000000, 33.000000, 0.000000, 0.000000, 0.000000, - -37.138802, 2.619370, 70.595299, -0.006720, -0.995442, 0.095132, 0.116117, 0.375566, 1.000000, 0.000000, 0.000000, 0.000000, 33.000000, 0.000000, 0.000000, 0.000000, - -35.884480, 2.617000, 70.659103, -0.006720, -0.995442, 0.095132, 0.127554, 0.376374, 1.000000, 0.000000, 0.000000, 0.000000, 33.000000, 0.000000, 0.000000, 0.000000, - -36.476601, 2.926190, 73.852592, -0.006720, -0.995442, 0.095132, 0.121998, 0.405198, 0.750000, 0.250000, 0.000000, 0.000000, 33.000000, 32.000000, 0.000000, 0.000000, - -36.476601, 2.926190, 73.852592, 0.042860, -0.995454, 0.085053, 0.121998, 0.405198, 0.750000, 0.250000, 0.000000, 0.000000, 33.000000, 32.000000, 0.000000, 0.000000, - -37.862492, 2.835590, 73.490593, 0.042860, -0.995454, 0.085053, 0.111076, 0.400859, 0.750000, 0.250000, 0.000000, 0.000000, 33.000000, 32.000000, 0.000000, 0.000000, - -37.138802, 2.619370, 70.595299, 0.042860, -0.995454, 0.085053, 0.116117, 0.375566, 1.000000, 0.000000, 0.000000, 0.000000, 33.000000, 0.000000, 0.000000, 0.000000, - -37.147480, 1.119800, 70.708687, -0.050514, 0.075592, 0.995859, 0.102799, 0.373382, 1.000000, 0.000000, 0.000000, 0.000000, 33.000000, 0.000000, 0.000000, 0.000000, - -35.893188, 1.117400, 70.772491, -0.050514, 0.075592, 0.995859, 0.104745, 0.362565, 1.000000, 0.000000, 0.000000, 0.000000, 33.000000, 0.000000, 0.000000, 0.000000, - -35.884480, 2.617000, 70.659103, -0.050514, 0.075592, 0.995859, 0.117729, 0.364695, 1.000000, 0.000000, 0.000000, 0.000000, 33.000000, 0.000000, 0.000000, 0.000000, - -35.884480, 2.617000, 70.659103, -0.050514, 0.075593, 0.995858, 0.117729, 0.364695, 1.000000, 0.000000, 0.000000, 0.000000, 33.000000, 0.000000, 0.000000, 0.000000, - -37.138802, 2.619370, 70.595299, -0.050514, 0.075593, 0.995858, 0.116117, 0.375566, 1.000000, 0.000000, 0.000000, 0.000000, 33.000000, 0.000000, 0.000000, 0.000000, - -37.147480, 1.119800, 70.708687, -0.050514, 0.075593, 0.995858, 0.102799, 0.373382, 1.000000, 0.000000, 0.000000, 0.000000, 33.000000, 0.000000, 0.000000, 0.000000, - -36.944801, 8.998390, 75.712090, 0.012411, -0.995532, 0.093606, 0.183131, 0.462501, 0.750000, 0.250000, 0.000000, 0.000000, 31.000000, 34.000000, 0.000000, 0.000000, - -34.756001, 8.905390, 74.432793, 0.012411, -0.995532, 0.093606, 0.206059, 0.462555, 0.500000, 0.500000, 0.000000, 0.000000, 31.000000, 34.000000, 0.000000, 0.000000, - -33.739792, 9.189680, 77.321579, 0.012411, -0.995532, 0.093606, 0.198453, 0.488377, 1.000000, 0.000000, 0.000000, 0.000000, 30.000000, 0.000000, 0.000000, 0.000000, - -33.739792, 9.189680, 77.321579, 0.010686, -0.995227, 0.097005, 0.198453, 0.488377, 1.000000, 0.000000, 0.000000, 0.000000, 30.000000, 0.000000, 0.000000, 0.000000, - -36.669979, 9.265290, 78.420082, 0.010686, -0.995227, 0.097005, 0.171699, 0.481266, 0.750000, 0.250000, 0.000000, 0.000000, 31.000000, 30.000000, 0.000000, 0.000000, - -36.944801, 8.998390, 75.712090, 0.010686, -0.995227, 0.097005, 0.183131, 0.462501, 0.750000, 0.250000, 0.000000, 0.000000, 31.000000, 34.000000, 0.000000, 0.000000, - -37.712292, 3.390590, 75.716499, -0.068075, 0.997553, -0.015965, 0.142782, 0.434518, 0.750000, 0.250000, 0.000000, 0.000000, 31.000000, 34.000000, 0.000000, 0.000000, - -37.302181, 3.471190, 79.003990, -0.068075, 0.997552, -0.015965, 0.111636, 0.456491, 0.497899, 0.252101, 0.250000, 0.000000, 30.000000, 31.000000, 32.000000, 0.000000, - -34.447392, 3.648400, 77.903893, -0.068075, 0.997552, -0.015965, 0.118464, 0.444956, 0.477273, 0.272727, 0.250000, 0.000000, 32.000000, 31.000000, 30.000000, 0.000000, - -34.447392, 3.648400, 77.903893, -0.039527, 0.997500, -0.058570, 0.118464, 0.444956, 0.477273, 0.272727, 0.250000, 0.000000, 32.000000, 31.000000, 30.000000, 0.000000, - -35.521889, 3.394900, 74.311691, -0.039527, 0.997500, -0.058570, 0.136752, 0.412871, 0.500000, 0.500000, 0.000000, 0.000000, 31.000000, 34.000000, 0.000000, 0.000000, - -37.712292, 3.390590, 75.716499, -0.039527, 0.997500, -0.058570, 0.142782, 0.434518, 0.750000, 0.250000, 0.000000, 0.000000, 31.000000, 34.000000, 0.000000, 0.000000, - -37.863380, 3.325400, 73.453499, -0.019592, 0.999430, -0.027482, 0.155391, 0.418781, 0.750000, 0.250000, 0.000000, 0.000000, 34.000000, 31.000000, 0.000000, 0.000000, - -37.712292, 3.390590, 75.716499, -0.019592, 0.999430, -0.027482, 0.142782, 0.434518, 0.750000, 0.250000, 0.000000, 0.000000, 31.000000, 34.000000, 0.000000, 0.000000, - -35.521889, 3.394900, 74.311691, -0.019592, 0.999430, -0.027482, 0.136752, 0.412871, 0.500000, 0.500000, 0.000000, 0.000000, 31.000000, 34.000000, 0.000000, 0.000000, - -36.944801, 8.998390, 75.712090, 0.016885, -0.994723, 0.101201, 0.183131, 0.462501, 0.750000, 0.250000, 0.000000, 0.000000, 31.000000, 34.000000, 0.000000, 0.000000, - -37.034889, 8.789590, 73.674789, 0.016885, -0.994723, 0.101201, 0.191669, 0.447454, 0.750000, 0.250000, 0.000000, 0.000000, 34.000000, 31.000000, 0.000000, 0.000000, - -34.756001, 8.905390, 74.432793, 0.016885, -0.994723, 0.101201, 0.206059, 0.462555, 0.500000, 0.500000, 0.000000, 0.000000, 31.000000, 34.000000, 0.000000, 0.000000, - -37.863380, 3.325400, 73.453499, -0.000714, 0.996891, -0.078784, 0.155391, 0.418781, 0.750000, 0.250000, 0.000000, 0.000000, 34.000000, 31.000000, 0.000000, 0.000000, - -35.521889, 3.394900, 74.311691, -0.000714, 0.996891, -0.078784, 0.136752, 0.412871, 0.500000, 0.500000, 0.000000, 0.000000, 31.000000, 34.000000, 0.000000, 0.000000, - -35.327999, 3.108770, 70.689400, -0.000714, 0.996891, -0.078784, 0.156015, 0.386935, 1.000000, 0.000000, 0.000000, 0.000000, 34.000000, 0.000000, 0.000000, 0.000000, - -35.327999, 3.108770, 70.689400, 0.005587, 0.997314, -0.073037, 0.156015, 0.386935, 1.000000, 0.000000, 0.000000, 0.000000, 34.000000, 0.000000, 0.000000, 0.000000, - -37.136002, 3.109290, 70.558189, 0.005587, 0.997313, -0.073037, 0.169242, 0.396812, 1.000000, 0.000000, 0.000000, 0.000000, 34.000000, 0.000000, 0.000000, 0.000000, - -37.863380, 3.325400, 73.453499, 0.005587, 0.997314, -0.073037, 0.155391, 0.418781, 0.750000, 0.250000, 0.000000, 0.000000, 34.000000, 31.000000, 0.000000, 0.000000, - -36.286201, 8.284970, 71.107292, -0.072091, -0.093514, 0.993005, 0.204127, 0.427865, 1.000000, 0.000000, 0.000000, 0.000000, 34.000000, 0.000000, 0.000000, 0.000000, - -37.136002, 3.109290, 70.558189, -0.072091, -0.093514, 0.993005, 0.169242, 0.396812, 1.000000, 0.000000, 0.000000, 0.000000, 34.000000, 0.000000, 0.000000, 0.000000, - -35.327999, 3.108770, 70.689400, -0.072091, -0.093514, 0.993005, 0.181838, 0.387092, 1.000000, 0.000000, 0.000000, 0.000000, 34.000000, 0.000000, 0.000000, 0.000000, - -35.327999, 3.108770, 70.689400, -0.060364, -0.091422, 0.993981, 0.181838, 0.387092, 1.000000, 0.000000, 0.000000, 0.000000, 34.000000, 0.000000, 0.000000, 0.000000, - -34.390789, 8.282790, 71.222198, -0.060364, -0.091422, 0.993981, 0.216870, 0.417275, 1.000000, 0.000000, 0.000000, 0.000000, 34.000000, 0.000000, 0.000000, 0.000000, - -36.286201, 8.284970, 71.107292, -0.060364, -0.091422, 0.993981, 0.204127, 0.427865, 1.000000, 0.000000, 0.000000, 0.000000, 34.000000, 0.000000, 0.000000, 0.000000, - -37.034889, 8.789590, 73.674789, -0.012605, -0.981839, 0.189296, 0.191669, 0.447454, 0.750000, 0.250000, 0.000000, 0.000000, 34.000000, 31.000000, 0.000000, 0.000000, - -36.286201, 8.284970, 71.107292, -0.012605, -0.981839, 0.189296, 0.204127, 0.427865, 1.000000, 0.000000, 0.000000, 0.000000, 34.000000, 0.000000, 0.000000, 0.000000, - -34.390789, 8.282790, 71.222198, -0.012605, -0.981839, 0.189296, 0.219952, 0.435615, 1.000000, 0.000000, 0.000000, 0.000000, 34.000000, 0.000000, 0.000000, 0.000000, - -34.390789, 8.282790, 71.222198, -0.012950, -0.981904, 0.188938, 0.219952, 0.435615, 1.000000, 0.000000, 0.000000, 0.000000, 34.000000, 0.000000, 0.000000, 0.000000, - -34.756001, 8.905390, 74.432793, -0.012950, -0.981904, 0.188938, 0.206059, 0.462555, 0.500000, 0.500000, 0.000000, 0.000000, 31.000000, 34.000000, 0.000000, 0.000000, - -37.034889, 8.789590, 73.674789, -0.012950, -0.981904, 0.188938, 0.191669, 0.447454, 0.750000, 0.250000, 0.000000, 0.000000, 34.000000, 31.000000, 0.000000, 0.000000, - -36.387482, 3.029900, 74.997902, -0.646070, -0.729213, 0.225481, 0.927545, 0.187666, 0.750000, 0.250000, 0.000000, 0.000000, 32.000000, 33.000000, 0.000000, 0.000000, - -35.562599, 2.167900, 74.573700, -0.646070, -0.729213, 0.225481, 0.916791, 0.184692, 0.500000, 0.500000, 0.000000, 0.000000, 32.000000, 33.000000, 0.000000, 0.000000, - -34.281101, 2.053990, 77.877190, -0.646070, -0.729213, 0.225481, 0.913688, 0.218094, 0.750000, 0.250000, 0.000000, 0.000000, 32.000000, 30.000000, 0.000000, 0.000000, - -34.281101, 2.053990, 77.877190, -0.818494, -0.094855, 0.566630, 0.913688, 0.218094, 0.750000, 0.250000, 0.000000, 0.000000, 32.000000, 30.000000, 0.000000, 0.000000, - -34.447392, 3.648400, 77.903893, -0.818494, -0.094855, 0.566630, 0.927093, 0.217591, 0.477273, 0.272727, 0.250000, 0.000000, 32.000000, 31.000000, 30.000000, 0.000000, - -36.387482, 3.029900, 74.997902, -0.818494, -0.094855, 0.566630, 0.927545, 0.187666, 0.750000, 0.250000, 0.000000, 0.000000, 32.000000, 33.000000, 0.000000, 0.000000, - -36.384289, 1.289400, 75.129997, -0.551545, 0.810637, 0.196637, 0.905232, 0.187244, 0.750000, 0.250000, 0.000000, 0.000000, 32.000000, 33.000000, 0.000000, 0.000000, - -35.421589, 1.108290, 78.576897, -0.551545, 0.810637, 0.196637, 0.899241, 0.217212, 0.750000, 0.250000, 0.000000, 0.000000, 32.000000, 30.000000, 0.000000, 0.000000, - -34.281101, 2.053990, 77.877190, -0.551545, 0.810637, 0.196637, 0.913688, 0.218094, 0.750000, 0.250000, 0.000000, 0.000000, 32.000000, 30.000000, 0.000000, 0.000000, - -34.281101, 2.053990, 77.877190, -0.615202, 0.742759, 0.264263, 0.913688, 0.218094, 0.750000, 0.250000, 0.000000, 0.000000, 32.000000, 30.000000, 0.000000, 0.000000, - -35.562599, 2.167900, 74.573700, -0.615203, 0.742759, 0.264263, 0.916791, 0.184692, 0.500000, 0.500000, 0.000000, 0.000000, 32.000000, 33.000000, 0.000000, 0.000000, - -36.384289, 1.289400, 75.129997, -0.615202, 0.742759, 0.264263, 0.905232, 0.187244, 0.750000, 0.250000, 0.000000, 0.000000, 32.000000, 33.000000, 0.000000, 0.000000, - -36.473400, 1.249090, 73.979790, -0.719943, 0.693319, 0.031479, 0.905877, 0.177689, 0.750000, 0.250000, 0.000000, 0.000000, 33.000000, 32.000000, 0.000000, 0.000000, - -36.384289, 1.289400, 75.129997, -0.719943, 0.693319, 0.031479, 0.905232, 0.187244, 0.750000, 0.250000, 0.000000, 0.000000, 32.000000, 33.000000, 0.000000, 0.000000, - -35.562599, 2.167900, 74.573700, -0.719943, 0.693319, 0.031479, 0.916791, 0.184692, 0.500000, 0.500000, 0.000000, 0.000000, 32.000000, 33.000000, 0.000000, 0.000000, - -36.387482, 3.029900, 74.997902, -0.687668, -0.716310, 0.118372, 0.927545, 0.187666, 0.750000, 0.250000, 0.000000, 0.000000, 32.000000, 33.000000, 0.000000, 0.000000, - -36.476601, 2.926190, 73.852592, -0.687668, -0.716310, 0.118372, 0.927666, 0.178504, 0.750000, 0.250000, 0.000000, 0.000000, 33.000000, 32.000000, 0.000000, 0.000000, - -35.562599, 2.167900, 74.573700, -0.687668, -0.716310, 0.118372, 0.916791, 0.184692, 0.500000, 0.500000, 0.000000, 0.000000, 32.000000, 33.000000, 0.000000, 0.000000, - -36.473400, 1.249090, 73.979790, -0.679432, 0.728745, -0.085453, 0.905877, 0.177689, 0.750000, 0.250000, 0.000000, 0.000000, 33.000000, 32.000000, 0.000000, 0.000000, - -35.562599, 2.167900, 74.573700, -0.679432, 0.728745, -0.085453, 0.916791, 0.184692, 0.500000, 0.500000, 0.000000, 0.000000, 32.000000, 33.000000, 0.000000, 0.000000, - -35.441292, 1.929990, 71.580292, -0.679432, 0.728745, -0.085453, 0.917201, 0.157500, 0.659481, 0.248582, 0.080745, 0.011192, 33.000000, 34.000000, 31.000000, 30.000000, - -35.441292, 1.929990, 71.580292, -0.782343, 0.600271, -0.166175, 0.917201, 0.157500, 0.659481, 0.248582, 0.080745, 0.011192, 33.000000, 34.000000, 31.000000, 30.000000, - -35.893188, 1.117400, 70.772491, -0.782343, 0.600271, -0.166175, 0.910388, 0.149216, 1.000000, 0.000000, 0.000000, 0.000000, 33.000000, 0.000000, 0.000000, 0.000000, - -36.473400, 1.249090, 73.979790, -0.782343, 0.600271, -0.166175, 0.905877, 0.177689, 0.750000, 0.250000, 0.000000, 0.000000, 33.000000, 32.000000, 0.000000, 0.000000, - -36.476601, 2.926190, 73.852592, -0.781450, -0.618145, -0.085045, 0.927666, 0.178504, 0.750000, 0.250000, 0.000000, 0.000000, 33.000000, 32.000000, 0.000000, 0.000000, - -35.884480, 2.617000, 70.659103, -0.781450, -0.618144, -0.085045, 0.924411, 0.149836, 1.000000, 0.000000, 0.000000, 0.000000, 33.000000, 0.000000, 0.000000, 0.000000, - -35.441292, 1.929990, 71.580292, -0.781451, -0.618144, -0.085045, 0.917201, 0.157500, 0.659481, 0.248582, 0.080745, 0.011192, 33.000000, 34.000000, 31.000000, 30.000000, - -35.441292, 1.929990, 71.580292, -0.653710, -0.756000, 0.033594, 0.917201, 0.157500, 0.659481, 0.248582, 0.080745, 0.011192, 33.000000, 34.000000, 31.000000, 30.000000, - -35.562599, 2.167900, 74.573700, -0.653709, -0.755999, 0.033594, 0.916791, 0.184692, 0.500000, 0.500000, 0.000000, 0.000000, 32.000000, 33.000000, 0.000000, 0.000000, - -36.476601, 2.926190, 73.852592, -0.653710, -0.756000, 0.033594, 0.927666, 0.178504, 0.750000, 0.250000, 0.000000, 0.000000, 33.000000, 32.000000, 0.000000, 0.000000, - -35.884480, 2.617000, 70.659103, -0.888528, 0.039722, 0.457099, 0.924411, 0.149836, 1.000000, 0.000000, 0.000000, 0.000000, 33.000000, 0.000000, 0.000000, 0.000000, - -35.893188, 1.117400, 70.772491, -0.888528, 0.039722, 0.457099, 0.910388, 0.149216, 1.000000, 0.000000, 0.000000, 0.000000, 33.000000, 0.000000, 0.000000, 0.000000, - -35.441292, 1.929990, 71.580292, -0.888528, 0.039722, 0.457099, 0.917201, 0.157500, 0.659481, 0.248582, 0.080745, 0.011192, 33.000000, 34.000000, 31.000000, 30.000000, - -34.447392, 3.648400, 77.903893, -0.936881, 0.152691, 0.314547, 0.927093, 0.217591, 0.477273, 0.272727, 0.250000, 0.000000, 32.000000, 31.000000, 30.000000, 0.000000, - -33.739792, 9.189680, 77.321579, -0.936881, 0.152691, 0.314547, 0.978982, 0.231142, 1.000000, 0.000000, 0.000000, 0.000000, 30.000000, 0.000000, 0.000000, 0.000000, - -34.756001, 8.905390, 74.432793, -0.936881, 0.152691, 0.314547, 0.981625, 0.203781, 0.500000, 0.500000, 0.000000, 0.000000, 31.000000, 34.000000, 0.000000, 0.000000, - -34.756001, 8.905390, 74.432793, -0.952792, 0.126359, 0.276082, 0.981625, 0.203781, 0.500000, 0.500000, 0.000000, 0.000000, 31.000000, 34.000000, 0.000000, 0.000000, - -35.521889, 3.394900, 74.311691, -0.952792, 0.126359, 0.276082, 0.933369, 0.191877, 0.500000, 0.500000, 0.000000, 0.000000, 31.000000, 34.000000, 0.000000, 0.000000, - -34.447392, 3.648400, 77.903893, -0.952792, 0.126359, 0.276082, 0.927093, 0.217591, 0.477273, 0.272727, 0.250000, 0.000000, 32.000000, 31.000000, 30.000000, 0.000000, - -35.521889, 3.394900, 74.311691, -0.980506, 0.139323, -0.138552, 0.933369, 0.191877, 0.500000, 0.500000, 0.000000, 0.000000, 31.000000, 34.000000, 0.000000, 0.000000, - -34.756001, 8.905390, 74.432793, -0.980506, 0.139323, -0.138552, 0.981625, 0.203781, 0.500000, 0.500000, 0.000000, 0.000000, 31.000000, 34.000000, 0.000000, 0.000000, - -34.390789, 8.282790, 71.222198, -0.980506, 0.139323, -0.138552, 0.983055, 0.174425, 1.000000, 0.000000, 0.000000, 0.000000, 34.000000, 0.000000, 0.000000, 0.000000, - -34.390789, 8.282790, 71.222198, -0.980539, 0.184518, -0.067060, 0.983055, 0.174425, 1.000000, 0.000000, 0.000000, 0.000000, 34.000000, 0.000000, 0.000000, 0.000000, - -35.327999, 3.108770, 70.689400, -0.980539, 0.184518, -0.067060, 0.938205, 0.159723, 1.000000, 0.000000, 0.000000, 0.000000, 34.000000, 0.000000, 0.000000, 0.000000, - -35.521889, 3.394900, 74.311691, -0.980539, 0.184518, -0.067060, 0.933369, 0.191877, 0.500000, 0.500000, 0.000000, 0.000000, 31.000000, 34.000000, 0.000000, 0.000000, - -30.973391, -0.950900, 79.465790, -0.286406, 0.958028, -0.012389, 0.031860, 0.483312, 0.750000, 0.250000, 0.000000, 0.000000, 35.000000, 30.000000, 0.000000, 0.000000, - -31.570789, -1.152790, 77.664391, -0.286406, 0.958028, -0.012389, 0.027914, 0.467032, 0.750000, 0.250000, 0.000000, 0.000000, 35.000000, 36.000000, 0.000000, 0.000000, - -33.258999, -1.649890, 78.251801, -0.286406, 0.958028, -0.012389, 0.043861, 0.463033, 0.750000, 0.250000, 0.000000, 0.000000, 35.000000, 36.000000, 0.000000, 0.000000, - -33.258999, -1.649890, 78.251801, -0.285675, 0.958226, -0.013879, 0.043861, 0.463033, 0.750000, 0.250000, 0.000000, 0.000000, 35.000000, 36.000000, 0.000000, 0.000000, - -32.861179, -1.503900, 80.142693, -0.285675, 0.958226, -0.013879, 0.049578, 0.478586, 0.750000, 0.250000, 0.000000, 0.000000, 35.000000, 30.000000, 0.000000, 0.000000, - -30.973391, -0.950900, 79.465790, -0.285675, 0.958226, -0.013879, 0.031860, 0.483312, 0.750000, 0.250000, 0.000000, 0.000000, 35.000000, 30.000000, 0.000000, 0.000000, - -33.258999, -1.649890, 78.251801, -0.272796, 0.961611, 0.029757, 0.043861, 0.463033, 0.750000, 0.250000, 0.000000, 0.000000, 35.000000, 36.000000, 0.000000, 0.000000, - -31.570789, -1.152790, 77.664391, -0.272796, 0.961611, 0.029757, 0.027914, 0.467032, 0.750000, 0.250000, 0.000000, 0.000000, 35.000000, 36.000000, 0.000000, 0.000000, - -32.046188, -1.246390, 76.330902, -0.272796, 0.961611, 0.029757, 0.025117, 0.454743, 0.750000, 0.250000, 0.000000, 0.000000, 36.000000, 35.000000, 0.000000, 0.000000, - -32.046188, -1.246390, 76.330902, -0.271475, 0.961957, 0.030663, 0.025117, 0.454743, 0.750000, 0.250000, 0.000000, 0.000000, 36.000000, 35.000000, 0.000000, 0.000000, - -33.701302, -1.733290, 76.952301, -0.271475, 0.961957, 0.030663, 0.040673, 0.451803, 0.750000, 0.250000, 0.000000, 0.000000, 36.000000, 35.000000, 0.000000, 0.000000, - -33.258999, -1.649890, 78.251801, -0.271475, 0.961957, 0.030663, 0.043861, 0.463033, 0.750000, 0.250000, 0.000000, 0.000000, 35.000000, 36.000000, 0.000000, 0.000000, - -32.046188, -1.246390, 76.330902, -0.201371, 0.956575, 0.210746, 0.025117, 0.454743, 0.750000, 0.250000, 0.000000, 0.000000, 36.000000, 35.000000, 0.000000, 0.000000, - -32.916801, -1.010100, 74.426498, -0.201371, 0.956575, 0.210746, 0.022777, 0.436258, 1.000000, 0.000000, 0.000000, 0.000000, 36.000000, 0.000000, 0.000000, 0.000000, - -34.354389, -1.441590, 75.011391, -0.201371, 0.956575, 0.210746, 0.036936, 0.434394, 1.000000, 0.000000, 0.000000, 0.000000, 36.000000, 0.000000, 0.000000, 0.000000, - -34.354389, -1.441590, 75.011391, -0.201857, 0.956275, 0.211641, 0.036936, 0.434394, 1.000000, 0.000000, 0.000000, 0.000000, 36.000000, 0.000000, 0.000000, 0.000000, - -33.701302, -1.733290, 76.952301, -0.201857, 0.956275, 0.211641, 0.040673, 0.451803, 0.750000, 0.250000, 0.000000, 0.000000, 36.000000, 35.000000, 0.000000, 0.000000, - -32.046188, -1.246390, 76.330902, -0.201857, 0.956275, 0.211641, 0.025117, 0.454743, 0.750000, 0.250000, 0.000000, 0.000000, 36.000000, 35.000000, 0.000000, 0.000000, - -33.258999, -1.649890, 78.251801, 0.845423, 0.496866, -0.195917, 0.043861, 0.463033, 0.750000, 0.250000, 0.000000, 0.000000, 35.000000, 36.000000, 0.000000, 0.000000, - -34.049191, -0.487500, 77.789902, 0.845423, 0.496866, -0.195917, 0.053886, 0.454475, 0.750000, 0.250000, 0.000000, 0.000000, 35.000000, 36.000000, 0.000000, 0.000000, - -33.792992, -0.144990, 79.764091, 0.845423, 0.496866, -0.195917, 0.062246, 0.470721, 0.750000, 0.250000, 0.000000, 0.000000, 35.000000, 30.000000, 0.000000, 0.000000, - -33.792992, -0.144990, 79.764091, 0.832378, 0.510985, -0.214573, 0.062246, 0.470721, 0.750000, 0.250000, 0.000000, 0.000000, 35.000000, 30.000000, 0.000000, 0.000000, - -32.861179, -1.503900, 80.142693, 0.832378, 0.510985, -0.214573, 0.049578, 0.478586, 0.750000, 0.250000, 0.000000, 0.000000, 35.000000, 30.000000, 0.000000, 0.000000, - -33.258999, -1.649890, 78.251801, 0.832378, 0.510985, -0.214573, 0.043861, 0.463033, 0.750000, 0.250000, 0.000000, 0.000000, 35.000000, 36.000000, 0.000000, 0.000000, - -31.570789, -1.152790, 77.664391, -0.949594, 0.016803, 0.313031, 0.873606, 0.242021, 0.750000, 0.250000, 0.000000, 0.000000, 35.000000, 36.000000, 0.000000, 0.000000, - -30.973391, -0.950900, 79.465790, -0.949594, 0.016803, 0.313031, 0.877385, 0.258453, 0.750000, 0.250000, 0.000000, 0.000000, 35.000000, 30.000000, 0.000000, 0.000000, - -31.166491, 0.625380, 78.795403, -0.949594, 0.016803, 0.313031, 0.890658, 0.250768, 0.750000, 0.250000, 0.000000, 0.000000, 35.000000, 30.000000, 0.000000, 0.000000, - -31.166491, 0.625380, 78.795403, -0.907213, -0.058683, 0.416558, 0.890658, 0.250768, 0.750000, 0.250000, 0.000000, 0.000000, 35.000000, 30.000000, 0.000000, 0.000000, - -31.956591, 0.127290, 77.004494, -0.907213, -0.058683, 0.416559, 0.884441, 0.233765, 0.750000, 0.250000, 0.000000, 0.000000, 35.000000, 36.000000, 0.000000, 0.000000, - -31.570789, -1.152790, 77.664391, -0.907213, -0.058683, 0.416559, 0.873606, 0.242021, 0.750000, 0.250000, 0.000000, 0.000000, 35.000000, 36.000000, 0.000000, 0.000000, - -32.046188, -1.246390, 76.330902, -0.934244, -0.106034, 0.340508, 0.871021, 0.229683, 0.750000, 0.250000, 0.000000, 0.000000, 36.000000, 35.000000, 0.000000, 0.000000, - -31.570789, -1.152790, 77.664391, -0.934244, -0.106034, 0.340508, 0.873606, 0.242021, 0.750000, 0.250000, 0.000000, 0.000000, 35.000000, 36.000000, 0.000000, 0.000000, - -31.956591, 0.127290, 77.004494, -0.934244, -0.106034, 0.340508, 0.884441, 0.233765, 0.750000, 0.250000, 0.000000, 0.000000, 35.000000, 36.000000, 0.000000, 0.000000, - -31.956591, 0.127290, 77.004494, -0.913257, -0.129787, 0.386156, 0.884441, 0.233765, 0.750000, 0.250000, 0.000000, 0.000000, 35.000000, 36.000000, 0.000000, 0.000000, - -32.256901, 0.051800, 76.268890, -0.913257, -0.129787, 0.386156, 0.882421, 0.227009, 0.750000, 0.250000, 0.000000, 0.000000, 36.000000, 35.000000, 0.000000, 0.000000, - -32.046188, -1.246390, 76.330902, -0.913257, -0.129787, 0.386156, 0.871021, 0.229683, 0.750000, 0.250000, 0.000000, 0.000000, 36.000000, 35.000000, 0.000000, 0.000000, - -33.701302, -1.733290, 76.952301, 0.888324, 0.399874, -0.225789, 0.040673, 0.451803, 0.750000, 0.250000, 0.000000, 0.000000, 36.000000, 35.000000, 0.000000, 0.000000, - -34.229900, -0.528800, 77.005791, 0.888324, 0.399874, -0.225789, 0.051082, 0.447747, 0.750000, 0.250000, 0.000000, 0.000000, 36.000000, 35.000000, 0.000000, 0.000000, - -34.049191, -0.487500, 77.789902, 0.888324, 0.399874, -0.225789, 0.053886, 0.454475, 0.750000, 0.250000, 0.000000, 0.000000, 35.000000, 36.000000, 0.000000, 0.000000, - -34.049191, -0.487500, 77.789902, 0.838539, 0.445270, -0.313985, 0.053886, 0.454475, 0.750000, 0.250000, 0.000000, 0.000000, 35.000000, 36.000000, 0.000000, 0.000000, - -33.258999, -1.649890, 78.251801, 0.838539, 0.445270, -0.313985, 0.043861, 0.463033, 0.750000, 0.250000, 0.000000, 0.000000, 35.000000, 36.000000, 0.000000, 0.000000, - -33.701302, -1.733290, 76.952301, 0.838539, 0.445270, -0.313985, 0.040673, 0.451803, 0.750000, 0.250000, 0.000000, 0.000000, 36.000000, 35.000000, 0.000000, 0.000000, - -32.916801, -1.010100, 74.426498, -0.907877, -0.128294, 0.399125, 0.870227, 0.210980, 1.000000, 0.000000, 0.000000, 0.000000, 36.000000, 0.000000, 0.000000, 0.000000, - -32.046188, -1.246390, 76.330902, -0.907877, -0.128294, 0.399125, 0.871021, 0.229683, 0.750000, 0.250000, 0.000000, 0.000000, 36.000000, 35.000000, 0.000000, 0.000000, - -32.256901, 0.051800, 76.268890, -0.907877, -0.128294, 0.399125, 0.882421, 0.227009, 0.750000, 0.250000, 0.000000, 0.000000, 36.000000, 35.000000, 0.000000, 0.000000, - -32.256901, 0.051800, 76.268890, -0.728851, -0.446949, 0.518665, 0.882421, 0.227009, 0.750000, 0.250000, 0.000000, 0.000000, 36.000000, 35.000000, 0.000000, 0.000000, - -33.280800, 0.017590, 74.800583, -0.728851, -0.446949, 0.518665, 0.880360, 0.211114, 1.000000, 0.000000, 0.000000, 0.000000, 36.000000, 0.000000, 0.000000, 0.000000, - -32.916801, -1.010100, 74.426498, -0.728851, -0.446949, 0.518665, 0.870227, 0.210980, 1.000000, 0.000000, 0.000000, 0.000000, 36.000000, 0.000000, 0.000000, 0.000000, - -34.354389, -1.441590, 75.011391, 0.973199, 0.179998, -0.143127, 0.036936, 0.434394, 1.000000, 0.000000, 0.000000, 0.000000, 36.000000, 0.000000, 0.000000, 0.000000, - -34.512402, -0.349590, 75.310287, 0.973199, 0.179998, -0.143127, 0.046858, 0.433097, 1.000000, 0.000000, 0.000000, 0.000000, 36.000000, 0.000000, 0.000000, 0.000000, - -34.229900, -0.528800, 77.005791, 0.973199, 0.179998, -0.143127, 0.051082, 0.447747, 0.750000, 0.250000, 0.000000, 0.000000, 36.000000, 35.000000, 0.000000, 0.000000, - -34.354389, -1.441590, 75.011391, 0.416078, -0.177278, 0.891881, 0.036936, 0.434394, 1.000000, 0.000000, 0.000000, 0.000000, 36.000000, 0.000000, 0.000000, 0.000000, - -32.916801, -1.010100, 74.426498, 0.416078, -0.177278, 0.891881, 0.035638, 0.420360, 1.000000, 0.000000, 0.000000, 0.000000, 36.000000, 0.000000, 0.000000, 0.000000, - -33.280800, 0.017590, 74.800583, 0.416078, -0.177278, 0.891881, 0.045699, 0.421056, 1.000000, 0.000000, 0.000000, 0.000000, 36.000000, 0.000000, 0.000000, 0.000000, - -33.280800, 0.017590, 74.800583, 0.421863, -0.182068, 0.888191, 0.045699, 0.421056, 1.000000, 0.000000, 0.000000, 0.000000, 36.000000, 0.000000, 0.000000, 0.000000, - -34.512402, -0.349590, 75.310287, 0.421863, -0.182068, 0.888191, 0.046858, 0.433097, 1.000000, 0.000000, 0.000000, 0.000000, 36.000000, 0.000000, 0.000000, 0.000000, - -34.354389, -1.441590, 75.011391, 0.421863, -0.182068, 0.888191, 0.036936, 0.434394, 1.000000, 0.000000, 0.000000, 0.000000, 36.000000, 0.000000, 0.000000, 0.000000, - -34.049191, -0.487500, 77.789902, 0.841145, -0.539600, -0.036137, 0.053886, 0.454475, 0.750000, 0.250000, 0.000000, 0.000000, 35.000000, 36.000000, 0.000000, 0.000000, - -33.407089, 0.570580, 76.936493, 0.841145, -0.539601, -0.036137, 0.062622, 0.444328, 0.500000, 0.500000, 0.000000, 0.000000, 35.000000, 36.000000, 0.000000, 0.000000, - -33.007099, 1.092200, 78.458000, 0.841145, -0.539600, -0.036137, 0.071412, 0.456058, 0.750000, 0.250000, 0.000000, 0.000000, 35.000000, 30.000000, 0.000000, 0.000000, - -33.007099, 1.092200, 78.458000, 0.837335, -0.546514, -0.013848, 0.071412, 0.456058, 0.750000, 0.250000, 0.000000, 0.000000, 35.000000, 30.000000, 0.000000, 0.000000, - -33.792992, -0.144990, 79.764091, 0.837335, -0.546514, -0.013848, 0.062246, 0.470721, 0.750000, 0.250000, 0.000000, 0.000000, 35.000000, 30.000000, 0.000000, 0.000000, - -34.049191, -0.487500, 77.789902, 0.837335, -0.546514, -0.013848, 0.053886, 0.454475, 0.750000, 0.250000, 0.000000, 0.000000, 35.000000, 36.000000, 0.000000, 0.000000, - -31.956591, 0.127290, 77.004494, -0.291800, -0.880490, 0.373617, 0.884441, 0.233765, 0.750000, 0.250000, 0.000000, 0.000000, 35.000000, 36.000000, 0.000000, 0.000000, - -31.166491, 0.625380, 78.795403, -0.291800, -0.880490, 0.373617, 0.890658, 0.250768, 0.750000, 0.250000, 0.000000, 0.000000, 35.000000, 30.000000, 0.000000, 0.000000, - -33.007099, 1.092200, 78.458000, -0.291800, -0.880490, 0.373617, 0.894880, 0.240238, 0.750000, 0.250000, 0.000000, 0.000000, 35.000000, 30.000000, 0.000000, 0.000000, - -33.007099, 1.092200, 78.458000, -0.286800, -0.880569, 0.377284, 0.894880, 0.240238, 0.750000, 0.250000, 0.000000, 0.000000, 35.000000, 30.000000, 0.000000, 0.000000, - -33.407089, 0.570580, 76.936493, -0.286800, -0.880570, 0.377284, 0.889317, 0.227516, 0.500000, 0.500000, 0.000000, 0.000000, 35.000000, 36.000000, 0.000000, 0.000000, - -31.956591, 0.127290, 77.004494, -0.286800, -0.880570, 0.377284, 0.884441, 0.233765, 0.750000, 0.250000, 0.000000, 0.000000, 35.000000, 36.000000, 0.000000, 0.000000, - -32.256901, 0.051800, 76.268890, -0.294620, -0.930926, 0.215813, 0.882421, 0.227009, 0.750000, 0.250000, 0.000000, 0.000000, 36.000000, 35.000000, 0.000000, 0.000000, - -31.956591, 0.127290, 77.004494, -0.294620, -0.930926, 0.215813, 0.884441, 0.233765, 0.750000, 0.250000, 0.000000, 0.000000, 35.000000, 36.000000, 0.000000, 0.000000, - -33.407089, 0.570580, 76.936493, -0.294620, -0.930926, 0.215813, 0.889317, 0.227516, 0.500000, 0.500000, 0.000000, 0.000000, 35.000000, 36.000000, 0.000000, 0.000000, - -34.049191, -0.487500, 77.789902, 0.787007, -0.598467, -0.149855, 0.053886, 0.454475, 0.750000, 0.250000, 0.000000, 0.000000, 35.000000, 36.000000, 0.000000, 0.000000, - -34.229900, -0.528800, 77.005791, 0.787007, -0.598467, -0.149855, 0.051082, 0.447747, 0.750000, 0.250000, 0.000000, 0.000000, 36.000000, 35.000000, 0.000000, 0.000000, - -33.407089, 0.570580, 76.936493, 0.787007, -0.598467, -0.149855, 0.062622, 0.444328, 0.500000, 0.500000, 0.000000, 0.000000, 35.000000, 36.000000, 0.000000, 0.000000, - -32.256901, 0.051800, 76.268890, -0.268256, -0.927909, 0.258889, 0.882421, 0.227009, 0.750000, 0.250000, 0.000000, 0.000000, 36.000000, 35.000000, 0.000000, 0.000000, - -33.407089, 0.570580, 76.936493, -0.268256, -0.927909, 0.258889, 0.889317, 0.227516, 0.500000, 0.500000, 0.000000, 0.000000, 35.000000, 36.000000, 0.000000, 0.000000, - -33.908089, 0.295800, 75.432503, -0.268256, -0.927909, 0.258889, 0.886118, 0.212776, 1.000000, 0.000000, 0.000000, 0.000000, 36.000000, 0.000000, 0.000000, 0.000000, - -33.908089, 0.295800, 75.432503, -0.235344, -0.953882, 0.186338, 0.886118, 0.212776, 1.000000, 0.000000, 0.000000, 0.000000, 36.000000, 0.000000, 0.000000, 0.000000, - -33.280800, 0.017590, 74.800583, -0.235344, -0.953882, 0.186338, 0.880360, 0.211114, 1.000000, 0.000000, 0.000000, 0.000000, 36.000000, 0.000000, 0.000000, 0.000000, - -32.256901, 0.051800, 76.268890, -0.235344, -0.953882, 0.186338, 0.882421, 0.227009, 0.750000, 0.250000, 0.000000, 0.000000, 36.000000, 35.000000, 0.000000, 0.000000, - -34.229900, -0.528800, 77.005791, 0.734293, -0.651352, -0.191192, 0.051082, 0.447747, 0.750000, 0.250000, 0.000000, 0.000000, 36.000000, 35.000000, 0.000000, 0.000000, - -34.512402, -0.349590, 75.310287, 0.734293, -0.651352, -0.191192, 0.046858, 0.433097, 1.000000, 0.000000, 0.000000, 0.000000, 36.000000, 0.000000, 0.000000, 0.000000, - -33.908089, 0.295800, 75.432503, 0.734293, -0.651352, -0.191192, 0.054365, 0.433020, 1.000000, 0.000000, 0.000000, 0.000000, 36.000000, 0.000000, 0.000000, 0.000000, - -33.908089, 0.295800, 75.432503, 0.786571, -0.598320, -0.152704, 0.054365, 0.433020, 1.000000, 0.000000, 0.000000, 0.000000, 36.000000, 0.000000, 0.000000, 0.000000, - -33.407089, 0.570580, 76.936493, 0.786571, -0.598320, -0.152704, 0.062622, 0.444328, 0.500000, 0.500000, 0.000000, 0.000000, 35.000000, 36.000000, 0.000000, 0.000000, - -34.229900, -0.528800, 77.005791, 0.786571, -0.598320, -0.152704, 0.051082, 0.447747, 0.750000, 0.250000, 0.000000, 0.000000, 36.000000, 35.000000, 0.000000, 0.000000, - -34.512402, -0.349590, 75.310287, 0.453904, -0.556756, 0.695696, 0.884545, 0.205138, 1.000000, 0.000000, 0.000000, 0.000000, 36.000000, 0.000000, 0.000000, 0.000000, - -33.280800, 0.017590, 74.800583, 0.453904, -0.556756, 0.695696, 0.880360, 0.211114, 1.000000, 0.000000, 0.000000, 0.000000, 36.000000, 0.000000, 0.000000, 0.000000, - -33.908089, 0.295800, 75.432503, 0.453904, -0.556756, 0.695696, 0.886118, 0.212776, 1.000000, 0.000000, 0.000000, 0.000000, 36.000000, 0.000000, 0.000000, 0.000000, - -35.421589, 1.108290, 78.576897, -0.343879, 0.769491, 0.538173, 0.899241, 0.217212, 0.750000, 0.250000, 0.000000, 0.000000, 32.000000, 30.000000, 0.000000, 0.000000, - -34.897301, 0.765100, 79.402603, -0.343879, 0.769491, 0.538173, 0.898582, 0.221087, 0.500000, 0.500000, 0.000000, 0.000000, 30.000000, 35.000000, 0.000000, 0.000000, - -33.672501, 1.777200, 78.738098, -0.343879, 0.769491, 0.538173, 0.911340, 0.231132, 0.500000, 0.500000, 0.000000, 0.000000, 30.000000, 35.000000, 0.000000, 0.000000, - -33.672501, 1.777200, 78.738098, -0.349002, 0.791778, 0.501283, 0.911340, 0.231132, 0.500000, 0.500000, 0.000000, 0.000000, 30.000000, 35.000000, 0.000000, 0.000000, - -34.281101, 2.053990, 77.877190, -0.349002, 0.791778, 0.501283, 0.913688, 0.218094, 0.750000, 0.250000, 0.000000, 0.000000, 32.000000, 30.000000, 0.000000, 0.000000, - -35.421589, 1.108290, 78.576897, -0.349002, 0.791778, 0.501283, 0.899241, 0.217212, 0.750000, 0.250000, 0.000000, 0.000000, 32.000000, 30.000000, 0.000000, 0.000000, - -34.897301, 0.765100, 79.402603, 0.264413, 0.615685, 0.742306, 0.898582, 0.221087, 0.500000, 0.500000, 0.000000, 0.000000, 30.000000, 35.000000, 0.000000, 0.000000, - -33.792992, -0.144990, 79.764091, 0.264413, 0.615685, 0.742306, 0.892385, 0.227509, 0.750000, 0.250000, 0.000000, 0.000000, 35.000000, 30.000000, 0.000000, 0.000000, - -33.007099, 1.092200, 78.458000, 0.264413, 0.615685, 0.742306, 0.904556, 0.236401, 0.750000, 0.250000, 0.000000, 0.000000, 35.000000, 30.000000, 0.000000, 0.000000, - -33.007099, 1.092200, 78.458000, 0.438095, 0.058774, 0.897005, 0.904556, 0.236401, 0.750000, 0.250000, 0.000000, 0.000000, 35.000000, 30.000000, 0.000000, 0.000000, - -33.672501, 1.777200, 78.738098, 0.438095, 0.058774, 0.897005, 0.911340, 0.231132, 0.500000, 0.500000, 0.000000, 0.000000, 30.000000, 35.000000, 0.000000, 0.000000, - -34.897301, 0.765100, 79.402603, 0.438095, 0.058774, 0.897005, 0.898582, 0.221087, 0.500000, 0.500000, 0.000000, 0.000000, 30.000000, 35.000000, 0.000000, 0.000000, - -37.302181, 3.471190, 79.003990, 0.912940, -0.026066, -0.407260, 0.111636, 0.456491, 0.497899, 0.252101, 0.250000, 0.000000, 30.000000, 31.000000, 32.000000, 0.000000, - -36.570202, 3.803400, 80.623581, 0.912940, -0.026066, -0.407260, 0.118565, 0.476132, 1.000000, 0.000000, 0.000000, 0.000000, 30.000000, 0.000000, 0.000000, 0.000000, - -36.559292, 1.472800, 80.797203, 0.912940, -0.026066, -0.407260, 0.099681, 0.474772, 1.000000, 0.000000, 0.000000, 0.000000, 30.000000, 0.000000, 0.000000, 0.000000, - -36.559292, 1.472800, 80.797203, 0.945727, 0.066060, -0.318176, 0.099681, 0.474772, 1.000000, 0.000000, 0.000000, 0.000000, 30.000000, 0.000000, 0.000000, 0.000000, - -37.103100, 1.384990, 79.162590, 0.945727, 0.066060, -0.318176, 0.095001, 0.446598, 0.750000, 0.250000, 0.000000, 0.000000, 32.000000, 30.000000, 0.000000, 0.000000, - -37.302181, 3.471190, 79.003990, 0.945727, 0.066060, -0.318176, 0.111636, 0.456491, 0.497899, 0.252101, 0.250000, 0.000000, 30.000000, 31.000000, 32.000000, 0.000000, - -36.669979, 9.265290, 78.420082, 0.905572, -0.144373, -0.398868, 0.171699, 0.481266, 0.750000, 0.250000, 0.000000, 0.000000, 31.000000, 30.000000, 0.000000, 0.000000, - -35.931091, 9.390500, 80.052299, 0.905572, -0.144373, -0.398868, 0.163544, 0.494080, 1.000000, 0.000000, 0.000000, 0.000000, 30.000000, 0.000000, 0.000000, 0.000000, - -36.570202, 3.803400, 80.623581, 0.905572, -0.144373, -0.398868, 0.118565, 0.476132, 1.000000, 0.000000, 0.000000, 0.000000, 30.000000, 0.000000, 0.000000, 0.000000, - -36.570202, 3.803400, 80.623581, 0.912835, -0.138318, -0.384187, 0.118565, 0.476132, 1.000000, 0.000000, 0.000000, 0.000000, 30.000000, 0.000000, 0.000000, 0.000000, - -37.302181, 3.471190, 79.003990, 0.912835, -0.138318, -0.384187, 0.111636, 0.456491, 0.497899, 0.252101, 0.250000, 0.000000, 30.000000, 31.000000, 32.000000, 0.000000, - -36.669979, 9.265290, 78.420082, 0.912835, -0.138318, -0.384187, 0.171699, 0.481266, 0.750000, 0.250000, 0.000000, 0.000000, 31.000000, 30.000000, 0.000000, 0.000000, - -36.570202, 3.803400, 80.623581, 0.874076, 0.120972, -0.470486, 0.118565, 0.476132, 1.000000, 0.000000, 0.000000, 0.000000, 30.000000, 0.000000, 0.000000, 0.000000, - -33.609501, 6.028290, 86.696091, 0.874076, 0.120972, -0.470486, 0.115462, 0.541545, 1.000000, 0.000000, 0.000000, 0.000000, 30.000000, 0.000000, 0.000000, 0.000000, - -33.099991, 2.152070, 86.646004, 0.874076, 0.120972, -0.470486, 0.083089, 0.532741, 0.960986, 0.039014, 0.000000, 0.000000, 30.000000, 37.000000, 0.000000, 0.000000, - -33.099991, 2.152070, 86.646004, 0.861941, -0.033652, -0.505891, 0.083089, 0.532741, 0.960986, 0.039014, 0.000000, 0.000000, 30.000000, 37.000000, 0.000000, 0.000000, - -36.559292, 1.472800, 80.797203, 0.861941, -0.033652, -0.505891, 0.099681, 0.474772, 1.000000, 0.000000, 0.000000, 0.000000, 30.000000, 0.000000, 0.000000, 0.000000, - -36.570202, 3.803400, 80.623581, 0.861941, -0.033652, -0.505891, 0.118565, 0.476132, 1.000000, 0.000000, 0.000000, 0.000000, 30.000000, 0.000000, 0.000000, 0.000000, - -36.570202, 3.803400, 80.623581, 0.909249, -0.143945, -0.390572, 0.118565, 0.476132, 1.000000, 0.000000, 0.000000, 0.000000, 30.000000, 0.000000, 0.000000, 0.000000, - -35.931091, 9.390500, 80.052299, 0.909249, -0.143945, -0.390572, 0.163544, 0.494080, 1.000000, 0.000000, 0.000000, 0.000000, 30.000000, 0.000000, 0.000000, 0.000000, - -33.609501, 6.028290, 86.696091, 0.909249, -0.143945, -0.390572, 0.115462, 0.541545, 1.000000, 0.000000, 0.000000, 0.000000, 30.000000, 0.000000, 0.000000, 0.000000, - -32.861179, -1.503900, 80.142693, 0.805174, 0.582752, 0.109977, 0.049578, 0.478586, 0.750000, 0.250000, 0.000000, 0.000000, 35.000000, 30.000000, 0.000000, 0.000000, - -33.792992, -0.144990, 79.764091, 0.805174, 0.582752, 0.109977, 0.062246, 0.470721, 0.750000, 0.250000, 0.000000, 0.000000, 35.000000, 30.000000, 0.000000, 0.000000, - -34.184700, -0.000690, 81.867287, 0.805174, 0.582752, 0.109977, 0.071045, 0.487618, 0.500000, 0.500000, 0.000000, 0.000000, 30.000000, 35.000000, 0.000000, 0.000000, - -33.792992, -0.144990, 79.764091, 0.622496, 0.780131, 0.062412, 0.062246, 0.470721, 0.750000, 0.250000, 0.000000, 0.000000, 35.000000, 30.000000, 0.000000, 0.000000, - -34.897301, 0.765100, 79.402603, 0.622496, 0.780131, 0.062412, 0.074341, 0.466756, 0.500000, 0.500000, 0.000000, 0.000000, 30.000000, 35.000000, 0.000000, 0.000000, - -34.184700, -0.000690, 81.867287, 0.622496, 0.780131, 0.062412, 0.071045, 0.487618, 0.500000, 0.500000, 0.000000, 0.000000, 30.000000, 35.000000, 0.000000, 0.000000, - -32.861179, -1.503900, 80.142693, -0.254560, 0.950888, -0.176102, 0.049578, 0.478586, 0.750000, 0.250000, 0.000000, 0.000000, 35.000000, 30.000000, 0.000000, 0.000000, - -32.395981, -0.797990, 83.281891, -0.254560, 0.950888, -0.176102, 0.059808, 0.504033, 0.500000, 0.500000, 0.000000, 0.000000, 30.000000, 35.000000, 0.000000, 0.000000, - -29.890791, -0.306600, 82.313904, -0.254560, 0.950888, -0.176102, 0.037657, 0.510416, 0.500000, 0.500000, 0.000000, 0.000000, 30.000000, 35.000000, 0.000000, 0.000000, - -29.890791, -0.306600, 82.313904, -0.311247, 0.945510, -0.095585, 0.037657, 0.510416, 0.500000, 0.500000, 0.000000, 0.000000, 30.000000, 35.000000, 0.000000, 0.000000, - -30.973391, -0.950900, 79.465790, -0.311247, 0.945510, -0.095585, 0.031860, 0.483312, 0.750000, 0.250000, 0.000000, 0.000000, 35.000000, 30.000000, 0.000000, 0.000000, - -32.861179, -1.503900, 80.142693, -0.311247, 0.945510, -0.095585, 0.049578, 0.478586, 0.750000, 0.250000, 0.000000, 0.000000, 35.000000, 30.000000, 0.000000, 0.000000, - -32.395981, -0.797990, 83.281891, -0.382149, 0.791249, -0.477375, 0.059808, 0.504033, 0.500000, 0.500000, 0.000000, 0.000000, 30.000000, 35.000000, 0.000000, 0.000000, - -31.695601, 1.217380, 86.061699, -0.382149, 0.791249, -0.477375, 0.066937, 0.530589, 1.000000, 0.000000, 0.000000, 0.000000, 30.000000, 0.000000, 0.000000, 0.000000, - -29.082790, 1.682300, 84.740692, -0.382149, 0.791249, -0.477375, 0.040621, 0.530198, 1.000000, 0.000000, 0.000000, 0.000000, 30.000000, 0.000000, 0.000000, 0.000000, - -29.082790, 1.682300, 84.740692, -0.353398, 0.777781, -0.519775, 0.040621, 0.530198, 1.000000, 0.000000, 0.000000, 0.000000, 30.000000, 0.000000, 0.000000, 0.000000, - -29.890791, -0.306600, 82.313904, -0.353398, 0.777781, -0.519775, 0.037657, 0.510416, 0.500000, 0.500000, 0.000000, 0.000000, 30.000000, 35.000000, 0.000000, 0.000000, - -32.395981, -0.797990, 83.281891, -0.353398, 0.777781, -0.519775, 0.059808, 0.504033, 0.500000, 0.500000, 0.000000, 0.000000, 30.000000, 35.000000, 0.000000, 0.000000, - -32.395981, -0.797990, 83.281891, 0.557114, 0.788713, -0.259916, 0.059808, 0.504033, 0.500000, 0.500000, 0.000000, 0.000000, 30.000000, 35.000000, 0.000000, 0.000000, - -32.861179, -1.503900, 80.142693, 0.557113, 0.788713, -0.259916, 0.049578, 0.478586, 0.750000, 0.250000, 0.000000, 0.000000, 35.000000, 30.000000, 0.000000, 0.000000, - -34.184700, -0.000690, 81.867287, 0.557114, 0.788713, -0.259916, 0.071045, 0.487618, 0.500000, 0.500000, 0.000000, 0.000000, 30.000000, 35.000000, 0.000000, 0.000000, - -32.395981, -0.797990, 83.281891, 0.629970, 0.644487, -0.433330, 0.059808, 0.504033, 0.500000, 0.500000, 0.000000, 0.000000, 30.000000, 35.000000, 0.000000, 0.000000, - -34.184700, -0.000690, 81.867287, 0.629970, 0.644487, -0.433330, 0.071045, 0.487618, 0.500000, 0.500000, 0.000000, 0.000000, 30.000000, 35.000000, 0.000000, 0.000000, - -33.099991, 2.152070, 86.646004, 0.629970, 0.644487, -0.433330, 0.083089, 0.532741, 0.960986, 0.039014, 0.000000, 0.000000, 30.000000, 37.000000, 0.000000, 0.000000, - -37.103100, 1.384990, 79.162590, 0.282270, 0.948337, -0.144850, 0.095001, 0.446598, 0.750000, 0.250000, 0.000000, 0.000000, 32.000000, 30.000000, 0.000000, 0.000000, - -36.559292, 1.472800, 80.797203, 0.282270, 0.948337, -0.144850, 0.099681, 0.474772, 1.000000, 0.000000, 0.000000, 0.000000, 30.000000, 0.000000, 0.000000, 0.000000, - -34.897301, 0.765100, 79.402603, 0.282270, 0.948337, -0.144850, 0.074341, 0.466756, 0.500000, 0.500000, 0.000000, 0.000000, 30.000000, 35.000000, 0.000000, 0.000000, - -34.897301, 0.765100, 79.402603, 0.238384, 0.941103, 0.239789, 0.074341, 0.466756, 0.500000, 0.500000, 0.000000, 0.000000, 30.000000, 35.000000, 0.000000, 0.000000, - -35.421589, 1.108290, 78.576897, 0.238384, 0.941103, 0.239789, 0.079285, 0.437406, 0.750000, 0.250000, 0.000000, 0.000000, 32.000000, 30.000000, 0.000000, 0.000000, - -37.103100, 1.384990, 79.162590, 0.238384, 0.941103, 0.239789, 0.095001, 0.446598, 0.750000, 0.250000, 0.000000, 0.000000, 32.000000, 30.000000, 0.000000, 0.000000, - -36.559292, 1.472800, 80.797203, 0.608146, 0.662924, -0.436681, 0.099681, 0.474772, 1.000000, 0.000000, 0.000000, 0.000000, 30.000000, 0.000000, 0.000000, 0.000000, - -33.099991, 2.152070, 86.646004, 0.608146, 0.662924, -0.436682, 0.083089, 0.532741, 0.960986, 0.039014, 0.000000, 0.000000, 30.000000, 37.000000, 0.000000, 0.000000, - -34.184700, -0.000690, 81.867287, 0.608146, 0.662924, -0.436682, 0.071045, 0.487618, 0.500000, 0.500000, 0.000000, 0.000000, 30.000000, 35.000000, 0.000000, 0.000000, - -34.184700, -0.000690, 81.867287, 0.479425, 0.867750, 0.131001, 0.071045, 0.487618, 0.500000, 0.500000, 0.000000, 0.000000, 30.000000, 35.000000, 0.000000, 0.000000, - -34.897301, 0.765100, 79.402603, 0.479425, 0.867750, 0.131001, 0.074341, 0.466756, 0.500000, 0.500000, 0.000000, 0.000000, 30.000000, 35.000000, 0.000000, 0.000000, - -36.559292, 1.472800, 80.797203, 0.479425, 0.867750, 0.131001, 0.099681, 0.474772, 1.000000, 0.000000, 0.000000, 0.000000, 30.000000, 0.000000, 0.000000, 0.000000, - -31.695601, 1.217380, 86.061699, 0.248184, 0.753491, -0.608815, 0.066937, 0.530589, 1.000000, 0.000000, 0.000000, 0.000000, 30.000000, 0.000000, 0.000000, 0.000000, - -32.395981, -0.797990, 83.281891, 0.248184, 0.753491, -0.608815, 0.059808, 0.504033, 0.500000, 0.500000, 0.000000, 0.000000, 30.000000, 35.000000, 0.000000, 0.000000, - -33.099991, 2.152070, 86.646004, 0.248184, 0.753491, -0.608815, 0.083089, 0.532741, 0.960986, 0.039014, 0.000000, 0.000000, 30.000000, 37.000000, 0.000000, 0.000000, - -33.672501, 1.777200, 78.738098, -0.198198, -0.529740, 0.824678, 0.911340, 0.231132, 0.500000, 0.500000, 0.000000, 0.000000, 30.000000, 35.000000, 0.000000, 0.000000, - -33.007099, 1.092200, 78.458000, -0.198198, -0.529740, 0.824678, 0.904556, 0.236401, 0.750000, 0.250000, 0.000000, 0.000000, 35.000000, 30.000000, 0.000000, 0.000000, - -32.069592, 3.540490, 80.255997, -0.198198, -0.529740, 0.824678, 0.924263, 0.255331, 1.000000, 0.000000, 0.000000, 0.000000, 30.000000, 0.000000, 0.000000, 0.000000, - -32.069592, 3.540490, 80.255997, -0.491370, -0.266974, 0.829024, 0.924263, 0.255331, 1.000000, 0.000000, 0.000000, 0.000000, 30.000000, 0.000000, 0.000000, 0.000000, - -32.737701, 3.983890, 80.002792, -0.491370, -0.266974, 0.829024, 0.929345, 0.249566, 1.000000, 0.000000, 0.000000, 0.000000, 30.000000, 0.000000, 0.000000, 0.000000, - -33.672501, 1.777200, 78.738098, -0.491370, -0.266974, 0.829024, 0.911340, 0.231132, 0.500000, 0.500000, 0.000000, 0.000000, 30.000000, 35.000000, 0.000000, 0.000000, - -32.737701, 3.983890, 80.002792, -0.521466, -0.338444, 0.783281, 0.929345, 0.249566, 1.000000, 0.000000, 0.000000, 0.000000, 30.000000, 0.000000, 0.000000, 0.000000, - -32.069592, 3.540490, 80.255997, -0.521466, -0.338444, 0.783281, 0.924263, 0.255331, 1.000000, 0.000000, 0.000000, 0.000000, 30.000000, 0.000000, 0.000000, 0.000000, - -28.363300, 6.512700, 84.007690, -0.521466, -0.338444, 0.783281, 0.945239, 0.304844, 1.000000, 0.000000, 0.000000, 0.000000, 30.000000, 0.000000, 0.000000, 0.000000, - -34.447392, 3.648400, 77.903893, -0.827050, -0.095535, 0.553950, 0.927093, 0.217591, 0.477273, 0.272727, 0.250000, 0.000000, 32.000000, 31.000000, 30.000000, 0.000000, - -34.281101, 2.053990, 77.877190, -0.827050, -0.095535, 0.553950, 0.913688, 0.218094, 0.750000, 0.250000, 0.000000, 0.000000, 32.000000, 30.000000, 0.000000, 0.000000, - -33.672501, 1.777200, 78.738098, -0.827050, -0.095535, 0.553950, 0.911340, 0.231132, 0.500000, 0.500000, 0.000000, 0.000000, 30.000000, 35.000000, 0.000000, 0.000000, - -33.672501, 1.777200, 78.738098, -0.771924, -0.036728, 0.634653, 0.911340, 0.231132, 0.500000, 0.500000, 0.000000, 0.000000, 30.000000, 35.000000, 0.000000, 0.000000, - -32.737701, 3.983890, 80.002792, -0.771924, -0.036728, 0.634653, 0.929345, 0.249566, 1.000000, 0.000000, 0.000000, 0.000000, 30.000000, 0.000000, 0.000000, 0.000000, - -34.447392, 3.648400, 77.903893, -0.771924, -0.036728, 0.634653, 0.927093, 0.217591, 0.477273, 0.272727, 0.250000, 0.000000, 32.000000, 31.000000, 30.000000, 0.000000, - -34.447392, 3.648400, 77.903893, -0.777552, 0.163109, 0.607295, 0.927093, 0.217591, 0.477273, 0.272727, 0.250000, 0.000000, 32.000000, 31.000000, 30.000000, 0.000000, - -32.737701, 3.983890, 80.002792, -0.777552, 0.163109, 0.607295, 0.929345, 0.249566, 1.000000, 0.000000, 0.000000, 0.000000, 30.000000, 0.000000, 0.000000, 0.000000, - -33.739792, 9.189680, 77.321579, -0.777552, 0.163109, 0.607295, 0.978982, 0.231142, 1.000000, 0.000000, 0.000000, 0.000000, 30.000000, 0.000000, 0.000000, 0.000000, - -31.166491, 0.625380, 78.795403, -0.882254, 0.088564, 0.462368, 0.890658, 0.250768, 0.750000, 0.250000, 0.000000, 0.000000, 35.000000, 30.000000, 0.000000, 0.000000, - -30.973391, -0.950900, 79.465790, -0.882254, 0.088564, 0.462368, 0.877385, 0.258453, 0.750000, 0.250000, 0.000000, 0.000000, 35.000000, 30.000000, 0.000000, 0.000000, - -29.920000, 1.984690, 80.913490, -0.882254, 0.088564, 0.462368, 0.905279, 0.271426, 0.500000, 0.500000, 0.000000, 0.000000, 30.000000, 35.000000, 0.000000, 0.000000, - -31.166491, 0.625380, 78.795403, -0.564244, -0.502878, 0.654785, 0.890658, 0.250768, 0.750000, 0.250000, 0.000000, 0.000000, 35.000000, 30.000000, 0.000000, 0.000000, - -29.920000, 1.984690, 80.913490, -0.564244, -0.502878, 0.654785, 0.905279, 0.271426, 0.500000, 0.500000, 0.000000, 0.000000, 30.000000, 35.000000, 0.000000, 0.000000, - -32.069592, 3.540490, 80.255997, -0.564244, -0.502878, 0.654785, 0.924263, 0.255331, 1.000000, 0.000000, 0.000000, 0.000000, 30.000000, 0.000000, 0.000000, 0.000000, - -32.069592, 3.540490, 80.255997, -0.276894, -0.497639, 0.822001, 0.924263, 0.255331, 1.000000, 0.000000, 0.000000, 0.000000, 30.000000, 0.000000, 0.000000, 0.000000, - -33.007099, 1.092200, 78.458000, -0.276894, -0.497639, 0.822001, 0.904556, 0.236401, 0.750000, 0.250000, 0.000000, 0.000000, 35.000000, 30.000000, 0.000000, 0.000000, - -31.166491, 0.625380, 78.795403, -0.276894, -0.497639, 0.822001, 0.890658, 0.250768, 0.750000, 0.250000, 0.000000, 0.000000, 35.000000, 30.000000, 0.000000, 0.000000, - -29.920000, 1.984690, 80.913490, -0.887326, 0.232197, 0.398418, 0.905279, 0.271426, 0.500000, 0.500000, 0.000000, 0.000000, 30.000000, 35.000000, 0.000000, 0.000000, - -29.890791, -0.306600, 82.313904, -0.887326, 0.232197, 0.398418, 0.885337, 0.284695, 0.500000, 0.500000, 0.000000, 0.000000, 30.000000, 35.000000, 0.000000, 0.000000, - -28.123791, 3.438690, 84.066483, -0.887326, 0.232197, 0.398418, 0.918338, 0.304978, 1.000000, 0.000000, 0.000000, 0.000000, 30.000000, 0.000000, 0.000000, 0.000000, - -32.069592, 3.540490, 80.255997, -0.584027, -0.557645, 0.589868, 0.924263, 0.255331, 1.000000, 0.000000, 0.000000, 0.000000, 30.000000, 0.000000, 0.000000, 0.000000, - -29.920000, 1.984690, 80.913490, -0.584027, -0.557645, 0.589868, 0.905279, 0.271426, 0.500000, 0.500000, 0.000000, 0.000000, 30.000000, 35.000000, 0.000000, 0.000000, - -28.123791, 3.438690, 84.066483, -0.584027, -0.557645, 0.589868, 0.918338, 0.304978, 1.000000, 0.000000, 0.000000, 0.000000, 30.000000, 0.000000, 0.000000, 0.000000, - -28.123791, 3.438690, 84.066483, -0.694637, -0.040386, 0.718226, 0.918338, 0.304978, 1.000000, 0.000000, 0.000000, 0.000000, 30.000000, 0.000000, 0.000000, 0.000000, - -28.363300, 6.512700, 84.007690, -0.694637, -0.040386, 0.718226, 0.945239, 0.304844, 1.000000, 0.000000, 0.000000, 0.000000, 30.000000, 0.000000, 0.000000, 0.000000, - -32.069592, 3.540490, 80.255997, -0.694637, -0.040386, 0.718226, 0.924263, 0.255331, 1.000000, 0.000000, 0.000000, 0.000000, 30.000000, 0.000000, 0.000000, 0.000000, - -35.931091, 9.390500, 80.052299, 0.002519, -0.997154, 0.075353, 0.163544, 0.494080, 1.000000, 0.000000, 0.000000, 0.000000, 30.000000, 0.000000, 0.000000, 0.000000, - -36.669979, 9.265290, 78.420082, 0.002519, -0.997154, 0.075353, 0.171699, 0.481266, 0.750000, 0.250000, 0.000000, 0.000000, 31.000000, 30.000000, 0.000000, 0.000000, - -33.739792, 9.189680, 77.321579, 0.002519, -0.997154, 0.075353, 0.198453, 0.488377, 1.000000, 0.000000, 0.000000, 0.000000, 30.000000, 0.000000, 0.000000, 0.000000, - -35.931091, 9.390500, 80.052299, -0.073098, -0.997217, 0.014678, 0.163544, 0.494080, 1.000000, 0.000000, 0.000000, 0.000000, 30.000000, 0.000000, 0.000000, 0.000000, - -33.739792, 9.189680, 77.321579, -0.073098, -0.997217, 0.014678, 0.198453, 0.488377, 1.000000, 0.000000, 0.000000, 0.000000, 30.000000, 0.000000, 0.000000, 0.000000, - -29.860991, 9.012290, 84.586502, -0.073098, -0.997217, 0.014678, 0.169935, 0.558730, 1.000000, 0.000000, 0.000000, 0.000000, 30.000000, 0.000000, 0.000000, 0.000000, - -29.860991, 9.012290, 84.586502, -0.072717, -0.997252, 0.014166, 0.169935, 0.558730, 1.000000, 0.000000, 0.000000, 0.000000, 30.000000, 0.000000, 0.000000, 0.000000, - -32.705688, 9.240980, 86.083298, -0.072717, -0.997252, 0.014166, 0.143564, 0.549932, 1.000000, 0.000000, 0.000000, 0.000000, 30.000000, 0.000000, 0.000000, 0.000000, - -35.931091, 9.390500, 80.052299, -0.072717, -0.997252, 0.014166, 0.163544, 0.494080, 1.000000, 0.000000, 0.000000, 0.000000, 30.000000, 0.000000, 0.000000, 0.000000, - -29.860991, 9.012290, 84.586502, -0.879015, 0.073434, 0.471106, 0.970074, 0.302908, 1.000000, 0.000000, 0.000000, 0.000000, 30.000000, 0.000000, 0.000000, 0.000000, - -33.739792, 9.189680, 77.321579, -0.879014, 0.073434, 0.471106, 0.978982, 0.231142, 1.000000, 0.000000, 0.000000, 0.000000, 30.000000, 0.000000, 0.000000, 0.000000, - -32.737701, 3.983890, 80.002792, -0.879014, 0.073434, 0.471106, 0.929345, 0.249566, 1.000000, 0.000000, 0.000000, 0.000000, 30.000000, 0.000000, 0.000000, 0.000000, - -32.737701, 3.983890, 80.002792, -0.448883, -0.447998, 0.773177, 0.929345, 0.249566, 1.000000, 0.000000, 0.000000, 0.000000, 30.000000, 0.000000, 0.000000, 0.000000, - -28.363300, 6.512700, 84.007690, -0.448883, -0.447998, 0.773177, 0.945239, 0.304844, 1.000000, 0.000000, 0.000000, 0.000000, 30.000000, 0.000000, 0.000000, 0.000000, - -29.860991, 9.012290, 84.586502, -0.448883, -0.447998, 0.773177, 0.970074, 0.302908, 1.000000, 0.000000, 0.000000, 0.000000, 30.000000, 0.000000, 0.000000, 0.000000, - -30.973391, -0.950900, 79.465790, -0.932333, 0.179848, 0.313705, 0.877385, 0.258453, 0.750000, 0.250000, 0.000000, 0.000000, 35.000000, 30.000000, 0.000000, 0.000000, - -29.890791, -0.306600, 82.313904, -0.932333, 0.179848, 0.313705, 0.885337, 0.284695, 0.500000, 0.500000, 0.000000, 0.000000, 30.000000, 35.000000, 0.000000, 0.000000, - -29.920000, 1.984690, 80.913490, -0.932333, 0.179848, 0.313705, 0.905279, 0.271426, 0.500000, 0.500000, 0.000000, 0.000000, 30.000000, 35.000000, 0.000000, 0.000000, - -34.229900, -0.528800, 77.005791, 0.885465, 0.399160, -0.237956, 0.051082, 0.447747, 0.750000, 0.250000, 0.000000, 0.000000, 36.000000, 35.000000, 0.000000, 0.000000, - -33.701302, -1.733290, 76.952301, 0.885465, 0.399160, -0.237956, 0.040673, 0.451803, 0.750000, 0.250000, 0.000000, 0.000000, 36.000000, 35.000000, 0.000000, 0.000000, - -34.354389, -1.441590, 75.011391, 0.885465, 0.399160, -0.237956, 0.036936, 0.434394, 1.000000, 0.000000, 0.000000, 0.000000, 36.000000, 0.000000, 0.000000, 0.000000, - -35.931091, 9.390500, 80.052299, 0.831987, -0.320445, -0.452894, 0.163544, 0.494080, 1.000000, 0.000000, 0.000000, 0.000000, 30.000000, 0.000000, 0.000000, 0.000000, - -32.705688, 9.240980, 86.083298, 0.831987, -0.320445, -0.452894, 0.143564, 0.549932, 1.000000, 0.000000, 0.000000, 0.000000, 30.000000, 0.000000, 0.000000, 0.000000, - -33.609501, 6.028290, 86.696091, 0.831987, -0.320445, -0.452894, 0.115462, 0.541545, 1.000000, 0.000000, 0.000000, 0.000000, 30.000000, 0.000000, 0.000000, 0.000000, - -29.890791, -0.306600, 82.313904, -0.887248, 0.454770, -0.077302, 0.885337, 0.284695, 0.500000, 0.500000, 0.000000, 0.000000, 30.000000, 35.000000, 0.000000, 0.000000, - -29.082790, 1.682300, 84.740692, -0.887248, 0.454770, -0.077302, 0.899671, 0.306861, 1.000000, 0.000000, 0.000000, 0.000000, 30.000000, 0.000000, 0.000000, 0.000000, - -28.123791, 3.438690, 84.066483, -0.887248, 0.454770, -0.077302, 0.918338, 0.304978, 1.000000, 0.000000, 0.000000, 0.000000, 30.000000, 0.000000, 0.000000, 0.000000, - -33.609501, 6.028290, 86.696091, 0.841465, 0.195075, -0.503867, 0.115462, 0.541545, 1.000000, 0.000000, 0.000000, 0.000000, 30.000000, 0.000000, 0.000000, 0.000000, - -32.078091, 6.090890, 89.277802, 0.841465, 0.195075, -0.503867, 0.108422, 0.567815, 0.500000, 0.500000, 0.000000, 0.000000, 30.000000, 37.000000, 0.000000, 0.000000, - -31.348600, 2.615100, 89.150391, 0.841465, 0.195075, -0.503867, 0.077016, 0.559978, 0.500000, 0.500000, 0.000000, 0.000000, 30.000000, 37.000000, 0.000000, 0.000000, - -31.348600, 2.615100, 89.150391, 0.804262, 0.113255, -0.583383, 0.077016, 0.559978, 0.500000, 0.500000, 0.000000, 0.000000, 30.000000, 37.000000, 0.000000, 0.000000, - -33.099991, 2.152070, 86.646004, 0.804262, 0.113255, -0.583383, 0.083089, 0.532741, 0.960986, 0.039014, 0.000000, 0.000000, 30.000000, 37.000000, 0.000000, 0.000000, - -33.609501, 6.028290, 86.696091, 0.804262, 0.113255, -0.583383, 0.115462, 0.541545, 1.000000, 0.000000, 0.000000, 0.000000, 30.000000, 0.000000, 0.000000, 0.000000, - -33.609501, 6.028290, 86.696091, 0.789459, -0.321793, -0.522689, 0.115462, 0.541545, 1.000000, 0.000000, 0.000000, 0.000000, 30.000000, 0.000000, 0.000000, 0.000000, - -32.705688, 9.240980, 86.083298, 0.789459, -0.321793, -0.522689, 0.143564, 0.549932, 1.000000, 0.000000, 0.000000, 0.000000, 30.000000, 0.000000, 0.000000, 0.000000, - -31.165890, 8.961400, 88.581100, 0.789459, -0.321793, -0.522689, 0.136111, 0.575224, 0.500000, 0.500000, 0.000000, 0.000000, 30.000000, 37.000000, 0.000000, 0.000000, - -31.165890, 8.961400, 88.581100, 0.803347, -0.368778, -0.467585, 0.136111, 0.575224, 0.500000, 0.500000, 0.000000, 0.000000, 30.000000, 37.000000, 0.000000, 0.000000, - -32.078091, 6.090890, 89.277802, 0.803347, -0.368778, -0.467585, 0.108422, 0.567815, 0.500000, 0.500000, 0.000000, 0.000000, 30.000000, 37.000000, 0.000000, 0.000000, - -33.609501, 6.028290, 86.696091, 0.803347, -0.368778, -0.467585, 0.115462, 0.541545, 1.000000, 0.000000, 0.000000, 0.000000, 30.000000, 0.000000, 0.000000, 0.000000, - -29.082790, 1.682300, 84.740692, -0.214267, 0.973393, -0.081218, 0.040621, 0.530198, 1.000000, 0.000000, 0.000000, 0.000000, 30.000000, 0.000000, 0.000000, 0.000000, - -31.695601, 1.217380, 86.061699, -0.214267, 0.973393, -0.081218, 0.066937, 0.530589, 1.000000, 0.000000, 0.000000, 0.000000, 30.000000, 0.000000, 0.000000, 0.000000, - -30.120701, 1.772990, 88.565804, -0.214267, 0.973393, -0.081218, 0.062225, 0.557204, 0.500000, 0.500000, 0.000000, 0.000000, 30.000000, 37.000000, 0.000000, 0.000000, - -30.120701, 1.772990, 88.565804, -0.220864, 0.971769, -0.082969, 0.062225, 0.557204, 0.500000, 0.500000, 0.000000, 0.000000, 30.000000, 37.000000, 0.000000, 0.000000, - -27.839090, 2.180800, 87.268593, -0.220864, 0.971769, -0.082969, 0.039169, 0.552415, 0.500000, 0.500000, 0.000000, 0.000000, 30.000000, 37.000000, 0.000000, 0.000000, - -29.082790, 1.682300, 84.740692, -0.220864, 0.971769, -0.082969, 0.040621, 0.530198, 1.000000, 0.000000, 0.000000, 0.000000, 30.000000, 0.000000, 0.000000, 0.000000, - -31.695601, 1.217380, 86.061699, 0.377139, 0.827134, -0.416671, 0.066937, 0.530589, 1.000000, 0.000000, 0.000000, 0.000000, 30.000000, 0.000000, 0.000000, 0.000000, - -33.099991, 2.152070, 86.646004, 0.377139, 0.827134, -0.416671, 0.083089, 0.532741, 0.960986, 0.039014, 0.000000, 0.000000, 30.000000, 37.000000, 0.000000, 0.000000, - -31.348600, 2.615100, 89.150391, 0.377139, 0.827134, -0.416671, 0.077016, 0.559978, 0.500000, 0.500000, 0.000000, 0.000000, 30.000000, 37.000000, 0.000000, 0.000000, - -31.348600, 2.615100, 89.150391, 0.370528, 0.829869, -0.417166, 0.077016, 0.559978, 0.500000, 0.500000, 0.000000, 0.000000, 30.000000, 37.000000, 0.000000, 0.000000, - -30.120701, 1.772990, 88.565804, 0.370528, 0.829869, -0.417166, 0.062225, 0.557204, 0.500000, 0.500000, 0.000000, 0.000000, 30.000000, 37.000000, 0.000000, 0.000000, - -31.695601, 1.217380, 86.061699, 0.370528, 0.829869, -0.417166, 0.066937, 0.530589, 1.000000, 0.000000, 0.000000, 0.000000, 30.000000, 0.000000, 0.000000, 0.000000, - -28.123791, 3.438690, 84.066483, -0.791972, 0.541035, 0.282950, 0.918338, 0.304978, 1.000000, 0.000000, 0.000000, 0.000000, 30.000000, 0.000000, 0.000000, 0.000000, - -29.082790, 1.682300, 84.740692, -0.791972, 0.541035, 0.282950, 0.899671, 0.306861, 1.000000, 0.000000, 0.000000, 0.000000, 30.000000, 0.000000, 0.000000, 0.000000, - -27.839090, 2.180800, 87.268593, -0.791972, 0.541035, 0.282950, 0.902834, 0.330946, 0.500000, 0.500000, 0.000000, 0.000000, 30.000000, 37.000000, 0.000000, 0.000000, - -27.839090, 2.180800, 87.268593, -0.794377, 0.538010, 0.281976, 0.902834, 0.330946, 0.500000, 0.500000, 0.000000, 0.000000, 30.000000, 37.000000, 0.000000, 0.000000, - -27.004700, 3.751300, 86.622704, -0.794377, 0.538011, 0.281976, 0.919952, 0.330921, 0.500006, 0.499994, 0.000000, 0.000000, 37.000000, 30.000000, 0.000000, 0.000000, - -28.123791, 3.438690, 84.066483, -0.794377, 0.538010, 0.281976, 0.918338, 0.304978, 1.000000, 0.000000, 0.000000, 0.000000, 30.000000, 0.000000, 0.000000, 0.000000, - -28.363300, 6.512700, 84.007690, -0.911362, -0.063230, 0.406719, 0.945239, 0.304844, 1.000000, 0.000000, 0.000000, 0.000000, 30.000000, 0.000000, 0.000000, 0.000000, - -28.123791, 3.438690, 84.066483, -0.911362, -0.063230, 0.406719, 0.918338, 0.304978, 1.000000, 0.000000, 0.000000, 0.000000, 30.000000, 0.000000, 0.000000, 0.000000, - -27.004700, 3.751300, 86.622704, -0.911363, -0.063230, 0.406719, 0.919952, 0.330921, 0.500006, 0.499994, 0.000000, 0.000000, 37.000000, 30.000000, 0.000000, 0.000000, - -27.004700, 3.751300, 86.622704, -0.910973, -0.062040, 0.407773, 0.919952, 0.330921, 0.500006, 0.499994, 0.000000, 0.000000, 37.000000, 30.000000, 0.000000, 0.000000, - -27.211390, 6.506190, 86.580093, -0.910973, -0.062040, 0.407773, 0.945248, 0.330402, 0.500000, 0.500000, 0.000000, 0.000000, 30.000000, 37.000000, 0.000000, 0.000000, - -28.363300, 6.512700, 84.007690, -0.910973, -0.062040, 0.407773, 0.945239, 0.304844, 1.000000, 0.000000, 0.000000, 0.000000, 30.000000, 0.000000, 0.000000, 0.000000, - -29.860991, 9.012290, 84.586502, -0.058247, -0.997797, -0.031739, 0.169935, 0.558730, 1.000000, 0.000000, 0.000000, 0.000000, 30.000000, 0.000000, 0.000000, 0.000000, - -28.381800, 8.848190, 87.030792, -0.058247, -0.997797, -0.031739, 0.164324, 0.580608, 0.500000, 0.500000, 0.000000, 0.000000, 37.000000, 30.000000, 0.000000, 0.000000, - -31.165890, 8.961400, 88.581100, -0.058247, -0.997797, -0.031739, 0.136111, 0.575224, 0.500000, 0.500000, 0.000000, 0.000000, 30.000000, 37.000000, 0.000000, 0.000000, - -31.165890, 8.961400, 88.581100, -0.104481, -0.993426, -0.046786, 0.136111, 0.575224, 0.500000, 0.500000, 0.000000, 0.000000, 30.000000, 37.000000, 0.000000, 0.000000, - -32.705688, 9.240980, 86.083298, -0.104481, -0.993426, -0.046786, 0.143564, 0.549932, 1.000000, 0.000000, 0.000000, 0.000000, 30.000000, 0.000000, 0.000000, 0.000000, - -29.860991, 9.012290, 84.586502, -0.104481, -0.993426, -0.046786, 0.169935, 0.558730, 1.000000, 0.000000, 0.000000, 0.000000, 30.000000, 0.000000, 0.000000, 0.000000, - -28.363300, 6.512700, 84.007690, -0.805257, -0.471588, 0.359397, 0.945239, 0.304844, 1.000000, 0.000000, 0.000000, 0.000000, 30.000000, 0.000000, 0.000000, 0.000000, - -27.211390, 6.506190, 86.580093, -0.805257, -0.471588, 0.359397, 0.945248, 0.330402, 0.500000, 0.500000, 0.000000, 0.000000, 30.000000, 37.000000, 0.000000, 0.000000, - -28.381800, 8.848190, 87.030792, -0.805257, -0.471588, 0.359397, 0.969071, 0.327614, 0.500000, 0.500000, 0.000000, 0.000000, 37.000000, 30.000000, 0.000000, 0.000000, - -28.381800, 8.848190, 87.030792, -0.737325, -0.536765, 0.410165, 0.969071, 0.327614, 0.500000, 0.500000, 0.000000, 0.000000, 37.000000, 30.000000, 0.000000, 0.000000, - -29.860991, 9.012290, 84.586502, -0.737325, -0.536765, 0.410165, 0.970074, 0.302908, 1.000000, 0.000000, 0.000000, 0.000000, 30.000000, 0.000000, 0.000000, 0.000000, - -28.363300, 6.512700, 84.007690, -0.737325, -0.536765, 0.410165, 0.945239, 0.304844, 1.000000, 0.000000, 0.000000, 0.000000, 30.000000, 0.000000, 0.000000, 0.000000, - -32.078091, 6.090890, 89.277802, 0.878102, 0.218647, -0.425594, 0.108422, 0.567815, 0.500000, 0.500000, 0.000000, 0.000000, 30.000000, 37.000000, 0.000000, 0.000000, - -29.601700, 7.109300, 94.910393, 0.878102, 0.218647, -0.425594, 0.099344, 0.621854, 0.850000, 0.150000, 0.000000, 0.000000, 37.000000, 30.000000, 0.000000, 0.000000, - -28.548189, 2.410570, 94.670090, 0.878102, 0.218647, -0.425594, 0.060372, 0.611992, 0.850000, 0.150000, 0.000000, 0.000000, 37.000000, 30.000000, 0.000000, 0.000000, - -28.548189, 2.410570, 94.670090, 0.876736, 0.200041, -0.437398, 0.060372, 0.611992, 0.850000, 0.150000, 0.000000, 0.000000, 37.000000, 30.000000, 0.000000, 0.000000, - -31.348600, 2.615100, 89.150391, 0.876736, 0.200041, -0.437398, 0.077016, 0.559978, 0.500000, 0.500000, 0.000000, 0.000000, 30.000000, 37.000000, 0.000000, 0.000000, - -32.078091, 6.090890, 89.277802, 0.876736, 0.200041, -0.437398, 0.108422, 0.567815, 0.500000, 0.500000, 0.000000, 0.000000, 30.000000, 37.000000, 0.000000, 0.000000, - -31.165890, 8.961400, 88.581100, 0.865686, -0.380498, -0.325284, 0.136111, 0.575224, 0.500000, 0.500000, 0.000000, 0.000000, 30.000000, 37.000000, 0.000000, 0.000000, - -28.394791, 10.760590, 93.851303, 0.865686, -0.380498, -0.325284, 0.131313, 0.630170, 0.850000, 0.150000, 0.000000, 0.000000, 37.000000, 30.000000, 0.000000, 0.000000, - -29.601700, 7.109300, 94.910393, 0.865686, -0.380498, -0.325284, 0.099344, 0.621854, 0.850000, 0.150000, 0.000000, 0.000000, 37.000000, 30.000000, 0.000000, 0.000000, - -29.601700, 7.109300, 94.910393, 0.877256, -0.356733, -0.321189, 0.099344, 0.621854, 0.850000, 0.150000, 0.000000, 0.000000, 37.000000, 30.000000, 0.000000, 0.000000, - -32.078091, 6.090890, 89.277802, 0.877256, -0.356734, -0.321189, 0.108422, 0.567815, 0.500000, 0.500000, 0.000000, 0.000000, 30.000000, 37.000000, 0.000000, 0.000000, - -31.165890, 8.961400, 88.581100, 0.877256, -0.356733, -0.321189, 0.136111, 0.575224, 0.500000, 0.500000, 0.000000, 0.000000, 30.000000, 37.000000, 0.000000, 0.000000, - -27.839090, 2.180800, 87.268593, -0.088880, 0.984208, 0.153082, 0.039169, 0.552415, 0.500000, 0.500000, 0.000000, 0.000000, 30.000000, 37.000000, 0.000000, 0.000000, - -30.120701, 1.772990, 88.565804, -0.088880, 0.984208, 0.153082, 0.062225, 0.557204, 0.500000, 0.500000, 0.000000, 0.000000, 30.000000, 37.000000, 0.000000, 0.000000, - -26.842400, 1.263880, 93.742401, -0.088880, 0.984208, 0.153082, 0.042745, 0.607755, 0.850000, 0.150000, 0.000000, 0.000000, 37.000000, 30.000000, 0.000000, 0.000000, - -26.842400, 1.263880, 93.742401, -0.070376, 0.986102, 0.150502, 0.042745, 0.607755, 0.850000, 0.150000, 0.000000, 0.000000, 37.000000, 30.000000, 0.000000, 0.000000, - -23.704700, 1.796490, 91.719910, -0.070376, 0.986102, 0.150502, 0.012398, 0.596754, 0.850000, 0.150000, 0.000000, 0.000000, 37.000000, 30.000000, 0.000000, 0.000000, - -27.839090, 2.180800, 87.268593, -0.070376, 0.986102, 0.150502, 0.039169, 0.552415, 0.500000, 0.500000, 0.000000, 0.000000, 30.000000, 37.000000, 0.000000, 0.000000, - -30.120701, 1.772990, 88.565804, 0.481668, 0.850106, -0.212873, 0.062225, 0.557204, 0.500000, 0.500000, 0.000000, 0.000000, 30.000000, 37.000000, 0.000000, 0.000000, - -31.348600, 2.615100, 89.150391, 0.481668, 0.850106, -0.212873, 0.077016, 0.559978, 0.500000, 0.500000, 0.000000, 0.000000, 30.000000, 37.000000, 0.000000, 0.000000, - -28.548189, 2.410570, 94.670090, 0.481668, 0.850106, -0.212873, 0.060372, 0.611992, 0.850000, 0.150000, 0.000000, 0.000000, 37.000000, 30.000000, 0.000000, 0.000000, - -28.548189, 2.410570, 94.670090, 0.464472, 0.860445, -0.209523, 0.060372, 0.611992, 0.850000, 0.150000, 0.000000, 0.000000, 37.000000, 30.000000, 0.000000, 0.000000, - -26.842400, 1.263880, 93.742401, 0.464472, 0.860445, -0.209523, 0.042745, 0.607755, 0.850000, 0.150000, 0.000000, 0.000000, 37.000000, 30.000000, 0.000000, 0.000000, - -30.120701, 1.772990, 88.565804, 0.464472, 0.860445, -0.209523, 0.062225, 0.557204, 0.500000, 0.500000, 0.000000, 0.000000, 30.000000, 37.000000, 0.000000, 0.000000, - -27.839090, 2.180800, 87.268593, -0.623141, 0.476831, 0.619942, 0.902834, 0.330946, 0.500000, 0.500000, 0.000000, 0.000000, 30.000000, 37.000000, 0.000000, 0.000000, - -23.704700, 1.796490, 91.719910, -0.623141, 0.476831, 0.619942, 0.897741, 0.384242, 0.850000, 0.150000, 0.000000, 0.000000, 37.000000, 30.000000, 0.000000, 0.000000, - -22.861277, 3.911090, 90.941231, -0.623141, 0.476831, 0.619942, 0.920263, 0.376645, 0.850000, 0.150000, 0.000000, 0.000000, 37.000000, 30.000000, 0.000000, 0.000000, - -22.861277, 3.911090, 90.941231, -0.609861, 0.556193, 0.564553, 0.920263, 0.376645, 0.850000, 0.150000, 0.000000, 0.000000, 37.000000, 30.000000, 0.000000, 0.000000, - -27.004700, 3.751300, 86.622704, -0.609861, 0.556193, 0.564553, 0.919952, 0.330921, 0.500006, 0.499994, 0.000000, 0.000000, 37.000000, 30.000000, 0.000000, 0.000000, - -27.839090, 2.180800, 87.268593, -0.609861, 0.556193, 0.564553, 0.902834, 0.330946, 0.500000, 0.500000, 0.000000, 0.000000, 30.000000, 37.000000, 0.000000, 0.000000, - -27.211390, 6.506190, 86.580093, -0.720106, -0.043316, 0.692511, 0.945248, 0.330402, 0.500000, 0.500000, 0.000000, 0.000000, 30.000000, 37.000000, 0.000000, 0.000000, - -27.004700, 3.751300, 86.622704, -0.720106, -0.043316, 0.692511, 0.919952, 0.330921, 0.500006, 0.499994, 0.000000, 0.000000, 37.000000, 30.000000, 0.000000, 0.000000, - -22.861277, 3.911090, 90.941231, -0.720106, -0.043316, 0.692511, 0.920263, 0.376645, 0.850000, 0.150000, 0.000000, 0.000000, 37.000000, 30.000000, 0.000000, 0.000000, - -22.861277, 3.911090, 90.941231, -0.695324, 0.040328, 0.717564, 0.920263, 0.376645, 0.850000, 0.150000, 0.000000, 0.000000, 37.000000, 30.000000, 0.000000, 0.000000, - -22.900000, 7.631700, 90.694603, -0.695324, 0.040328, 0.717564, 0.952668, 0.384378, 0.850000, 0.150000, 0.000000, 0.000000, 37.000000, 30.000000, 0.000000, 0.000000, - -27.211390, 6.506190, 86.580093, -0.695324, 0.040328, 0.717564, 0.945248, 0.330402, 0.500000, 0.500000, 0.000000, 0.000000, 30.000000, 37.000000, 0.000000, 0.000000, - -28.381800, 8.848190, 87.030792, 0.083638, -0.959451, 0.269179, 0.164324, 0.580608, 0.500000, 0.500000, 0.000000, 0.000000, 37.000000, 30.000000, 0.000000, 0.000000, - -24.741800, 10.455690, 91.629494, 0.083638, -0.959451, 0.269179, 0.167826, 0.632055, 0.850000, 0.150000, 0.000000, 0.000000, 37.000000, 30.000000, 0.000000, 0.000000, - -28.394791, 10.760590, 93.851303, 0.083638, -0.959451, 0.269179, 0.131313, 0.630170, 0.850000, 0.150000, 0.000000, 0.000000, 37.000000, 30.000000, 0.000000, 0.000000, - -28.394791, 10.760590, 93.851303, 0.110611, -0.956903, 0.268516, 0.131313, 0.630170, 0.850000, 0.150000, 0.000000, 0.000000, 37.000000, 30.000000, 0.000000, 0.000000, - -31.165890, 8.961400, 88.581100, 0.110611, -0.956903, 0.268516, 0.136111, 0.575224, 0.500000, 0.500000, 0.000000, 0.000000, 30.000000, 37.000000, 0.000000, 0.000000, - -28.381800, 8.848190, 87.030792, 0.110611, -0.956903, 0.268516, 0.164324, 0.580608, 0.500000, 0.500000, 0.000000, 0.000000, 37.000000, 30.000000, 0.000000, 0.000000, - -28.381800, 8.848190, 87.030792, -0.566903, -0.419719, 0.708842, 0.969071, 0.327614, 0.500000, 0.500000, 0.000000, 0.000000, 37.000000, 30.000000, 0.000000, 0.000000, - -27.211390, 6.506190, 86.580093, -0.566903, -0.419719, 0.708842, 0.945248, 0.330402, 0.500000, 0.500000, 0.000000, 0.000000, 30.000000, 37.000000, 0.000000, 0.000000, - -22.900000, 7.631700, 90.694603, -0.566903, -0.419719, 0.708842, 0.952668, 0.384378, 0.850000, 0.150000, 0.000000, 0.000000, 37.000000, 30.000000, 0.000000, 0.000000, - -22.900000, 7.631700, 90.694603, -0.542475, -0.560852, 0.625433, 0.952668, 0.384378, 0.850000, 0.150000, 0.000000, 0.000000, 37.000000, 30.000000, 0.000000, 0.000000, - -24.741800, 10.455690, 91.629494, -0.542475, -0.560852, 0.625433, 0.983167, 0.379419, 0.850000, 0.150000, 0.000000, 0.000000, 37.000000, 30.000000, 0.000000, 0.000000, - -28.381800, 8.848190, 87.030792, -0.542475, -0.560852, 0.625433, 0.969071, 0.327614, 0.500000, 0.500000, 0.000000, 0.000000, 37.000000, 30.000000, 0.000000, 0.000000, - 4.320400, -1.684693, 118.066200, -0.111754, 0.886778, -0.448482, 0.515904, 0.927786, 1.000000, 0.000000, 0.000000, 0.000000, 2.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -2.371373, 117.785004, -0.111754, 0.886778, -0.448482, 0.507603, 0.959173, 1.000000, 0.000000, 0.000000, 0.000000, 2.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -1.601182, 119.307892, -0.111754, 0.886778, -0.448482, 0.522817, 0.958509, 1.000000, 0.000000, 0.000000, 0.000000, 2.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -1.601182, 119.307892, -0.142858, 0.821311, -0.552304, 0.522817, 0.958509, 1.000000, 0.000000, 0.000000, 0.000000, 2.000000, 0.000000, 0.000000, 0.000000, - 4.827590, -0.059682, 120.351501, -0.142858, 0.821311, -0.552305, 0.537803, 0.923970, 0.900000, 0.100000, 0.000000, 0.000000, 2.000000, 3.000000, 0.000000, 0.000000, - 4.320400, -1.684693, 118.066200, -0.142858, 0.821311, -0.552304, 0.515904, 0.927786, 1.000000, 0.000000, 0.000000, 0.000000, 2.000000, 0.000000, 0.000000, 0.000000, - 4.083890, 11.265808, 122.301804, -0.366811, -0.822595, -0.434496, 0.603247, 0.854439, 0.420000, 0.300000, 0.280000, 0.000000, 2.000000, 1.000000, 3.000000, 0.000000, - 4.209000, 9.810187, 124.951988, -0.366811, -0.822595, -0.434496, 0.610250, 0.876330, 0.600000, 0.400000, 0.000000, 0.000000, 2.000000, 1.000000, 0.000000, 0.000000, - 0.000000, 11.622508, 125.074203, -0.366811, -0.822595, -0.434496, 0.638112, 0.855450, 0.500000, 0.500000, 0.000000, 0.000000, 1.000000, 2.000000, 0.000000, 0.000000, - 0.000000, 11.622508, 125.074203, -0.183466, -0.972249, -0.145164, 0.638112, 0.855450, 0.500000, 0.500000, 0.000000, 0.000000, 1.000000, 2.000000, 0.000000, 0.000000, - 0.000000, 12.019308, 122.416603, -0.183466, -0.972249, -0.145164, 0.628430, 0.837538, 0.750000, 0.250000, 0.000000, 0.000000, 2.000000, 1.000000, 0.000000, 0.000000, - 4.083890, 11.265808, 122.301804, -0.183466, -0.972249, -0.145164, 0.603247, 0.854439, 0.420000, 0.300000, 0.280000, 0.000000, 2.000000, 1.000000, 3.000000, 0.000000, - 0.000000, 12.641908, 119.816887, -0.127716, -0.941609, -0.311547, 0.617582, 0.816079, 1.000000, 0.000000, 0.000000, 0.000000, 2.000000, 0.000000, 0.000000, 0.000000, - 5.835390, 11.888397, 119.702103, -0.127716, -0.941609, -0.311547, 0.585348, 0.841733, 0.750000, 0.250000, 0.000000, 0.000000, 2.000000, 3.000000, 0.000000, 0.000000, - 4.083890, 11.265808, 122.301804, -0.127716, -0.941609, -0.311547, 0.603247, 0.854439, 0.420000, 0.300000, 0.280000, 0.000000, 2.000000, 1.000000, 3.000000, 0.000000, - 4.083890, 11.265808, 122.301804, -0.182843, -0.956106, -0.228975, 0.603247, 0.854439, 0.420000, 0.300000, 0.280000, 0.000000, 2.000000, 1.000000, 3.000000, 0.000000, - 0.000000, 12.019308, 122.416603, -0.182843, -0.956106, -0.228975, 0.628430, 0.837538, 0.750000, 0.250000, 0.000000, 0.000000, 2.000000, 1.000000, 0.000000, 0.000000, - 0.000000, 12.641908, 119.816887, -0.182843, -0.956106, -0.228975, 0.617582, 0.816079, 1.000000, 0.000000, 0.000000, 0.000000, 2.000000, 0.000000, 0.000000, 0.000000, - 0.000000, 13.258608, 114.842194, -0.076752, -0.979903, -0.184118, 0.588983, 0.782237, 1.000000, 0.000000, 0.000000, 0.000000, 2.000000, 0.000000, 0.000000, 0.000000, - 6.250490, 12.758098, 114.900391, -0.076752, -0.979903, -0.184118, 0.561993, 0.814947, 1.000000, 0.000000, 0.000000, 0.000000, 2.000000, 0.000000, 0.000000, 0.000000, - 5.835390, 11.888397, 119.702103, -0.076752, -0.979903, -0.184118, 0.585348, 0.841733, 0.750000, 0.250000, 0.000000, 0.000000, 2.000000, 3.000000, 0.000000, 0.000000, - 5.835390, 11.888397, 119.702103, -0.129468, -0.984051, -0.121990, 0.585348, 0.841733, 0.750000, 0.250000, 0.000000, 0.000000, 2.000000, 3.000000, 0.000000, 0.000000, - 0.000000, 12.641908, 119.816887, -0.129468, -0.984051, -0.121990, 0.617582, 0.816079, 1.000000, 0.000000, 0.000000, 0.000000, 2.000000, 0.000000, 0.000000, 0.000000, - 0.000000, 13.258608, 114.842194, -0.129468, -0.984051, -0.121990, 0.588983, 0.782237, 1.000000, 0.000000, 0.000000, 0.000000, 2.000000, 0.000000, 0.000000, 0.000000, - 5.758200, 11.574596, 109.633904, -0.079849, -0.970930, 0.225654, 0.530109, 0.793115, 0.636430, 0.363570, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 6.250490, 12.758098, 114.900391, -0.079849, -0.970930, 0.225654, 0.561993, 0.814947, 1.000000, 0.000000, 0.000000, 0.000000, 2.000000, 0.000000, 0.000000, 0.000000, - 0.000000, 13.258608, 114.842194, -0.079849, -0.970930, 0.225654, 0.588983, 0.782237, 1.000000, 0.000000, 0.000000, 0.000000, 2.000000, 0.000000, 0.000000, 0.000000, - 0.000000, 13.258608, 114.842194, -0.151599, -0.977243, 0.148369, 0.588983, 0.782237, 1.000000, 0.000000, 0.000000, 0.000000, 2.000000, 0.000000, 0.000000, 0.000000, - 0.000000, 12.485307, 109.748802, -0.151599, -0.977243, 0.148369, 0.549577, 0.758362, 0.680999, 0.319001, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 5.758200, 11.574596, 109.633904, -0.151599, -0.977243, 0.148369, 0.530109, 0.793115, 0.636430, 0.363570, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 0.000000, 8.728387, 103.137589, -0.211780, -0.812209, 0.543568, 0.493073, 0.745281, 0.892595, 0.102999, 0.004406, 0.000000, 7.000000, 5.000000, 2.000000, 0.000000, - 5.143890, 7.376297, 103.121391, -0.211780, -0.812209, 0.543568, 0.474527, 0.780112, 0.887725, 0.106157, 0.006117, 0.000000, 7.000000, 5.000000, 2.000000, 0.000000, - 5.758200, 11.574596, 109.633904, -0.211780, -0.812208, 0.543568, 0.530109, 0.793115, 0.636430, 0.363570, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 5.758200, 11.574596, 109.633904, -0.126621, -0.862428, 0.490087, 0.530109, 0.793115, 0.636430, 0.363570, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 0.000000, 12.485307, 109.748802, -0.126621, -0.862428, 0.490087, 0.549577, 0.758362, 0.680999, 0.319001, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 0.000000, 8.728387, 103.137589, -0.126621, -0.862428, 0.490087, 0.493073, 0.745281, 0.892595, 0.102999, 0.004406, 0.000000, 7.000000, 5.000000, 2.000000, 0.000000, - 4.468900, 6.623106, 96.927589, -0.251154, -0.957210, 0.143771, 0.434958, 0.754053, 0.753825, 0.235477, 0.010698, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - 5.143890, 7.376297, 103.121391, -0.251154, -0.957210, 0.143771, 0.474527, 0.780112, 0.887725, 0.106157, 0.006117, 0.000000, 7.000000, 5.000000, 2.000000, 0.000000, - 0.000000, 8.728387, 103.137589, -0.251154, -0.957210, 0.143771, 0.493073, 0.745281, 0.892595, 0.102999, 0.004406, 0.000000, 7.000000, 5.000000, 2.000000, 0.000000, - 0.000000, 8.728387, 103.137589, -0.177100, -0.963803, 0.199297, 0.493073, 0.745281, 0.892595, 0.102999, 0.004406, 0.000000, 7.000000, 5.000000, 2.000000, 0.000000, - 0.000000, 7.376596, 96.600304, -0.177100, -0.963803, 0.199297, 0.453369, 0.726033, 0.777850, 0.207714, 0.014436, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - 4.468900, 6.623106, 96.927589, -0.177100, -0.963803, 0.199297, 0.434958, 0.754053, 0.753825, 0.235477, 0.010698, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - 6.703990, -7.566583, 110.361000, -0.284309, 0.863655, -0.416255, 0.450874, 0.906352, 0.500000, 0.500000, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 4.575700, -7.072593, 112.839600, -0.284309, 0.863655, -0.416255, 0.462931, 0.924462, 0.571016, 0.428984, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 6.036690, -6.285593, 113.474602, -0.284309, 0.863655, -0.416255, 0.471135, 0.916411, 0.673820, 0.326180, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 6.703990, -7.566583, 110.361000, -0.142646, 0.940029, -0.309835, 0.450874, 0.906352, 0.500000, 0.500000, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 3.949990, -7.501793, 111.825493, -0.142646, 0.940029, -0.309835, 0.454821, 0.926076, 0.500200, 0.499800, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 4.575700, -7.072593, 112.839600, -0.142646, 0.940029, -0.309835, 0.462931, 0.924462, 0.571016, 0.428984, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 6.703990, -7.566583, 110.361000, -0.078030, 0.978672, -0.190033, 0.450874, 0.906352, 0.500000, 0.500000, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 3.978000, -7.868683, 109.924500, -0.078030, 0.978672, -0.190033, 0.442258, 0.920795, 0.500000, 0.500000, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 3.949990, -7.501793, 111.825493, -0.078030, 0.978672, -0.190033, 0.454821, 0.926076, 0.500200, 0.499800, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 6.703990, -7.566583, 110.361000, -0.094066, 0.990709, -0.098216, 0.450874, 0.906352, 0.500000, 0.500000, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 4.908800, -7.941494, 108.298592, -0.094066, 0.990709, -0.098216, 0.434736, 0.909818, 0.750000, 0.250000, 0.000000, 0.000000, 7.000000, 2.000000, 0.000000, 0.000000, - 3.978000, -7.868683, 109.924500, -0.094066, 0.990710, -0.098216, 0.442258, 0.920795, 0.500000, 0.500000, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 6.703990, -7.566583, 110.361000, -0.279368, 0.957696, 0.069078, 0.450874, 0.906352, 0.500000, 0.500000, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 6.387100, -7.461993, 107.629402, -0.279368, 0.957696, 0.069078, 0.435187, 0.898472, 0.750000, 0.250000, 0.000000, 0.000000, 7.000000, 2.000000, 0.000000, 0.000000, - 4.908800, -7.941494, 108.298592, -0.279368, 0.957696, 0.069078, 0.434736, 0.909818, 0.750000, 0.250000, 0.000000, 0.000000, 7.000000, 2.000000, 0.000000, 0.000000, - 6.703990, -7.566583, 110.361000, -0.487995, 0.868209, 0.089854, 0.450874, 0.906352, 0.500000, 0.500000, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 7.848080, -6.674994, 107.959602, -0.487995, 0.868209, 0.089854, 0.441843, 0.890631, 0.750000, 0.250000, 0.000000, 0.000000, 7.000000, 2.000000, 0.000000, 0.000000, - 6.387100, -7.461993, 107.629402, -0.487995, 0.868209, 0.089854, 0.435187, 0.898472, 0.750000, 0.250000, 0.000000, 0.000000, 7.000000, 2.000000, 0.000000, 0.000000, - 6.703990, -7.566583, 110.361000, -0.643097, 0.765463, -0.022188, 0.450874, 0.906352, 0.500000, 0.500000, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 8.733790, -5.881083, 109.677292, -0.643097, 0.765463, -0.022188, 0.455040, 0.890268, 0.500000, 0.500000, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 7.848080, -6.674994, 107.959602, -0.643097, 0.765463, -0.022188, 0.441843, 0.890631, 0.750000, 0.250000, 0.000000, 0.000000, 7.000000, 2.000000, 0.000000, 0.000000, - 6.703990, -7.566583, 110.361000, -0.666862, 0.704071, -0.244087, 0.450874, 0.906352, 0.500000, 0.500000, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 8.705900, -5.452583, 110.989502, -0.666862, 0.704071, -0.244087, 0.463330, 0.893010, 0.511120, 0.488880, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 8.733790, -5.881083, 109.677292, -0.666862, 0.704071, -0.244087, 0.455040, 0.890268, 0.500000, 0.500000, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 6.703990, -7.566583, 110.361000, -0.607753, 0.691576, -0.390331, 0.450874, 0.906352, 0.500000, 0.500000, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 7.775100, -5.441393, 112.458603, -0.607753, 0.691576, -0.390331, 0.470771, 0.901902, 0.578341, 0.421659, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 8.705900, -5.452583, 110.989502, -0.607753, 0.691576, -0.390331, 0.463330, 0.893010, 0.511120, 0.488880, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 6.703990, -7.566583, 110.361000, -0.581675, 0.700787, -0.412979, 0.450874, 0.906352, 0.500000, 0.500000, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 6.036690, -6.285593, 113.474602, -0.581675, 0.700787, -0.412979, 0.471135, 0.916411, 0.673820, 0.326180, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 7.775100, -5.441393, 112.458603, -0.581675, 0.700787, -0.412979, 0.470771, 0.901902, 0.578341, 0.421659, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 3.595300, -5.814773, 114.144203, -0.105263, 0.591297, -0.799555, 0.473614, 0.932646, 0.812413, 0.187587, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 5.254700, -4.951183, 114.564392, -0.105263, 0.591297, -0.799555, 0.481927, 0.921693, 0.819163, 0.180837, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 6.036690, -6.285593, 113.474602, -0.105263, 0.591297, -0.799555, 0.471135, 0.916411, 0.673820, 0.326180, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 6.036690, -6.285593, 113.474602, -0.062629, 0.694553, -0.716711, 0.471135, 0.916411, 0.673820, 0.326180, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 4.575700, -7.072593, 112.839600, -0.062629, 0.694553, -0.716711, 0.462931, 0.924462, 0.571016, 0.428984, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 3.595300, -5.814773, 114.144203, -0.062629, 0.694553, -0.716711, 0.473614, 0.932646, 0.812413, 0.187587, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 2.278780, -6.642693, 112.513893, 0.228589, 0.780993, -0.581203, 0.457815, 0.938475, 0.701595, 0.298405, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 3.595300, -5.814773, 114.144203, 0.228589, 0.780993, -0.581203, 0.473614, 0.932646, 0.812413, 0.187587, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 4.575700, -7.072593, 112.839600, 0.228589, 0.780993, -0.581203, 0.462931, 0.924462, 0.571016, 0.428984, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 4.575700, -7.072593, 112.839600, 0.227163, 0.838619, -0.495090, 0.462931, 0.924462, 0.571016, 0.428984, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 3.949990, -7.501793, 111.825493, 0.227164, 0.838619, -0.495090, 0.454821, 0.926076, 0.500200, 0.499800, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 2.278780, -6.642693, 112.513893, 0.227164, 0.838620, -0.495090, 0.457815, 0.938475, 0.701595, 0.298405, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 3.978000, -7.868683, 109.924500, 0.360210, 0.912157, -0.195497, 0.442258, 0.920795, 0.500000, 0.500000, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 1.829300, -7.173983, 109.206802, 0.360210, 0.912157, -0.195497, 0.432844, 0.932040, 0.500000, 0.500000, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 2.278780, -6.642693, 112.513893, 0.360210, 0.912157, -0.195497, 0.457815, 0.938475, 0.701595, 0.298405, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 2.278780, -6.642693, 112.513893, 0.394871, 0.903155, -0.168490, 0.457815, 0.938475, 0.701595, 0.298405, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 3.949990, -7.501793, 111.825493, 0.394871, 0.903155, -0.168490, 0.454821, 0.926076, 0.500200, 0.499800, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 3.978000, -7.868683, 109.924500, 0.394871, 0.903155, -0.168490, 0.442258, 0.920795, 0.500000, 0.500000, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 3.022590, -7.115893, 107.018593, 0.253593, 0.953376, 0.163600, 0.421250, 0.915424, 0.900000, 0.100000, 0.000000, 0.000000, 7.000000, 2.000000, 0.000000, 0.000000, - 1.829300, -7.173983, 109.206802, 0.253593, 0.953376, 0.163600, 0.432844, 0.932040, 0.500000, 0.500000, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 3.978000, -7.868683, 109.924500, 0.253593, 0.953376, 0.163600, 0.442258, 0.920795, 0.500000, 0.500000, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 3.978000, -7.868683, 109.924500, 0.316353, 0.938390, 0.139083, 0.442258, 0.920795, 0.500000, 0.500000, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 4.908800, -7.941494, 108.298592, 0.316353, 0.938390, 0.139083, 0.434736, 0.909818, 0.750000, 0.250000, 0.000000, 0.000000, 7.000000, 2.000000, 0.000000, 0.000000, - 3.022590, -7.115893, 107.018593, 0.316353, 0.938390, 0.139083, 0.421250, 0.915424, 0.900000, 0.100000, 0.000000, 0.000000, 7.000000, 2.000000, 0.000000, 0.000000, - 5.913690, -6.514793, 106.022789, 0.007993, 0.845655, 0.533670, 0.424922, 0.891987, 0.900000, 0.100000, 0.000000, 0.000000, 7.000000, 2.000000, 0.000000, 0.000000, - 3.022590, -7.115893, 107.018593, 0.007993, 0.845655, 0.533670, 0.421250, 0.915424, 0.900000, 0.100000, 0.000000, 0.000000, 7.000000, 2.000000, 0.000000, 0.000000, - 4.908800, -7.941494, 108.298592, 0.007993, 0.845655, 0.533670, 0.434736, 0.909818, 0.750000, 0.250000, 0.000000, 0.000000, 7.000000, 2.000000, 0.000000, 0.000000, - 4.908800, -7.941494, 108.298592, -0.043360, 0.854982, 0.516842, 0.434736, 0.909818, 0.750000, 0.250000, 0.000000, 0.000000, 7.000000, 2.000000, 0.000000, 0.000000, - 6.387100, -7.461993, 107.629402, -0.043360, 0.854982, 0.516842, 0.435187, 0.898472, 0.750000, 0.250000, 0.000000, 0.000000, 7.000000, 2.000000, 0.000000, 0.000000, - 5.913690, -6.514793, 106.022789, -0.043360, 0.854982, 0.516842, 0.424922, 0.891987, 0.900000, 0.100000, 0.000000, 0.000000, 7.000000, 2.000000, 0.000000, 0.000000, - 7.848080, -6.674994, 107.959602, -0.584496, 0.515715, 0.626421, 0.441843, 0.890631, 0.750000, 0.250000, 0.000000, 0.000000, 7.000000, 2.000000, 0.000000, 0.000000, - 7.663600, -5.226183, 106.594704, -0.584496, 0.515715, 0.626421, 0.435444, 0.879533, 0.900000, 0.100000, 0.000000, 0.000000, 7.000000, 2.000000, 0.000000, 0.000000, - 5.913690, -6.514793, 106.022789, -0.584496, 0.515715, 0.626421, 0.424922, 0.891987, 0.900000, 0.100000, 0.000000, 0.000000, 7.000000, 2.000000, 0.000000, 0.000000, - 5.913690, -6.514793, 106.022789, -0.489707, 0.680271, 0.545361, 0.424922, 0.891987, 0.900000, 0.100000, 0.000000, 0.000000, 7.000000, 2.000000, 0.000000, 0.000000, - 6.387100, -7.461993, 107.629402, -0.489707, 0.680271, 0.545361, 0.435187, 0.898472, 0.750000, 0.250000, 0.000000, 0.000000, 7.000000, 2.000000, 0.000000, 0.000000, - 7.848080, -6.674994, 107.959602, -0.489707, 0.680271, 0.545361, 0.441843, 0.890631, 0.750000, 0.250000, 0.000000, 0.000000, 7.000000, 2.000000, 0.000000, 0.000000, - 9.167900, -4.077983, 108.870491, -0.859260, 0.288527, 0.422403, 0.455915, 0.878524, 0.500000, 0.500000, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 7.663600, -5.226183, 106.594704, -0.859260, 0.288527, 0.422403, 0.435444, 0.879533, 0.900000, 0.100000, 0.000000, 0.000000, 7.000000, 2.000000, 0.000000, 0.000000, - 7.848080, -6.674994, 107.959602, -0.859260, 0.288527, 0.422403, 0.441843, 0.890631, 0.750000, 0.250000, 0.000000, 0.000000, 7.000000, 2.000000, 0.000000, 0.000000, - 7.848080, -6.674994, 107.959602, -0.889142, 0.347374, 0.297923, 0.441843, 0.890631, 0.750000, 0.250000, 0.000000, 0.000000, 7.000000, 2.000000, 0.000000, 0.000000, - 8.733790, -5.881083, 109.677292, -0.889142, 0.347374, 0.297923, 0.455040, 0.890268, 0.500000, 0.500000, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 9.167900, -4.077983, 108.870491, -0.889142, 0.347374, 0.297923, 0.455915, 0.878524, 0.500000, 0.500000, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 8.705900, -5.452583, 110.989502, -0.973324, 0.218305, -0.070596, 0.463330, 0.893010, 0.511120, 0.488880, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 9.151490, -3.220683, 111.747803, -0.973324, 0.218305, -0.070596, 0.475515, 0.885474, 0.689747, 0.310253, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 9.167900, -4.077983, 108.870491, -0.973324, 0.218305, -0.070596, 0.455915, 0.878524, 0.500000, 0.500000, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 9.167900, -4.077983, 108.870491, -0.976690, 0.197063, -0.085109, 0.455915, 0.878524, 0.500000, 0.500000, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 8.733790, -5.881083, 109.677292, -0.976690, 0.197063, -0.085109, 0.455040, 0.890268, 0.500000, 0.500000, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 8.705900, -5.452583, 110.989502, -0.976690, 0.197063, -0.085109, 0.463330, 0.893010, 0.511120, 0.488880, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 7.775100, -5.441393, 112.458603, -0.850739, 0.431010, -0.300787, 0.470771, 0.901902, 0.578341, 0.421659, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 8.119390, -3.905483, 113.685692, -0.850739, 0.431010, -0.300787, 0.482751, 0.899527, 0.705258, 0.294742, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 9.151490, -3.220683, 111.747803, -0.850739, 0.431010, -0.300787, 0.475515, 0.885474, 0.689747, 0.310253, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 9.151490, -3.220683, 111.747803, -0.795935, 0.331098, -0.506814, 0.475515, 0.885474, 0.689747, 0.310253, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 8.705900, -5.452583, 110.989502, -0.795935, 0.331098, -0.506814, 0.463330, 0.893010, 0.511120, 0.488880, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 7.775100, -5.441393, 112.458603, -0.795935, 0.331098, -0.506814, 0.470771, 0.901902, 0.578341, 0.421659, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 6.036690, -6.285593, 113.474602, -0.403672, 0.425082, -0.810157, 0.471135, 0.916411, 0.673820, 0.326180, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 5.254700, -4.951183, 114.564392, -0.403672, 0.425082, -0.810157, 0.481927, 0.921693, 0.819163, 0.180837, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 8.119390, -3.905483, 113.685692, -0.403672, 0.425082, -0.810157, 0.482751, 0.899527, 0.705258, 0.294742, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 8.119390, -3.905483, 113.685692, -0.602543, 0.576224, -0.552184, 0.482751, 0.899527, 0.705258, 0.294742, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 7.775100, -5.441393, 112.458603, -0.602543, 0.576224, -0.552184, 0.470771, 0.901902, 0.578341, 0.421659, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 6.036690, -6.285593, 113.474602, -0.602543, 0.576224, -0.552184, 0.471135, 0.916411, 0.673820, 0.326180, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 5.254700, -4.951183, 114.564392, -0.102417, 0.587401, -0.802789, 0.481927, 0.921693, 0.819163, 0.180837, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 3.595300, -5.814773, 114.144203, -0.102417, 0.587401, -0.802789, 0.473614, 0.932646, 0.812413, 0.187587, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 2.576290, -4.724183, 115.072189, -0.102417, 0.587401, -0.802789, 0.482378, 0.939907, 0.934054, 0.065946, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 2.576290, -4.724183, 115.072189, -0.075141, 0.700645, -0.709543, 0.482378, 0.939907, 0.934054, 0.065946, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 4.606990, -3.453193, 116.112190, -0.075141, 0.700645, -0.709543, 0.496414, 0.926152, 0.945076, 0.054924, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 5.254700, -4.951183, 114.564392, -0.075141, 0.700645, -0.709543, 0.481927, 0.921693, 0.819163, 0.180837, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 2.278780, -6.642693, 112.513893, 0.021045, 0.798678, -0.601390, 0.457815, 0.938475, 0.701595, 0.298405, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 0.000000, -6.234773, 112.975891, 0.021045, 0.798678, -0.601390, 0.457880, 0.954265, 0.864881, 0.135119, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 2.576290, -4.724183, 115.072189, 0.021045, 0.798678, -0.601390, 0.482378, 0.939907, 0.934054, 0.065946, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 2.576290, -4.724183, 115.072189, 0.264913, 0.756409, -0.598052, 0.482378, 0.939907, 0.934054, 0.065946, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 3.595300, -5.814773, 114.144203, 0.264913, 0.756409, -0.598052, 0.473614, 0.932646, 0.812413, 0.187587, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 2.278780, -6.642693, 112.513893, 0.264913, 0.756409, -0.598052, 0.457815, 0.938475, 0.701595, 0.298405, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 0.000000, -6.234773, 112.975891, 0.326270, 0.942182, -0.076427, 0.457880, 0.954265, 0.864881, 0.135119, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 1.829300, -7.173983, 109.206802, 0.326270, 0.942182, -0.076427, 0.432844, 0.932040, 0.500000, 0.500000, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 0.000000, -6.564693, 108.908691, 0.326270, 0.942182, -0.076427, 0.425541, 0.941930, 0.500000, 0.500000, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 2.436190, -6.105494, 106.357689, 0.234630, 0.892696, 0.384762, 0.413468, 0.916223, 0.995283, 0.004717, 0.000000, 0.000000, 7.000000, 2.000000, 0.000000, 0.000000, - 0.000000, -6.564693, 108.908691, 0.234630, 0.892696, 0.384762, 0.425541, 0.941930, 0.500000, 0.500000, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 1.829300, -7.173983, 109.206802, 0.234630, 0.892696, 0.384762, 0.432844, 0.932040, 0.500000, 0.500000, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 1.829300, -7.173983, 109.206802, 0.668896, 0.637874, 0.381700, 0.432844, 0.932040, 0.500000, 0.500000, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 3.022590, -7.115893, 107.018593, 0.668896, 0.637874, 0.381700, 0.421250, 0.915424, 0.900000, 0.100000, 0.000000, 0.000000, 7.000000, 2.000000, 0.000000, 0.000000, - 2.436190, -6.105494, 106.357689, 0.668896, 0.637874, 0.381700, 0.413468, 0.916223, 0.995283, 0.004717, 0.000000, 0.000000, 7.000000, 2.000000, 0.000000, 0.000000, - 5.913690, -6.514793, 106.022789, 0.140770, 0.493961, 0.858013, 0.424922, 0.891987, 0.900000, 0.100000, 0.000000, 0.000000, 7.000000, 2.000000, 0.000000, 0.000000, - 5.417100, -5.188093, 105.340477, 0.140770, 0.493961, 0.858013, 0.417502, 0.884196, 0.989995, 0.007620, 0.002385, 0.000000, 7.000000, 5.000000, 2.000000, 0.000000, - 2.436190, -6.105494, 106.357689, 0.140770, 0.493961, 0.858013, 0.413468, 0.916223, 0.995283, 0.004717, 0.000000, 0.000000, 7.000000, 2.000000, 0.000000, 0.000000, - 2.436190, -6.105494, 106.357689, 0.146345, 0.599589, 0.786814, 0.413468, 0.916223, 0.995283, 0.004717, 0.000000, 0.000000, 7.000000, 2.000000, 0.000000, 0.000000, - 3.022590, -7.115893, 107.018593, 0.146345, 0.599589, 0.786813, 0.421250, 0.915424, 0.900000, 0.100000, 0.000000, 0.000000, 7.000000, 2.000000, 0.000000, 0.000000, - 5.913690, -6.514793, 106.022789, 0.146345, 0.599589, 0.786814, 0.424922, 0.891987, 0.900000, 0.100000, 0.000000, 0.000000, 7.000000, 2.000000, 0.000000, 0.000000, - 7.663600, -5.226183, 106.594704, -0.450354, 0.358885, 0.817547, 0.435444, 0.879533, 0.900000, 0.100000, 0.000000, 0.000000, 7.000000, 2.000000, 0.000000, 0.000000, - 7.628090, -3.453083, 105.796791, -0.450354, 0.358885, 0.817547, 0.434478, 0.865992, 0.965289, 0.023814, 0.010896, 0.000000, 7.000000, 2.000000, 5.000000, 0.000000, - 5.417100, -5.188093, 105.340477, -0.450354, 0.358885, 0.817547, 0.417502, 0.884196, 0.989995, 0.007620, 0.002385, 0.000000, 7.000000, 5.000000, 2.000000, 0.000000, - 5.417100, -5.188093, 105.340477, -0.467394, 0.259658, 0.845056, 0.417502, 0.884196, 0.989995, 0.007620, 0.002385, 0.000000, 7.000000, 5.000000, 2.000000, 0.000000, - 5.913690, -6.514793, 106.022789, -0.467394, 0.259658, 0.845056, 0.424922, 0.891987, 0.900000, 0.100000, 0.000000, 0.000000, 7.000000, 2.000000, 0.000000, 0.000000, - 7.663600, -5.226183, 106.594704, -0.467394, 0.259658, 0.845056, 0.435444, 0.879533, 0.900000, 0.100000, 0.000000, 0.000000, 7.000000, 2.000000, 0.000000, 0.000000, - 9.167900, -4.077983, 108.870491, -0.882703, 0.091830, 0.460871, 0.455915, 0.878524, 0.500000, 0.500000, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 9.073680, -0.831693, 108.043198, -0.882703, 0.091830, 0.460871, 0.462002, 0.858187, 0.797503, 0.202062, 0.000435, 0.000000, 7.000000, 2.000000, 5.000000, 0.000000, - 7.628090, -3.453083, 105.796791, -0.882703, 0.091830, 0.460871, 0.434478, 0.865992, 0.965289, 0.023814, 0.010896, 0.000000, 7.000000, 2.000000, 5.000000, 0.000000, - 7.628090, -3.453083, 105.796791, -0.860583, 0.194575, 0.470678, 0.434478, 0.865992, 0.965289, 0.023814, 0.010896, 0.000000, 7.000000, 2.000000, 5.000000, 0.000000, - 7.663600, -5.226183, 106.594704, -0.860583, 0.194575, 0.470678, 0.435444, 0.879533, 0.900000, 0.100000, 0.000000, 0.000000, 7.000000, 2.000000, 0.000000, 0.000000, - 9.167900, -4.077983, 108.870491, -0.860583, 0.194575, 0.470678, 0.455915, 0.878524, 0.500000, 0.500000, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 9.151490, -3.220683, 111.747803, -0.993893, -0.101063, -0.044297, 0.475515, 0.885474, 0.689747, 0.310253, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 8.814680, 0.061797, 111.815887, -0.993893, -0.101063, -0.044297, 0.488804, 0.870382, 0.749630, 0.239813, 0.010557, 0.000000, 2.000000, 7.000000, 4.000000, 0.000000, - 9.073680, -0.831693, 108.043198, -0.993893, -0.101063, -0.044297, 0.462002, 0.858187, 0.797503, 0.202062, 0.000435, 0.000000, 7.000000, 2.000000, 5.000000, 0.000000, - 9.073680, -0.831693, 108.043198, -0.999595, -0.028315, 0.002736, 0.462002, 0.858187, 0.797503, 0.202062, 0.000435, 0.000000, 7.000000, 2.000000, 5.000000, 0.000000, - 9.167900, -4.077983, 108.870491, -0.999595, -0.028315, 0.002736, 0.455915, 0.878524, 0.500000, 0.500000, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 9.151490, -3.220683, 111.747803, -0.999595, -0.028315, 0.002736, 0.475515, 0.885474, 0.689747, 0.310253, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 7.902270, -1.675863, 115.340591, -0.952125, -0.091647, -0.291650, 0.500474, 0.898386, 0.975667, 0.024333, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 8.814680, 0.061797, 111.815887, -0.952125, -0.091647, -0.291650, 0.488804, 0.870382, 0.749630, 0.239813, 0.010557, 0.000000, 2.000000, 7.000000, 4.000000, 0.000000, - 9.151490, -3.220683, 111.747803, -0.952125, -0.091647, -0.291650, 0.475515, 0.885474, 0.689747, 0.310253, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 9.151490, -3.220683, 111.747803, -0.891765, 0.210476, -0.400569, 0.475515, 0.885474, 0.689747, 0.310253, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 8.119390, -3.905483, 113.685692, -0.891765, 0.210476, -0.400569, 0.482751, 0.899527, 0.705258, 0.294742, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 7.902270, -1.675863, 115.340591, -0.891765, 0.210476, -0.400569, 0.500474, 0.898386, 0.975667, 0.024333, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 5.254700, -4.951183, 114.564392, -0.455739, 0.536680, -0.710124, 0.481927, 0.921693, 0.819163, 0.180837, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 4.606990, -3.453193, 116.112190, -0.455739, 0.536680, -0.710124, 0.496414, 0.926152, 0.945076, 0.054924, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 7.902270, -1.675863, 115.340591, -0.455739, 0.536680, -0.710124, 0.500474, 0.898386, 0.975667, 0.024333, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 7.902270, -1.675863, 115.340591, -0.417604, 0.514974, -0.748605, 0.500474, 0.898386, 0.975667, 0.024333, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 8.119390, -3.905483, 113.685692, -0.417604, 0.514974, -0.748605, 0.482751, 0.899527, 0.705258, 0.294742, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 5.254700, -4.951183, 114.564392, -0.417604, 0.514974, -0.748605, 0.481927, 0.921693, 0.819163, 0.180837, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 2.576290, -4.724183, 115.072189, -0.069499, 0.720016, -0.690468, 0.482378, 0.939907, 0.934054, 0.065946, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 0.000000, -2.371373, 117.785004, -0.069499, 0.720016, -0.690468, 0.507603, 0.959173, 1.000000, 0.000000, 0.000000, 0.000000, 2.000000, 0.000000, 0.000000, 0.000000, - 4.320400, -1.684693, 118.066200, -0.069499, 0.720016, -0.690468, 0.515904, 0.927786, 1.000000, 0.000000, 0.000000, 0.000000, 2.000000, 0.000000, 0.000000, 0.000000, - 4.320400, -1.684693, 118.066200, -0.110073, 0.728834, -0.675784, 0.515904, 0.927786, 1.000000, 0.000000, 0.000000, 0.000000, 2.000000, 0.000000, 0.000000, 0.000000, - 4.606990, -3.453193, 116.112190, -0.110073, 0.728834, -0.675784, 0.496414, 0.926152, 0.945076, 0.054924, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 2.576290, -4.724183, 115.072189, -0.110073, 0.728834, -0.675784, 0.482378, 0.939907, 0.934054, 0.065946, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 0.000000, -6.234773, 112.975891, 0.052421, 0.778521, -0.625425, 0.457880, 0.954265, 0.864881, 0.135119, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 0.000000, -2.371373, 117.785004, 0.052421, 0.778521, -0.625425, 0.507603, 0.959173, 1.000000, 0.000000, 0.000000, 0.000000, 2.000000, 0.000000, 0.000000, 0.000000, - 2.576290, -4.724183, 115.072189, 0.052421, 0.778521, -0.625425, 0.482378, 0.939907, 0.934054, 0.065946, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 5.862690, 4.941008, 122.056198, -0.790938, 0.337671, -0.510290, 0.568673, 0.897398, 0.500000, 0.500000, 0.000000, 0.000000, 2.000000, 3.000000, 0.000000, 0.000000, - 5.997000, 2.597708, 120.297401, -0.790938, 0.337671, -0.510290, 0.547736, 0.906262, 0.500000, 0.500000, 0.000000, 0.000000, 3.000000, 2.000000, 0.000000, 0.000000, - 4.827590, -0.059682, 120.351501, -0.790938, 0.337671, -0.510290, 0.537803, 0.923970, 0.900000, 0.100000, 0.000000, 0.000000, 2.000000, 3.000000, 0.000000, 0.000000, - 4.827590, -0.059682, 120.351501, -0.690190, 0.290230, -0.662876, 0.537803, 0.923970, 0.900000, 0.100000, 0.000000, 0.000000, 2.000000, 3.000000, 0.000000, 0.000000, - 5.997000, 2.597708, 120.297401, -0.690190, 0.290230, -0.662876, 0.547736, 0.906262, 0.500000, 0.500000, 0.000000, 0.000000, 3.000000, 2.000000, 0.000000, 0.000000, - 7.636900, 0.551408, 117.693993, -0.690189, 0.290230, -0.662876, 0.521915, 0.899807, 0.898739, 0.100000, 0.001261, 0.000000, 2.000000, 3.000000, 7.000000, 0.000000, - 7.636900, 0.551408, 117.693993, -0.542176, 0.736940, -0.403688, 0.521915, 0.899807, 0.898739, 0.100000, 0.001261, 0.000000, 2.000000, 3.000000, 7.000000, 0.000000, - 4.320400, -1.684693, 118.066200, -0.542176, 0.736940, -0.403688, 0.515904, 0.927786, 1.000000, 0.000000, 0.000000, 0.000000, 2.000000, 0.000000, 0.000000, 0.000000, - 4.827590, -0.059682, 120.351501, -0.542176, 0.736940, -0.403688, 0.537803, 0.923970, 0.900000, 0.100000, 0.000000, 0.000000, 2.000000, 3.000000, 0.000000, 0.000000, - 4.320400, -1.684693, 118.066200, -0.481308, 0.608902, -0.630540, 0.515904, 0.927786, 1.000000, 0.000000, 0.000000, 0.000000, 2.000000, 0.000000, 0.000000, 0.000000, - 7.636900, 0.551408, 117.693993, -0.481308, 0.608902, -0.630540, 0.521915, 0.899807, 0.898739, 0.100000, 0.001261, 0.000000, 2.000000, 3.000000, 7.000000, 0.000000, - 7.902270, -1.675863, 115.340591, -0.481308, 0.608902, -0.630540, 0.500474, 0.898386, 0.975667, 0.024333, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 7.902270, -1.675863, 115.340591, -0.478463, 0.614993, -0.626782, 0.500474, 0.898386, 0.975667, 0.024333, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 4.606990, -3.453193, 116.112190, -0.478463, 0.614993, -0.626782, 0.496414, 0.926152, 0.945076, 0.054924, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 4.320400, -1.684693, 118.066200, -0.478463, 0.614994, -0.626782, 0.515904, 0.927786, 1.000000, 0.000000, 0.000000, 0.000000, 2.000000, 0.000000, 0.000000, 0.000000, - 1.829300, -7.173983, 109.206802, 0.138897, 0.974640, -0.175456, 0.432844, 0.932040, 0.500000, 0.500000, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 0.000000, -6.234773, 112.975891, 0.138897, 0.974640, -0.175456, 0.457880, 0.954265, 0.864881, 0.135119, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 2.278780, -6.642693, 112.513893, 0.138897, 0.974640, -0.175456, 0.457815, 0.938475, 0.701595, 0.298405, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 5.862690, 4.941008, 122.056198, -0.301647, 0.544444, -0.782681, 0.568673, 0.897398, 0.500000, 0.500000, 0.000000, 0.000000, 2.000000, 3.000000, 0.000000, 0.000000, - 7.477900, 4.941008, 121.433693, -0.301647, 0.544445, -0.782681, 0.560148, 0.889923, 0.750000, 0.169852, 0.080148, 0.000000, 3.000000, 4.000000, 2.000000, 0.000000, - 7.604800, 3.490208, 120.375587, -0.301647, 0.544444, -0.782681, 0.548478, 0.893954, 0.750000, 0.147490, 0.102510, 0.000000, 3.000000, 4.000000, 2.000000, 0.000000, - 7.604800, 3.490208, 120.375587, -0.276802, 0.566635, -0.776083, 0.548478, 0.893954, 0.750000, 0.147490, 0.102510, 0.000000, 3.000000, 4.000000, 2.000000, 0.000000, - 5.997000, 2.597708, 120.297401, -0.276802, 0.566635, -0.776083, 0.547736, 0.906262, 0.500000, 0.500000, 0.000000, 0.000000, 3.000000, 2.000000, 0.000000, 0.000000, - 5.862690, 4.941008, 122.056198, -0.276802, 0.566635, -0.776083, 0.568673, 0.897398, 0.500000, 0.500000, 0.000000, 0.000000, 2.000000, 3.000000, 0.000000, 0.000000, - 5.862690, 4.941008, 122.056198, -0.498747, 0.061781, -0.864543, 0.568673, 0.897398, 0.500000, 0.500000, 0.000000, 0.000000, 2.000000, 3.000000, 0.000000, 0.000000, - 5.862690, 9.169807, 122.358391, -0.498747, 0.061781, -0.864543, 0.588860, 0.870510, 0.425000, 0.425000, 0.150000, 0.000000, 2.000000, 3.000000, 1.000000, 0.000000, - 7.477900, 9.169807, 121.426590, -0.498747, 0.061781, -0.864543, 0.577862, 0.866514, 0.550583, 0.296600, 0.152817, 0.000000, 3.000000, 4.000000, 2.000000, 0.000000, - 7.477900, 9.169807, 121.426590, -0.359618, -0.001567, -0.933098, 0.577862, 0.866514, 0.550583, 0.296600, 0.152817, 0.000000, 3.000000, 4.000000, 2.000000, 0.000000, - 7.477900, 4.941008, 121.433693, -0.359618, -0.001567, -0.933098, 0.560148, 0.889923, 0.750000, 0.169852, 0.080148, 0.000000, 3.000000, 4.000000, 2.000000, 0.000000, - 5.862690, 4.941008, 122.056198, -0.359618, -0.001567, -0.933098, 0.568673, 0.897398, 0.500000, 0.500000, 0.000000, 0.000000, 2.000000, 3.000000, 0.000000, 0.000000, - 7.477900, 9.169807, 121.426590, -0.380486, -0.648252, -0.659545, 0.577862, 0.866514, 0.550583, 0.296600, 0.152817, 0.000000, 3.000000, 4.000000, 2.000000, 0.000000, - 5.862690, 9.169807, 122.358391, -0.380486, -0.648252, -0.659545, 0.588860, 0.870510, 0.425000, 0.425000, 0.150000, 0.000000, 2.000000, 3.000000, 1.000000, 0.000000, - 5.835390, 11.888397, 119.702103, -0.380486, -0.648251, -0.659545, 0.585348, 0.841733, 0.750000, 0.250000, 0.000000, 0.000000, 2.000000, 3.000000, 0.000000, 0.000000, - 5.835390, 11.888397, 119.702103, -0.259248, -0.624156, -0.737035, 0.585348, 0.841733, 0.750000, 0.250000, 0.000000, 0.000000, 2.000000, 3.000000, 0.000000, 0.000000, - 7.477900, 11.652898, 119.323792, -0.259248, -0.624156, -0.737035, 0.576463, 0.844571, 0.750000, 0.250000, 0.000000, 0.000000, 2.000000, 3.000000, 0.000000, 0.000000, - 7.477900, 9.169807, 121.426590, -0.259248, -0.624156, -0.737035, 0.577862, 0.866514, 0.550583, 0.296600, 0.152817, 0.000000, 3.000000, 4.000000, 2.000000, 0.000000, - 5.862690, 9.169807, 122.358391, -0.909043, 0.029702, -0.415642, 0.588860, 0.870510, 0.425000, 0.425000, 0.150000, 0.000000, 2.000000, 3.000000, 1.000000, 0.000000, - 5.862690, 4.941008, 122.056198, -0.909043, 0.029702, -0.415642, 0.568673, 0.897398, 0.500000, 0.500000, 0.000000, 0.000000, 2.000000, 3.000000, 0.000000, 0.000000, - 4.711200, 4.941008, 124.574600, -0.909043, 0.029702, -0.415642, 0.585328, 0.907752, 1.000000, 0.000000, 0.000000, 0.000000, 2.000000, 0.000000, 0.000000, 0.000000, - 4.711200, 4.941008, 124.574600, -0.847434, -0.046413, -0.528868, 0.585328, 0.907752, 1.000000, 0.000000, 0.000000, 0.000000, 2.000000, 0.000000, 0.000000, 0.000000, - 4.209000, 9.810187, 124.951988, -0.847434, -0.046413, -0.528868, 0.610250, 0.876330, 0.600000, 0.400000, 0.000000, 0.000000, 2.000000, 1.000000, 0.000000, 0.000000, - 5.862690, 9.169807, 122.358391, -0.847434, -0.046413, -0.528868, 0.588860, 0.870510, 0.425000, 0.425000, 0.150000, 0.000000, 2.000000, 3.000000, 1.000000, 0.000000, - 4.083890, 11.265808, 122.301804, -0.721563, -0.620648, -0.306829, 0.603247, 0.854439, 0.420000, 0.300000, 0.280000, 0.000000, 2.000000, 1.000000, 3.000000, 0.000000, - 5.862690, 9.169807, 122.358391, -0.721563, -0.620648, -0.306829, 0.588860, 0.870510, 0.425000, 0.425000, 0.150000, 0.000000, 2.000000, 3.000000, 1.000000, 0.000000, - 4.209000, 9.810187, 124.951988, -0.721563, -0.620648, -0.306829, 0.610250, 0.876330, 0.600000, 0.400000, 0.000000, 0.000000, 2.000000, 1.000000, 0.000000, 0.000000, - 5.835390, 11.888397, 119.702103, -0.627410, -0.547412, -0.553803, 0.585348, 0.841733, 0.750000, 0.250000, 0.000000, 0.000000, 2.000000, 3.000000, 0.000000, 0.000000, - 5.862690, 9.169807, 122.358391, -0.627410, -0.547412, -0.553803, 0.588860, 0.870510, 0.425000, 0.425000, 0.150000, 0.000000, 2.000000, 3.000000, 1.000000, 0.000000, - 4.083890, 11.265808, 122.301804, -0.627410, -0.547412, -0.553803, 0.603247, 0.854439, 0.420000, 0.300000, 0.280000, 0.000000, 2.000000, 1.000000, 3.000000, 0.000000, - 7.604800, 3.490208, 120.375587, -0.640025, 0.514077, -0.571046, 0.548478, 0.893954, 0.750000, 0.147490, 0.102510, 0.000000, 3.000000, 4.000000, 2.000000, 0.000000, - 8.982590, 1.856997, 117.361092, -0.640025, 0.514077, -0.571046, 0.523721, 0.888246, 0.730781, 0.250000, 0.019219, 0.000000, 2.000000, 3.000000, 4.000000, 0.000000, - 7.636900, 0.551408, 117.693993, -0.640025, 0.514077, -0.571046, 0.521915, 0.899807, 0.898739, 0.100000, 0.001261, 0.000000, 2.000000, 3.000000, 7.000000, 0.000000, - 7.636900, 0.551408, 117.693993, -0.319385, 0.636833, -0.701738, 0.521915, 0.899807, 0.898739, 0.100000, 0.001261, 0.000000, 2.000000, 3.000000, 7.000000, 0.000000, - 5.997000, 2.597708, 120.297401, -0.319385, 0.636833, -0.701738, 0.547736, 0.906262, 0.500000, 0.500000, 0.000000, 0.000000, 3.000000, 2.000000, 0.000000, 0.000000, - 7.604800, 3.490208, 120.375587, -0.319385, 0.636833, -0.701738, 0.548478, 0.893954, 0.750000, 0.147490, 0.102510, 0.000000, 3.000000, 4.000000, 2.000000, 0.000000, - 8.982590, 1.856997, 117.361092, -0.978475, 0.099024, -0.181053, 0.523721, 0.888246, 0.730781, 0.250000, 0.019219, 0.000000, 2.000000, 3.000000, 4.000000, 0.000000, - 9.818400, 2.004197, 112.924591, -0.978475, 0.099024, -0.181054, 0.499657, 0.867253, 0.727634, 0.154391, 0.117975, 0.000000, 2.000000, 4.000000, 7.000000, 0.000000, - 9.817600, 1.263677, 112.523903, -0.978475, 0.099024, -0.181054, 0.496445, 0.867613, 0.767937, 0.145588, 0.086476, 0.000000, 2.000000, 7.000000, 4.000000, 0.000000, - 9.817600, 1.263677, 112.523903, -0.707194, 0.676625, -0.205072, 0.496445, 0.867613, 0.767937, 0.145588, 0.086476, 0.000000, 2.000000, 7.000000, 4.000000, 0.000000, - 7.636900, 0.551408, 117.693993, -0.707194, 0.676625, -0.205072, 0.521915, 0.899807, 0.898739, 0.100000, 0.001261, 0.000000, 2.000000, 3.000000, 7.000000, 0.000000, - 8.982590, 1.856997, 117.361092, -0.707194, 0.676626, -0.205072, 0.523721, 0.888246, 0.730781, 0.250000, 0.019219, 0.000000, 2.000000, 3.000000, 4.000000, 0.000000, - 9.817600, 1.263677, 112.523903, -0.995485, -0.044336, 0.083927, 0.496445, 0.867613, 0.767937, 0.145588, 0.086476, 0.000000, 2.000000, 7.000000, 4.000000, 0.000000, - 9.818400, 2.004197, 112.924591, -0.995485, -0.044336, 0.083927, 0.499657, 0.867253, 0.727634, 0.154391, 0.117975, 0.000000, 2.000000, 4.000000, 7.000000, 0.000000, - 9.496980, 5.135097, 110.766090, -0.995485, -0.044336, 0.083927, 0.501286, 0.840392, 0.587867, 0.238650, 0.173483, 0.000000, 2.000000, 7.000000, 4.000000, 0.000000, - 9.496980, 5.135097, 110.766090, -0.986637, -0.007816, 0.162745, 0.501286, 0.840392, 0.587867, 0.238650, 0.173483, 0.000000, 2.000000, 7.000000, 4.000000, 0.000000, - 9.201380, 4.280907, 108.932999, -0.986637, -0.007816, 0.162745, 0.488532, 0.834858, 0.559070, 0.384731, 0.056199, 0.000000, 7.000000, 2.000000, 4.000000, 0.000000, - 9.817600, 1.263677, 112.523903, -0.986637, -0.007816, 0.162745, 0.496445, 0.867613, 0.767937, 0.145588, 0.086476, 0.000000, 2.000000, 7.000000, 4.000000, 0.000000, - 9.496980, 5.135097, 110.766090, -0.898934, -0.153824, 0.410191, 0.501286, 0.840392, 0.587867, 0.238650, 0.173483, 0.000000, 2.000000, 7.000000, 4.000000, 0.000000, - 8.976800, 8.902997, 111.039101, -0.898934, -0.153824, 0.410191, 0.520156, 0.822171, 0.805265, 0.194735, 0.000000, 0.000000, 2.000000, 4.000000, 0.000000, 0.000000, - 7.985180, 9.215887, 108.983299, -0.898934, -0.153824, 0.410191, 0.512309, 0.808580, 0.498966, 0.483935, 0.017099, 0.000000, 7.000000, 2.000000, 4.000000, 0.000000, - 7.985180, 9.215887, 108.983299, -0.936958, -0.233558, 0.259925, 0.512309, 0.808580, 0.498966, 0.483935, 0.017099, 0.000000, 7.000000, 2.000000, 4.000000, 0.000000, - 9.201380, 4.280907, 108.932999, -0.936958, -0.233558, 0.259925, 0.488532, 0.834858, 0.559070, 0.384731, 0.056199, 0.000000, 7.000000, 2.000000, 4.000000, 0.000000, - 9.496980, 5.135097, 110.766090, -0.936958, -0.233558, 0.259925, 0.501286, 0.840392, 0.587867, 0.238650, 0.173483, 0.000000, 2.000000, 7.000000, 4.000000, 0.000000, - 8.976800, 8.902997, 111.039101, -0.878066, -0.292050, 0.379087, 0.520156, 0.822171, 0.805265, 0.194735, 0.000000, 0.000000, 2.000000, 4.000000, 0.000000, 0.000000, - 9.020480, 11.485308, 113.129692, -0.878066, -0.292050, 0.379087, 0.542221, 0.821368, 0.815460, 0.160464, 0.024076, 0.000000, 2.000000, 4.000000, 7.000000, 0.000000, - 7.985180, 9.215887, 108.983299, -0.878066, -0.292050, 0.379087, 0.512309, 0.808580, 0.498966, 0.483935, 0.017099, 0.000000, 7.000000, 2.000000, 4.000000, 0.000000, - 9.020480, 11.485308, 113.129692, -0.381950, -0.921884, 0.065153, 0.542221, 0.821368, 0.815460, 0.160464, 0.024076, 0.000000, 2.000000, 4.000000, 7.000000, 0.000000, - 8.723500, 11.819298, 116.114502, -0.381950, -0.921884, 0.065153, 0.558157, 0.831518, 0.900000, 0.100000, 0.000000, 0.000000, 2.000000, 4.000000, 0.000000, 0.000000, - 6.250490, 12.758098, 114.900391, -0.381950, -0.921884, 0.065153, 0.561993, 0.814947, 1.000000, 0.000000, 0.000000, 0.000000, 2.000000, 0.000000, 0.000000, 0.000000, - 6.250490, 12.758098, 114.900391, -0.277599, -0.931444, 0.235266, 0.561993, 0.814947, 1.000000, 0.000000, 0.000000, 0.000000, 2.000000, 0.000000, 0.000000, 0.000000, - 5.758200, 11.574596, 109.633904, -0.277599, -0.931444, 0.235266, 0.530109, 0.793115, 0.636430, 0.363570, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 9.020480, 11.485308, 113.129692, -0.277600, -0.931444, 0.235266, 0.542221, 0.821368, 0.815460, 0.160464, 0.024076, 0.000000, 2.000000, 4.000000, 7.000000, 0.000000, - 8.723500, 11.819298, 116.114502, -0.167012, -0.979156, -0.115590, 0.558157, 0.831518, 0.900000, 0.100000, 0.000000, 0.000000, 2.000000, 4.000000, 0.000000, 0.000000, - 7.477900, 11.652898, 119.323792, -0.167012, -0.979156, -0.115590, 0.576463, 0.844571, 0.750000, 0.250000, 0.000000, 0.000000, 2.000000, 3.000000, 0.000000, 0.000000, - 5.835390, 11.888397, 119.702103, -0.167012, -0.979156, -0.115590, 0.585348, 0.841733, 0.750000, 0.250000, 0.000000, 0.000000, 2.000000, 3.000000, 0.000000, 0.000000, - 5.835390, 11.888397, 119.702103, -0.263513, -0.944961, -0.193934, 0.585348, 0.841733, 0.750000, 0.250000, 0.000000, 0.000000, 2.000000, 3.000000, 0.000000, 0.000000, - 6.250490, 12.758098, 114.900391, -0.263513, -0.944960, -0.193934, 0.561993, 0.814947, 1.000000, 0.000000, 0.000000, 0.000000, 2.000000, 0.000000, 0.000000, 0.000000, - 8.723500, 11.819298, 116.114502, -0.263513, -0.944960, -0.193934, 0.558157, 0.831518, 0.900000, 0.100000, 0.000000, 0.000000, 2.000000, 4.000000, 0.000000, 0.000000, - 9.817600, 1.263677, 112.523903, -0.790832, 0.604853, 0.093473, 0.496445, 0.867613, 0.767937, 0.145588, 0.086476, 0.000000, 2.000000, 7.000000, 4.000000, 0.000000, - 8.814680, 0.061797, 111.815887, -0.790832, 0.604853, 0.093473, 0.488804, 0.870382, 0.749630, 0.239813, 0.010557, 0.000000, 2.000000, 7.000000, 4.000000, 0.000000, - 7.902270, -1.675863, 115.340591, -0.790832, 0.604853, 0.093473, 0.500474, 0.898386, 0.975667, 0.024333, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 7.902270, -1.675863, 115.340591, -0.902561, 0.257265, -0.345250, 0.500474, 0.898386, 0.975667, 0.024333, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 7.636900, 0.551408, 117.693993, -0.902561, 0.257265, -0.345250, 0.521915, 0.899807, 0.898739, 0.100000, 0.001261, 0.000000, 2.000000, 3.000000, 7.000000, 0.000000, - 9.817600, 1.263677, 112.523903, -0.902561, 0.257265, -0.345250, 0.496445, 0.867613, 0.767937, 0.145588, 0.086476, 0.000000, 2.000000, 7.000000, 4.000000, 0.000000, - 7.985180, 9.215887, 108.983299, -0.555682, -0.663013, 0.501629, 0.512309, 0.808580, 0.498966, 0.483935, 0.017099, 0.000000, 7.000000, 2.000000, 4.000000, 0.000000, - 9.020480, 11.485308, 113.129692, -0.555682, -0.663013, 0.501629, 0.542221, 0.821368, 0.815460, 0.160464, 0.024076, 0.000000, 2.000000, 4.000000, 7.000000, 0.000000, - 5.758200, 11.574596, 109.633904, -0.555682, -0.663013, 0.501629, 0.530109, 0.793115, 0.636430, 0.363570, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 2.436190, -6.105494, 106.357689, -0.137000, 0.989442, 0.047273, 0.413468, 0.916223, 0.995283, 0.004717, 0.000000, 0.000000, 7.000000, 2.000000, 0.000000, 0.000000, - 0.000000, -6.442393, 106.348900, -0.137000, 0.989442, 0.047273, 0.407772, 0.934026, 0.997908, 0.002092, 0.000000, 0.000000, 7.000000, 2.000000, 0.000000, 0.000000, - 0.000000, -6.564693, 108.908691, -0.137000, 0.989442, 0.047273, 0.425541, 0.941930, 0.500000, 0.500000, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 5.417100, -5.188093, 105.340477, -0.628777, 0.765793, 0.134912, 0.417502, 0.884196, 0.989995, 0.007620, 0.002385, 0.000000, 7.000000, 5.000000, 2.000000, 0.000000, - 7.628090, -3.453083, 105.796791, -0.628777, 0.765793, 0.134912, 0.434478, 0.865992, 0.965289, 0.023814, 0.010896, 0.000000, 7.000000, 2.000000, 5.000000, 0.000000, - 7.279490, -3.164284, 102.532791, -0.628777, 0.765793, 0.134912, 0.417375, 0.850543, 0.864141, 0.135859, 0.000000, 0.000000, 7.000000, 5.000000, 0.000000, 0.000000, - 7.279490, -3.164284, 102.532791, -0.721551, 0.692066, 0.020231, 0.417375, 0.850543, 0.864141, 0.135859, 0.000000, 0.000000, 7.000000, 5.000000, 0.000000, 0.000000, - 4.738290, -5.808583, 102.356087, -0.721551, 0.692066, 0.020231, 0.398141, 0.871130, 0.884546, 0.115454, 0.000000, 0.000000, 7.000000, 5.000000, 0.000000, 0.000000, - 5.417100, -5.188093, 105.340477, -0.721551, 0.692066, 0.020231, 0.417502, 0.884196, 0.989995, 0.007620, 0.002385, 0.000000, 7.000000, 5.000000, 2.000000, 0.000000, - 0.000000, 7.376596, 96.600304, -0.130135, -0.824404, -0.550839, 0.453369, 0.726033, 0.777850, 0.207714, 0.014436, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - 0.000000, 12.724806, 88.596001, -0.130135, -0.824404, -0.550839, 0.411758, 0.674075, 0.700000, 0.300000, 0.000000, 0.000000, 5.000000, 6.000000, 0.000000, 0.000000, - 7.081700, 10.059795, 90.911499, -0.130135, -0.824403, -0.550839, 0.389001, 0.724212, 0.700000, 0.300000, 0.000000, 0.000000, 5.000000, 6.000000, 0.000000, 0.000000, - 7.081700, 10.059795, 90.911499, -0.103645, -0.843579, -0.526908, 0.389001, 0.724212, 0.700000, 0.300000, 0.000000, 0.000000, 5.000000, 6.000000, 0.000000, 0.000000, - 4.468900, 6.623106, 96.927589, -0.103645, -0.843579, -0.526908, 0.434958, 0.754053, 0.753825, 0.235477, 0.010698, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - 0.000000, 7.376596, 96.600304, -0.103645, -0.843579, -0.526908, 0.453369, 0.726033, 0.777850, 0.207714, 0.014436, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - 7.279490, -3.164284, 102.532791, -0.991301, 0.069143, 0.111990, 0.417375, 0.850543, 0.864141, 0.135859, 0.000000, 0.000000, 7.000000, 5.000000, 0.000000, 0.000000, - 7.628090, -3.453083, 105.796791, -0.991301, 0.069143, 0.111990, 0.434478, 0.865992, 0.965289, 0.023814, 0.010896, 0.000000, 7.000000, 2.000000, 5.000000, 0.000000, - 7.571590, 1.268307, 102.381691, -0.991301, 0.069143, 0.111990, 0.438450, 0.821269, 0.795815, 0.202606, 0.001579, 0.000000, 7.000000, 5.000000, 2.000000, 0.000000, - 7.571590, 1.268307, 102.381691, -0.989846, 0.060850, -0.128463, 0.438450, 0.821269, 0.795815, 0.202606, 0.001579, 0.000000, 7.000000, 5.000000, 2.000000, 0.000000, - 7.649400, -1.003374, 100.706100, -0.989846, 0.060850, -0.128463, 0.418987, 0.828096, 0.705915, 0.294085, 0.000000, 0.000000, 7.000000, 5.000000, 0.000000, 0.000000, - 7.279490, -3.164284, 102.532791, -0.989846, 0.060850, -0.128463, 0.417375, 0.850543, 0.864141, 0.135859, 0.000000, 0.000000, 7.000000, 5.000000, 0.000000, 0.000000, - 7.649400, -1.003374, 100.706100, -0.993978, 0.040930, -0.101649, 0.418987, 0.828096, 0.705915, 0.294085, 0.000000, 0.000000, 7.000000, 5.000000, 0.000000, 0.000000, - 7.571590, 1.268307, 102.381691, -0.993978, 0.040930, -0.101649, 0.438450, 0.821269, 0.795815, 0.202606, 0.001579, 0.000000, 7.000000, 5.000000, 2.000000, 0.000000, - 8.011990, 1.232886, 98.060982, -0.993978, 0.040930, -0.101649, 0.413541, 0.803077, 0.624202, 0.372551, 0.003247, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - 8.011990, 1.232886, 98.060982, -0.949640, -0.162746, -0.267765, 0.413541, 0.803077, 0.624202, 0.372551, 0.003247, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - 8.442400, -1.061784, 97.929199, -0.949640, -0.162746, -0.267765, 0.403799, 0.817048, 0.643318, 0.353551, 0.003131, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - 7.649400, -1.003374, 100.706100, -0.949640, -0.162746, -0.267765, 0.418987, 0.828096, 0.705915, 0.294085, 0.000000, 0.000000, 7.000000, 5.000000, 0.000000, 0.000000, - 8.442400, -1.061784, 97.929199, -0.847562, -0.129419, -0.514674, 0.403799, 0.817048, 0.643318, 0.353551, 0.003131, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - 8.011990, 1.232886, 98.060982, -0.847562, -0.129419, -0.514674, 0.413541, 0.803077, 0.624202, 0.372551, 0.003247, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - 9.959090, -0.267484, 95.231789, -0.847562, -0.129419, -0.514674, 0.386558, 0.805665, 0.828303, 0.135755, 0.035942, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - 9.959090, -0.267484, 95.231789, -0.879743, 0.162646, -0.446765, 0.386558, 0.805665, 0.828303, 0.135755, 0.035942, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - 9.050200, -2.173064, 96.327789, -0.879743, 0.162646, -0.446765, 0.390789, 0.821040, 0.792886, 0.191863, 0.015251, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - 8.442400, -1.061784, 97.929199, -0.879743, 0.162646, -0.446765, 0.403799, 0.817048, 0.643318, 0.353551, 0.003131, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - 9.959090, -0.267484, 95.231789, -0.854442, -0.248915, -0.456038, 0.386558, 0.805665, 0.828303, 0.135755, 0.035942, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - 8.011990, 1.232886, 98.060982, -0.854442, -0.248915, -0.456038, 0.413541, 0.803077, 0.624202, 0.372551, 0.003247, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - 8.794190, 5.756406, 94.126404, -0.854442, -0.248915, -0.456038, 0.397798, 0.763185, 0.850953, 0.075036, 0.074010, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - 8.794190, 5.756406, 94.126404, -0.671069, -0.257358, -0.695294, 0.397798, 0.763185, 0.850953, 0.075036, 0.074010, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - 10.648200, 3.935206, 93.011093, -0.671069, -0.257358, -0.695294, 0.380585, 0.774210, 0.832925, 0.123071, 0.044004, 0.000000, 5.000000, 6.000000, 7.000000, 0.000000, - 9.959090, -0.267484, 95.231789, -0.671069, -0.257358, -0.695294, 0.386558, 0.805665, 0.828303, 0.135755, 0.035942, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - 8.794190, 5.756406, 94.126404, -0.755131, -0.557806, -0.344427, 0.397798, 0.763185, 0.850953, 0.075036, 0.074010, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - 7.081700, 10.059795, 90.911499, -0.755131, -0.557806, -0.344427, 0.389001, 0.724212, 0.700000, 0.300000, 0.000000, 0.000000, 5.000000, 6.000000, 0.000000, 0.000000, - 10.648200, 3.935206, 93.011093, -0.755131, -0.557806, -0.344427, 0.380585, 0.774210, 0.832925, 0.123071, 0.044004, 0.000000, 5.000000, 6.000000, 7.000000, 0.000000, - 8.011990, 1.232886, 98.060982, -0.966769, -0.236699, -0.096600, 0.413541, 0.803077, 0.624202, 0.372551, 0.003247, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - 7.571590, 1.268307, 102.381691, -0.966769, -0.236699, -0.096600, 0.438450, 0.821269, 0.795815, 0.202606, 0.001579, 0.000000, 7.000000, 5.000000, 2.000000, 0.000000, - 6.791690, 4.367397, 102.593193, -0.966769, -0.236699, -0.096600, 0.454400, 0.800150, 0.809871, 0.185825, 0.004304, 0.000000, 7.000000, 5.000000, 2.000000, 0.000000, - 6.791690, 4.367397, 102.593193, -0.958975, -0.275256, -0.067835, 0.454400, 0.800150, 0.809871, 0.185825, 0.004304, 0.000000, 7.000000, 5.000000, 2.000000, 0.000000, - 7.155000, 4.331996, 97.600800, -0.958975, -0.275256, -0.067835, 0.423384, 0.779908, 0.661239, 0.332644, 0.006117, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - 8.011990, 1.232886, 98.060982, -0.958975, -0.275256, -0.067835, 0.413541, 0.803077, 0.624202, 0.372551, 0.003247, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - 6.791690, 4.367397, 102.593193, -0.855112, -0.495226, 0.153410, 0.454400, 0.800150, 0.809871, 0.185825, 0.004304, 0.000000, 7.000000, 5.000000, 2.000000, 0.000000, - 5.143890, 7.376297, 103.121391, -0.855112, -0.495226, 0.153410, 0.474527, 0.780112, 0.887725, 0.106157, 0.006117, 0.000000, 7.000000, 5.000000, 2.000000, 0.000000, - 4.468900, 6.623106, 96.927589, -0.855112, -0.495226, 0.153410, 0.434958, 0.754053, 0.753825, 0.235477, 0.010698, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - 4.468900, 6.623106, 96.927589, -0.642381, -0.765270, -0.041321, 0.434958, 0.754053, 0.753825, 0.235477, 0.010698, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - 7.155000, 4.331996, 97.600800, -0.642381, -0.765270, -0.041321, 0.423384, 0.779908, 0.661239, 0.332644, 0.006117, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - 6.791690, 4.367397, 102.593193, -0.642381, -0.765270, -0.041321, 0.454400, 0.800150, 0.809871, 0.185825, 0.004304, 0.000000, 7.000000, 5.000000, 2.000000, 0.000000, - 7.155000, 4.331996, 97.600800, -0.809925, -0.298902, -0.504658, 0.423384, 0.779908, 0.661239, 0.332644, 0.006117, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - 8.794190, 5.756406, 94.126404, -0.809925, -0.298902, -0.504658, 0.397798, 0.763185, 0.850953, 0.075036, 0.074010, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - 8.011990, 1.232886, 98.060982, -0.809925, -0.298902, -0.504658, 0.413541, 0.803077, 0.624202, 0.372551, 0.003247, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - 4.468900, 6.623106, 96.927589, -0.477028, -0.711055, -0.516571, 0.434958, 0.754053, 0.753825, 0.235477, 0.010698, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - 8.794190, 5.756406, 94.126404, -0.477028, -0.711055, -0.516571, 0.397798, 0.763185, 0.850953, 0.075036, 0.074010, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - 7.155000, 4.331996, 97.600800, -0.477028, -0.711055, -0.516571, 0.423384, 0.779908, 0.661239, 0.332644, 0.006117, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - 4.468900, 6.623106, 96.927589, -0.505062, -0.636474, -0.582935, 0.434958, 0.754053, 0.753825, 0.235477, 0.010698, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - 7.081700, 10.059795, 90.911499, -0.505062, -0.636474, -0.582935, 0.389001, 0.724212, 0.700000, 0.300000, 0.000000, 0.000000, 5.000000, 6.000000, 0.000000, 0.000000, - 8.794190, 5.756406, 94.126404, -0.505062, -0.636474, -0.582935, 0.397798, 0.763185, 0.850953, 0.075036, 0.074010, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - 9.073680, -0.831693, 108.043198, -0.917625, 0.225667, 0.327167, 0.462002, 0.858187, 0.797503, 0.202062, 0.000435, 0.000000, 7.000000, 2.000000, 5.000000, 0.000000, - 7.571590, 1.268307, 102.381691, -0.917625, 0.225667, 0.327167, 0.438450, 0.821269, 0.795815, 0.202606, 0.001579, 0.000000, 7.000000, 5.000000, 2.000000, 0.000000, - 7.628090, -3.453083, 105.796791, -0.917625, 0.225667, 0.327167, 0.434478, 0.865992, 0.965289, 0.023814, 0.010896, 0.000000, 7.000000, 2.000000, 5.000000, 0.000000, - 9.817600, 1.263677, 112.523903, -0.986168, -0.004206, 0.165698, 0.496445, 0.867613, 0.767937, 0.145588, 0.086476, 0.000000, 2.000000, 7.000000, 4.000000, 0.000000, - 9.201380, 4.280907, 108.932999, -0.986168, -0.004206, 0.165698, 0.488532, 0.834858, 0.559070, 0.384731, 0.056199, 0.000000, 7.000000, 2.000000, 4.000000, 0.000000, - 9.073680, -0.831693, 108.043198, -0.986168, -0.004206, 0.165698, 0.462002, 0.858187, 0.797503, 0.202062, 0.000435, 0.000000, 7.000000, 2.000000, 5.000000, 0.000000, - 9.073680, -0.831693, 108.043198, -0.685262, 0.696742, -0.212054, 0.462002, 0.858187, 0.797503, 0.202062, 0.000435, 0.000000, 7.000000, 2.000000, 5.000000, 0.000000, - 8.814680, 0.061797, 111.815887, -0.685262, 0.696742, -0.212054, 0.488804, 0.870382, 0.749630, 0.239813, 0.010557, 0.000000, 2.000000, 7.000000, 4.000000, 0.000000, - 9.817600, 1.263677, 112.523903, -0.685262, 0.696742, -0.212054, 0.496445, 0.867613, 0.767937, 0.145588, 0.086476, 0.000000, 2.000000, 7.000000, 4.000000, 0.000000, - 9.201380, 4.280907, 108.932999, -0.905907, -0.251241, 0.340898, 0.488532, 0.834858, 0.559070, 0.384731, 0.056199, 0.000000, 7.000000, 2.000000, 4.000000, 0.000000, - 6.791690, 4.367397, 102.593193, -0.905907, -0.251241, 0.340898, 0.454400, 0.800150, 0.809871, 0.185825, 0.004304, 0.000000, 7.000000, 5.000000, 2.000000, 0.000000, - 7.571590, 1.268307, 102.381691, -0.905907, -0.251241, 0.340898, 0.438450, 0.821269, 0.795815, 0.202606, 0.001579, 0.000000, 7.000000, 5.000000, 2.000000, 0.000000, - 7.571590, 1.268307, 102.381691, -0.968129, -0.019278, 0.249710, 0.438450, 0.821269, 0.795815, 0.202606, 0.001579, 0.000000, 7.000000, 5.000000, 2.000000, 0.000000, - 9.073680, -0.831693, 108.043198, -0.968129, -0.019278, 0.249710, 0.462002, 0.858187, 0.797503, 0.202062, 0.000435, 0.000000, 7.000000, 2.000000, 5.000000, 0.000000, - 9.201380, 4.280907, 108.932999, -0.968129, -0.019278, 0.249710, 0.488532, 0.834858, 0.559070, 0.384731, 0.056199, 0.000000, 7.000000, 2.000000, 4.000000, 0.000000, - 5.758200, 11.574596, 109.633904, -0.565829, -0.667672, 0.483789, 0.530109, 0.793115, 0.636430, 0.363570, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 5.143890, 7.376297, 103.121391, -0.565829, -0.667672, 0.483789, 0.474527, 0.780112, 0.887725, 0.106157, 0.006117, 0.000000, 7.000000, 5.000000, 2.000000, 0.000000, - 7.985180, 9.215887, 108.983299, -0.565829, -0.667672, 0.483789, 0.512309, 0.808580, 0.498966, 0.483935, 0.017099, 0.000000, 7.000000, 2.000000, 4.000000, 0.000000, - 9.201380, 4.280907, 108.932999, -0.850787, -0.214562, 0.479714, 0.488532, 0.834858, 0.559070, 0.384731, 0.056199, 0.000000, 7.000000, 2.000000, 4.000000, 0.000000, - 7.985180, 9.215887, 108.983299, -0.850787, -0.214562, 0.479714, 0.512309, 0.808580, 0.498966, 0.483935, 0.017099, 0.000000, 7.000000, 2.000000, 4.000000, 0.000000, - 5.143890, 7.376297, 103.121391, -0.850787, -0.214562, 0.479714, 0.474527, 0.780112, 0.887725, 0.106157, 0.006117, 0.000000, 7.000000, 5.000000, 2.000000, 0.000000, - 5.143890, 7.376297, 103.121391, -0.812760, -0.498138, 0.302125, 0.474527, 0.780112, 0.887725, 0.106157, 0.006117, 0.000000, 7.000000, 5.000000, 2.000000, 0.000000, - 6.791690, 4.367397, 102.593193, -0.812760, -0.498138, 0.302125, 0.454400, 0.800150, 0.809871, 0.185825, 0.004304, 0.000000, 7.000000, 5.000000, 2.000000, 0.000000, - 9.201380, 4.280907, 108.932999, -0.812760, -0.498138, 0.302125, 0.488532, 0.834858, 0.559070, 0.384731, 0.056199, 0.000000, 7.000000, 2.000000, 4.000000, 0.000000, - 8.501000, 5.047698, 120.559303, -0.441851, 0.003661, -0.897081, 0.273056, 0.969867, 0.750000, 0.131579, 0.118421, 0.000000, 3.000000, 2.000000, 4.000000, 0.000000, - 8.586790, 9.447898, 120.535004, -0.441851, 0.003661, -0.897081, 0.303238, 0.969380, 0.700000, 0.300000, 0.000000, 0.000000, 3.000000, 4.000000, 0.000000, 0.000000, - 10.402290, 9.229188, 119.639900, -0.441851, 0.003661, -0.897081, 0.300851, 0.956375, 0.500000, 0.500000, 0.000000, 0.000000, 3.000000, 4.000000, 0.000000, 0.000000, - 10.402290, 9.229188, 119.639900, -0.437437, 0.001177, -0.899248, 0.300851, 0.956375, 0.500000, 0.500000, 0.000000, 0.000000, 3.000000, 4.000000, 0.000000, 0.000000, - 10.377880, 4.972198, 119.646202, -0.437437, 0.001177, -0.899248, 0.273068, 0.956041, 0.500000, 0.500000, 0.000000, 0.000000, 3.000000, 4.000000, 0.000000, 0.000000, - 8.501000, 5.047698, 120.559303, -0.437437, 0.001177, -0.899249, 0.273056, 0.969867, 0.750000, 0.131579, 0.118421, 0.000000, 3.000000, 2.000000, 4.000000, 0.000000, - 10.377880, 4.972198, 119.646202, -0.774601, 0.003505, -0.632441, 0.273068, 0.956041, 0.500000, 0.500000, 0.000000, 0.000000, 3.000000, 4.000000, 0.000000, 0.000000, - 10.402290, 9.229188, 119.639900, -0.774600, 0.003505, -0.632441, 0.300851, 0.956375, 0.500000, 0.500000, 0.000000, 0.000000, 3.000000, 4.000000, 0.000000, 0.000000, - 12.208590, 8.778698, 117.425087, -0.774600, 0.003505, -0.632441, 0.298942, 0.936694, 0.800000, 0.200000, 0.000000, 0.000000, 4.000000, 3.000000, 0.000000, 0.000000, - 12.208590, 8.778698, 117.425087, -0.774962, 0.003940, -0.631995, 0.298942, 0.936694, 0.800000, 0.200000, 0.000000, 0.000000, 4.000000, 3.000000, 0.000000, 0.000000, - 12.184190, 4.990208, 117.431389, -0.774962, 0.003940, -0.631995, 0.273013, 0.936275, 0.800000, 0.200000, 0.000000, 0.000000, 4.000000, 3.000000, 0.000000, 0.000000, - 10.377880, 4.972198, 119.646202, -0.774962, 0.003940, -0.631995, 0.273068, 0.956041, 0.500000, 0.500000, 0.000000, 0.000000, 3.000000, 4.000000, 0.000000, 0.000000, - 12.208590, 8.778698, 117.425087, -0.939422, 0.005483, -0.342719, 0.298942, 0.936694, 0.800000, 0.200000, 0.000000, 0.000000, 4.000000, 3.000000, 0.000000, 0.000000, - 13.005800, 8.786887, 115.239998, -0.939422, 0.005483, -0.342719, 0.301287, 0.920799, 1.000000, 0.000000, 0.000000, 0.000000, 4.000000, 0.000000, 0.000000, 0.000000, - 12.981390, 4.998407, 115.246300, -0.939422, 0.005483, -0.342719, 0.271999, 0.920144, 1.000000, 0.000000, 0.000000, 0.000000, 4.000000, 0.000000, 0.000000, 0.000000, - 12.981390, 4.998407, 115.246300, -0.939423, 0.005480, -0.342715, 0.271999, 0.920144, 1.000000, 0.000000, 0.000000, 0.000000, 4.000000, 0.000000, 0.000000, 0.000000, - 12.184190, 4.990208, 117.431389, -0.939423, 0.005480, -0.342715, 0.273013, 0.936275, 0.800000, 0.200000, 0.000000, 0.000000, 4.000000, 3.000000, 0.000000, 0.000000, - 12.208590, 8.778698, 117.425087, -0.939423, 0.005480, -0.342715, 0.298942, 0.936694, 0.800000, 0.200000, 0.000000, 0.000000, 4.000000, 3.000000, 0.000000, 0.000000, - 12.184190, 4.990208, 117.431389, -0.462563, 0.800567, -0.380957, 0.273013, 0.936275, 0.800000, 0.200000, 0.000000, 0.000000, 4.000000, 3.000000, 0.000000, 0.000000, - 11.120300, 2.930507, 114.394791, -0.462563, 0.800567, -0.380957, 0.248965, 0.924903, 0.850000, 0.150000, 0.000000, 0.000000, 4.000000, 3.000000, 0.000000, 0.000000, - 9.651800, 2.804797, 115.913689, -0.462563, 0.800567, -0.380957, 0.247668, 0.940905, 0.500000, 0.275000, 0.225000, 0.000000, 2.000000, 4.000000, 3.000000, 0.000000, - 9.651800, 2.804797, 115.913689, -0.466994, 0.801112, -0.374347, 0.247668, 0.940905, 0.500000, 0.275000, 0.225000, 0.000000, 2.000000, 4.000000, 3.000000, 0.000000, - 10.377880, 4.972198, 119.646202, -0.466994, 0.801112, -0.374347, 0.273068, 0.956041, 0.500000, 0.500000, 0.000000, 0.000000, 3.000000, 4.000000, 0.000000, 0.000000, - 12.184190, 4.990208, 117.431389, -0.466994, 0.801112, -0.374347, 0.273013, 0.936275, 0.800000, 0.200000, 0.000000, 0.000000, 4.000000, 3.000000, 0.000000, 0.000000, - 12.208590, 8.778698, 117.425087, -0.564510, -0.767278, -0.304325, 0.298942, 0.936694, 0.800000, 0.200000, 0.000000, 0.000000, 4.000000, 3.000000, 0.000000, 0.000000, - 10.402290, 9.229188, 119.639900, -0.564510, -0.767278, -0.304325, 0.300851, 0.956375, 0.500000, 0.500000, 0.000000, 0.000000, 3.000000, 4.000000, 0.000000, 0.000000, - 9.643900, 11.183098, 116.120392, -0.564510, -0.767278, -0.304325, 0.324217, 0.942406, 0.500000, 0.500000, 0.000000, 0.000000, 3.000000, 4.000000, 0.000000, 0.000000, - 9.643900, 11.183098, 116.120392, -0.566283, -0.767317, -0.300912, 0.324217, 0.942406, 0.500000, 0.500000, 0.000000, 0.000000, 3.000000, 4.000000, 0.000000, 0.000000, - 11.116790, 10.775288, 114.388481, -0.566283, -0.767317, -0.300912, 0.322533, 0.925528, 0.800000, 0.200000, 0.000000, 0.000000, 4.000000, 3.000000, 0.000000, 0.000000, - 12.208590, 8.778698, 117.425087, -0.566283, -0.767317, -0.300912, 0.298942, 0.936694, 0.800000, 0.200000, 0.000000, 0.000000, 4.000000, 3.000000, 0.000000, 0.000000, - 9.651800, 8.949997, 111.126198, 0.316511, -0.905738, 0.281884, 0.347407, 0.911837, 0.800000, 0.200000, 0.000000, 0.000000, 4.000000, 3.000000, 0.000000, 0.000000, - 10.315800, 8.921197, 110.288094, 0.316511, -0.905738, 0.281884, 0.346317, 0.904946, 1.000000, 0.000000, 0.000000, 0.000000, 4.000000, 0.000000, 0.000000, 0.000000, - 11.933200, 10.374998, 113.143303, 0.316511, -0.905738, 0.281884, 0.322365, 0.914100, 1.000000, 0.000000, 0.000000, 0.000000, 4.000000, 0.000000, 0.000000, 0.000000, - 11.933200, 10.374998, 113.143303, 0.191918, -0.890670, 0.412158, 0.322365, 0.914100, 1.000000, 0.000000, 0.000000, 0.000000, 4.000000, 0.000000, 0.000000, 0.000000, - 11.116790, 10.775288, 114.388481, 0.191918, -0.890670, 0.412158, 0.322533, 0.925528, 0.800000, 0.200000, 0.000000, 0.000000, 4.000000, 3.000000, 0.000000, 0.000000, - 9.651800, 8.949997, 111.126198, 0.191918, -0.890670, 0.412158, 0.347407, 0.911837, 0.800000, 0.200000, 0.000000, 0.000000, 4.000000, 3.000000, 0.000000, 0.000000, - 9.651800, 8.949997, 111.126198, 0.783503, 0.056767, 0.618790, 0.347407, 0.911837, 0.800000, 0.200000, 0.000000, 0.000000, 4.000000, 3.000000, 0.000000, 0.000000, - 9.661190, 5.298397, 111.449303, 0.783503, 0.056767, 0.618790, 0.373299, 0.910453, 0.800000, 0.200000, 0.000000, 0.000000, 4.000000, 3.000000, 0.000000, 0.000000, - 10.315800, 8.921197, 110.288094, 0.783503, 0.056767, 0.618790, 0.346317, 0.904946, 1.000000, 0.000000, 0.000000, 0.000000, 4.000000, 0.000000, 0.000000, 0.000000, - 8.501000, 5.047698, 120.559303, -0.279560, 0.144576, -0.949181, 0.273056, 0.969867, 0.750000, 0.131579, 0.118421, 0.000000, 3.000000, 2.000000, 4.000000, 0.000000, - 5.778800, 3.842408, 121.177483, -0.279560, 0.144576, -0.949181, 0.263361, 0.988148, 0.500000, 0.500000, 0.000000, 0.000000, 2.000000, 3.000000, 0.000000, 0.000000, - 5.670600, 6.753788, 121.652802, -0.279560, 0.144576, -0.949181, 0.284831, 0.991127, 0.736482, 0.263518, 0.000000, 0.000000, 3.000000, 2.000000, 0.000000, 0.000000, - 10.377880, 4.972198, 119.646202, -0.950171, 0.311707, 0.003833, 0.273068, 0.956041, 0.500000, 0.500000, 0.000000, 0.000000, 3.000000, 4.000000, 0.000000, 0.000000, - 9.651800, 2.804797, 115.913689, -0.950171, 0.311707, 0.003833, 0.247668, 0.940905, 0.500000, 0.275000, 0.225000, 0.000000, 2.000000, 4.000000, 3.000000, 0.000000, - 9.464380, 2.221707, 116.871902, -0.950171, 0.311707, 0.003833, 0.247992, 0.948919, 0.654796, 0.245204, 0.100000, 0.000000, 2.000000, 3.000000, 4.000000, 0.000000, - 9.464380, 2.221707, 116.871902, -0.276807, 0.726420, -0.629041, 0.247992, 0.948919, 0.654796, 0.245204, 0.100000, 0.000000, 2.000000, 3.000000, 4.000000, 0.000000, - 8.501000, 5.047698, 120.559303, -0.276807, 0.726420, -0.629041, 0.273056, 0.969867, 0.750000, 0.131579, 0.118421, 0.000000, 3.000000, 2.000000, 4.000000, 0.000000, - 10.377880, 4.972198, 119.646202, -0.276807, 0.726420, -0.629041, 0.273068, 0.956041, 0.500000, 0.500000, 0.000000, 0.000000, 3.000000, 4.000000, 0.000000, 0.000000, - 8.501000, 5.047698, 120.559303, -0.543172, 0.591878, -0.595520, 0.273056, 0.969867, 0.750000, 0.131579, 0.118421, 0.000000, 3.000000, 2.000000, 4.000000, 0.000000, - 9.464380, 2.221707, 116.871902, -0.543172, 0.591878, -0.595520, 0.247992, 0.948919, 0.654796, 0.245204, 0.100000, 0.000000, 2.000000, 3.000000, 4.000000, 0.000000, - 6.802590, 0.849908, 117.936302, -0.543172, 0.591878, -0.595520, 0.238289, 0.968887, 0.750000, 0.148288, 0.101405, 0.000308, 2.000000, 4.000000, 3.000000, 7.000000, - 6.802590, 0.849908, 117.936302, -0.419605, 0.597011, -0.683746, 0.238289, 0.968887, 0.750000, 0.148288, 0.101405, 0.000308, 2.000000, 4.000000, 3.000000, 7.000000, - 5.778800, 3.842408, 121.177483, -0.419605, 0.597011, -0.683746, 0.263361, 0.988148, 0.500000, 0.500000, 0.000000, 0.000000, 2.000000, 3.000000, 0.000000, 0.000000, - 8.501000, 5.047698, 120.559303, -0.419605, 0.597011, -0.683746, 0.273056, 0.969867, 0.750000, 0.131579, 0.118421, 0.000000, 3.000000, 2.000000, 4.000000, 0.000000, - 8.586790, 9.447898, 120.535004, -0.359407, 0.001854, -0.933179, 0.303238, 0.969380, 0.700000, 0.300000, 0.000000, 0.000000, 3.000000, 4.000000, 0.000000, 0.000000, - 8.501000, 5.047698, 120.559303, -0.359407, 0.001854, -0.933179, 0.273056, 0.969867, 0.750000, 0.131579, 0.118421, 0.000000, 3.000000, 2.000000, 4.000000, 0.000000, - 5.670600, 6.753788, 121.652802, -0.359407, 0.001854, -0.933179, 0.284831, 0.991127, 0.736482, 0.263518, 0.000000, 0.000000, 3.000000, 2.000000, 0.000000, 0.000000, - 5.670600, 6.753788, 121.652802, -0.348280, -0.011907, -0.937315, 0.284831, 0.991127, 0.736482, 0.263518, 0.000000, 0.000000, 3.000000, 2.000000, 0.000000, 0.000000, - 5.864600, 9.447898, 121.546494, -0.348280, -0.011907, -0.937315, 0.305297, 0.988950, 0.750000, 0.250000, 0.000000, 0.000000, 2.000000, 3.000000, 0.000000, 0.000000, - 8.586790, 9.447898, 120.535004, -0.348280, -0.011907, -0.937315, 0.303238, 0.969380, 0.700000, 0.300000, 0.000000, 0.000000, 3.000000, 4.000000, 0.000000, 0.000000, - 9.797880, 2.582297, 113.254204, -0.657630, 0.393708, 0.642275, 0.234881, 0.927035, 0.687330, 0.217864, 0.094806, 0.000000, 2.000000, 4.000000, 7.000000, 0.000000, - 11.120300, 2.930507, 114.394791, -0.657630, 0.393708, 0.642275, 0.248965, 0.924903, 0.850000, 0.150000, 0.000000, 0.000000, 4.000000, 3.000000, 0.000000, 0.000000, - 9.661190, 5.298397, 111.449303, -0.657630, 0.393708, 0.642275, 0.228335, 0.906520, 0.800000, 0.200000, 0.000000, 0.000000, 4.000000, 3.000000, 0.000000, 0.000000, - 9.661190, 5.298397, 111.449303, -0.972966, 0.091846, 0.211900, 0.228335, 0.906520, 0.800000, 0.200000, 0.000000, 0.000000, 4.000000, 3.000000, 0.000000, 0.000000, - 9.496980, 5.135097, 110.766090, -0.972966, 0.091846, 0.211900, 0.225078, 0.903640, 0.587867, 0.238650, 0.173483, 0.000000, 2.000000, 7.000000, 4.000000, 0.000000, - 9.797880, 2.582297, 113.254204, -0.972966, 0.091846, 0.211900, 0.234881, 0.927035, 0.687330, 0.217864, 0.094806, 0.000000, 2.000000, 4.000000, 7.000000, 0.000000, - 9.651800, 2.804797, 115.913689, -0.977544, 0.198657, -0.070315, 0.247668, 0.940905, 0.500000, 0.275000, 0.225000, 0.000000, 2.000000, 4.000000, 3.000000, 0.000000, - 9.797880, 2.582297, 113.254204, -0.977544, 0.198657, -0.070315, 0.234881, 0.927035, 0.687330, 0.217864, 0.094806, 0.000000, 2.000000, 4.000000, 7.000000, 0.000000, - 9.464380, 2.221707, 116.871902, -0.977544, 0.198657, -0.070315, 0.247992, 0.948919, 0.654796, 0.245204, 0.100000, 0.000000, 2.000000, 3.000000, 4.000000, 0.000000, - 9.464380, 2.221707, 116.871902, -0.948996, 0.310171, -0.056568, 0.247992, 0.948919, 0.654796, 0.245204, 0.100000, 0.000000, 2.000000, 3.000000, 4.000000, 0.000000, - 9.797880, 2.582297, 113.254204, -0.948996, 0.310171, -0.056568, 0.234881, 0.927035, 0.687330, 0.217864, 0.094806, 0.000000, 2.000000, 4.000000, 7.000000, 0.000000, - 9.286800, 0.876387, 112.474403, -0.948996, 0.310171, -0.056568, 0.222345, 0.932713, 0.800417, 0.151166, 0.048417, 0.000000, 2.000000, 7.000000, 4.000000, 0.000000, - 9.286800, 0.876387, 112.474403, -0.517158, 0.824066, -0.231221, 0.222345, 0.932713, 0.800417, 0.151166, 0.048417, 0.000000, 2.000000, 7.000000, 4.000000, 0.000000, - 6.802590, 0.849908, 117.936302, -0.517158, 0.824066, -0.231221, 0.238289, 0.968887, 0.750000, 0.148288, 0.101405, 0.000308, 2.000000, 4.000000, 3.000000, 7.000000, - 9.464380, 2.221707, 116.871902, -0.517158, 0.824066, -0.231221, 0.247992, 0.948919, 0.654796, 0.245204, 0.100000, 0.000000, 2.000000, 3.000000, 4.000000, 0.000000, - 9.797880, 2.582297, 113.254204, -0.948017, 0.157666, 0.276414, 0.234881, 0.927035, 0.687330, 0.217864, 0.094806, 0.000000, 2.000000, 4.000000, 7.000000, 0.000000, - 9.496980, 5.135097, 110.766090, -0.948017, 0.157666, 0.276414, 0.225078, 0.903640, 0.587867, 0.238650, 0.173483, 0.000000, 2.000000, 7.000000, 4.000000, 0.000000, - 9.286800, 0.876387, 112.474403, -0.948017, 0.157666, 0.276414, 0.222345, 0.932713, 0.800417, 0.151166, 0.048417, 0.000000, 2.000000, 7.000000, 4.000000, 0.000000, - 11.120300, 2.930507, 114.394791, -0.178784, 0.979599, -0.091776, 0.248965, 0.924903, 0.850000, 0.150000, 0.000000, 0.000000, 4.000000, 3.000000, 0.000000, 0.000000, - 9.797880, 2.582297, 113.254204, -0.178784, 0.979599, -0.091776, 0.234881, 0.927035, 0.687330, 0.217864, 0.094806, 0.000000, 2.000000, 4.000000, 7.000000, 0.000000, - 9.651800, 2.804797, 115.913689, -0.178784, 0.979599, -0.091776, 0.247668, 0.940905, 0.500000, 0.275000, 0.225000, 0.000000, 2.000000, 4.000000, 3.000000, 0.000000, - 10.402290, 9.229188, 119.639900, -0.338090, -0.803913, -0.489305, 0.300851, 0.956375, 0.500000, 0.500000, 0.000000, 0.000000, 3.000000, 4.000000, 0.000000, 0.000000, - 8.586790, 9.447898, 120.535004, -0.338090, -0.803913, -0.489305, 0.303238, 0.969380, 0.700000, 0.300000, 0.000000, 0.000000, 3.000000, 4.000000, 0.000000, 0.000000, - 9.262000, 11.558698, 116.600487, -0.338090, -0.803913, -0.489305, 0.324991, 0.947811, 0.900000, 0.100000, 0.000000, 0.000000, 2.000000, 3.000000, 0.000000, 0.000000, - 9.262000, 11.558698, 116.600487, -0.787384, -0.595139, -0.160734, 0.324991, 0.947811, 0.900000, 0.100000, 0.000000, 0.000000, 2.000000, 3.000000, 0.000000, 0.000000, - 9.643900, 11.183098, 116.120392, -0.787384, -0.595140, -0.160734, 0.324217, 0.942406, 0.500000, 0.500000, 0.000000, 0.000000, 3.000000, 4.000000, 0.000000, 0.000000, - 10.402290, 9.229188, 119.639900, -0.787384, -0.595139, -0.160734, 0.300851, 0.956375, 0.500000, 0.500000, 0.000000, 0.000000, 3.000000, 4.000000, 0.000000, 0.000000, - 5.864600, 9.447898, 121.546494, -0.251581, -0.691579, -0.677071, 0.305297, 0.988950, 0.750000, 0.250000, 0.000000, 0.000000, 2.000000, 3.000000, 0.000000, 0.000000, - 5.864600, 11.495708, 119.454803, -0.251581, -0.691579, -0.677071, 0.325537, 0.979315, 0.750000, 0.250000, 0.000000, 0.000000, 2.000000, 3.000000, 0.000000, 0.000000, - 8.586790, 9.447898, 120.535004, -0.251581, -0.691579, -0.677071, 0.303238, 0.969380, 0.700000, 0.300000, 0.000000, 0.000000, 3.000000, 4.000000, 0.000000, 0.000000, - 8.586790, 9.447898, 120.535004, -0.393934, -0.780078, -0.486102, 0.303238, 0.969380, 0.700000, 0.300000, 0.000000, 0.000000, 3.000000, 4.000000, 0.000000, 0.000000, - 5.864600, 11.495708, 119.454803, -0.393934, -0.780078, -0.486102, 0.325537, 0.979315, 0.750000, 0.250000, 0.000000, 0.000000, 2.000000, 3.000000, 0.000000, 0.000000, - 9.262000, 11.558698, 116.600487, -0.393934, -0.780078, -0.486102, 0.324991, 0.947811, 0.900000, 0.100000, 0.000000, 0.000000, 2.000000, 3.000000, 0.000000, 0.000000, - 9.262000, 11.558698, 116.600487, -0.583810, -0.796259, 0.158548, 0.324991, 0.947811, 0.900000, 0.100000, 0.000000, 0.000000, 2.000000, 3.000000, 0.000000, 0.000000, - 9.280890, 11.024998, 113.989700, -0.583810, -0.796259, 0.158548, 0.337124, 0.935157, 0.900000, 0.100000, 0.000000, 0.000000, 2.000000, 24.000000, 0.000000, 0.000000, - 9.643900, 11.183098, 116.120392, -0.583810, -0.796259, 0.158548, 0.324217, 0.942406, 0.500000, 0.500000, 0.000000, 0.000000, 3.000000, 4.000000, 0.000000, 0.000000, - 9.643900, 11.183098, 116.120392, -0.979349, -0.102207, 0.174437, 0.324217, 0.942406, 0.500000, 0.500000, 0.000000, 0.000000, 3.000000, 4.000000, 0.000000, 0.000000, - 9.280890, 11.024998, 113.989700, -0.979349, -0.102207, 0.174437, 0.337124, 0.935157, 0.900000, 0.100000, 0.000000, 0.000000, 2.000000, 24.000000, 0.000000, 0.000000, - 8.976800, 8.902997, 111.039101, -0.979349, -0.102207, 0.174437, 0.350258, 0.914446, 0.805265, 0.194735, 0.000000, 0.000000, 2.000000, 4.000000, 0.000000, 0.000000, - 9.262000, 11.558698, 116.600487, 0.000000, -0.999757, -0.022063, 0.324991, 0.947811, 0.900000, 0.100000, 0.000000, 0.000000, 2.000000, 3.000000, 0.000000, 0.000000, - 5.864600, 11.495708, 119.454803, 0.000000, -0.999757, -0.022063, 0.325537, 0.979315, 0.750000, 0.250000, 0.000000, 0.000000, 2.000000, 3.000000, 0.000000, 0.000000, - 6.440190, 11.558698, 116.600487, 0.000000, -0.999757, -0.022063, 0.338400, 0.962201, 0.955120, 0.044880, 0.000000, 0.000000, 2.000000, 4.000000, 0.000000, 0.000000, - 9.280890, 11.024998, 113.989700, -0.379372, -0.732185, 0.565669, 0.337124, 0.935157, 0.900000, 0.100000, 0.000000, 0.000000, 2.000000, 24.000000, 0.000000, 0.000000, - 6.459090, 11.494397, 112.704803, -0.379372, -0.732185, 0.565669, 0.357655, 0.941884, 0.954680, 0.044372, 0.000948, 0.000000, 2.000000, 7.000000, 4.000000, 0.000000, - 8.976800, 8.902997, 111.039101, -0.379372, -0.732185, 0.565669, 0.350258, 0.914446, 0.805265, 0.194735, 0.000000, 0.000000, 2.000000, 4.000000, 0.000000, 0.000000, - 9.280890, 11.024998, 113.989700, 0.000000, -0.979739, 0.200279, 0.337124, 0.935157, 0.900000, 0.100000, 0.000000, 0.000000, 2.000000, 24.000000, 0.000000, 0.000000, - 9.262000, 11.558698, 116.600487, 0.000000, -0.979739, 0.200279, 0.324991, 0.947811, 0.900000, 0.100000, 0.000000, 0.000000, 2.000000, 3.000000, 0.000000, 0.000000, - 6.440190, 11.558698, 116.600487, 0.000000, -0.979739, 0.200279, 0.338400, 0.962201, 0.955120, 0.044880, 0.000000, 0.000000, 2.000000, 4.000000, 0.000000, 0.000000, - 6.440190, 11.558698, 116.600487, -0.170907, -0.985166, 0.015432, 0.338400, 0.962201, 0.955120, 0.044880, 0.000000, 0.000000, 2.000000, 4.000000, 0.000000, 0.000000, - 6.459090, 11.494397, 112.704803, -0.170907, -0.985166, 0.015432, 0.357655, 0.941884, 0.954680, 0.044372, 0.000948, 0.000000, 2.000000, 7.000000, 4.000000, 0.000000, - 9.280890, 11.024998, 113.989700, -0.170907, -0.985166, 0.015432, 0.337124, 0.935157, 0.900000, 0.100000, 0.000000, 0.000000, 2.000000, 24.000000, 0.000000, 0.000000, - 12.981390, 4.998407, 115.246300, -0.697033, 0.696866, -0.168887, 0.271999, 0.920144, 1.000000, 0.000000, 0.000000, 0.000000, 4.000000, 0.000000, 0.000000, 0.000000, - 11.901690, 3.410307, 113.149590, -0.697033, 0.696866, -0.168887, 0.251630, 0.912060, 1.000000, 0.000000, 0.000000, 0.000000, 4.000000, 0.000000, 0.000000, 0.000000, - 11.120300, 2.930507, 114.394791, -0.697033, 0.696866, -0.168887, 0.248965, 0.924903, 0.850000, 0.150000, 0.000000, 0.000000, 4.000000, 3.000000, 0.000000, 0.000000, - 11.120300, 2.930507, 114.394791, -0.669678, 0.702224, -0.241688, 0.248965, 0.924903, 0.850000, 0.150000, 0.000000, 0.000000, 4.000000, 3.000000, 0.000000, 0.000000, - 12.184190, 4.990208, 117.431389, -0.669678, 0.702224, -0.241688, 0.273013, 0.936275, 0.800000, 0.200000, 0.000000, 0.000000, 4.000000, 3.000000, 0.000000, 0.000000, - 12.981390, 4.998407, 115.246300, -0.669678, 0.702224, -0.241688, 0.271999, 0.920144, 1.000000, 0.000000, 0.000000, 0.000000, 4.000000, 0.000000, 0.000000, 0.000000, - 13.005800, 8.786887, 115.239998, -0.650408, -0.720674, -0.239997, 0.301287, 0.920799, 1.000000, 0.000000, 0.000000, 0.000000, 4.000000, 0.000000, 0.000000, 0.000000, - 12.208590, 8.778698, 117.425087, -0.650408, -0.720674, -0.239997, 0.298942, 0.936694, 0.800000, 0.200000, 0.000000, 0.000000, 4.000000, 3.000000, 0.000000, 0.000000, - 11.116790, 10.775288, 114.388481, -0.650408, -0.720674, -0.239997, 0.322533, 0.925528, 0.800000, 0.200000, 0.000000, 0.000000, 4.000000, 3.000000, 0.000000, 0.000000, - 11.116790, 10.775288, 114.388481, -0.664426, -0.718815, -0.204557, 0.322533, 0.925528, 0.800000, 0.200000, 0.000000, 0.000000, 4.000000, 3.000000, 0.000000, 0.000000, - 11.933200, 10.374998, 113.143303, -0.664426, -0.718815, -0.204557, 0.322365, 0.914100, 1.000000, 0.000000, 0.000000, 0.000000, 4.000000, 0.000000, 0.000000, 0.000000, - 13.005800, 8.786887, 115.239998, -0.664426, -0.718815, -0.204557, 0.301287, 0.920799, 1.000000, 0.000000, 0.000000, 0.000000, 4.000000, 0.000000, 0.000000, 0.000000, - 11.901690, 3.410307, 113.149590, 0.302119, 0.810462, 0.501872, 0.251630, 0.912060, 1.000000, 0.000000, 0.000000, 0.000000, 4.000000, 0.000000, 0.000000, 0.000000, - 9.661190, 5.298397, 111.449303, 0.302119, 0.810462, 0.501872, 0.228335, 0.906520, 0.800000, 0.200000, 0.000000, 0.000000, 4.000000, 3.000000, 0.000000, 0.000000, - 11.120300, 2.930507, 114.394791, 0.302119, 0.810462, 0.501872, 0.248965, 0.924903, 0.850000, 0.150000, 0.000000, 0.000000, 4.000000, 3.000000, 0.000000, 0.000000, - 13.005800, 8.786887, 115.239998, -0.786838, -0.000946, -0.617158, 0.301287, 0.920799, 1.000000, 0.000000, 0.000000, 0.000000, 4.000000, 0.000000, 0.000000, 0.000000, - 17.339390, 8.884907, 109.714790, -0.786838, -0.000946, -0.617158, 0.303068, 0.871592, 1.000000, 0.000000, 0.000000, 0.000000, 4.000000, 0.000000, 0.000000, 0.000000, - 17.309790, 4.993507, 109.758492, -0.786838, -0.000946, -0.617158, 0.276056, 0.871144, 1.000000, 0.000000, 0.000000, 0.000000, 4.000000, 0.000000, 0.000000, 0.000000, - 17.309790, 4.993507, 109.758492, -0.785158, 0.004029, -0.619282, 0.276056, 0.871144, 1.000000, 0.000000, 0.000000, 0.000000, 4.000000, 0.000000, 0.000000, 0.000000, - 12.981390, 4.998407, 115.246300, -0.785159, 0.004029, -0.619282, 0.271999, 0.920144, 1.000000, 0.000000, 0.000000, 0.000000, 4.000000, 0.000000, 0.000000, 0.000000, - 13.005800, 8.786887, 115.239998, -0.785159, 0.004029, -0.619282, 0.301287, 0.920799, 1.000000, 0.000000, 0.000000, 0.000000, 4.000000, 0.000000, 0.000000, 0.000000, - 9.661190, 5.298397, 111.449303, 0.790426, 0.052788, 0.610279, 0.373299, 0.910453, 0.800000, 0.200000, 0.000000, 0.000000, 4.000000, 3.000000, 0.000000, 0.000000, - 13.414790, 6.906407, 106.448593, 0.790426, 0.052788, 0.610279, 0.355548, 0.869814, 1.000000, 0.000000, 0.000000, 0.000000, 4.000000, 0.000000, 0.000000, 0.000000, - 10.315800, 8.921197, 110.288094, 0.790426, 0.052788, 0.610279, 0.346317, 0.904946, 1.000000, 0.000000, 0.000000, 0.000000, 4.000000, 0.000000, 0.000000, 0.000000, - 11.901690, 3.410307, 113.149590, -0.466554, 0.803981, -0.368703, 0.251630, 0.912060, 1.000000, 0.000000, 0.000000, 0.000000, 4.000000, 0.000000, 0.000000, 0.000000, - 12.981390, 4.998407, 115.246300, -0.466554, 0.803981, -0.368703, 0.271999, 0.920144, 1.000000, 0.000000, 0.000000, 0.000000, 4.000000, 0.000000, 0.000000, 0.000000, - 17.309790, 4.993507, 109.758492, -0.466554, 0.803981, -0.368703, 0.276056, 0.871144, 1.000000, 0.000000, 0.000000, 0.000000, 4.000000, 0.000000, 0.000000, 0.000000, - 17.309790, 4.993507, 109.758492, -0.473351, 0.792281, -0.385005, 0.276056, 0.871144, 1.000000, 0.000000, 0.000000, 0.000000, 4.000000, 0.000000, 0.000000, 0.000000, - 15.582500, 3.039597, 107.861290, -0.473351, 0.792281, -0.385005, 0.255131, 0.866487, 0.950000, 0.050000, 0.000000, 0.000000, 4.000000, 23.000000, 0.000000, 0.000000, - 11.901690, 3.410307, 113.149590, -0.473351, 0.792281, -0.385005, 0.251630, 0.912060, 1.000000, 0.000000, 0.000000, 0.000000, 4.000000, 0.000000, 0.000000, 0.000000, - 11.933200, 10.374998, 113.143303, -0.376633, -0.904327, -0.200851, 0.322365, 0.914100, 1.000000, 0.000000, 0.000000, 0.000000, 4.000000, 0.000000, 0.000000, 0.000000, - 14.549890, 10.427307, 108.000999, -0.376633, -0.904327, -0.200851, 0.328348, 0.874183, 1.000000, 0.000000, 0.000000, 0.000000, 4.000000, 0.000000, 0.000000, 0.000000, - 17.339390, 8.884907, 109.714790, -0.376633, -0.904327, -0.200851, 0.303068, 0.871592, 1.000000, 0.000000, 0.000000, 0.000000, 4.000000, 0.000000, 0.000000, 0.000000, - 17.339390, 8.884907, 109.714790, -0.459598, -0.805186, -0.374761, 0.303068, 0.871592, 1.000000, 0.000000, 0.000000, 0.000000, 4.000000, 0.000000, 0.000000, 0.000000, - 13.005800, 8.786887, 115.239998, -0.459598, -0.805186, -0.374761, 0.301287, 0.920799, 1.000000, 0.000000, 0.000000, 0.000000, 4.000000, 0.000000, 0.000000, 0.000000, - 11.933200, 10.374998, 113.143303, -0.459598, -0.805186, -0.374761, 0.322365, 0.914100, 1.000000, 0.000000, 0.000000, 0.000000, 4.000000, 0.000000, 0.000000, 0.000000, - 9.661190, 5.298397, 111.449303, 0.485532, 0.828204, 0.279887, 0.228335, 0.906520, 0.800000, 0.200000, 0.000000, 0.000000, 4.000000, 3.000000, 0.000000, 0.000000, - 11.901690, 3.410307, 113.149590, 0.485532, 0.828204, 0.279887, 0.251630, 0.912060, 1.000000, 0.000000, 0.000000, 0.000000, 4.000000, 0.000000, 0.000000, 0.000000, - 15.582500, 3.039597, 107.861290, 0.485532, 0.828204, 0.279887, 0.255131, 0.866487, 0.950000, 0.050000, 0.000000, 0.000000, 4.000000, 23.000000, 0.000000, 0.000000, - 15.582500, 3.039597, 107.861290, 0.576639, 0.545472, 0.608233, 0.255131, 0.866487, 0.950000, 0.050000, 0.000000, 0.000000, 4.000000, 23.000000, 0.000000, 0.000000, - 13.414790, 6.906407, 106.448593, 0.576639, 0.545472, 0.608233, 0.223781, 0.863793, 1.000000, 0.000000, 0.000000, 0.000000, 4.000000, 0.000000, 0.000000, 0.000000, - 9.661190, 5.298397, 111.449303, 0.576639, 0.545472, 0.608233, 0.228335, 0.906520, 0.800000, 0.200000, 0.000000, 0.000000, 4.000000, 3.000000, 0.000000, 0.000000, - 10.315800, 8.921197, 110.288094, 0.542959, -0.479125, 0.689663, 0.346317, 0.904946, 1.000000, 0.000000, 0.000000, 0.000000, 4.000000, 0.000000, 0.000000, 0.000000, - 13.414790, 6.906407, 106.448593, 0.542959, -0.479125, 0.689663, 0.355548, 0.869814, 1.000000, 0.000000, 0.000000, 0.000000, 4.000000, 0.000000, 0.000000, 0.000000, - 14.549890, 10.427307, 108.000999, 0.542959, -0.479125, 0.689663, 0.328348, 0.874183, 1.000000, 0.000000, 0.000000, 0.000000, 4.000000, 0.000000, 0.000000, 0.000000, - 14.549890, 10.427307, 108.000999, 0.425433, -0.880875, 0.207523, 0.328348, 0.874183, 1.000000, 0.000000, 0.000000, 0.000000, 4.000000, 0.000000, 0.000000, 0.000000, - 11.933200, 10.374998, 113.143303, 0.425433, -0.880875, 0.207523, 0.322365, 0.914100, 1.000000, 0.000000, 0.000000, 0.000000, 4.000000, 0.000000, 0.000000, 0.000000, - 10.315800, 8.921197, 110.288094, 0.425433, -0.880875, 0.207523, 0.346317, 0.904946, 1.000000, 0.000000, 0.000000, 0.000000, 4.000000, 0.000000, 0.000000, 0.000000, - 17.309790, 4.993507, 109.758492, -0.813560, -0.000342, -0.581481, 0.276056, 0.871144, 1.000000, 0.000000, 0.000000, 0.000000, 4.000000, 0.000000, 0.000000, 0.000000, - 17.339390, 8.884907, 109.714790, -0.813560, -0.000342, -0.581481, 0.303068, 0.871592, 1.000000, 0.000000, 0.000000, 0.000000, 4.000000, 0.000000, 0.000000, 0.000000, - 19.830690, 9.029297, 106.229088, -0.813560, -0.000342, -0.581481, 0.304247, 0.841691, 0.850000, 0.150000, 0.000000, 0.000000, 4.000000, 23.000000, 0.000000, 0.000000, - 19.830690, 9.029297, 106.229088, -0.813373, -0.000686, -0.581742, 0.304247, 0.841691, 0.850000, 0.150000, 0.000000, 0.000000, 4.000000, 23.000000, 0.000000, 0.000000, - 20.466190, 5.352307, 105.344887, -0.813373, -0.000686, -0.581742, 0.277886, 0.832922, 0.700000, 0.300000, 0.000000, 0.000000, 4.000000, 23.000000, 0.000000, 0.000000, - 17.309790, 4.993507, 109.758492, -0.813373, -0.000686, -0.581742, 0.276056, 0.871144, 1.000000, 0.000000, 0.000000, 0.000000, 4.000000, 0.000000, 0.000000, 0.000000, - 15.582500, 3.039597, 107.861290, -0.534854, 0.782457, -0.318893, 0.255131, 0.866487, 0.950000, 0.050000, 0.000000, 0.000000, 4.000000, 23.000000, 0.000000, 0.000000, - 17.309790, 4.993507, 109.758492, -0.534854, 0.782457, -0.318893, 0.276056, 0.871144, 1.000000, 0.000000, 0.000000, 0.000000, 4.000000, 0.000000, 0.000000, 0.000000, - 20.466190, 5.352307, 105.344887, -0.534854, 0.782457, -0.318893, 0.277886, 0.832922, 0.700000, 0.300000, 0.000000, 0.000000, 4.000000, 23.000000, 0.000000, 0.000000, - 20.466190, 5.352307, 105.344887, -0.501308, 0.842076, -0.198996, 0.277886, 0.832922, 0.700000, 0.300000, 0.000000, 0.000000, 4.000000, 23.000000, 0.000000, 0.000000, - 18.962601, 3.866987, 102.847389, -0.501307, 0.842076, -0.198996, 0.255674, 0.823565, 0.600000, 0.400000, 0.000000, 0.000000, 23.000000, 4.000000, 0.000000, 0.000000, - 15.582500, 3.039597, 107.861290, -0.501307, 0.842076, -0.198996, 0.255131, 0.866487, 0.950000, 0.050000, 0.000000, 0.000000, 4.000000, 23.000000, 0.000000, 0.000000, - 17.339390, 8.884907, 109.714790, -0.382432, -0.904002, -0.191119, 0.303068, 0.871592, 1.000000, 0.000000, 0.000000, 0.000000, 4.000000, 0.000000, 0.000000, 0.000000, - 14.549890, 10.427307, 108.000999, -0.382432, -0.904002, -0.191119, 0.328348, 0.874183, 1.000000, 0.000000, 0.000000, 0.000000, 4.000000, 0.000000, 0.000000, 0.000000, - 17.068790, 10.156007, 104.243889, -0.382432, -0.904002, -0.191119, 0.330662, 0.842595, 0.850000, 0.150000, 0.000000, 0.000000, 4.000000, 23.000000, 0.000000, 0.000000, - 17.068790, 10.156007, 104.243889, -0.237041, -0.948813, -0.208721, 0.330662, 0.842595, 0.850000, 0.150000, 0.000000, 0.000000, 4.000000, 23.000000, 0.000000, 0.000000, - 19.830690, 9.029297, 106.229088, -0.237041, -0.948813, -0.208721, 0.304247, 0.841691, 0.850000, 0.150000, 0.000000, 0.000000, 4.000000, 23.000000, 0.000000, 0.000000, - 17.339390, 8.884907, 109.714790, -0.237041, -0.948813, -0.208721, 0.303068, 0.871592, 1.000000, 0.000000, 0.000000, 0.000000, 4.000000, 0.000000, 0.000000, 0.000000, - 15.582500, 3.039597, 107.861290, 0.623129, 0.586932, 0.516935, 0.255131, 0.866487, 0.950000, 0.050000, 0.000000, 0.000000, 4.000000, 23.000000, 0.000000, 0.000000, - 18.962601, 3.866987, 102.847389, 0.623129, 0.586932, 0.516935, 0.255674, 0.823565, 0.600000, 0.400000, 0.000000, 0.000000, 23.000000, 4.000000, 0.000000, 0.000000, - 16.271790, 7.067407, 102.457191, 0.623129, 0.586932, 0.516935, 0.226600, 0.830184, 1.000000, 0.000000, 0.000000, 0.000000, 4.000000, 0.000000, 0.000000, 0.000000, - 16.271790, 7.067407, 102.457191, 0.665502, 0.555292, 0.498757, 0.226600, 0.830184, 1.000000, 0.000000, 0.000000, 0.000000, 4.000000, 0.000000, 0.000000, 0.000000, - 13.414790, 6.906407, 106.448593, 0.665502, 0.555292, 0.498757, 0.223781, 0.863793, 1.000000, 0.000000, 0.000000, 0.000000, 4.000000, 0.000000, 0.000000, 0.000000, - 15.582500, 3.039597, 107.861290, 0.665502, 0.555292, 0.498757, 0.255131, 0.866487, 0.950000, 0.050000, 0.000000, 0.000000, 4.000000, 23.000000, 0.000000, 0.000000, - 13.414790, 6.906407, 106.448593, 0.724238, -0.475673, 0.499214, 0.355548, 0.869814, 1.000000, 0.000000, 0.000000, 0.000000, 4.000000, 0.000000, 0.000000, 0.000000, - 16.271790, 7.067407, 102.457191, 0.724238, -0.475673, 0.499214, 0.356818, 0.835594, 1.000000, 0.000000, 0.000000, 0.000000, 4.000000, 0.000000, 0.000000, 0.000000, - 17.068790, 10.156007, 104.243889, 0.724238, -0.475673, 0.499214, 0.330662, 0.842595, 0.850000, 0.150000, 0.000000, 0.000000, 4.000000, 23.000000, 0.000000, 0.000000, - 17.068790, 10.156007, 104.243889, 0.721527, -0.460561, 0.516994, 0.330662, 0.842595, 0.850000, 0.150000, 0.000000, 0.000000, 4.000000, 23.000000, 0.000000, 0.000000, - 14.549890, 10.427307, 108.000999, 0.721527, -0.460561, 0.516994, 0.328348, 0.874183, 1.000000, 0.000000, 0.000000, 0.000000, 4.000000, 0.000000, 0.000000, 0.000000, - 13.414790, 6.906407, 106.448593, 0.721527, -0.460561, 0.516994, 0.355548, 0.869814, 1.000000, 0.000000, 0.000000, 0.000000, 4.000000, 0.000000, 0.000000, 0.000000, - 19.830690, 9.029297, 106.229088, -0.812135, -0.000056, -0.583470, 0.304247, 0.841691, 0.850000, 0.150000, 0.000000, 0.000000, 4.000000, 23.000000, 0.000000, 0.000000, - 20.955000, 9.599007, 104.664101, -0.812135, -0.000056, -0.583470, 0.306969, 0.828510, 0.500000, 0.500000, 0.000000, 0.000000, 4.000000, 23.000000, 0.000000, 0.000000, - 20.466190, 5.352307, 105.344887, -0.812135, -0.000056, -0.583470, 0.277886, 0.832922, 0.700000, 0.300000, 0.000000, 0.000000, 4.000000, 23.000000, 0.000000, 0.000000, - 17.068790, 10.156007, 104.243889, -0.065070, -0.849265, -0.523942, 0.330662, 0.842595, 0.850000, 0.150000, 0.000000, 0.000000, 4.000000, 23.000000, 0.000000, 0.000000, - 18.187771, 10.951007, 102.816292, -0.065070, -0.849265, -0.523942, 0.329345, 0.830198, 0.500000, 0.500000, 0.000000, 0.000000, 4.000000, 23.000000, 0.000000, 0.000000, - 20.955000, 9.599007, 104.664101, -0.065070, -0.849265, -0.523942, 0.306969, 0.828510, 0.500000, 0.500000, 0.000000, 0.000000, 4.000000, 23.000000, 0.000000, 0.000000, - 20.955000, 9.599007, 104.664101, -0.088172, -0.913980, -0.396065, 0.306969, 0.828510, 0.500000, 0.500000, 0.000000, 0.000000, 4.000000, 23.000000, 0.000000, 0.000000, - 19.830690, 9.029297, 106.229088, -0.088172, -0.913980, -0.396065, 0.304247, 0.841691, 0.850000, 0.150000, 0.000000, 0.000000, 4.000000, 23.000000, 0.000000, 0.000000, - 17.068790, 10.156007, 104.243889, -0.088172, -0.913980, -0.396065, 0.330662, 0.842595, 0.850000, 0.150000, 0.000000, 0.000000, 4.000000, 23.000000, 0.000000, 0.000000, - 16.271790, 7.067407, 102.457191, 0.810048, -0.435903, 0.392187, 0.356818, 0.835594, 1.000000, 0.000000, 0.000000, 0.000000, 4.000000, 0.000000, 0.000000, 0.000000, - 18.187771, 10.951007, 102.816292, 0.810048, -0.435903, 0.392187, 0.329345, 0.830198, 0.500000, 0.500000, 0.000000, 0.000000, 4.000000, 23.000000, 0.000000, 0.000000, - 17.068790, 10.156007, 104.243889, 0.810048, -0.435903, 0.392187, 0.330662, 0.842595, 0.850000, 0.150000, 0.000000, 0.000000, 4.000000, 23.000000, 0.000000, 0.000000, - 20.466190, 5.352307, 105.344887, -0.794126, -0.006017, -0.607723, 0.277886, 0.832922, 0.700000, 0.300000, 0.000000, 0.000000, 4.000000, 23.000000, 0.000000, 0.000000, - 20.955000, 9.599007, 104.664101, -0.794127, -0.006017, -0.607723, 0.306969, 0.828510, 0.500000, 0.500000, 0.000000, 0.000000, 4.000000, 23.000000, 0.000000, 0.000000, - 22.111900, 8.867597, 103.159592, -0.794126, -0.006017, -0.607723, 0.304759, 0.815310, 1.000000, 0.000000, 0.000000, 0.000000, 23.000000, 0.000000, 0.000000, 0.000000, - 22.111900, 8.867597, 103.159592, -0.806331, 0.009855, -0.591382, 0.304759, 0.815310, 1.000000, 0.000000, 0.000000, 0.000000, 23.000000, 0.000000, 0.000000, 0.000000, - 21.870100, 5.303997, 103.429893, -0.806331, 0.009855, -0.591382, 0.278463, 0.815989, 1.000000, 0.000000, 0.000000, 0.000000, 23.000000, 0.000000, 0.000000, 0.000000, - 20.466190, 5.352307, 105.344887, -0.806331, 0.009855, -0.591382, 0.277886, 0.832922, 0.700000, 0.300000, 0.000000, 0.000000, 4.000000, 23.000000, 0.000000, 0.000000, - 20.466190, 5.352307, 105.344887, -0.374658, 0.878365, -0.296826, 0.277886, 0.832922, 0.700000, 0.300000, 0.000000, 0.000000, 4.000000, 23.000000, 0.000000, 0.000000, - 21.870100, 5.303997, 103.429893, -0.374658, 0.878365, -0.296826, 0.278463, 0.815989, 1.000000, 0.000000, 0.000000, 0.000000, 23.000000, 0.000000, 0.000000, 0.000000, - 18.962601, 3.866987, 102.847389, -0.374658, 0.878365, -0.296826, 0.255674, 0.823565, 0.600000, 0.400000, 0.000000, 0.000000, 23.000000, 4.000000, 0.000000, 0.000000, - 20.955000, 9.599007, 104.664101, -0.465584, -0.883546, 0.050776, 0.306969, 0.828510, 0.500000, 0.500000, 0.000000, 0.000000, 4.000000, 23.000000, 0.000000, 0.000000, - 18.187771, 10.951007, 102.816292, -0.465584, -0.883546, 0.050776, 0.329345, 0.830198, 0.500000, 0.500000, 0.000000, 0.000000, 4.000000, 23.000000, 0.000000, 0.000000, - 19.615589, 10.102197, 101.138481, -0.465584, -0.883546, 0.050776, 0.330129, 0.815073, 1.000000, 0.000000, 0.000000, 0.000000, 23.000000, 0.000000, 0.000000, 0.000000, - 19.615589, 10.102197, 101.138481, -0.479372, -0.875751, 0.057127, 0.330129, 0.815073, 1.000000, 0.000000, 0.000000, 0.000000, 23.000000, 0.000000, 0.000000, 0.000000, - 22.111900, 8.867597, 103.159592, -0.479372, -0.875751, 0.057127, 0.304759, 0.815310, 1.000000, 0.000000, 0.000000, 0.000000, 23.000000, 0.000000, 0.000000, 0.000000, - 20.955000, 9.599007, 104.664101, -0.479372, -0.875751, 0.057127, 0.306969, 0.828510, 0.500000, 0.500000, 0.000000, 0.000000, 4.000000, 23.000000, 0.000000, 0.000000, - 18.962601, 3.866987, 102.847389, 0.634551, 0.593824, 0.494690, 0.255674, 0.823565, 0.600000, 0.400000, 0.000000, 0.000000, 23.000000, 4.000000, 0.000000, 0.000000, - 18.105000, 7.054406, 100.121292, 0.634551, 0.593824, 0.494690, 0.227819, 0.810558, 1.000000, 0.000000, 0.000000, 0.000000, 23.000000, 0.000000, 0.000000, 0.000000, - 16.271790, 7.067407, 102.457191, 0.634551, 0.593824, 0.494690, 0.226600, 0.830184, 1.000000, 0.000000, 0.000000, 0.000000, 4.000000, 0.000000, 0.000000, 0.000000, - 16.271790, 7.067407, 102.457191, 0.674416, -0.511860, 0.532130, 0.356818, 0.835594, 1.000000, 0.000000, 0.000000, 0.000000, 4.000000, 0.000000, 0.000000, 0.000000, - 18.105000, 7.054406, 100.121292, 0.674416, -0.511860, 0.532130, 0.355427, 0.813016, 1.000000, 0.000000, 0.000000, 0.000000, 23.000000, 0.000000, 0.000000, 0.000000, - 19.615589, 10.102197, 101.138481, 0.674416, -0.511860, 0.532130, 0.330129, 0.815073, 1.000000, 0.000000, 0.000000, 0.000000, 23.000000, 0.000000, 0.000000, 0.000000, - 19.615589, 10.102197, 101.138481, 0.609344, -0.365675, 0.703549, 0.330129, 0.815073, 1.000000, 0.000000, 0.000000, 0.000000, 23.000000, 0.000000, 0.000000, 0.000000, - 18.187771, 10.951007, 102.816292, 0.609344, -0.365675, 0.703549, 0.329345, 0.830198, 0.500000, 0.500000, 0.000000, 0.000000, 4.000000, 23.000000, 0.000000, 0.000000, - 16.271790, 7.067407, 102.457191, 0.609344, -0.365675, 0.703549, 0.356818, 0.835594, 1.000000, 0.000000, 0.000000, 0.000000, 4.000000, 0.000000, 0.000000, 0.000000, - 21.870100, 5.303997, 103.429893, -0.697540, -0.007018, -0.716512, 0.278463, 0.815989, 1.000000, 0.000000, 0.000000, 0.000000, 23.000000, 0.000000, 0.000000, 0.000000, - 22.111900, 8.867597, 103.159592, -0.697540, -0.007018, -0.716512, 0.304759, 0.815310, 1.000000, 0.000000, 0.000000, 0.000000, 23.000000, 0.000000, 0.000000, 0.000000, - 24.980391, 8.382597, 100.371803, -0.697540, -0.007018, -0.716512, 0.303377, 0.788432, 1.000000, 0.000000, 0.000000, 0.000000, 23.000000, 0.000000, 0.000000, 0.000000, - 24.980391, 8.382597, 100.371803, -0.698617, -0.004905, -0.715479, 0.303377, 0.788432, 1.000000, 0.000000, 0.000000, 0.000000, 23.000000, 0.000000, 0.000000, 0.000000, - 24.720690, 4.631006, 100.651100, -0.698617, -0.004905, -0.715479, 0.279210, 0.788514, 1.000000, 0.000000, 0.000000, 0.000000, 23.000000, 0.000000, 0.000000, 0.000000, - 21.870100, 5.303997, 103.429893, -0.698617, -0.004905, -0.715479, 0.278463, 0.815989, 1.000000, 0.000000, 0.000000, 0.000000, 23.000000, 0.000000, 0.000000, 0.000000, - 21.870100, 5.303997, 103.429893, -0.177490, 0.899228, -0.399858, 0.278463, 0.815989, 1.000000, 0.000000, 0.000000, 0.000000, 23.000000, 0.000000, 0.000000, 0.000000, - 24.720690, 4.631006, 100.651100, -0.177490, 0.899228, -0.399858, 0.279210, 0.788514, 1.000000, 0.000000, 0.000000, 0.000000, 23.000000, 0.000000, 0.000000, 0.000000, - 22.132700, 3.300796, 98.808403, -0.177490, 0.899228, -0.399858, 0.257357, 0.786876, 1.000000, 0.000000, 0.000000, 0.000000, 23.000000, 0.000000, 0.000000, 0.000000, - 22.132700, 3.300796, 98.808403, -0.344085, 0.854199, -0.389807, 0.257357, 0.786876, 1.000000, 0.000000, 0.000000, 0.000000, 23.000000, 0.000000, 0.000000, 0.000000, - 18.962601, 3.866987, 102.847389, -0.344085, 0.854199, -0.389807, 0.255674, 0.823565, 0.600000, 0.400000, 0.000000, 0.000000, 23.000000, 4.000000, 0.000000, 0.000000, - 21.870100, 5.303997, 103.429893, -0.344085, 0.854199, -0.389807, 0.278463, 0.815989, 1.000000, 0.000000, 0.000000, 0.000000, 23.000000, 0.000000, 0.000000, 0.000000, - 22.111900, 8.867597, 103.159592, -0.328310, -0.930426, -0.162851, 0.304759, 0.815310, 1.000000, 0.000000, 0.000000, 0.000000, 23.000000, 0.000000, 0.000000, 0.000000, - 19.615589, 10.102197, 101.138481, -0.328310, -0.930426, -0.162851, 0.330129, 0.815073, 1.000000, 0.000000, 0.000000, 0.000000, 23.000000, 0.000000, 0.000000, 0.000000, - 22.090200, 9.719697, 98.334991, -0.328310, -0.930426, -0.162851, 0.328437, 0.788802, 1.000000, 0.000000, 0.000000, 0.000000, 23.000000, 0.000000, 0.000000, 0.000000, - 22.090200, 9.719697, 98.334991, -0.316932, -0.934236, -0.163575, 0.328437, 0.788802, 1.000000, 0.000000, 0.000000, 0.000000, 23.000000, 0.000000, 0.000000, 0.000000, - 24.980391, 8.382597, 100.371803, -0.316932, -0.934236, -0.163575, 0.303377, 0.788432, 1.000000, 0.000000, 0.000000, 0.000000, 23.000000, 0.000000, 0.000000, 0.000000, - 22.111900, 8.867597, 103.159592, -0.316932, -0.934236, -0.163575, 0.304759, 0.815310, 1.000000, 0.000000, 0.000000, 0.000000, 23.000000, 0.000000, 0.000000, 0.000000, - 18.105000, 7.054406, 100.121292, 0.681970, 0.572627, 0.454989, 0.227819, 0.810558, 1.000000, 0.000000, 0.000000, 0.000000, 23.000000, 0.000000, 0.000000, 0.000000, - 18.962601, 3.866987, 102.847389, 0.681970, 0.572627, 0.454989, 0.255674, 0.823565, 0.600000, 0.400000, 0.000000, 0.000000, 23.000000, 4.000000, 0.000000, 0.000000, - 22.132700, 3.300796, 98.808403, 0.681970, 0.572627, 0.454989, 0.257357, 0.786876, 1.000000, 0.000000, 0.000000, 0.000000, 23.000000, 0.000000, 0.000000, 0.000000, - 22.132700, 3.300796, 98.808403, 0.702501, 0.676510, 0.220967, 0.257357, 0.786876, 1.000000, 0.000000, 0.000000, 0.000000, 23.000000, 0.000000, 0.000000, 0.000000, - 19.744200, 6.375296, 96.989090, 0.702501, 0.676511, 0.220967, 0.228344, 0.785025, 1.000000, 0.000000, 0.000000, 0.000000, 23.000000, 0.000000, 0.000000, 0.000000, - 18.105000, 7.054406, 100.121292, 0.702501, 0.676510, 0.220967, 0.227819, 0.810558, 1.000000, 0.000000, 0.000000, 0.000000, 23.000000, 0.000000, 0.000000, 0.000000, - 18.105000, 7.054406, 100.121292, 0.626699, -0.626242, 0.463755, 0.355427, 0.813016, 1.000000, 0.000000, 0.000000, 0.000000, 23.000000, 0.000000, 0.000000, 0.000000, - 19.744200, 6.375296, 96.989090, 0.626699, -0.626242, 0.463755, 0.358129, 0.786615, 1.000000, 0.000000, 0.000000, 0.000000, 23.000000, 0.000000, 0.000000, 0.000000, - 22.090200, 9.719697, 98.334991, 0.626699, -0.626242, 0.463755, 0.328437, 0.788802, 1.000000, 0.000000, 0.000000, 0.000000, 23.000000, 0.000000, 0.000000, 0.000000, - 22.090200, 9.719697, 98.334991, 0.611214, -0.506042, 0.608555, 0.328437, 0.788802, 1.000000, 0.000000, 0.000000, 0.000000, 23.000000, 0.000000, 0.000000, 0.000000, - 19.615589, 10.102197, 101.138481, 0.611214, -0.506042, 0.608555, 0.330129, 0.815073, 1.000000, 0.000000, 0.000000, 0.000000, 23.000000, 0.000000, 0.000000, 0.000000, - 18.105000, 7.054406, 100.121292, 0.611214, -0.506042, 0.608555, 0.355427, 0.813016, 1.000000, 0.000000, 0.000000, 0.000000, 23.000000, 0.000000, 0.000000, 0.000000, - 24.980391, 8.382597, 100.371803, -0.886173, -0.040465, -0.461583, 0.303377, 0.788432, 1.000000, 0.000000, 0.000000, 0.000000, 23.000000, 0.000000, 0.000000, 0.000000, - 31.518980, 6.739496, 87.962700, -0.886173, -0.040465, -0.461583, 0.303395, 0.690573, 0.554467, 0.445533, 0.000000, 0.000000, 16.000000, 23.000000, 0.000000, 0.000000, - 31.421490, 3.992306, 88.390701, -0.886173, -0.040465, -0.461583, 0.282801, 0.691570, 0.710705, 0.289295, 0.000000, 0.000000, 16.000000, 23.000000, 0.000000, 0.000000, - 31.421490, 3.992306, 88.390701, -0.876675, 0.024920, -0.480436, 0.282801, 0.691570, 0.710705, 0.289295, 0.000000, 0.000000, 16.000000, 23.000000, 0.000000, 0.000000, - 24.720690, 4.631006, 100.651100, -0.876675, 0.024920, -0.480436, 0.279210, 0.788514, 1.000000, 0.000000, 0.000000, 0.000000, 23.000000, 0.000000, 0.000000, 0.000000, - 24.980391, 8.382597, 100.371803, -0.876675, 0.024920, -0.480437, 0.303377, 0.788432, 1.000000, 0.000000, 0.000000, 0.000000, 23.000000, 0.000000, 0.000000, 0.000000, - 22.132700, 3.300796, 98.808403, -0.316666, 0.922403, -0.221123, 0.257357, 0.786876, 1.000000, 0.000000, 0.000000, 0.000000, 23.000000, 0.000000, 0.000000, 0.000000, - 24.720690, 4.631006, 100.651100, -0.316666, 0.922403, -0.221123, 0.279210, 0.788514, 1.000000, 0.000000, 0.000000, 0.000000, 23.000000, 0.000000, 0.000000, 0.000000, - 31.421490, 3.992306, 88.390701, -0.316666, 0.922403, -0.221123, 0.282801, 0.691570, 0.710705, 0.289295, 0.000000, 0.000000, 16.000000, 23.000000, 0.000000, 0.000000, - 31.421490, 3.992306, 88.390701, -0.333621, 0.912455, -0.236901, 0.282801, 0.691570, 0.710705, 0.289295, 0.000000, 0.000000, 16.000000, 23.000000, 0.000000, 0.000000, - 29.713301, 2.984705, 86.915390, -0.333621, 0.912455, -0.236901, 0.265064, 0.688490, 0.734959, 0.265041, 0.000000, 0.000000, 16.000000, 23.000000, 0.000000, 0.000000, - 22.132700, 3.300796, 98.808403, -0.333621, 0.912455, -0.236901, 0.257357, 0.786876, 1.000000, 0.000000, 0.000000, 0.000000, 23.000000, 0.000000, 0.000000, 0.000000, - 22.090200, 9.719697, 98.334991, -0.598809, -0.727293, -0.335370, 0.328437, 0.788802, 1.000000, 0.000000, 0.000000, 0.000000, 23.000000, 0.000000, 0.000000, 0.000000, - 30.389290, 8.197596, 86.817703, -0.598809, -0.727293, -0.335370, 0.318820, 0.689290, 0.500000, 0.500000, 0.000000, 0.000000, 16.000000, 23.000000, 0.000000, 0.000000, - 31.518980, 6.739496, 87.962700, -0.598809, -0.727293, -0.335370, 0.303395, 0.690573, 0.554467, 0.445533, 0.000000, 0.000000, 16.000000, 23.000000, 0.000000, 0.000000, - 31.518980, 6.739496, 87.962700, -0.374646, -0.924126, -0.075044, 0.303395, 0.690573, 0.554467, 0.445533, 0.000000, 0.000000, 16.000000, 23.000000, 0.000000, 0.000000, - 24.980391, 8.382597, 100.371803, -0.374646, -0.924126, -0.075044, 0.303377, 0.788432, 1.000000, 0.000000, 0.000000, 0.000000, 23.000000, 0.000000, 0.000000, 0.000000, - 22.090200, 9.719697, 98.334991, -0.374646, -0.924126, -0.075044, 0.328437, 0.788802, 1.000000, 0.000000, 0.000000, 0.000000, 23.000000, 0.000000, 0.000000, 0.000000, - 19.744200, 6.375296, 96.989090, 0.613185, 0.696690, 0.372327, 0.228344, 0.785025, 1.000000, 0.000000, 0.000000, 0.000000, 23.000000, 0.000000, 0.000000, 0.000000, - 22.132700, 3.300796, 98.808403, 0.613185, 0.696690, 0.372327, 0.257357, 0.786876, 1.000000, 0.000000, 0.000000, 0.000000, 23.000000, 0.000000, 0.000000, 0.000000, - 29.713301, 2.984705, 86.915390, 0.613185, 0.696690, 0.372327, 0.265064, 0.688490, 0.734959, 0.265041, 0.000000, 0.000000, 16.000000, 23.000000, 0.000000, 0.000000, - 29.713301, 2.984705, 86.915390, 0.668417, 0.579314, 0.466491, 0.265064, 0.688490, 0.734959, 0.265041, 0.000000, 0.000000, 16.000000, 23.000000, 0.000000, 0.000000, - 28.429190, 5.466195, 85.673691, 0.668417, 0.579314, 0.466491, 0.243776, 0.685443, 0.529334, 0.470666, 0.000000, 0.000000, 16.000000, 23.000000, 0.000000, 0.000000, - 19.744200, 6.375296, 96.989090, 0.668417, 0.579314, 0.466491, 0.228344, 0.785025, 1.000000, 0.000000, 0.000000, 0.000000, 23.000000, 0.000000, 0.000000, 0.000000, - 22.090200, 9.719697, 98.334991, 0.596010, -0.622302, 0.507457, 0.328437, 0.788802, 1.000000, 0.000000, 0.000000, 0.000000, 23.000000, 0.000000, 0.000000, 0.000000, - 19.744200, 6.375296, 96.989090, 0.596010, -0.622302, 0.507457, 0.358129, 0.786615, 1.000000, 0.000000, 0.000000, 0.000000, 23.000000, 0.000000, 0.000000, 0.000000, - 28.429190, 5.466195, 85.673691, 0.596010, -0.622302, 0.507457, 0.343755, 0.687014, 0.529334, 0.470666, 0.000000, 0.000000, 16.000000, 23.000000, 0.000000, 0.000000, - 28.429190, 5.466195, 85.673691, 0.586242, -0.632647, 0.506042, 0.343755, 0.687014, 0.529334, 0.470666, 0.000000, 0.000000, 16.000000, 23.000000, 0.000000, 0.000000, - 30.389290, 8.197596, 86.817703, 0.586242, -0.632647, 0.506042, 0.318820, 0.689290, 0.500000, 0.500000, 0.000000, 0.000000, 16.000000, 23.000000, 0.000000, 0.000000, - 22.090200, 9.719697, 98.334991, 0.586242, -0.632647, 0.506042, 0.328437, 0.788802, 1.000000, 0.000000, 0.000000, 0.000000, 23.000000, 0.000000, 0.000000, 0.000000, - 3.282490, -0.059682, 122.675499, -0.839165, 0.385465, -0.383692, 0.553429, 0.936429, 1.000000, 0.000000, 0.000000, 0.000000, 2.000000, 0.000000, 0.000000, 0.000000, - 4.711200, 4.941008, 124.574600, -0.839165, 0.385465, -0.383692, 0.585328, 0.907752, 1.000000, 0.000000, 0.000000, 0.000000, 2.000000, 0.000000, 0.000000, 0.000000, - 5.862690, 4.941008, 122.056198, -0.839165, 0.385465, -0.383692, 0.568673, 0.897398, 0.500000, 0.500000, 0.000000, 0.000000, 2.000000, 3.000000, 0.000000, 0.000000, - 5.862690, 4.941008, 122.056198, -0.783247, 0.339641, -0.520738, 0.568673, 0.897398, 0.500000, 0.500000, 0.000000, 0.000000, 2.000000, 3.000000, 0.000000, 0.000000, - 4.827590, -0.059682, 120.351501, -0.783247, 0.339641, -0.520738, 0.537803, 0.923970, 0.900000, 0.100000, 0.000000, 0.000000, 2.000000, 3.000000, 0.000000, 0.000000, - 3.282490, -0.059682, 122.675499, -0.783247, 0.339641, -0.520738, 0.553429, 0.936429, 1.000000, 0.000000, 0.000000, 0.000000, 2.000000, 0.000000, 0.000000, 0.000000, - 3.282490, -0.059682, 122.675499, -0.264705, 0.948135, -0.175988, 0.553429, 0.936429, 1.000000, 0.000000, 0.000000, 0.000000, 2.000000, 0.000000, 0.000000, 0.000000, - 4.827590, -0.059682, 120.351501, -0.264705, 0.948135, -0.175988, 0.537803, 0.923970, 0.900000, 0.100000, 0.000000, 0.000000, 2.000000, 3.000000, 0.000000, 0.000000, - 0.000000, -1.601182, 119.307892, -0.264705, 0.948135, -0.175988, 0.522817, 0.958509, 1.000000, 0.000000, 0.000000, 0.000000, 2.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -1.601182, 119.307892, 0.125528, 0.850081, -0.511474, 0.522817, 0.958509, 1.000000, 0.000000, 0.000000, 0.000000, 2.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -0.194582, 121.645691, 0.125528, 0.850081, -0.511474, 0.542809, 0.959428, 1.000000, 0.000000, 0.000000, 0.000000, 2.000000, 0.000000, 0.000000, 0.000000, - 3.282490, -0.059682, 122.675499, 0.125528, 0.850081, -0.511474, 0.553429, 0.936429, 1.000000, 0.000000, 0.000000, 0.000000, 2.000000, 0.000000, 0.000000, 0.000000, - 8.976800, 8.902997, 111.039101, -0.952421, -0.150683, 0.264931, 0.350258, 0.914446, 0.805265, 0.194735, 0.000000, 0.000000, 2.000000, 4.000000, 0.000000, 0.000000, - 9.496980, 5.135097, 110.766090, -0.952421, -0.150683, 0.264931, 0.375082, 0.914309, 0.587867, 0.238650, 0.173483, 0.000000, 2.000000, 7.000000, 4.000000, 0.000000, - 9.661190, 5.298397, 111.449303, -0.952421, -0.150683, 0.264931, 0.373299, 0.910453, 0.800000, 0.200000, 0.000000, 0.000000, 4.000000, 3.000000, 0.000000, 0.000000, - 9.661190, 5.298397, 111.449303, -0.133443, 0.087010, 0.987229, 0.373299, 0.910453, 0.800000, 0.200000, 0.000000, 0.000000, 4.000000, 3.000000, 0.000000, 0.000000, - 9.651800, 8.949997, 111.126198, -0.133443, 0.087010, 0.987229, 0.347407, 0.911837, 0.800000, 0.200000, 0.000000, 0.000000, 4.000000, 3.000000, 0.000000, 0.000000, - 8.976800, 8.902997, 111.039101, -0.133443, 0.087010, 0.987229, 0.350258, 0.914446, 0.805265, 0.194735, 0.000000, 0.000000, 2.000000, 4.000000, 0.000000, 0.000000, - 8.976800, 8.902997, 111.039101, -0.002376, -0.872230, 0.489091, 0.350258, 0.914446, 0.805265, 0.194735, 0.000000, 0.000000, 2.000000, 4.000000, 0.000000, 0.000000, - 9.651800, 8.949997, 111.126198, -0.002376, -0.872230, 0.489091, 0.347407, 0.911837, 0.800000, 0.200000, 0.000000, 0.000000, 4.000000, 3.000000, 0.000000, 0.000000, - 11.116790, 10.775288, 114.388481, -0.002376, -0.872230, 0.489091, 0.322533, 0.925528, 0.800000, 0.200000, 0.000000, 0.000000, 4.000000, 3.000000, 0.000000, 0.000000, - 11.116790, 10.775288, 114.388481, 0.196364, -0.903965, 0.379852, 0.322533, 0.925528, 0.800000, 0.200000, 0.000000, 0.000000, 4.000000, 3.000000, 0.000000, 0.000000, - 9.643900, 11.183098, 116.120392, 0.196364, -0.903965, 0.379852, 0.324217, 0.942406, 0.500000, 0.500000, 0.000000, 0.000000, 3.000000, 4.000000, 0.000000, 0.000000, - 8.976800, 8.902997, 111.039101, 0.196364, -0.903966, 0.379852, 0.350258, 0.914446, 0.805265, 0.194735, 0.000000, 0.000000, 2.000000, 4.000000, 0.000000, 0.000000, - -4.320400, -1.684693, 118.066200, 0.142858, 0.821311, -0.552304, 0.515904, 0.927786, 1.000000, 0.000000, 0.000000, 0.000000, 2.000000, 0.000000, 0.000000, 0.000000, - -4.827590, -0.059682, 120.351501, 0.142858, 0.821311, -0.552305, 0.537803, 0.923970, 0.900000, 0.100000, 0.000000, 0.000000, 2.000000, 24.000000, 0.000000, 0.000000, - 0.000000, -1.601182, 119.307892, 0.142858, 0.821311, -0.552304, 0.522817, 0.958509, 1.000000, 0.000000, 0.000000, 0.000000, 2.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -1.601182, 119.307892, 0.111754, 0.886778, -0.448482, 0.522817, 0.958509, 1.000000, 0.000000, 0.000000, 0.000000, 2.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -2.371373, 117.785004, 0.111754, 0.886778, -0.448482, 0.507603, 0.959173, 1.000000, 0.000000, 0.000000, 0.000000, 2.000000, 0.000000, 0.000000, 0.000000, - -4.320400, -1.684693, 118.066200, 0.111754, 0.886778, -0.448482, 0.515904, 0.927786, 1.000000, 0.000000, 0.000000, 0.000000, 2.000000, 0.000000, 0.000000, 0.000000, - -4.083890, 11.265808, 122.301804, 0.183466, -0.972249, -0.145164, 0.603247, 0.854439, 0.420000, 0.300000, 0.280000, 0.000000, 2.000000, 1.000000, 24.000000, 0.000000, - 0.000000, 12.019308, 122.416603, 0.183466, -0.972249, -0.145164, 0.628430, 0.837538, 0.750000, 0.250000, 0.000000, 0.000000, 2.000000, 1.000000, 0.000000, 0.000000, - 0.000000, 11.622508, 125.074203, 0.183466, -0.972249, -0.145164, 0.638112, 0.855450, 0.500000, 0.500000, 0.000000, 0.000000, 1.000000, 2.000000, 0.000000, 0.000000, - 0.000000, 11.622508, 125.074203, 0.366811, -0.822595, -0.434496, 0.638112, 0.855450, 0.500000, 0.500000, 0.000000, 0.000000, 1.000000, 2.000000, 0.000000, 0.000000, - -4.209000, 9.810187, 124.951988, 0.366811, -0.822595, -0.434496, 0.610250, 0.876330, 0.600000, 0.400000, 0.000000, 0.000000, 2.000000, 1.000000, 0.000000, 0.000000, - -4.083890, 11.265808, 122.301804, 0.366811, -0.822595, -0.434496, 0.603247, 0.854439, 0.420000, 0.300000, 0.280000, 0.000000, 2.000000, 1.000000, 24.000000, 0.000000, - 0.000000, 12.641908, 119.816887, 0.182843, -0.956106, -0.228975, 0.617582, 0.816079, 1.000000, 0.000000, 0.000000, 0.000000, 2.000000, 0.000000, 0.000000, 0.000000, - 0.000000, 12.019308, 122.416603, 0.182843, -0.956106, -0.228975, 0.628430, 0.837538, 0.750000, 0.250000, 0.000000, 0.000000, 2.000000, 1.000000, 0.000000, 0.000000, - -4.083890, 11.265808, 122.301804, 0.182843, -0.956106, -0.228975, 0.603247, 0.854439, 0.420000, 0.300000, 0.280000, 0.000000, 2.000000, 1.000000, 24.000000, 0.000000, - -4.083890, 11.265808, 122.301804, 0.127716, -0.941609, -0.311547, 0.603247, 0.854439, 0.420000, 0.300000, 0.280000, 0.000000, 2.000000, 1.000000, 24.000000, 0.000000, - -5.835390, 11.888397, 119.702103, 0.127716, -0.941609, -0.311547, 0.585348, 0.841733, 0.750000, 0.250000, 0.000000, 0.000000, 2.000000, 24.000000, 0.000000, 0.000000, - 0.000000, 12.641908, 119.816887, 0.127716, -0.941609, -0.311547, 0.617582, 0.816079, 1.000000, 0.000000, 0.000000, 0.000000, 2.000000, 0.000000, 0.000000, 0.000000, - 0.000000, 13.258608, 114.842194, 0.129468, -0.984051, -0.121990, 0.588983, 0.782237, 1.000000, 0.000000, 0.000000, 0.000000, 2.000000, 0.000000, 0.000000, 0.000000, - 0.000000, 12.641908, 119.816887, 0.129468, -0.984051, -0.121990, 0.617582, 0.816079, 1.000000, 0.000000, 0.000000, 0.000000, 2.000000, 0.000000, 0.000000, 0.000000, - -5.835390, 11.888397, 119.702103, 0.129468, -0.984051, -0.121990, 0.585348, 0.841733, 0.750000, 0.250000, 0.000000, 0.000000, 2.000000, 24.000000, 0.000000, 0.000000, - -5.835390, 11.888397, 119.702103, 0.076752, -0.979903, -0.184118, 0.585348, 0.841733, 0.750000, 0.250000, 0.000000, 0.000000, 2.000000, 24.000000, 0.000000, 0.000000, - -6.250490, 12.758098, 114.900391, 0.076752, -0.979903, -0.184118, 0.561993, 0.814947, 1.000000, 0.000000, 0.000000, 0.000000, 2.000000, 0.000000, 0.000000, 0.000000, - 0.000000, 13.258608, 114.842194, 0.076752, -0.979903, -0.184118, 0.588983, 0.782237, 1.000000, 0.000000, 0.000000, 0.000000, 2.000000, 0.000000, 0.000000, 0.000000, - -5.758200, 11.574596, 109.633904, 0.151599, -0.977243, 0.148369, 0.530109, 0.793115, 0.636430, 0.363570, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 0.000000, 12.485307, 109.748802, 0.151599, -0.977243, 0.148369, 0.549577, 0.758362, 0.680999, 0.319001, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 0.000000, 13.258608, 114.842194, 0.151599, -0.977243, 0.148369, 0.588983, 0.782237, 1.000000, 0.000000, 0.000000, 0.000000, 2.000000, 0.000000, 0.000000, 0.000000, - 0.000000, 13.258608, 114.842194, 0.079849, -0.970930, 0.225654, 0.588983, 0.782237, 1.000000, 0.000000, 0.000000, 0.000000, 2.000000, 0.000000, 0.000000, 0.000000, - -6.250490, 12.758098, 114.900391, 0.079849, -0.970930, 0.225654, 0.561993, 0.814947, 1.000000, 0.000000, 0.000000, 0.000000, 2.000000, 0.000000, 0.000000, 0.000000, - -5.758200, 11.574596, 109.633904, 0.079849, -0.970930, 0.225654, 0.530109, 0.793115, 0.636430, 0.363570, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 0.000000, 8.728387, 103.137589, 0.126621, -0.862428, 0.490087, 0.493073, 0.745281, 0.892595, 0.102999, 0.004406, 0.000000, 7.000000, 5.000000, 2.000000, 0.000000, - 0.000000, 12.485307, 109.748802, 0.126621, -0.862428, 0.490087, 0.549577, 0.758362, 0.680999, 0.319001, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -5.758200, 11.574596, 109.633904, 0.126621, -0.862428, 0.490087, 0.530109, 0.793115, 0.636430, 0.363570, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -5.758200, 11.574596, 109.633904, 0.211780, -0.812208, 0.543568, 0.530109, 0.793115, 0.636430, 0.363570, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -5.143890, 7.376297, 103.121391, 0.211780, -0.812209, 0.543568, 0.474527, 0.780112, 0.887725, 0.106157, 0.006117, 0.000000, 7.000000, 5.000000, 2.000000, 0.000000, - 0.000000, 8.728387, 103.137589, 0.211780, -0.812209, 0.543568, 0.493073, 0.745281, 0.892595, 0.102999, 0.004406, 0.000000, 7.000000, 5.000000, 2.000000, 0.000000, - -4.468900, 6.623106, 96.927589, 0.177100, -0.963803, 0.199297, 0.434958, 0.754053, 0.753825, 0.235477, 0.010698, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - 0.000000, 7.376596, 96.600304, 0.177100, -0.963803, 0.199297, 0.453369, 0.726033, 0.777850, 0.207714, 0.014436, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - 0.000000, 8.728387, 103.137589, 0.177100, -0.963803, 0.199297, 0.493073, 0.745281, 0.892595, 0.102999, 0.004406, 0.000000, 7.000000, 5.000000, 2.000000, 0.000000, - 0.000000, 8.728387, 103.137589, 0.251154, -0.957210, 0.143771, 0.493073, 0.745281, 0.892595, 0.102999, 0.004406, 0.000000, 7.000000, 5.000000, 2.000000, 0.000000, - -5.143890, 7.376297, 103.121391, 0.251154, -0.957210, 0.143771, 0.474527, 0.780112, 0.887725, 0.106157, 0.006117, 0.000000, 7.000000, 5.000000, 2.000000, 0.000000, - -4.468900, 6.623106, 96.927589, 0.251154, -0.957210, 0.143771, 0.434958, 0.754053, 0.753825, 0.235477, 0.010698, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - -6.703990, -7.566583, 110.361000, 0.284309, 0.863655, -0.416255, 0.450874, 0.906352, 0.500000, 0.500000, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -6.036690, -6.285593, 113.474602, 0.284309, 0.863655, -0.416255, 0.471135, 0.916411, 0.673820, 0.326180, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -4.575700, -7.072593, 112.839600, 0.284309, 0.863655, -0.416255, 0.462931, 0.924462, 0.571016, 0.428984, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -6.703990, -7.566583, 110.361000, 0.142646, 0.940029, -0.309835, 0.450874, 0.906352, 0.500000, 0.500000, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -4.575700, -7.072593, 112.839600, 0.142646, 0.940029, -0.309835, 0.462931, 0.924462, 0.571016, 0.428984, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -3.949990, -7.501793, 111.825493, 0.142646, 0.940029, -0.309835, 0.454821, 0.926076, 0.500200, 0.499800, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -6.703990, -7.566583, 110.361000, 0.078030, 0.978672, -0.190033, 0.450874, 0.906352, 0.500000, 0.500000, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -3.949990, -7.501793, 111.825493, 0.078030, 0.978672, -0.190033, 0.454821, 0.926076, 0.500200, 0.499800, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -3.978000, -7.868683, 109.924500, 0.078030, 0.978672, -0.190033, 0.442258, 0.920795, 0.500000, 0.500000, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -6.703990, -7.566583, 110.361000, 0.094066, 0.990709, -0.098216, 0.450874, 0.906352, 0.500000, 0.500000, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -3.978000, -7.868683, 109.924500, 0.094066, 0.990709, -0.098216, 0.442258, 0.920795, 0.500000, 0.500000, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -4.908800, -7.941494, 108.298592, 0.094066, 0.990709, -0.098216, 0.434736, 0.909818, 0.750000, 0.250000, 0.000000, 0.000000, 7.000000, 2.000000, 0.000000, 0.000000, - -6.703990, -7.566583, 110.361000, 0.279368, 0.957696, 0.069078, 0.450874, 0.906352, 0.500000, 0.500000, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -4.908800, -7.941494, 108.298592, 0.279368, 0.957696, 0.069078, 0.434736, 0.909818, 0.750000, 0.250000, 0.000000, 0.000000, 7.000000, 2.000000, 0.000000, 0.000000, - -6.387100, -7.461993, 107.629402, 0.279368, 0.957696, 0.069078, 0.435187, 0.898472, 0.750000, 0.250000, 0.000000, 0.000000, 7.000000, 2.000000, 0.000000, 0.000000, - -6.703990, -7.566583, 110.361000, 0.487995, 0.868209, 0.089854, 0.450874, 0.906352, 0.500000, 0.500000, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -6.387100, -7.461993, 107.629402, 0.487995, 0.868209, 0.089854, 0.435187, 0.898472, 0.750000, 0.250000, 0.000000, 0.000000, 7.000000, 2.000000, 0.000000, 0.000000, - -7.848080, -6.674994, 107.959602, 0.487995, 0.868209, 0.089854, 0.441843, 0.890631, 0.750000, 0.250000, 0.000000, 0.000000, 7.000000, 2.000000, 0.000000, 0.000000, - -6.703990, -7.566583, 110.361000, 0.643097, 0.765463, -0.022188, 0.450874, 0.906352, 0.500000, 0.500000, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -7.848080, -6.674994, 107.959602, 0.643097, 0.765463, -0.022188, 0.441843, 0.890631, 0.750000, 0.250000, 0.000000, 0.000000, 7.000000, 2.000000, 0.000000, 0.000000, - -8.733790, -5.881083, 109.677292, 0.643097, 0.765463, -0.022188, 0.455040, 0.890268, 0.500000, 0.500000, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -6.703990, -7.566583, 110.361000, 0.666862, 0.704072, -0.244087, 0.450874, 0.906352, 0.500000, 0.500000, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -8.733790, -5.881083, 109.677292, 0.666862, 0.704071, -0.244087, 0.455040, 0.890268, 0.500000, 0.500000, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -8.705900, -5.452583, 110.989502, 0.666862, 0.704071, -0.244087, 0.463330, 0.893010, 0.511120, 0.488880, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -6.703990, -7.566583, 110.361000, 0.607754, 0.691576, -0.390331, 0.450874, 0.906352, 0.500000, 0.500000, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -8.705900, -5.452583, 110.989502, 0.607754, 0.691576, -0.390331, 0.463330, 0.893010, 0.511120, 0.488880, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -7.775100, -5.441393, 112.458603, 0.607754, 0.691576, -0.390331, 0.470771, 0.901902, 0.578341, 0.421659, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -6.703990, -7.566583, 110.361000, 0.581675, 0.700787, -0.412979, 0.450874, 0.906352, 0.500000, 0.500000, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -7.775100, -5.441393, 112.458603, 0.581675, 0.700787, -0.412979, 0.470771, 0.901902, 0.578341, 0.421659, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -6.036690, -6.285593, 113.474602, 0.581675, 0.700787, -0.412979, 0.471135, 0.916411, 0.673820, 0.326180, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -3.595300, -5.814773, 114.144203, 0.062629, 0.694553, -0.716711, 0.473614, 0.932646, 0.812413, 0.187587, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -4.575700, -7.072593, 112.839600, 0.062629, 0.694553, -0.716711, 0.462931, 0.924462, 0.571016, 0.428984, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -6.036690, -6.285593, 113.474602, 0.062629, 0.694553, -0.716711, 0.471135, 0.916411, 0.673820, 0.326180, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -6.036690, -6.285593, 113.474602, 0.105263, 0.591297, -0.799555, 0.471135, 0.916411, 0.673820, 0.326180, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -5.254700, -4.951183, 114.564392, 0.105263, 0.591297, -0.799555, 0.481927, 0.921693, 0.819163, 0.180837, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -3.595300, -5.814773, 114.144203, 0.105263, 0.591297, -0.799555, 0.473614, 0.932646, 0.812413, 0.187587, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -2.278780, -6.642693, 112.513893, -0.227164, 0.838620, -0.495090, 0.457815, 0.938475, 0.701595, 0.298405, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -3.949990, -7.501793, 111.825493, -0.227164, 0.838619, -0.495090, 0.454821, 0.926076, 0.500200, 0.499800, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -4.575700, -7.072593, 112.839600, -0.227163, 0.838619, -0.495090, 0.462931, 0.924462, 0.571016, 0.428984, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -4.575700, -7.072593, 112.839600, -0.228589, 0.780993, -0.581203, 0.462931, 0.924462, 0.571016, 0.428984, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -3.595300, -5.814773, 114.144203, -0.228589, 0.780993, -0.581203, 0.473614, 0.932646, 0.812413, 0.187587, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -2.278780, -6.642693, 112.513893, -0.228589, 0.780993, -0.581203, 0.457815, 0.938475, 0.701595, 0.298405, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -3.978000, -7.868683, 109.924500, -0.394871, 0.903155, -0.168490, 0.442258, 0.920795, 0.500000, 0.500000, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -3.949990, -7.501793, 111.825493, -0.394871, 0.903155, -0.168490, 0.454821, 0.926076, 0.500200, 0.499800, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -2.278780, -6.642693, 112.513893, -0.394871, 0.903155, -0.168490, 0.457815, 0.938475, 0.701595, 0.298405, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -2.278780, -6.642693, 112.513893, -0.360210, 0.912157, -0.195497, 0.457815, 0.938475, 0.701595, 0.298405, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -1.829300, -7.173983, 109.206802, -0.360210, 0.912157, -0.195497, 0.432844, 0.932040, 0.500000, 0.500000, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -3.978000, -7.868683, 109.924500, -0.360210, 0.912157, -0.195497, 0.442258, 0.920795, 0.500000, 0.500000, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -3.022590, -7.115893, 107.018593, -0.316353, 0.938390, 0.139083, 0.421250, 0.915424, 0.900000, 0.100000, 0.000000, 0.000000, 7.000000, 2.000000, 0.000000, 0.000000, - -4.908800, -7.941494, 108.298592, -0.316353, 0.938390, 0.139083, 0.434736, 0.909818, 0.750000, 0.250000, 0.000000, 0.000000, 7.000000, 2.000000, 0.000000, 0.000000, - -3.978000, -7.868683, 109.924500, -0.316353, 0.938390, 0.139083, 0.442258, 0.920795, 0.500000, 0.500000, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -3.978000, -7.868683, 109.924500, -0.253593, 0.953376, 0.163600, 0.442258, 0.920795, 0.500000, 0.500000, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -1.829300, -7.173983, 109.206802, -0.253593, 0.953376, 0.163600, 0.432844, 0.932040, 0.500000, 0.500000, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -3.022590, -7.115893, 107.018593, -0.253593, 0.953376, 0.163600, 0.421250, 0.915424, 0.900000, 0.100000, 0.000000, 0.000000, 7.000000, 2.000000, 0.000000, 0.000000, - -5.913690, -6.514793, 106.022789, 0.043360, 0.854982, 0.516842, 0.424922, 0.891987, 0.900000, 0.100000, 0.000000, 0.000000, 7.000000, 2.000000, 0.000000, 0.000000, - -6.387100, -7.461993, 107.629402, 0.043360, 0.854982, 0.516842, 0.435187, 0.898472, 0.750000, 0.250000, 0.000000, 0.000000, 7.000000, 2.000000, 0.000000, 0.000000, - -4.908800, -7.941494, 108.298592, 0.043360, 0.854982, 0.516842, 0.434736, 0.909818, 0.750000, 0.250000, 0.000000, 0.000000, 7.000000, 2.000000, 0.000000, 0.000000, - -4.908800, -7.941494, 108.298592, -0.007993, 0.845655, 0.533670, 0.434736, 0.909818, 0.750000, 0.250000, 0.000000, 0.000000, 7.000000, 2.000000, 0.000000, 0.000000, - -3.022590, -7.115893, 107.018593, -0.007993, 0.845655, 0.533670, 0.421250, 0.915424, 0.900000, 0.100000, 0.000000, 0.000000, 7.000000, 2.000000, 0.000000, 0.000000, - -5.913690, -6.514793, 106.022789, -0.007993, 0.845655, 0.533670, 0.424922, 0.891987, 0.900000, 0.100000, 0.000000, 0.000000, 7.000000, 2.000000, 0.000000, 0.000000, - -7.848080, -6.674994, 107.959602, 0.489707, 0.680271, 0.545361, 0.441843, 0.890631, 0.750000, 0.250000, 0.000000, 0.000000, 7.000000, 2.000000, 0.000000, 0.000000, - -6.387100, -7.461993, 107.629402, 0.489707, 0.680271, 0.545361, 0.435187, 0.898472, 0.750000, 0.250000, 0.000000, 0.000000, 7.000000, 2.000000, 0.000000, 0.000000, - -5.913690, -6.514793, 106.022789, 0.489707, 0.680271, 0.545361, 0.424922, 0.891987, 0.900000, 0.100000, 0.000000, 0.000000, 7.000000, 2.000000, 0.000000, 0.000000, - -5.913690, -6.514793, 106.022789, 0.584496, 0.515715, 0.626421, 0.424922, 0.891987, 0.900000, 0.100000, 0.000000, 0.000000, 7.000000, 2.000000, 0.000000, 0.000000, - -7.663600, -5.226183, 106.594704, 0.584496, 0.515715, 0.626421, 0.435444, 0.879533, 0.900000, 0.100000, 0.000000, 0.000000, 7.000000, 2.000000, 0.000000, 0.000000, - -7.848080, -6.674994, 107.959602, 0.584496, 0.515715, 0.626421, 0.441843, 0.890631, 0.750000, 0.250000, 0.000000, 0.000000, 7.000000, 2.000000, 0.000000, 0.000000, - -9.167900, -4.077983, 108.870491, 0.889142, 0.347374, 0.297923, 0.455915, 0.878524, 0.500000, 0.500000, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -8.733790, -5.881083, 109.677292, 0.889142, 0.347374, 0.297923, 0.455040, 0.890268, 0.500000, 0.500000, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -7.848080, -6.674994, 107.959602, 0.889142, 0.347374, 0.297923, 0.441843, 0.890631, 0.750000, 0.250000, 0.000000, 0.000000, 7.000000, 2.000000, 0.000000, 0.000000, - -7.848080, -6.674994, 107.959602, 0.859260, 0.288527, 0.422403, 0.441843, 0.890631, 0.750000, 0.250000, 0.000000, 0.000000, 7.000000, 2.000000, 0.000000, 0.000000, - -7.663600, -5.226183, 106.594704, 0.859260, 0.288527, 0.422403, 0.435444, 0.879533, 0.900000, 0.100000, 0.000000, 0.000000, 7.000000, 2.000000, 0.000000, 0.000000, - -9.167900, -4.077983, 108.870491, 0.859260, 0.288527, 0.422403, 0.455915, 0.878524, 0.500000, 0.500000, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -8.705900, -5.452583, 110.989502, 0.976690, 0.197063, -0.085109, 0.463330, 0.893010, 0.511120, 0.488880, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -8.733790, -5.881083, 109.677292, 0.976690, 0.197063, -0.085109, 0.455040, 0.890268, 0.500000, 0.500000, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -9.167900, -4.077983, 108.870491, 0.976690, 0.197063, -0.085109, 0.455915, 0.878524, 0.500000, 0.500000, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -9.167900, -4.077983, 108.870491, 0.973324, 0.218305, -0.070596, 0.455915, 0.878524, 0.500000, 0.500000, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -9.151490, -3.220683, 111.747803, 0.973324, 0.218305, -0.070596, 0.475515, 0.885474, 0.689747, 0.310253, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -8.705900, -5.452583, 110.989502, 0.973324, 0.218305, -0.070596, 0.463330, 0.893010, 0.511120, 0.488880, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -7.775100, -5.441393, 112.458603, 0.795935, 0.331098, -0.506814, 0.470771, 0.901902, 0.578341, 0.421659, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -8.705900, -5.452583, 110.989502, 0.795935, 0.331098, -0.506814, 0.463330, 0.893010, 0.511120, 0.488880, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -9.151490, -3.220683, 111.747803, 0.795935, 0.331098, -0.506814, 0.475515, 0.885474, 0.689747, 0.310253, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -9.151490, -3.220683, 111.747803, 0.850739, 0.431010, -0.300787, 0.475515, 0.885474, 0.689747, 0.310253, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -8.119390, -3.905483, 113.685692, 0.850739, 0.431010, -0.300787, 0.482751, 0.899527, 0.705258, 0.294742, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -7.775100, -5.441393, 112.458603, 0.850739, 0.431010, -0.300787, 0.470771, 0.901902, 0.578341, 0.421659, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -6.036690, -6.285593, 113.474602, 0.602543, 0.576224, -0.552184, 0.471135, 0.916411, 0.673820, 0.326180, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -7.775100, -5.441393, 112.458603, 0.602543, 0.576224, -0.552184, 0.470771, 0.901902, 0.578341, 0.421659, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -8.119390, -3.905483, 113.685692, 0.602543, 0.576224, -0.552184, 0.482751, 0.899527, 0.705258, 0.294742, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -8.119390, -3.905483, 113.685692, 0.403672, 0.425082, -0.810157, 0.482751, 0.899527, 0.705258, 0.294742, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -5.254700, -4.951183, 114.564392, 0.403672, 0.425082, -0.810157, 0.481927, 0.921693, 0.819163, 0.180837, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -6.036690, -6.285593, 113.474602, 0.403672, 0.425082, -0.810157, 0.471135, 0.916411, 0.673820, 0.326180, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -5.254700, -4.951183, 114.564392, 0.075141, 0.700645, -0.709543, 0.481927, 0.921693, 0.819163, 0.180837, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -4.606990, -3.453193, 116.112190, 0.075141, 0.700645, -0.709543, 0.496414, 0.926152, 0.945076, 0.054924, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -2.576290, -4.724183, 115.072189, 0.075141, 0.700645, -0.709543, 0.482378, 0.939907, 0.934054, 0.065946, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -2.576290, -4.724183, 115.072189, 0.102417, 0.587401, -0.802789, 0.482378, 0.939907, 0.934054, 0.065946, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -3.595300, -5.814773, 114.144203, 0.102417, 0.587401, -0.802789, 0.473614, 0.932646, 0.812413, 0.187587, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -5.254700, -4.951183, 114.564392, 0.102417, 0.587401, -0.802789, 0.481927, 0.921693, 0.819163, 0.180837, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -2.278780, -6.642693, 112.513893, -0.264913, 0.756409, -0.598052, 0.457815, 0.938475, 0.701595, 0.298405, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -3.595300, -5.814773, 114.144203, -0.264913, 0.756409, -0.598052, 0.473614, 0.932646, 0.812413, 0.187587, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -2.576290, -4.724183, 115.072189, -0.264913, 0.756409, -0.598052, 0.482378, 0.939907, 0.934054, 0.065946, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -2.576290, -4.724183, 115.072189, -0.021045, 0.798678, -0.601390, 0.482378, 0.939907, 0.934054, 0.065946, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 0.000000, -6.234773, 112.975891, -0.021045, 0.798678, -0.601390, 0.457880, 0.954265, 0.864881, 0.135119, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -2.278780, -6.642693, 112.513893, -0.021045, 0.798678, -0.601390, 0.457815, 0.938475, 0.701595, 0.298405, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 0.000000, -6.234773, 112.975891, -0.326270, 0.942182, -0.076427, 0.457880, 0.954265, 0.864881, 0.135119, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 0.000000, -6.564693, 108.908691, -0.326270, 0.942182, -0.076427, 0.425541, 0.941930, 0.500000, 0.500000, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -1.829300, -7.173983, 109.206802, -0.326270, 0.942182, -0.076427, 0.432844, 0.932040, 0.500000, 0.500000, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -2.436190, -6.105494, 106.357689, -0.668896, 0.637874, 0.381700, 0.413468, 0.916223, 0.995283, 0.004717, 0.000000, 0.000000, 7.000000, 2.000000, 0.000000, 0.000000, - -3.022590, -7.115893, 107.018593, -0.668896, 0.637874, 0.381700, 0.421250, 0.915424, 0.900000, 0.100000, 0.000000, 0.000000, 7.000000, 2.000000, 0.000000, 0.000000, - -1.829300, -7.173983, 109.206802, -0.668896, 0.637874, 0.381700, 0.432844, 0.932040, 0.500000, 0.500000, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -1.829300, -7.173983, 109.206802, -0.234630, 0.892696, 0.384762, 0.432844, 0.932040, 0.500000, 0.500000, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 0.000000, -6.564693, 108.908691, -0.234630, 0.892696, 0.384762, 0.425541, 0.941930, 0.500000, 0.500000, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -2.436190, -6.105494, 106.357689, -0.234630, 0.892696, 0.384762, 0.413468, 0.916223, 0.995283, 0.004717, 0.000000, 0.000000, 7.000000, 2.000000, 0.000000, 0.000000, - -5.913690, -6.514793, 106.022789, -0.146345, 0.599589, 0.786814, 0.424922, 0.891987, 0.900000, 0.100000, 0.000000, 0.000000, 7.000000, 2.000000, 0.000000, 0.000000, - -3.022590, -7.115893, 107.018593, -0.146345, 0.599589, 0.786813, 0.421250, 0.915424, 0.900000, 0.100000, 0.000000, 0.000000, 7.000000, 2.000000, 0.000000, 0.000000, - -2.436190, -6.105494, 106.357689, -0.146345, 0.599589, 0.786814, 0.413468, 0.916223, 0.995283, 0.004717, 0.000000, 0.000000, 7.000000, 2.000000, 0.000000, 0.000000, - -2.436190, -6.105494, 106.357689, -0.140770, 0.493961, 0.858013, 0.413468, 0.916223, 0.995283, 0.004717, 0.000000, 0.000000, 7.000000, 2.000000, 0.000000, 0.000000, - -5.417100, -5.188093, 105.340477, -0.140770, 0.493961, 0.858013, 0.417502, 0.884196, 0.989995, 0.007620, 0.002385, 0.000000, 7.000000, 5.000000, 2.000000, 0.000000, - -5.913690, -6.514793, 106.022789, -0.140770, 0.493961, 0.858013, 0.424922, 0.891987, 0.900000, 0.100000, 0.000000, 0.000000, 7.000000, 2.000000, 0.000000, 0.000000, - -7.663600, -5.226183, 106.594704, 0.467394, 0.259658, 0.845056, 0.435444, 0.879533, 0.900000, 0.100000, 0.000000, 0.000000, 7.000000, 2.000000, 0.000000, 0.000000, - -5.913690, -6.514793, 106.022789, 0.467394, 0.259658, 0.845056, 0.424922, 0.891987, 0.900000, 0.100000, 0.000000, 0.000000, 7.000000, 2.000000, 0.000000, 0.000000, - -5.417100, -5.188093, 105.340477, 0.467394, 0.259658, 0.845056, 0.417502, 0.884196, 0.989995, 0.007620, 0.002385, 0.000000, 7.000000, 5.000000, 2.000000, 0.000000, - -5.417100, -5.188093, 105.340477, 0.450354, 0.358885, 0.817547, 0.417502, 0.884196, 0.989995, 0.007620, 0.002385, 0.000000, 7.000000, 5.000000, 2.000000, 0.000000, - -7.628090, -3.453083, 105.796791, 0.450354, 0.358885, 0.817547, 0.434478, 0.865992, 0.965289, 0.023814, 0.010897, 0.000000, 7.000000, 2.000000, 5.000000, 0.000000, - -7.663600, -5.226183, 106.594704, 0.450354, 0.358885, 0.817547, 0.435444, 0.879533, 0.900000, 0.100000, 0.000000, 0.000000, 7.000000, 2.000000, 0.000000, 0.000000, - -9.167900, -4.077983, 108.870491, 0.860583, 0.194575, 0.470678, 0.455915, 0.878524, 0.500000, 0.500000, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -7.663600, -5.226183, 106.594704, 0.860583, 0.194575, 0.470678, 0.435444, 0.879533, 0.900000, 0.100000, 0.000000, 0.000000, 7.000000, 2.000000, 0.000000, 0.000000, - -7.628090, -3.453083, 105.796791, 0.860583, 0.194575, 0.470678, 0.434478, 0.865992, 0.965289, 0.023814, 0.010897, 0.000000, 7.000000, 2.000000, 5.000000, 0.000000, - -7.628090, -3.453083, 105.796791, 0.882703, 0.091830, 0.460871, 0.434478, 0.865992, 0.965289, 0.023814, 0.010897, 0.000000, 7.000000, 2.000000, 5.000000, 0.000000, - -9.073680, -0.831693, 108.043198, 0.882703, 0.091830, 0.460871, 0.462002, 0.858187, 0.797504, 0.202061, 0.000435, 0.000000, 7.000000, 2.000000, 5.000000, 0.000000, - -9.167900, -4.077983, 108.870491, 0.882703, 0.091830, 0.460871, 0.455915, 0.878524, 0.500000, 0.500000, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -9.151490, -3.220683, 111.747803, 0.999595, -0.028315, 0.002736, 0.475515, 0.885474, 0.689747, 0.310253, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -9.167900, -4.077983, 108.870491, 0.999595, -0.028315, 0.002736, 0.455915, 0.878524, 0.500000, 0.500000, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -9.073680, -0.831693, 108.043198, 0.999595, -0.028315, 0.002736, 0.462002, 0.858187, 0.797504, 0.202061, 0.000435, 0.000000, 7.000000, 2.000000, 5.000000, 0.000000, - -9.073680, -0.831693, 108.043198, 0.993893, -0.101063, -0.044297, 0.462002, 0.858187, 0.797504, 0.202061, 0.000435, 0.000000, 7.000000, 2.000000, 5.000000, 0.000000, - -8.814680, 0.061797, 111.815887, 0.993893, -0.101063, -0.044297, 0.488804, 0.870382, 0.749630, 0.239813, 0.010557, 0.000000, 2.000000, 7.000000, 25.000000, 0.000000, - -9.151490, -3.220683, 111.747803, 0.993893, -0.101063, -0.044297, 0.475515, 0.885474, 0.689747, 0.310253, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -7.902270, -1.675863, 115.340591, 0.891765, 0.210476, -0.400569, 0.500474, 0.898386, 0.975667, 0.024333, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -8.119390, -3.905483, 113.685692, 0.891765, 0.210476, -0.400569, 0.482751, 0.899527, 0.705258, 0.294742, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -9.151490, -3.220683, 111.747803, 0.891765, 0.210476, -0.400569, 0.475515, 0.885474, 0.689747, 0.310253, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -9.151490, -3.220683, 111.747803, 0.952125, -0.091647, -0.291650, 0.475515, 0.885474, 0.689747, 0.310253, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -8.814680, 0.061797, 111.815887, 0.952125, -0.091647, -0.291650, 0.488804, 0.870382, 0.749630, 0.239813, 0.010557, 0.000000, 2.000000, 7.000000, 25.000000, 0.000000, - -7.902270, -1.675863, 115.340591, 0.952125, -0.091647, -0.291650, 0.500474, 0.898386, 0.975667, 0.024333, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -5.254700, -4.951183, 114.564392, 0.417604, 0.514974, -0.748605, 0.481927, 0.921693, 0.819163, 0.180837, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -8.119390, -3.905483, 113.685692, 0.417604, 0.514974, -0.748605, 0.482751, 0.899527, 0.705258, 0.294742, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -7.902270, -1.675863, 115.340591, 0.417604, 0.514974, -0.748605, 0.500474, 0.898386, 0.975667, 0.024333, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -7.902270, -1.675863, 115.340591, 0.455739, 0.536680, -0.710124, 0.500474, 0.898386, 0.975667, 0.024333, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -4.606990, -3.453193, 116.112190, 0.455739, 0.536680, -0.710124, 0.496414, 0.926152, 0.945076, 0.054924, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -5.254700, -4.951183, 114.564392, 0.455739, 0.536680, -0.710124, 0.481927, 0.921693, 0.819163, 0.180837, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -2.576290, -4.724183, 115.072189, 0.110073, 0.728834, -0.675784, 0.482378, 0.939907, 0.934054, 0.065946, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -4.606990, -3.453193, 116.112190, 0.110073, 0.728834, -0.675784, 0.496414, 0.926152, 0.945076, 0.054924, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -4.320400, -1.684693, 118.066200, 0.110073, 0.728834, -0.675784, 0.515904, 0.927786, 1.000000, 0.000000, 0.000000, 0.000000, 2.000000, 0.000000, 0.000000, 0.000000, - -4.320400, -1.684693, 118.066200, 0.069499, 0.720016, -0.690468, 0.515904, 0.927786, 1.000000, 0.000000, 0.000000, 0.000000, 2.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -2.371373, 117.785004, 0.069499, 0.720016, -0.690468, 0.507603, 0.959173, 1.000000, 0.000000, 0.000000, 0.000000, 2.000000, 0.000000, 0.000000, 0.000000, - -2.576290, -4.724183, 115.072189, 0.069499, 0.720016, -0.690468, 0.482378, 0.939907, 0.934054, 0.065946, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 0.000000, -6.234773, 112.975891, -0.052421, 0.778521, -0.625425, 0.457880, 0.954265, 0.864881, 0.135119, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -2.576290, -4.724183, 115.072189, -0.052421, 0.778521, -0.625425, 0.482378, 0.939907, 0.934054, 0.065946, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 0.000000, -2.371373, 117.785004, -0.052421, 0.778521, -0.625425, 0.507603, 0.959173, 1.000000, 0.000000, 0.000000, 0.000000, 2.000000, 0.000000, 0.000000, 0.000000, - -5.862690, 4.941008, 122.056198, 0.790938, 0.337671, -0.510290, 0.568673, 0.897398, 0.500000, 0.500000, 0.000000, 0.000000, 2.000000, 24.000000, 0.000000, 0.000000, - -4.827590, -0.059682, 120.351501, 0.790938, 0.337671, -0.510290, 0.537803, 0.923970, 0.900000, 0.100000, 0.000000, 0.000000, 2.000000, 24.000000, 0.000000, 0.000000, - -5.997000, 2.597708, 120.297401, 0.790938, 0.337671, -0.510290, 0.547736, 0.906262, 0.500000, 0.500000, 0.000000, 0.000000, 24.000000, 2.000000, 0.000000, 0.000000, - -4.827590, -0.059682, 120.351501, 0.542176, 0.736940, -0.403688, 0.537803, 0.923970, 0.900000, 0.100000, 0.000000, 0.000000, 2.000000, 24.000000, 0.000000, 0.000000, - -4.320400, -1.684693, 118.066200, 0.542176, 0.736940, -0.403688, 0.515904, 0.927786, 1.000000, 0.000000, 0.000000, 0.000000, 2.000000, 0.000000, 0.000000, 0.000000, - -7.636900, 0.551408, 117.693993, 0.542176, 0.736940, -0.403688, 0.521915, 0.899807, 0.898739, 0.100000, 0.001261, 0.000000, 2.000000, 24.000000, 7.000000, 0.000000, - -7.636900, 0.551408, 117.693993, 0.690189, 0.290230, -0.662876, 0.521915, 0.899807, 0.898739, 0.100000, 0.001261, 0.000000, 2.000000, 24.000000, 7.000000, 0.000000, - -5.997000, 2.597708, 120.297401, 0.690190, 0.290230, -0.662876, 0.547736, 0.906262, 0.500000, 0.500000, 0.000000, 0.000000, 24.000000, 2.000000, 0.000000, 0.000000, - -4.827590, -0.059682, 120.351501, 0.690190, 0.290230, -0.662876, 0.537803, 0.923970, 0.900000, 0.100000, 0.000000, 0.000000, 2.000000, 24.000000, 0.000000, 0.000000, - -4.320400, -1.684693, 118.066200, 0.478463, 0.614994, -0.626782, 0.515904, 0.927786, 1.000000, 0.000000, 0.000000, 0.000000, 2.000000, 0.000000, 0.000000, 0.000000, - -4.606990, -3.453193, 116.112190, 0.478463, 0.614993, -0.626782, 0.496414, 0.926152, 0.945076, 0.054924, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -7.902270, -1.675863, 115.340591, 0.478463, 0.614993, -0.626782, 0.500474, 0.898386, 0.975667, 0.024333, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -7.902270, -1.675863, 115.340591, 0.481308, 0.608902, -0.630540, 0.500474, 0.898386, 0.975667, 0.024333, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -7.636900, 0.551408, 117.693993, 0.481308, 0.608902, -0.630540, 0.521915, 0.899807, 0.898739, 0.100000, 0.001261, 0.000000, 2.000000, 24.000000, 7.000000, 0.000000, - -4.320400, -1.684693, 118.066200, 0.481308, 0.608902, -0.630540, 0.515904, 0.927786, 1.000000, 0.000000, 0.000000, 0.000000, 2.000000, 0.000000, 0.000000, 0.000000, - -1.829300, -7.173983, 109.206802, -0.138897, 0.974640, -0.175456, 0.432844, 0.932040, 0.500000, 0.500000, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -2.278780, -6.642693, 112.513893, -0.138897, 0.974640, -0.175456, 0.457815, 0.938475, 0.701595, 0.298405, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 0.000000, -6.234773, 112.975891, -0.138897, 0.974640, -0.175456, 0.457880, 0.954265, 0.864881, 0.135119, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -5.862690, 4.941008, 122.056198, 0.276802, 0.566635, -0.776083, 0.568673, 0.897398, 0.500000, 0.500000, 0.000000, 0.000000, 2.000000, 24.000000, 0.000000, 0.000000, - -5.997000, 2.597708, 120.297401, 0.276802, 0.566635, -0.776083, 0.547736, 0.906262, 0.500000, 0.500000, 0.000000, 0.000000, 24.000000, 2.000000, 0.000000, 0.000000, - -7.604800, 3.490208, 120.375587, 0.276802, 0.566635, -0.776083, 0.548478, 0.893954, 0.750000, 0.147490, 0.102510, 0.000000, 24.000000, 25.000000, 2.000000, 0.000000, - -7.604800, 3.490208, 120.375587, 0.301647, 0.544444, -0.782681, 0.548478, 0.893954, 0.750000, 0.147490, 0.102510, 0.000000, 24.000000, 25.000000, 2.000000, 0.000000, - -7.477900, 4.941008, 121.433693, 0.301647, 0.544445, -0.782681, 0.560148, 0.889923, 0.750000, 0.169852, 0.080148, 0.000000, 24.000000, 25.000000, 2.000000, 0.000000, - -5.862690, 4.941008, 122.056198, 0.301647, 0.544444, -0.782681, 0.568673, 0.897398, 0.500000, 0.500000, 0.000000, 0.000000, 2.000000, 24.000000, 0.000000, 0.000000, - -5.862690, 4.941008, 122.056198, 0.359618, -0.001567, -0.933098, 0.568673, 0.897398, 0.500000, 0.500000, 0.000000, 0.000000, 2.000000, 24.000000, 0.000000, 0.000000, - -7.477900, 4.941008, 121.433693, 0.359618, -0.001567, -0.933098, 0.560148, 0.889923, 0.750000, 0.169852, 0.080148, 0.000000, 24.000000, 25.000000, 2.000000, 0.000000, - -7.477900, 9.169807, 121.426590, 0.359618, -0.001567, -0.933098, 0.577862, 0.866514, 0.550583, 0.296600, 0.152817, 0.000000, 24.000000, 25.000000, 2.000000, 0.000000, - -7.477900, 9.169807, 121.426590, 0.498747, 0.061781, -0.864543, 0.577862, 0.866514, 0.550583, 0.296600, 0.152817, 0.000000, 24.000000, 25.000000, 2.000000, 0.000000, - -5.862690, 9.169807, 122.358391, 0.498747, 0.061781, -0.864543, 0.588860, 0.870510, 0.425000, 0.425000, 0.150000, 0.000000, 2.000000, 24.000000, 1.000000, 0.000000, - -5.862690, 4.941008, 122.056198, 0.498747, 0.061781, -0.864543, 0.568673, 0.897398, 0.500000, 0.500000, 0.000000, 0.000000, 2.000000, 24.000000, 0.000000, 0.000000, - -7.477900, 9.169807, 121.426590, 0.259248, -0.624156, -0.737035, 0.577862, 0.866514, 0.550583, 0.296600, 0.152817, 0.000000, 24.000000, 25.000000, 2.000000, 0.000000, - -7.477900, 11.652898, 119.323792, 0.259248, -0.624156, -0.737035, 0.576463, 0.844571, 0.750000, 0.250000, 0.000000, 0.000000, 2.000000, 24.000000, 0.000000, 0.000000, - -5.835390, 11.888397, 119.702103, 0.259248, -0.624156, -0.737035, 0.585348, 0.841733, 0.750000, 0.250000, 0.000000, 0.000000, 2.000000, 24.000000, 0.000000, 0.000000, - -5.835390, 11.888397, 119.702103, 0.380486, -0.648251, -0.659545, 0.585348, 0.841733, 0.750000, 0.250000, 0.000000, 0.000000, 2.000000, 24.000000, 0.000000, 0.000000, - -5.862690, 9.169807, 122.358391, 0.380486, -0.648252, -0.659545, 0.588860, 0.870510, 0.425000, 0.425000, 0.150000, 0.000000, 2.000000, 24.000000, 1.000000, 0.000000, - -7.477900, 9.169807, 121.426590, 0.380486, -0.648252, -0.659545, 0.577862, 0.866514, 0.550583, 0.296600, 0.152817, 0.000000, 24.000000, 25.000000, 2.000000, 0.000000, - -5.862690, 9.169807, 122.358391, 0.847434, -0.046413, -0.528868, 0.588860, 0.870510, 0.425000, 0.425000, 0.150000, 0.000000, 2.000000, 24.000000, 1.000000, 0.000000, - -4.209000, 9.810187, 124.951988, 0.847434, -0.046413, -0.528868, 0.610250, 0.876330, 0.600000, 0.400000, 0.000000, 0.000000, 2.000000, 1.000000, 0.000000, 0.000000, - -4.711200, 4.941008, 124.574600, 0.847434, -0.046413, -0.528868, 0.585328, 0.907752, 1.000000, 0.000000, 0.000000, 0.000000, 2.000000, 0.000000, 0.000000, 0.000000, - -4.711200, 4.941008, 124.574600, 0.909043, 0.029702, -0.415642, 0.585328, 0.907752, 1.000000, 0.000000, 0.000000, 0.000000, 2.000000, 0.000000, 0.000000, 0.000000, - -5.862690, 4.941008, 122.056198, 0.909043, 0.029702, -0.415642, 0.568673, 0.897398, 0.500000, 0.500000, 0.000000, 0.000000, 2.000000, 24.000000, 0.000000, 0.000000, - -5.862690, 9.169807, 122.358391, 0.909043, 0.029702, -0.415642, 0.588860, 0.870510, 0.425000, 0.425000, 0.150000, 0.000000, 2.000000, 24.000000, 1.000000, 0.000000, - -4.083890, 11.265808, 122.301804, 0.721563, -0.620648, -0.306829, 0.603247, 0.854439, 0.420000, 0.300000, 0.280000, 0.000000, 2.000000, 1.000000, 24.000000, 0.000000, - -4.209000, 9.810187, 124.951988, 0.721563, -0.620648, -0.306829, 0.610250, 0.876330, 0.600000, 0.400000, 0.000000, 0.000000, 2.000000, 1.000000, 0.000000, 0.000000, - -5.862690, 9.169807, 122.358391, 0.721563, -0.620648, -0.306829, 0.588860, 0.870510, 0.425000, 0.425000, 0.150000, 0.000000, 2.000000, 24.000000, 1.000000, 0.000000, - -5.835390, 11.888397, 119.702103, 0.627410, -0.547412, -0.553803, 0.585348, 0.841733, 0.750000, 0.250000, 0.000000, 0.000000, 2.000000, 24.000000, 0.000000, 0.000000, - -4.083890, 11.265808, 122.301804, 0.627410, -0.547412, -0.553803, 0.603247, 0.854439, 0.420000, 0.300000, 0.280000, 0.000000, 2.000000, 1.000000, 24.000000, 0.000000, - -5.862690, 9.169807, 122.358391, 0.627410, -0.547412, -0.553803, 0.588860, 0.870510, 0.425000, 0.425000, 0.150000, 0.000000, 2.000000, 24.000000, 1.000000, 0.000000, - -7.604800, 3.490208, 120.375587, 0.319385, 0.636833, -0.701738, 0.548478, 0.893954, 0.750000, 0.147490, 0.102510, 0.000000, 24.000000, 25.000000, 2.000000, 0.000000, - -5.997000, 2.597708, 120.297401, 0.319385, 0.636833, -0.701738, 0.547736, 0.906262, 0.500000, 0.500000, 0.000000, 0.000000, 24.000000, 2.000000, 0.000000, 0.000000, - -7.636900, 0.551408, 117.693993, 0.319385, 0.636833, -0.701738, 0.521915, 0.899807, 0.898739, 0.100000, 0.001261, 0.000000, 2.000000, 24.000000, 7.000000, 0.000000, - -7.636900, 0.551408, 117.693993, 0.640025, 0.514077, -0.571046, 0.521915, 0.899807, 0.898739, 0.100000, 0.001261, 0.000000, 2.000000, 24.000000, 7.000000, 0.000000, - -8.982590, 1.856997, 117.361092, 0.640025, 0.514077, -0.571046, 0.523721, 0.888246, 0.730781, 0.250000, 0.019219, 0.000000, 2.000000, 24.000000, 25.000000, 0.000000, - -7.604800, 3.490208, 120.375587, 0.640025, 0.514077, -0.571046, 0.548478, 0.893954, 0.750000, 0.147490, 0.102510, 0.000000, 24.000000, 25.000000, 2.000000, 0.000000, - -8.982590, 1.856997, 117.361092, 0.707194, 0.676626, -0.205072, 0.523721, 0.888246, 0.730781, 0.250000, 0.019219, 0.000000, 2.000000, 24.000000, 25.000000, 0.000000, - -7.636900, 0.551408, 117.693993, 0.707194, 0.676625, -0.205072, 0.521915, 0.899807, 0.898739, 0.100000, 0.001261, 0.000000, 2.000000, 24.000000, 7.000000, 0.000000, - -9.817600, 1.263677, 112.523903, 0.707194, 0.676625, -0.205072, 0.496445, 0.867613, 0.767937, 0.145588, 0.086476, 0.000000, 2.000000, 7.000000, 25.000000, 0.000000, - -9.817600, 1.263677, 112.523903, 0.978475, 0.099024, -0.181054, 0.496445, 0.867613, 0.767937, 0.145588, 0.086476, 0.000000, 2.000000, 7.000000, 25.000000, 0.000000, - -9.818400, 2.004197, 112.924591, 0.978475, 0.099024, -0.181054, 0.499657, 0.867253, 0.727634, 0.154391, 0.117975, 0.000000, 2.000000, 25.000000, 7.000000, 0.000000, - -8.982590, 1.856997, 117.361092, 0.978475, 0.099024, -0.181053, 0.523721, 0.888246, 0.730781, 0.250000, 0.019219, 0.000000, 2.000000, 24.000000, 25.000000, 0.000000, - -9.817600, 1.263677, 112.523903, 0.986637, -0.007816, 0.162745, 0.496445, 0.867613, 0.767937, 0.145588, 0.086476, 0.000000, 2.000000, 7.000000, 25.000000, 0.000000, - -9.201380, 4.280907, 108.932999, 0.986637, -0.007816, 0.162745, 0.488532, 0.834858, 0.559070, 0.384731, 0.056199, 0.000000, 7.000000, 2.000000, 25.000000, 0.000000, - -9.496980, 5.135097, 110.766090, 0.986637, -0.007816, 0.162745, 0.501286, 0.840392, 0.587867, 0.238650, 0.173483, 0.000000, 2.000000, 7.000000, 25.000000, 0.000000, - -9.496980, 5.135097, 110.766090, 0.995485, -0.044336, 0.083927, 0.501286, 0.840392, 0.587867, 0.238650, 0.173483, 0.000000, 2.000000, 7.000000, 25.000000, 0.000000, - -9.818400, 2.004197, 112.924591, 0.995485, -0.044336, 0.083927, 0.499657, 0.867253, 0.727634, 0.154391, 0.117975, 0.000000, 2.000000, 25.000000, 7.000000, 0.000000, - -9.817600, 1.263677, 112.523903, 0.995485, -0.044336, 0.083927, 0.496445, 0.867613, 0.767937, 0.145588, 0.086476, 0.000000, 2.000000, 7.000000, 25.000000, 0.000000, - -9.496980, 5.135097, 110.766090, 0.936958, -0.233558, 0.259925, 0.501286, 0.840392, 0.587867, 0.238650, 0.173483, 0.000000, 2.000000, 7.000000, 25.000000, 0.000000, - -9.201380, 4.280907, 108.932999, 0.936958, -0.233558, 0.259925, 0.488532, 0.834858, 0.559070, 0.384731, 0.056199, 0.000000, 7.000000, 2.000000, 25.000000, 0.000000, - -7.985180, 9.215887, 108.983299, 0.936958, -0.233558, 0.259925, 0.512309, 0.808580, 0.498966, 0.483935, 0.017099, 0.000000, 7.000000, 2.000000, 25.000000, 0.000000, - -7.985180, 9.215887, 108.983299, 0.898934, -0.153824, 0.410191, 0.512309, 0.808580, 0.498966, 0.483935, 0.017099, 0.000000, 7.000000, 2.000000, 25.000000, 0.000000, - -8.976800, 8.902997, 111.039101, 0.898934, -0.153824, 0.410191, 0.520156, 0.822171, 0.805265, 0.194735, 0.000000, 0.000000, 2.000000, 25.000000, 0.000000, 0.000000, - -9.496980, 5.135097, 110.766090, 0.898934, -0.153824, 0.410191, 0.501286, 0.840392, 0.587867, 0.238650, 0.173483, 0.000000, 2.000000, 7.000000, 25.000000, 0.000000, - -8.976800, 8.902997, 111.039101, 0.878066, -0.292050, 0.379087, 0.520156, 0.822171, 0.805265, 0.194735, 0.000000, 0.000000, 2.000000, 25.000000, 0.000000, 0.000000, - -7.985180, 9.215887, 108.983299, 0.878066, -0.292050, 0.379087, 0.512309, 0.808580, 0.498966, 0.483935, 0.017099, 0.000000, 7.000000, 2.000000, 25.000000, 0.000000, - -9.020480, 11.485308, 113.129692, 0.878066, -0.292050, 0.379087, 0.542221, 0.821368, 0.815460, 0.160464, 0.024076, 0.000000, 2.000000, 25.000000, 7.000000, 0.000000, - -9.020480, 11.485308, 113.129692, 0.277600, -0.931444, 0.235266, 0.542221, 0.821368, 0.815460, 0.160464, 0.024076, 0.000000, 2.000000, 25.000000, 7.000000, 0.000000, - -5.758200, 11.574596, 109.633904, 0.277599, -0.931444, 0.235266, 0.530109, 0.793115, 0.636430, 0.363570, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -6.250490, 12.758098, 114.900391, 0.277599, -0.931444, 0.235266, 0.561993, 0.814947, 1.000000, 0.000000, 0.000000, 0.000000, 2.000000, 0.000000, 0.000000, 0.000000, - -6.250490, 12.758098, 114.900391, 0.381950, -0.921884, 0.065153, 0.561993, 0.814947, 1.000000, 0.000000, 0.000000, 0.000000, 2.000000, 0.000000, 0.000000, 0.000000, - -8.723500, 11.819298, 116.114502, 0.381950, -0.921884, 0.065153, 0.558157, 0.831518, 0.900000, 0.100000, 0.000000, 0.000000, 2.000000, 25.000000, 0.000000, 0.000000, - -9.020480, 11.485308, 113.129692, 0.381950, -0.921884, 0.065153, 0.542221, 0.821368, 0.815460, 0.160464, 0.024076, 0.000000, 2.000000, 25.000000, 7.000000, 0.000000, - -8.723500, 11.819298, 116.114502, 0.263513, -0.944960, -0.193934, 0.558157, 0.831518, 0.900000, 0.100000, 0.000000, 0.000000, 2.000000, 25.000000, 0.000000, 0.000000, - -6.250490, 12.758098, 114.900391, 0.263513, -0.944960, -0.193934, 0.561993, 0.814947, 1.000000, 0.000000, 0.000000, 0.000000, 2.000000, 0.000000, 0.000000, 0.000000, - -5.835390, 11.888397, 119.702103, 0.263513, -0.944961, -0.193934, 0.585348, 0.841733, 0.750000, 0.250000, 0.000000, 0.000000, 2.000000, 24.000000, 0.000000, 0.000000, - -5.835390, 11.888397, 119.702103, 0.167012, -0.979156, -0.115590, 0.585348, 0.841733, 0.750000, 0.250000, 0.000000, 0.000000, 2.000000, 24.000000, 0.000000, 0.000000, - -7.477900, 11.652898, 119.323792, 0.167012, -0.979156, -0.115590, 0.576463, 0.844571, 0.750000, 0.250000, 0.000000, 0.000000, 2.000000, 24.000000, 0.000000, 0.000000, - -8.723500, 11.819298, 116.114502, 0.167012, -0.979156, -0.115590, 0.558157, 0.831518, 0.900000, 0.100000, 0.000000, 0.000000, 2.000000, 25.000000, 0.000000, 0.000000, - -9.817600, 1.263677, 112.523903, 0.902561, 0.257265, -0.345250, 0.496445, 0.867613, 0.767937, 0.145588, 0.086476, 0.000000, 2.000000, 7.000000, 25.000000, 0.000000, - -7.636900, 0.551408, 117.693993, 0.902561, 0.257265, -0.345250, 0.521915, 0.899807, 0.898739, 0.100000, 0.001261, 0.000000, 2.000000, 24.000000, 7.000000, 0.000000, - -7.902270, -1.675863, 115.340591, 0.902561, 0.257265, -0.345250, 0.500474, 0.898386, 0.975667, 0.024333, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -7.902270, -1.675863, 115.340591, 0.790832, 0.604853, 0.093473, 0.500474, 0.898386, 0.975667, 0.024333, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -8.814680, 0.061797, 111.815887, 0.790832, 0.604853, 0.093473, 0.488804, 0.870382, 0.749630, 0.239813, 0.010557, 0.000000, 2.000000, 7.000000, 25.000000, 0.000000, - -9.817600, 1.263677, 112.523903, 0.790832, 0.604853, 0.093473, 0.496445, 0.867613, 0.767937, 0.145588, 0.086476, 0.000000, 2.000000, 7.000000, 25.000000, 0.000000, - -7.985180, 9.215887, 108.983299, 0.555682, -0.663013, 0.501629, 0.512309, 0.808580, 0.498966, 0.483935, 0.017099, 0.000000, 7.000000, 2.000000, 25.000000, 0.000000, - -5.758200, 11.574596, 109.633904, 0.555682, -0.663013, 0.501629, 0.530109, 0.793115, 0.636430, 0.363570, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -9.020480, 11.485308, 113.129692, 0.555682, -0.663013, 0.501629, 0.542221, 0.821368, 0.815460, 0.160464, 0.024076, 0.000000, 2.000000, 25.000000, 7.000000, 0.000000, - -2.436190, -6.105494, 106.357689, 0.137000, 0.989442, 0.047273, 0.413468, 0.916223, 0.995283, 0.004717, 0.000000, 0.000000, 7.000000, 2.000000, 0.000000, 0.000000, - 0.000000, -6.564693, 108.908691, 0.137000, 0.989442, 0.047273, 0.425541, 0.941930, 0.500000, 0.500000, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - 0.000000, -6.442393, 106.348900, 0.137000, 0.989442, 0.047273, 0.407772, 0.934026, 0.997908, 0.002092, 0.000000, 0.000000, 7.000000, 2.000000, 0.000000, 0.000000, - -5.417100, -5.188093, 105.340477, 0.721551, 0.692066, 0.020231, 0.417502, 0.884196, 0.989995, 0.007620, 0.002385, 0.000000, 7.000000, 5.000000, 2.000000, 0.000000, - -4.738290, -5.808583, 102.356087, 0.721551, 0.692066, 0.020231, 0.398141, 0.871130, 0.884546, 0.115454, 0.000000, 0.000000, 7.000000, 5.000000, 0.000000, 0.000000, - -7.279490, -3.164284, 102.532791, 0.721551, 0.692066, 0.020231, 0.417375, 0.850543, 0.864141, 0.135859, 0.000000, 0.000000, 7.000000, 5.000000, 0.000000, 0.000000, - -7.279490, -3.164284, 102.532791, 0.628777, 0.765793, 0.134912, 0.417375, 0.850543, 0.864141, 0.135859, 0.000000, 0.000000, 7.000000, 5.000000, 0.000000, 0.000000, - -7.628090, -3.453083, 105.796791, 0.628777, 0.765793, 0.134912, 0.434478, 0.865992, 0.965289, 0.023814, 0.010897, 0.000000, 7.000000, 2.000000, 5.000000, 0.000000, - -5.417100, -5.188093, 105.340477, 0.628777, 0.765793, 0.134912, 0.417502, 0.884196, 0.989995, 0.007620, 0.002385, 0.000000, 7.000000, 5.000000, 2.000000, 0.000000, - 0.000000, 7.376596, 96.600304, 0.103645, -0.843579, -0.526908, 0.453369, 0.726033, 0.777850, 0.207714, 0.014436, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - -4.468900, 6.623106, 96.927589, 0.103645, -0.843579, -0.526908, 0.434958, 0.754053, 0.753825, 0.235477, 0.010698, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - -7.081700, 10.059795, 90.911499, 0.103645, -0.843579, -0.526908, 0.389001, 0.724212, 0.700000, 0.300000, 0.000000, 0.000000, 5.000000, 6.000000, 0.000000, 0.000000, - -7.081700, 10.059795, 90.911499, 0.130135, -0.824403, -0.550839, 0.389001, 0.724212, 0.700000, 0.300000, 0.000000, 0.000000, 5.000000, 6.000000, 0.000000, 0.000000, - 0.000000, 12.724806, 88.596001, 0.130135, -0.824404, -0.550839, 0.411758, 0.674075, 0.700000, 0.300000, 0.000000, 0.000000, 5.000000, 6.000000, 0.000000, 0.000000, - 0.000000, 7.376596, 96.600304, 0.130135, -0.824404, -0.550839, 0.453369, 0.726033, 0.777850, 0.207714, 0.014436, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - -7.279490, -3.164284, 102.532791, 0.989846, 0.060850, -0.128463, 0.417375, 0.850543, 0.864141, 0.135859, 0.000000, 0.000000, 7.000000, 5.000000, 0.000000, 0.000000, - -7.649400, -1.003374, 100.706100, 0.989846, 0.060850, -0.128463, 0.418987, 0.828096, 0.705916, 0.294084, 0.000000, 0.000000, 7.000000, 5.000000, 0.000000, 0.000000, - -7.571590, 1.268307, 102.381691, 0.989846, 0.060850, -0.128463, 0.438450, 0.821269, 0.795815, 0.202606, 0.001579, 0.000000, 7.000000, 5.000000, 2.000000, 0.000000, - -7.571590, 1.268307, 102.381691, 0.991301, 0.069143, 0.111990, 0.438450, 0.821269, 0.795815, 0.202606, 0.001579, 0.000000, 7.000000, 5.000000, 2.000000, 0.000000, - -7.628090, -3.453083, 105.796791, 0.991301, 0.069143, 0.111990, 0.434478, 0.865992, 0.965289, 0.023814, 0.010897, 0.000000, 7.000000, 2.000000, 5.000000, 0.000000, - -7.279490, -3.164284, 102.532791, 0.991301, 0.069143, 0.111990, 0.417375, 0.850543, 0.864141, 0.135859, 0.000000, 0.000000, 7.000000, 5.000000, 0.000000, 0.000000, - -7.649400, -1.003374, 100.706100, 0.949640, -0.162746, -0.267765, 0.418987, 0.828096, 0.705916, 0.294084, 0.000000, 0.000000, 7.000000, 5.000000, 0.000000, 0.000000, - -8.442400, -1.061784, 97.929199, 0.949640, -0.162746, -0.267765, 0.403799, 0.817048, 0.643318, 0.353551, 0.003131, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - -8.011990, 1.232886, 98.060982, 0.949640, -0.162746, -0.267765, 0.413541, 0.803077, 0.624202, 0.372551, 0.003247, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - -8.011990, 1.232886, 98.060982, 0.993978, 0.040930, -0.101649, 0.413541, 0.803077, 0.624202, 0.372551, 0.003247, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - -7.571590, 1.268307, 102.381691, 0.993978, 0.040930, -0.101649, 0.438450, 0.821269, 0.795815, 0.202606, 0.001579, 0.000000, 7.000000, 5.000000, 2.000000, 0.000000, - -7.649400, -1.003374, 100.706100, 0.993978, 0.040930, -0.101649, 0.418987, 0.828096, 0.705916, 0.294084, 0.000000, 0.000000, 7.000000, 5.000000, 0.000000, 0.000000, - -8.442400, -1.061784, 97.929199, 0.879743, 0.162646, -0.446765, 0.403799, 0.817048, 0.643318, 0.353551, 0.003131, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - -9.050200, -2.173064, 96.327789, 0.879743, 0.162646, -0.446765, 0.390789, 0.821040, 0.792886, 0.191863, 0.015251, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - -9.959090, -0.267484, 95.231789, 0.879743, 0.162646, -0.446765, 0.386558, 0.805665, 0.828303, 0.135755, 0.035942, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - -9.959090, -0.267484, 95.231789, 0.847562, -0.129419, -0.514674, 0.386558, 0.805665, 0.828303, 0.135755, 0.035942, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - -8.011990, 1.232886, 98.060982, 0.847562, -0.129419, -0.514674, 0.413541, 0.803077, 0.624202, 0.372551, 0.003247, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - -8.442400, -1.061784, 97.929199, 0.847562, -0.129419, -0.514674, 0.403799, 0.817048, 0.643318, 0.353551, 0.003131, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - -9.959090, -0.267484, 95.231789, 0.671069, -0.257358, -0.695294, 0.386558, 0.805665, 0.828303, 0.135755, 0.035942, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - -10.648200, 3.935206, 93.011093, 0.671069, -0.257358, -0.695294, 0.380585, 0.774210, 0.832925, 0.123071, 0.044004, 0.000000, 5.000000, 6.000000, 7.000000, 0.000000, - -8.794190, 5.756406, 94.126404, 0.671069, -0.257358, -0.695294, 0.397798, 0.763185, 0.850953, 0.075036, 0.074010, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - -8.794190, 5.756406, 94.126404, 0.854442, -0.248915, -0.456038, 0.397798, 0.763185, 0.850953, 0.075036, 0.074010, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - -8.011990, 1.232886, 98.060982, 0.854442, -0.248915, -0.456038, 0.413541, 0.803077, 0.624202, 0.372551, 0.003247, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - -9.959090, -0.267484, 95.231789, 0.854442, -0.248915, -0.456038, 0.386558, 0.805665, 0.828303, 0.135755, 0.035942, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - -8.794190, 5.756406, 94.126404, 0.755131, -0.557806, -0.344427, 0.397798, 0.763185, 0.850953, 0.075036, 0.074010, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - -10.648200, 3.935206, 93.011093, 0.755131, -0.557806, -0.344427, 0.380585, 0.774210, 0.832925, 0.123071, 0.044004, 0.000000, 5.000000, 6.000000, 7.000000, 0.000000, - -7.081700, 10.059795, 90.911499, 0.755131, -0.557806, -0.344427, 0.389001, 0.724212, 0.700000, 0.300000, 0.000000, 0.000000, 5.000000, 6.000000, 0.000000, 0.000000, - -8.011990, 1.232886, 98.060982, 0.958975, -0.275256, -0.067835, 0.413541, 0.803077, 0.624202, 0.372551, 0.003247, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - -7.155000, 4.331996, 97.600800, 0.958975, -0.275256, -0.067835, 0.423384, 0.779908, 0.661239, 0.332644, 0.006117, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - -6.791690, 4.367397, 102.593193, 0.958975, -0.275256, -0.067835, 0.454400, 0.800150, 0.809872, 0.185825, 0.004304, 0.000000, 7.000000, 5.000000, 2.000000, 0.000000, - -6.791690, 4.367397, 102.593193, 0.966769, -0.236699, -0.096600, 0.454400, 0.800150, 0.809872, 0.185825, 0.004304, 0.000000, 7.000000, 5.000000, 2.000000, 0.000000, - -7.571590, 1.268307, 102.381691, 0.966769, -0.236699, -0.096600, 0.438450, 0.821269, 0.795815, 0.202606, 0.001579, 0.000000, 7.000000, 5.000000, 2.000000, 0.000000, - -8.011990, 1.232886, 98.060982, 0.966769, -0.236699, -0.096600, 0.413541, 0.803077, 0.624202, 0.372551, 0.003247, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - -6.791690, 4.367397, 102.593193, 0.642381, -0.765270, -0.041321, 0.454400, 0.800150, 0.809872, 0.185825, 0.004304, 0.000000, 7.000000, 5.000000, 2.000000, 0.000000, - -7.155000, 4.331996, 97.600800, 0.642381, -0.765270, -0.041321, 0.423384, 0.779908, 0.661239, 0.332644, 0.006117, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - -4.468900, 6.623106, 96.927589, 0.642381, -0.765270, -0.041321, 0.434958, 0.754053, 0.753825, 0.235477, 0.010698, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - -4.468900, 6.623106, 96.927589, 0.855112, -0.495226, 0.153410, 0.434958, 0.754053, 0.753825, 0.235477, 0.010698, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - -5.143890, 7.376297, 103.121391, 0.855112, -0.495226, 0.153410, 0.474527, 0.780112, 0.887725, 0.106157, 0.006117, 0.000000, 7.000000, 5.000000, 2.000000, 0.000000, - -6.791690, 4.367397, 102.593193, 0.855112, -0.495226, 0.153410, 0.454400, 0.800150, 0.809872, 0.185825, 0.004304, 0.000000, 7.000000, 5.000000, 2.000000, 0.000000, - -7.155000, 4.331996, 97.600800, 0.809925, -0.298902, -0.504658, 0.423384, 0.779908, 0.661239, 0.332644, 0.006117, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - -8.011990, 1.232886, 98.060982, 0.809925, -0.298902, -0.504658, 0.413541, 0.803077, 0.624202, 0.372551, 0.003247, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - -8.794190, 5.756406, 94.126404, 0.809925, -0.298902, -0.504658, 0.397798, 0.763185, 0.850953, 0.075036, 0.074010, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - -4.468900, 6.623106, 96.927589, 0.477028, -0.711055, -0.516571, 0.434958, 0.754053, 0.753825, 0.235477, 0.010698, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - -7.155000, 4.331996, 97.600800, 0.477028, -0.711055, -0.516571, 0.423384, 0.779908, 0.661239, 0.332644, 0.006117, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - -8.794190, 5.756406, 94.126404, 0.477028, -0.711055, -0.516571, 0.397798, 0.763185, 0.850953, 0.075036, 0.074010, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - -4.468900, 6.623106, 96.927589, 0.505062, -0.636474, -0.582935, 0.434958, 0.754053, 0.753825, 0.235477, 0.010698, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - -8.794190, 5.756406, 94.126404, 0.505062, -0.636474, -0.582935, 0.397798, 0.763185, 0.850953, 0.075036, 0.074010, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - -7.081700, 10.059795, 90.911499, 0.505062, -0.636474, -0.582935, 0.389001, 0.724212, 0.700000, 0.300000, 0.000000, 0.000000, 5.000000, 6.000000, 0.000000, 0.000000, - -9.073680, -0.831693, 108.043198, 0.917626, 0.225667, 0.327167, 0.462002, 0.858187, 0.797504, 0.202061, 0.000435, 0.000000, 7.000000, 2.000000, 5.000000, 0.000000, - -7.628090, -3.453083, 105.796791, 0.917625, 0.225667, 0.327167, 0.434478, 0.865992, 0.965289, 0.023814, 0.010897, 0.000000, 7.000000, 2.000000, 5.000000, 0.000000, - -7.571590, 1.268307, 102.381691, 0.917625, 0.225667, 0.327167, 0.438450, 0.821269, 0.795815, 0.202606, 0.001579, 0.000000, 7.000000, 5.000000, 2.000000, 0.000000, - -9.817600, 1.263677, 112.523903, 0.685262, 0.696742, -0.212054, 0.496445, 0.867613, 0.767937, 0.145588, 0.086476, 0.000000, 2.000000, 7.000000, 25.000000, 0.000000, - -8.814680, 0.061797, 111.815887, 0.685262, 0.696742, -0.212054, 0.488804, 0.870382, 0.749630, 0.239813, 0.010557, 0.000000, 2.000000, 7.000000, 25.000000, 0.000000, - -9.073680, -0.831693, 108.043198, 0.685262, 0.696742, -0.212054, 0.462002, 0.858187, 0.797504, 0.202061, 0.000435, 0.000000, 7.000000, 2.000000, 5.000000, 0.000000, - -9.073680, -0.831693, 108.043198, 0.986168, -0.004206, 0.165698, 0.462002, 0.858187, 0.797504, 0.202061, 0.000435, 0.000000, 7.000000, 2.000000, 5.000000, 0.000000, - -9.201380, 4.280907, 108.932999, 0.986168, -0.004206, 0.165698, 0.488532, 0.834858, 0.559070, 0.384731, 0.056199, 0.000000, 7.000000, 2.000000, 25.000000, 0.000000, - -9.817600, 1.263677, 112.523903, 0.986168, -0.004206, 0.165698, 0.496445, 0.867613, 0.767937, 0.145588, 0.086476, 0.000000, 2.000000, 7.000000, 25.000000, 0.000000, - -9.201380, 4.280907, 108.932999, 0.968129, -0.019278, 0.249710, 0.488532, 0.834858, 0.559070, 0.384731, 0.056199, 0.000000, 7.000000, 2.000000, 25.000000, 0.000000, - -9.073680, -0.831693, 108.043198, 0.968129, -0.019278, 0.249710, 0.462002, 0.858187, 0.797504, 0.202061, 0.000435, 0.000000, 7.000000, 2.000000, 5.000000, 0.000000, - -7.571590, 1.268307, 102.381691, 0.968129, -0.019278, 0.249710, 0.438450, 0.821269, 0.795815, 0.202606, 0.001579, 0.000000, 7.000000, 5.000000, 2.000000, 0.000000, - -7.571590, 1.268307, 102.381691, 0.905907, -0.251241, 0.340898, 0.438450, 0.821269, 0.795815, 0.202606, 0.001579, 0.000000, 7.000000, 5.000000, 2.000000, 0.000000, - -6.791690, 4.367397, 102.593193, 0.905907, -0.251241, 0.340898, 0.454400, 0.800150, 0.809872, 0.185825, 0.004304, 0.000000, 7.000000, 5.000000, 2.000000, 0.000000, - -9.201380, 4.280907, 108.932999, 0.905907, -0.251241, 0.340898, 0.488532, 0.834858, 0.559070, 0.384731, 0.056199, 0.000000, 7.000000, 2.000000, 25.000000, 0.000000, - -5.758200, 11.574596, 109.633904, 0.565829, -0.667672, 0.483789, 0.530109, 0.793115, 0.636430, 0.363570, 0.000000, 0.000000, 2.000000, 7.000000, 0.000000, 0.000000, - -7.985180, 9.215887, 108.983299, 0.565829, -0.667672, 0.483789, 0.512309, 0.808580, 0.498966, 0.483935, 0.017099, 0.000000, 7.000000, 2.000000, 25.000000, 0.000000, - -5.143890, 7.376297, 103.121391, 0.565829, -0.667672, 0.483789, 0.474527, 0.780112, 0.887725, 0.106157, 0.006117, 0.000000, 7.000000, 5.000000, 2.000000, 0.000000, - -9.201380, 4.280907, 108.932999, 0.812760, -0.498138, 0.302125, 0.488532, 0.834858, 0.559070, 0.384731, 0.056199, 0.000000, 7.000000, 2.000000, 25.000000, 0.000000, - -6.791690, 4.367397, 102.593193, 0.812760, -0.498138, 0.302125, 0.454400, 0.800150, 0.809872, 0.185825, 0.004304, 0.000000, 7.000000, 5.000000, 2.000000, 0.000000, - -5.143890, 7.376297, 103.121391, 0.812760, -0.498138, 0.302125, 0.474527, 0.780112, 0.887725, 0.106157, 0.006117, 0.000000, 7.000000, 5.000000, 2.000000, 0.000000, - -5.143890, 7.376297, 103.121391, 0.850787, -0.214562, 0.479714, 0.474527, 0.780112, 0.887725, 0.106157, 0.006117, 0.000000, 7.000000, 5.000000, 2.000000, 0.000000, - -7.985180, 9.215887, 108.983299, 0.850787, -0.214562, 0.479714, 0.512309, 0.808580, 0.498966, 0.483935, 0.017099, 0.000000, 7.000000, 2.000000, 25.000000, 0.000000, - -9.201380, 4.280907, 108.932999, 0.850787, -0.214562, 0.479714, 0.488532, 0.834858, 0.559070, 0.384731, 0.056199, 0.000000, 7.000000, 2.000000, 25.000000, 0.000000, - -8.501000, 5.047698, 120.559303, 0.437437, 0.001177, -0.899249, 0.273056, 0.969867, 0.750000, 0.131579, 0.118421, 0.000000, 24.000000, 2.000000, 25.000000, 0.000000, - -10.377880, 4.972198, 119.646202, 0.437437, 0.001177, -0.899248, 0.273068, 0.956041, 0.500000, 0.500000, 0.000000, 0.000000, 24.000000, 25.000000, 0.000000, 0.000000, - -10.402290, 9.229188, 119.639900, 0.437437, 0.001177, -0.899248, 0.300851, 0.956375, 0.500000, 0.500000, 0.000000, 0.000000, 24.000000, 25.000000, 0.000000, 0.000000, - -10.402290, 9.229188, 119.639900, 0.441851, 0.003661, -0.897081, 0.300851, 0.956375, 0.500000, 0.500000, 0.000000, 0.000000, 24.000000, 25.000000, 0.000000, 0.000000, - -8.586790, 9.447898, 120.535004, 0.441851, 0.003661, -0.897081, 0.303238, 0.969380, 0.700000, 0.300000, 0.000000, 0.000000, 24.000000, 25.000000, 0.000000, 0.000000, - -8.501000, 5.047698, 120.559303, 0.441851, 0.003661, -0.897081, 0.273056, 0.969867, 0.750000, 0.131579, 0.118421, 0.000000, 24.000000, 2.000000, 25.000000, 0.000000, - -10.377880, 4.972198, 119.646202, 0.774962, 0.003940, -0.631995, 0.273068, 0.956041, 0.500000, 0.500000, 0.000000, 0.000000, 24.000000, 25.000000, 0.000000, 0.000000, - -12.184190, 4.990208, 117.431389, 0.774962, 0.003940, -0.631995, 0.273013, 0.936275, 0.800000, 0.200000, 0.000000, 0.000000, 25.000000, 24.000000, 0.000000, 0.000000, - -12.208590, 8.778698, 117.425087, 0.774962, 0.003940, -0.631995, 0.298942, 0.936694, 0.800000, 0.200000, 0.000000, 0.000000, 25.000000, 24.000000, 0.000000, 0.000000, - -12.208590, 8.778698, 117.425087, 0.774600, 0.003505, -0.632441, 0.298942, 0.936694, 0.800000, 0.200000, 0.000000, 0.000000, 25.000000, 24.000000, 0.000000, 0.000000, - -10.402290, 9.229188, 119.639900, 0.774600, 0.003505, -0.632441, 0.300851, 0.956375, 0.500000, 0.500000, 0.000000, 0.000000, 24.000000, 25.000000, 0.000000, 0.000000, - -10.377880, 4.972198, 119.646202, 0.774601, 0.003505, -0.632441, 0.273068, 0.956041, 0.500000, 0.500000, 0.000000, 0.000000, 24.000000, 25.000000, 0.000000, 0.000000, - -12.208590, 8.778698, 117.425087, 0.939423, 0.005480, -0.342715, 0.298942, 0.936694, 0.800000, 0.200000, 0.000000, 0.000000, 25.000000, 24.000000, 0.000000, 0.000000, - -12.184190, 4.990208, 117.431389, 0.939423, 0.005480, -0.342715, 0.273013, 0.936275, 0.800000, 0.200000, 0.000000, 0.000000, 25.000000, 24.000000, 0.000000, 0.000000, - -12.981390, 4.998407, 115.246300, 0.939423, 0.005480, -0.342715, 0.271999, 0.920144, 1.000000, 0.000000, 0.000000, 0.000000, 25.000000, 0.000000, 0.000000, 0.000000, - -12.981390, 4.998407, 115.246300, 0.939422, 0.005483, -0.342719, 0.271999, 0.920144, 1.000000, 0.000000, 0.000000, 0.000000, 25.000000, 0.000000, 0.000000, 0.000000, - -13.005800, 8.786887, 115.239998, 0.939422, 0.005483, -0.342719, 0.301287, 0.920799, 1.000000, 0.000000, 0.000000, 0.000000, 25.000000, 0.000000, 0.000000, 0.000000, - -12.208590, 8.778698, 117.425087, 0.939422, 0.005483, -0.342719, 0.298942, 0.936694, 0.800000, 0.200000, 0.000000, 0.000000, 25.000000, 24.000000, 0.000000, 0.000000, - -12.184190, 4.990208, 117.431389, 0.466994, 0.801112, -0.374347, 0.273013, 0.936275, 0.800000, 0.200000, 0.000000, 0.000000, 25.000000, 24.000000, 0.000000, 0.000000, - -10.377880, 4.972198, 119.646202, 0.466994, 0.801112, -0.374347, 0.273068, 0.956041, 0.500000, 0.500000, 0.000000, 0.000000, 24.000000, 25.000000, 0.000000, 0.000000, - -9.651800, 2.804797, 115.913689, 0.466994, 0.801112, -0.374347, 0.247668, 0.940905, 0.500000, 0.275000, 0.225000, 0.000000, 2.000000, 25.000000, 24.000000, 0.000000, - -9.651800, 2.804797, 115.913689, 0.462563, 0.800567, -0.380957, 0.247668, 0.940905, 0.500000, 0.275000, 0.225000, 0.000000, 2.000000, 25.000000, 24.000000, 0.000000, - -11.120300, 2.930507, 114.394791, 0.462563, 0.800567, -0.380957, 0.248965, 0.924903, 0.850000, 0.150000, 0.000000, 0.000000, 25.000000, 24.000000, 0.000000, 0.000000, - -12.184190, 4.990208, 117.431389, 0.462563, 0.800567, -0.380957, 0.273013, 0.936275, 0.800000, 0.200000, 0.000000, 0.000000, 25.000000, 24.000000, 0.000000, 0.000000, - -12.208590, 8.778698, 117.425087, 0.566283, -0.767317, -0.300912, 0.298942, 0.936694, 0.800000, 0.200000, 0.000000, 0.000000, 25.000000, 24.000000, 0.000000, 0.000000, - -11.116790, 10.775288, 114.388481, 0.566283, -0.767317, -0.300912, 0.322533, 0.925528, 0.800000, 0.200000, 0.000000, 0.000000, 25.000000, 24.000000, 0.000000, 0.000000, - -9.643900, 11.183098, 116.120392, 0.566283, -0.767317, -0.300912, 0.324217, 0.942406, 0.500000, 0.500000, 0.000000, 0.000000, 24.000000, 25.000000, 0.000000, 0.000000, - -9.643900, 11.183098, 116.120392, 0.564510, -0.767278, -0.304325, 0.324217, 0.942406, 0.500000, 0.500000, 0.000000, 0.000000, 24.000000, 25.000000, 0.000000, 0.000000, - -10.402290, 9.229188, 119.639900, 0.564510, -0.767278, -0.304325, 0.300851, 0.956375, 0.500000, 0.500000, 0.000000, 0.000000, 24.000000, 25.000000, 0.000000, 0.000000, - -12.208590, 8.778698, 117.425087, 0.564510, -0.767278, -0.304325, 0.298942, 0.936694, 0.800000, 0.200000, 0.000000, 0.000000, 25.000000, 24.000000, 0.000000, 0.000000, - -9.651800, 8.949997, 111.126198, -0.191918, -0.890670, 0.412158, 0.347407, 0.911837, 0.800000, 0.200000, 0.000000, 0.000000, 25.000000, 24.000000, 0.000000, 0.000000, - -11.116790, 10.775288, 114.388481, -0.191918, -0.890670, 0.412158, 0.322533, 0.925528, 0.800000, 0.200000, 0.000000, 0.000000, 25.000000, 24.000000, 0.000000, 0.000000, - -11.933200, 10.374998, 113.143303, -0.191918, -0.890670, 0.412158, 0.322365, 0.914100, 1.000000, 0.000000, 0.000000, 0.000000, 25.000000, 0.000000, 0.000000, 0.000000, - -11.933200, 10.374998, 113.143303, -0.316511, -0.905738, 0.281884, 0.322365, 0.914100, 1.000000, 0.000000, 0.000000, 0.000000, 25.000000, 0.000000, 0.000000, 0.000000, - -10.315800, 8.921197, 110.288094, -0.316511, -0.905738, 0.281884, 0.346317, 0.904946, 1.000000, 0.000000, 0.000000, 0.000000, 25.000000, 0.000000, 0.000000, 0.000000, - -9.651800, 8.949997, 111.126198, -0.316511, -0.905738, 0.281884, 0.347407, 0.911837, 0.800000, 0.200000, 0.000000, 0.000000, 25.000000, 24.000000, 0.000000, 0.000000, - -9.651800, 8.949997, 111.126198, -0.783503, 0.056767, 0.618790, 0.347407, 0.911837, 0.800000, 0.200000, 0.000000, 0.000000, 25.000000, 24.000000, 0.000000, 0.000000, - -10.315800, 8.921197, 110.288094, -0.783503, 0.056767, 0.618790, 0.346317, 0.904946, 1.000000, 0.000000, 0.000000, 0.000000, 25.000000, 0.000000, 0.000000, 0.000000, - -9.661190, 5.298397, 111.449303, -0.783503, 0.056767, 0.618790, 0.373299, 0.910453, 0.800000, 0.200000, 0.000000, 0.000000, 25.000000, 24.000000, 0.000000, 0.000000, - -8.501000, 5.047698, 120.559303, 0.279560, 0.144576, -0.949181, 0.273056, 0.969867, 0.750000, 0.131579, 0.118421, 0.000000, 24.000000, 2.000000, 25.000000, 0.000000, - -5.670600, 6.753788, 121.652802, 0.279560, 0.144576, -0.949181, 0.284831, 0.991127, 0.736482, 0.263518, 0.000000, 0.000000, 24.000000, 2.000000, 0.000000, 0.000000, - -5.778800, 3.842408, 121.177483, 0.279560, 0.144576, -0.949181, 0.263361, 0.988148, 0.500000, 0.500000, 0.000000, 0.000000, 2.000000, 24.000000, 0.000000, 0.000000, - -10.377880, 4.972198, 119.646202, 0.276807, 0.726420, -0.629041, 0.273068, 0.956041, 0.500000, 0.500000, 0.000000, 0.000000, 24.000000, 25.000000, 0.000000, 0.000000, - -8.501000, 5.047698, 120.559303, 0.276807, 0.726420, -0.629041, 0.273056, 0.969867, 0.750000, 0.131579, 0.118421, 0.000000, 24.000000, 2.000000, 25.000000, 0.000000, - -9.464380, 2.221707, 116.871902, 0.276807, 0.726420, -0.629041, 0.247992, 0.948919, 0.654796, 0.245204, 0.100000, 0.000000, 2.000000, 24.000000, 25.000000, 0.000000, - -9.464380, 2.221707, 116.871902, 0.950171, 0.311707, 0.003833, 0.247992, 0.948919, 0.654796, 0.245204, 0.100000, 0.000000, 2.000000, 24.000000, 25.000000, 0.000000, - -9.651800, 2.804797, 115.913689, 0.950171, 0.311707, 0.003833, 0.247668, 0.940905, 0.500000, 0.275000, 0.225000, 0.000000, 2.000000, 25.000000, 24.000000, 0.000000, - -10.377880, 4.972198, 119.646202, 0.950171, 0.311707, 0.003833, 0.273068, 0.956041, 0.500000, 0.500000, 0.000000, 0.000000, 24.000000, 25.000000, 0.000000, 0.000000, - -8.501000, 5.047698, 120.559303, 0.419605, 0.597011, -0.683746, 0.273056, 0.969867, 0.750000, 0.131579, 0.118421, 0.000000, 24.000000, 2.000000, 25.000000, 0.000000, - -5.778800, 3.842408, 121.177483, 0.419605, 0.597011, -0.683746, 0.263361, 0.988148, 0.500000, 0.500000, 0.000000, 0.000000, 2.000000, 24.000000, 0.000000, 0.000000, - -6.802590, 0.849908, 117.936302, 0.419605, 0.597011, -0.683746, 0.238289, 0.968887, 0.750000, 0.148288, 0.101405, 0.000308, 2.000000, 25.000000, 24.000000, 7.000000, - -6.802590, 0.849908, 117.936302, 0.543172, 0.591878, -0.595520, 0.238289, 0.968887, 0.750000, 0.148288, 0.101405, 0.000308, 2.000000, 25.000000, 24.000000, 7.000000, - -9.464380, 2.221707, 116.871902, 0.543172, 0.591878, -0.595520, 0.247992, 0.948919, 0.654796, 0.245204, 0.100000, 0.000000, 2.000000, 24.000000, 25.000000, 0.000000, - -8.501000, 5.047698, 120.559303, 0.543172, 0.591878, -0.595520, 0.273056, 0.969867, 0.750000, 0.131579, 0.118421, 0.000000, 24.000000, 2.000000, 25.000000, 0.000000, - -8.586790, 9.447898, 120.535004, 0.348280, -0.011907, -0.937315, 0.303238, 0.969380, 0.700000, 0.300000, 0.000000, 0.000000, 24.000000, 25.000000, 0.000000, 0.000000, - -5.864600, 9.447898, 121.546494, 0.348280, -0.011907, -0.937315, 0.305297, 0.988950, 0.750000, 0.250000, 0.000000, 0.000000, 2.000000, 24.000000, 0.000000, 0.000000, - -5.670600, 6.753788, 121.652802, 0.348280, -0.011907, -0.937315, 0.284831, 0.991127, 0.736482, 0.263518, 0.000000, 0.000000, 24.000000, 2.000000, 0.000000, 0.000000, - -5.670600, 6.753788, 121.652802, 0.359407, 0.001854, -0.933179, 0.284831, 0.991127, 0.736482, 0.263518, 0.000000, 0.000000, 24.000000, 2.000000, 0.000000, 0.000000, - -8.501000, 5.047698, 120.559303, 0.359407, 0.001854, -0.933179, 0.273056, 0.969867, 0.750000, 0.131579, 0.118421, 0.000000, 24.000000, 2.000000, 25.000000, 0.000000, - -8.586790, 9.447898, 120.535004, 0.359407, 0.001854, -0.933179, 0.303238, 0.969380, 0.700000, 0.300000, 0.000000, 0.000000, 24.000000, 25.000000, 0.000000, 0.000000, - -9.797880, 2.582297, 113.254204, 0.972966, 0.091846, 0.211900, 0.234881, 0.927035, 0.687330, 0.217864, 0.094806, 0.000000, 2.000000, 25.000000, 7.000000, 0.000000, - -9.496980, 5.135097, 110.766090, 0.972966, 0.091846, 0.211900, 0.225078, 0.903640, 0.587867, 0.238650, 0.173483, 0.000000, 2.000000, 7.000000, 25.000000, 0.000000, - -9.661190, 5.298397, 111.449303, 0.972966, 0.091846, 0.211900, 0.228335, 0.906520, 0.800000, 0.200000, 0.000000, 0.000000, 25.000000, 24.000000, 0.000000, 0.000000, - -9.661190, 5.298397, 111.449303, 0.657630, 0.393708, 0.642275, 0.228335, 0.906520, 0.800000, 0.200000, 0.000000, 0.000000, 25.000000, 24.000000, 0.000000, 0.000000, - -11.120300, 2.930507, 114.394791, 0.657630, 0.393708, 0.642275, 0.248965, 0.924903, 0.850000, 0.150000, 0.000000, 0.000000, 25.000000, 24.000000, 0.000000, 0.000000, - -9.797880, 2.582297, 113.254204, 0.657630, 0.393708, 0.642275, 0.234881, 0.927035, 0.687330, 0.217864, 0.094806, 0.000000, 2.000000, 25.000000, 7.000000, 0.000000, - -9.651800, 2.804797, 115.913689, 0.977544, 0.198657, -0.070315, 0.247668, 0.940905, 0.500000, 0.275000, 0.225000, 0.000000, 2.000000, 25.000000, 24.000000, 0.000000, - -9.464380, 2.221707, 116.871902, 0.977544, 0.198657, -0.070315, 0.247992, 0.948919, 0.654796, 0.245204, 0.100000, 0.000000, 2.000000, 24.000000, 25.000000, 0.000000, - -9.797880, 2.582297, 113.254204, 0.977544, 0.198657, -0.070315, 0.234881, 0.927035, 0.687330, 0.217864, 0.094806, 0.000000, 2.000000, 25.000000, 7.000000, 0.000000, - -9.464380, 2.221707, 116.871902, 0.517158, 0.824066, -0.231221, 0.247992, 0.948919, 0.654796, 0.245204, 0.100000, 0.000000, 2.000000, 24.000000, 25.000000, 0.000000, - -6.802590, 0.849908, 117.936302, 0.517158, 0.824066, -0.231221, 0.238289, 0.968887, 0.750000, 0.148288, 0.101405, 0.000308, 2.000000, 25.000000, 24.000000, 7.000000, - -9.286800, 0.876387, 112.474403, 0.517158, 0.824066, -0.231221, 0.222345, 0.932713, 0.800417, 0.151166, 0.048417, 0.000000, 2.000000, 7.000000, 25.000000, 0.000000, - -9.286800, 0.876387, 112.474403, 0.948996, 0.310171, -0.056568, 0.222345, 0.932713, 0.800417, 0.151166, 0.048417, 0.000000, 2.000000, 7.000000, 25.000000, 0.000000, - -9.797880, 2.582297, 113.254204, 0.948996, 0.310171, -0.056568, 0.234881, 0.927035, 0.687330, 0.217864, 0.094806, 0.000000, 2.000000, 25.000000, 7.000000, 0.000000, - -9.464380, 2.221707, 116.871902, 0.948996, 0.310171, -0.056568, 0.247992, 0.948919, 0.654796, 0.245204, 0.100000, 0.000000, 2.000000, 24.000000, 25.000000, 0.000000, - -9.797880, 2.582297, 113.254204, 0.948017, 0.157666, 0.276414, 0.234881, 0.927035, 0.687330, 0.217864, 0.094806, 0.000000, 2.000000, 25.000000, 7.000000, 0.000000, - -9.286800, 0.876387, 112.474403, 0.948017, 0.157666, 0.276414, 0.222345, 0.932713, 0.800417, 0.151166, 0.048417, 0.000000, 2.000000, 7.000000, 25.000000, 0.000000, - -9.496980, 5.135097, 110.766090, 0.948017, 0.157666, 0.276414, 0.225078, 0.903640, 0.587867, 0.238650, 0.173483, 0.000000, 2.000000, 7.000000, 25.000000, 0.000000, - -11.120300, 2.930507, 114.394791, 0.178784, 0.979599, -0.091776, 0.248965, 0.924903, 0.850000, 0.150000, 0.000000, 0.000000, 25.000000, 24.000000, 0.000000, 0.000000, - -9.651800, 2.804797, 115.913689, 0.178784, 0.979599, -0.091776, 0.247668, 0.940905, 0.500000, 0.275000, 0.225000, 0.000000, 2.000000, 25.000000, 24.000000, 0.000000, - -9.797880, 2.582297, 113.254204, 0.178784, 0.979599, -0.091776, 0.234881, 0.927035, 0.687330, 0.217864, 0.094806, 0.000000, 2.000000, 25.000000, 7.000000, 0.000000, - -10.402290, 9.229188, 119.639900, 0.787384, -0.595139, -0.160734, 0.300851, 0.956375, 0.500000, 0.500000, 0.000000, 0.000000, 24.000000, 25.000000, 0.000000, 0.000000, - -9.643900, 11.183098, 116.120392, 0.787384, -0.595140, -0.160734, 0.324217, 0.942406, 0.500000, 0.500000, 0.000000, 0.000000, 24.000000, 25.000000, 0.000000, 0.000000, - -9.262000, 11.558698, 116.600487, 0.787384, -0.595139, -0.160734, 0.324991, 0.947811, 0.900000, 0.100000, 0.000000, 0.000000, 2.000000, 24.000000, 0.000000, 0.000000, - -9.262000, 11.558698, 116.600487, 0.338090, -0.803913, -0.489305, 0.324991, 0.947811, 0.900000, 0.100000, 0.000000, 0.000000, 2.000000, 24.000000, 0.000000, 0.000000, - -8.586790, 9.447898, 120.535004, 0.338090, -0.803913, -0.489305, 0.303238, 0.969380, 0.700000, 0.300000, 0.000000, 0.000000, 24.000000, 25.000000, 0.000000, 0.000000, - -10.402290, 9.229188, 119.639900, 0.338090, -0.803913, -0.489305, 0.300851, 0.956375, 0.500000, 0.500000, 0.000000, 0.000000, 24.000000, 25.000000, 0.000000, 0.000000, - -5.864600, 9.447898, 121.546494, 0.251581, -0.691579, -0.677071, 0.305297, 0.988950, 0.750000, 0.250000, 0.000000, 0.000000, 2.000000, 24.000000, 0.000000, 0.000000, - -8.586790, 9.447898, 120.535004, 0.251581, -0.691579, -0.677071, 0.303238, 0.969380, 0.700000, 0.300000, 0.000000, 0.000000, 24.000000, 25.000000, 0.000000, 0.000000, - -5.864600, 11.495708, 119.454803, 0.251581, -0.691579, -0.677071, 0.325537, 0.979315, 0.750000, 0.250000, 0.000000, 0.000000, 2.000000, 24.000000, 0.000000, 0.000000, - -8.586790, 9.447898, 120.535004, 0.393934, -0.780078, -0.486102, 0.303238, 0.969380, 0.700000, 0.300000, 0.000000, 0.000000, 24.000000, 25.000000, 0.000000, 0.000000, - -9.262000, 11.558698, 116.600487, 0.393934, -0.780078, -0.486102, 0.324991, 0.947811, 0.900000, 0.100000, 0.000000, 0.000000, 2.000000, 24.000000, 0.000000, 0.000000, - -5.864600, 11.495708, 119.454803, 0.393934, -0.780078, -0.486102, 0.325537, 0.979315, 0.750000, 0.250000, 0.000000, 0.000000, 2.000000, 24.000000, 0.000000, 0.000000, - -9.262000, 11.558698, 116.600487, 0.583810, -0.796259, 0.158548, 0.324991, 0.947811, 0.900000, 0.100000, 0.000000, 0.000000, 2.000000, 24.000000, 0.000000, 0.000000, - -9.643900, 11.183098, 116.120392, 0.583810, -0.796259, 0.158548, 0.324217, 0.942406, 0.500000, 0.500000, 0.000000, 0.000000, 24.000000, 25.000000, 0.000000, 0.000000, - -9.280890, 11.024998, 113.989700, 0.583810, -0.796259, 0.158548, 0.337124, 0.935157, 0.900000, 0.100000, 0.000000, 0.000000, 2.000000, 3.000000, 0.000000, 0.000000, - -9.643900, 11.183098, 116.120392, 0.979349, -0.102207, 0.174437, 0.324217, 0.942406, 0.500000, 0.500000, 0.000000, 0.000000, 24.000000, 25.000000, 0.000000, 0.000000, - -8.976800, 8.902997, 111.039101, 0.979349, -0.102207, 0.174437, 0.350258, 0.914446, 0.805265, 0.194735, 0.000000, 0.000000, 2.000000, 25.000000, 0.000000, 0.000000, - -9.280890, 11.024998, 113.989700, 0.979349, -0.102207, 0.174437, 0.337124, 0.935157, 0.900000, 0.100000, 0.000000, 0.000000, 2.000000, 3.000000, 0.000000, 0.000000, - -9.262000, 11.558698, 116.600487, 0.000000, -0.999757, -0.022063, 0.324991, 0.947811, 0.900000, 0.100000, 0.000000, 0.000000, 2.000000, 24.000000, 0.000000, 0.000000, - -6.440190, 11.558698, 116.600487, 0.000000, -0.999757, -0.022063, 0.338400, 0.962201, 0.955120, 0.044880, 0.000000, 0.000000, 2.000000, 25.000000, 0.000000, 0.000000, - -5.864600, 11.495708, 119.454803, 0.000000, -0.999757, -0.022063, 0.325537, 0.979315, 0.750000, 0.250000, 0.000000, 0.000000, 2.000000, 24.000000, 0.000000, 0.000000, - -9.280890, 11.024998, 113.989700, 0.379372, -0.732185, 0.565669, 0.337124, 0.935157, 0.900000, 0.100000, 0.000000, 0.000000, 2.000000, 3.000000, 0.000000, 0.000000, - -8.976800, 8.902997, 111.039101, 0.379372, -0.732185, 0.565669, 0.350258, 0.914446, 0.805265, 0.194735, 0.000000, 0.000000, 2.000000, 25.000000, 0.000000, 0.000000, - -6.459090, 11.494397, 112.704803, 0.379372, -0.732185, 0.565669, 0.357655, 0.941884, 0.954680, 0.044372, 0.000948, 0.000000, 2.000000, 7.000000, 25.000000, 0.000000, - -9.280890, 11.024998, 113.989700, 0.170907, -0.985166, 0.015432, 0.337124, 0.935157, 0.900000, 0.100000, 0.000000, 0.000000, 2.000000, 3.000000, 0.000000, 0.000000, - -6.459090, 11.494397, 112.704803, 0.170907, -0.985166, 0.015432, 0.357655, 0.941884, 0.954680, 0.044372, 0.000948, 0.000000, 2.000000, 7.000000, 25.000000, 0.000000, - -6.440190, 11.558698, 116.600487, 0.170907, -0.985166, 0.015432, 0.338400, 0.962201, 0.955120, 0.044880, 0.000000, 0.000000, 2.000000, 25.000000, 0.000000, 0.000000, - -6.440190, 11.558698, 116.600487, 0.000000, -0.979739, 0.200279, 0.338400, 0.962201, 0.955120, 0.044880, 0.000000, 0.000000, 2.000000, 25.000000, 0.000000, 0.000000, - -9.262000, 11.558698, 116.600487, 0.000000, -0.979739, 0.200279, 0.324991, 0.947811, 0.900000, 0.100000, 0.000000, 0.000000, 2.000000, 24.000000, 0.000000, 0.000000, - -9.280890, 11.024998, 113.989700, 0.000000, -0.979739, 0.200279, 0.337124, 0.935157, 0.900000, 0.100000, 0.000000, 0.000000, 2.000000, 3.000000, 0.000000, 0.000000, - -12.981390, 4.998407, 115.246300, 0.669678, 0.702224, -0.241688, 0.271999, 0.920144, 1.000000, 0.000000, 0.000000, 0.000000, 25.000000, 0.000000, 0.000000, 0.000000, - -12.184190, 4.990208, 117.431389, 0.669678, 0.702224, -0.241688, 0.273013, 0.936275, 0.800000, 0.200000, 0.000000, 0.000000, 25.000000, 24.000000, 0.000000, 0.000000, - -11.120300, 2.930507, 114.394791, 0.669678, 0.702224, -0.241688, 0.248965, 0.924903, 0.850000, 0.150000, 0.000000, 0.000000, 25.000000, 24.000000, 0.000000, 0.000000, - -11.120300, 2.930507, 114.394791, 0.697033, 0.696866, -0.168887, 0.248965, 0.924903, 0.850000, 0.150000, 0.000000, 0.000000, 25.000000, 24.000000, 0.000000, 0.000000, - -11.901690, 3.410307, 113.149590, 0.697033, 0.696866, -0.168887, 0.251630, 0.912060, 1.000000, 0.000000, 0.000000, 0.000000, 25.000000, 0.000000, 0.000000, 0.000000, - -12.981390, 4.998407, 115.246300, 0.697033, 0.696866, -0.168887, 0.271999, 0.920144, 1.000000, 0.000000, 0.000000, 0.000000, 25.000000, 0.000000, 0.000000, 0.000000, - -13.005800, 8.786887, 115.239998, 0.664426, -0.718815, -0.204557, 0.301287, 0.920799, 1.000000, 0.000000, 0.000000, 0.000000, 25.000000, 0.000000, 0.000000, 0.000000, - -11.933200, 10.374998, 113.143303, 0.664426, -0.718815, -0.204557, 0.322365, 0.914100, 1.000000, 0.000000, 0.000000, 0.000000, 25.000000, 0.000000, 0.000000, 0.000000, - -11.116790, 10.775288, 114.388481, 0.664426, -0.718815, -0.204557, 0.322533, 0.925528, 0.800000, 0.200000, 0.000000, 0.000000, 25.000000, 24.000000, 0.000000, 0.000000, - -11.116790, 10.775288, 114.388481, 0.650408, -0.720674, -0.239997, 0.322533, 0.925528, 0.800000, 0.200000, 0.000000, 0.000000, 25.000000, 24.000000, 0.000000, 0.000000, - -12.208590, 8.778698, 117.425087, 0.650408, -0.720674, -0.239997, 0.298942, 0.936694, 0.800000, 0.200000, 0.000000, 0.000000, 25.000000, 24.000000, 0.000000, 0.000000, - -13.005800, 8.786887, 115.239998, 0.650408, -0.720674, -0.239997, 0.301287, 0.920799, 1.000000, 0.000000, 0.000000, 0.000000, 25.000000, 0.000000, 0.000000, 0.000000, - -11.901690, 3.410307, 113.149590, -0.302119, 0.810462, 0.501872, 0.251630, 0.912060, 1.000000, 0.000000, 0.000000, 0.000000, 25.000000, 0.000000, 0.000000, 0.000000, - -11.120300, 2.930507, 114.394791, -0.302119, 0.810462, 0.501872, 0.248965, 0.924903, 0.850000, 0.150000, 0.000000, 0.000000, 25.000000, 24.000000, 0.000000, 0.000000, - -9.661190, 5.298397, 111.449303, -0.302119, 0.810462, 0.501872, 0.228335, 0.906520, 0.800000, 0.200000, 0.000000, 0.000000, 25.000000, 24.000000, 0.000000, 0.000000, - -13.005800, 8.786887, 115.239998, 0.785159, 0.004029, -0.619282, 0.301287, 0.920799, 1.000000, 0.000000, 0.000000, 0.000000, 25.000000, 0.000000, 0.000000, 0.000000, - -12.981390, 4.998407, 115.246300, 0.785159, 0.004029, -0.619282, 0.271999, 0.920144, 1.000000, 0.000000, 0.000000, 0.000000, 25.000000, 0.000000, 0.000000, 0.000000, - -17.309790, 4.993507, 109.758492, 0.785158, 0.004029, -0.619282, 0.276056, 0.871144, 1.000000, 0.000000, 0.000000, 0.000000, 25.000000, 0.000000, 0.000000, 0.000000, - -17.309790, 4.993507, 109.758492, 0.786838, -0.000946, -0.617158, 0.276056, 0.871144, 1.000000, 0.000000, 0.000000, 0.000000, 25.000000, 0.000000, 0.000000, 0.000000, - -17.339390, 8.884907, 109.714790, 0.786838, -0.000946, -0.617158, 0.303068, 0.871592, 1.000000, 0.000000, 0.000000, 0.000000, 25.000000, 0.000000, 0.000000, 0.000000, - -13.005800, 8.786887, 115.239998, 0.786838, -0.000946, -0.617158, 0.301287, 0.920799, 1.000000, 0.000000, 0.000000, 0.000000, 25.000000, 0.000000, 0.000000, 0.000000, - -9.661190, 5.298397, 111.449303, -0.790426, 0.052788, 0.610279, 0.373299, 0.910453, 0.800000, 0.200000, 0.000000, 0.000000, 25.000000, 24.000000, 0.000000, 0.000000, - -10.315800, 8.921197, 110.288094, -0.790426, 0.052788, 0.610279, 0.346317, 0.904946, 1.000000, 0.000000, 0.000000, 0.000000, 25.000000, 0.000000, 0.000000, 0.000000, - -13.414790, 6.906407, 106.448593, -0.790426, 0.052788, 0.610279, 0.355548, 0.869814, 1.000000, 0.000000, 0.000000, 0.000000, 25.000000, 0.000000, 0.000000, 0.000000, - -11.901690, 3.410307, 113.149590, 0.473351, 0.792281, -0.385005, 0.251630, 0.912060, 1.000000, 0.000000, 0.000000, 0.000000, 25.000000, 0.000000, 0.000000, 0.000000, - -15.582500, 3.039597, 107.861290, 0.473351, 0.792281, -0.385005, 0.255131, 0.866487, 0.950000, 0.050000, 0.000000, 0.000000, 25.000000, 37.000000, 0.000000, 0.000000, - -17.309790, 4.993507, 109.758492, 0.473351, 0.792281, -0.385005, 0.276056, 0.871144, 1.000000, 0.000000, 0.000000, 0.000000, 25.000000, 0.000000, 0.000000, 0.000000, - -17.309790, 4.993507, 109.758492, 0.466554, 0.803981, -0.368703, 0.276056, 0.871144, 1.000000, 0.000000, 0.000000, 0.000000, 25.000000, 0.000000, 0.000000, 0.000000, - -12.981390, 4.998407, 115.246300, 0.466554, 0.803981, -0.368703, 0.271999, 0.920144, 1.000000, 0.000000, 0.000000, 0.000000, 25.000000, 0.000000, 0.000000, 0.000000, - -11.901690, 3.410307, 113.149590, 0.466554, 0.803981, -0.368703, 0.251630, 0.912060, 1.000000, 0.000000, 0.000000, 0.000000, 25.000000, 0.000000, 0.000000, 0.000000, - -11.933200, 10.374998, 113.143303, 0.459598, -0.805186, -0.374761, 0.322365, 0.914100, 1.000000, 0.000000, 0.000000, 0.000000, 25.000000, 0.000000, 0.000000, 0.000000, - -13.005800, 8.786887, 115.239998, 0.459598, -0.805186, -0.374761, 0.301287, 0.920799, 1.000000, 0.000000, 0.000000, 0.000000, 25.000000, 0.000000, 0.000000, 0.000000, - -17.339390, 8.884907, 109.714790, 0.459598, -0.805186, -0.374761, 0.303068, 0.871592, 1.000000, 0.000000, 0.000000, 0.000000, 25.000000, 0.000000, 0.000000, 0.000000, - -17.339390, 8.884907, 109.714790, 0.376633, -0.904327, -0.200851, 0.303068, 0.871592, 1.000000, 0.000000, 0.000000, 0.000000, 25.000000, 0.000000, 0.000000, 0.000000, - -14.549890, 10.427307, 108.000999, 0.376633, -0.904327, -0.200851, 0.328348, 0.874183, 1.000000, 0.000000, 0.000000, 0.000000, 25.000000, 0.000000, 0.000000, 0.000000, - -11.933200, 10.374998, 113.143303, 0.376633, -0.904327, -0.200851, 0.322365, 0.914100, 1.000000, 0.000000, 0.000000, 0.000000, 25.000000, 0.000000, 0.000000, 0.000000, - -9.661190, 5.298397, 111.449303, -0.576639, 0.545472, 0.608233, 0.228335, 0.906520, 0.800000, 0.200000, 0.000000, 0.000000, 25.000000, 24.000000, 0.000000, 0.000000, - -13.414790, 6.906407, 106.448593, -0.576639, 0.545472, 0.608233, 0.223781, 0.863793, 1.000000, 0.000000, 0.000000, 0.000000, 25.000000, 0.000000, 0.000000, 0.000000, - -15.582500, 3.039597, 107.861290, -0.576639, 0.545472, 0.608233, 0.255131, 0.866487, 0.950000, 0.050000, 0.000000, 0.000000, 25.000000, 37.000000, 0.000000, 0.000000, - -15.582500, 3.039597, 107.861290, -0.485532, 0.828204, 0.279887, 0.255131, 0.866487, 0.950000, 0.050000, 0.000000, 0.000000, 25.000000, 37.000000, 0.000000, 0.000000, - -11.901690, 3.410307, 113.149590, -0.485532, 0.828204, 0.279887, 0.251630, 0.912060, 1.000000, 0.000000, 0.000000, 0.000000, 25.000000, 0.000000, 0.000000, 0.000000, - -9.661190, 5.298397, 111.449303, -0.485532, 0.828204, 0.279887, 0.228335, 0.906520, 0.800000, 0.200000, 0.000000, 0.000000, 25.000000, 24.000000, 0.000000, 0.000000, - -10.315800, 8.921197, 110.288094, -0.425433, -0.880875, 0.207523, 0.346317, 0.904946, 1.000000, 0.000000, 0.000000, 0.000000, 25.000000, 0.000000, 0.000000, 0.000000, - -11.933200, 10.374998, 113.143303, -0.425433, -0.880875, 0.207523, 0.322365, 0.914100, 1.000000, 0.000000, 0.000000, 0.000000, 25.000000, 0.000000, 0.000000, 0.000000, - -14.549890, 10.427307, 108.000999, -0.425433, -0.880875, 0.207523, 0.328348, 0.874183, 1.000000, 0.000000, 0.000000, 0.000000, 25.000000, 0.000000, 0.000000, 0.000000, - -14.549890, 10.427307, 108.000999, -0.542959, -0.479125, 0.689663, 0.328348, 0.874183, 1.000000, 0.000000, 0.000000, 0.000000, 25.000000, 0.000000, 0.000000, 0.000000, - -13.414790, 6.906407, 106.448593, -0.542959, -0.479125, 0.689663, 0.355548, 0.869814, 1.000000, 0.000000, 0.000000, 0.000000, 25.000000, 0.000000, 0.000000, 0.000000, - -10.315800, 8.921197, 110.288094, -0.542959, -0.479125, 0.689663, 0.346317, 0.904946, 1.000000, 0.000000, 0.000000, 0.000000, 25.000000, 0.000000, 0.000000, 0.000000, - -17.309790, 4.993507, 109.758492, 0.813373, -0.000686, -0.581742, 0.276056, 0.871144, 1.000000, 0.000000, 0.000000, 0.000000, 25.000000, 0.000000, 0.000000, 0.000000, - -20.466190, 5.352307, 105.344887, 0.813373, -0.000686, -0.581742, 0.277886, 0.832922, 0.700000, 0.300000, 0.000000, 0.000000, 25.000000, 37.000000, 0.000000, 0.000000, - -19.830690, 9.029297, 106.229088, 0.813373, -0.000686, -0.581742, 0.304247, 0.841691, 0.850000, 0.150000, 0.000000, 0.000000, 25.000000, 37.000000, 0.000000, 0.000000, - -19.830690, 9.029297, 106.229088, 0.813560, -0.000342, -0.581481, 0.304247, 0.841691, 0.850000, 0.150000, 0.000000, 0.000000, 25.000000, 37.000000, 0.000000, 0.000000, - -17.339390, 8.884907, 109.714790, 0.813560, -0.000342, -0.581481, 0.303068, 0.871592, 1.000000, 0.000000, 0.000000, 0.000000, 25.000000, 0.000000, 0.000000, 0.000000, - -17.309790, 4.993507, 109.758492, 0.813560, -0.000342, -0.581481, 0.276056, 0.871144, 1.000000, 0.000000, 0.000000, 0.000000, 25.000000, 0.000000, 0.000000, 0.000000, - -15.582500, 3.039597, 107.861290, 0.501307, 0.842076, -0.198996, 0.255131, 0.866487, 0.950000, 0.050000, 0.000000, 0.000000, 25.000000, 37.000000, 0.000000, 0.000000, - -18.962601, 3.866987, 102.847389, 0.501307, 0.842076, -0.198996, 0.255674, 0.823565, 0.600000, 0.400000, 0.000000, 0.000000, 37.000000, 25.000000, 0.000000, 0.000000, - -20.466190, 5.352307, 105.344887, 0.501308, 0.842076, -0.198996, 0.277886, 0.832922, 0.700000, 0.300000, 0.000000, 0.000000, 25.000000, 37.000000, 0.000000, 0.000000, - -20.466190, 5.352307, 105.344887, 0.534854, 0.782457, -0.318893, 0.277886, 0.832922, 0.700000, 0.300000, 0.000000, 0.000000, 25.000000, 37.000000, 0.000000, 0.000000, - -17.309790, 4.993507, 109.758492, 0.534854, 0.782457, -0.318893, 0.276056, 0.871144, 1.000000, 0.000000, 0.000000, 0.000000, 25.000000, 0.000000, 0.000000, 0.000000, - -15.582500, 3.039597, 107.861290, 0.534854, 0.782457, -0.318893, 0.255131, 0.866487, 0.950000, 0.050000, 0.000000, 0.000000, 25.000000, 37.000000, 0.000000, 0.000000, - -17.339390, 8.884907, 109.714790, 0.237041, -0.948813, -0.208721, 0.303068, 0.871592, 1.000000, 0.000000, 0.000000, 0.000000, 25.000000, 0.000000, 0.000000, 0.000000, - -19.830690, 9.029297, 106.229088, 0.237041, -0.948813, -0.208721, 0.304247, 0.841691, 0.850000, 0.150000, 0.000000, 0.000000, 25.000000, 37.000000, 0.000000, 0.000000, - -17.068790, 10.156007, 104.243889, 0.237041, -0.948813, -0.208721, 0.330662, 0.842595, 0.850000, 0.150000, 0.000000, 0.000000, 25.000000, 37.000000, 0.000000, 0.000000, - -17.068790, 10.156007, 104.243889, 0.382432, -0.904002, -0.191119, 0.330662, 0.842595, 0.850000, 0.150000, 0.000000, 0.000000, 25.000000, 37.000000, 0.000000, 0.000000, - -14.549890, 10.427307, 108.000999, 0.382432, -0.904002, -0.191119, 0.328348, 0.874183, 1.000000, 0.000000, 0.000000, 0.000000, 25.000000, 0.000000, 0.000000, 0.000000, - -17.339390, 8.884907, 109.714790, 0.382432, -0.904002, -0.191119, 0.303068, 0.871592, 1.000000, 0.000000, 0.000000, 0.000000, 25.000000, 0.000000, 0.000000, 0.000000, - -15.582500, 3.039597, 107.861290, -0.665502, 0.555292, 0.498757, 0.255131, 0.866487, 0.950000, 0.050000, 0.000000, 0.000000, 25.000000, 37.000000, 0.000000, 0.000000, - -13.414790, 6.906407, 106.448593, -0.665502, 0.555292, 0.498757, 0.223781, 0.863793, 1.000000, 0.000000, 0.000000, 0.000000, 25.000000, 0.000000, 0.000000, 0.000000, - -16.271790, 7.067407, 102.457191, -0.665502, 0.555292, 0.498757, 0.226600, 0.830184, 1.000000, 0.000000, 0.000000, 0.000000, 25.000000, 0.000000, 0.000000, 0.000000, - -16.271790, 7.067407, 102.457191, -0.623129, 0.586932, 0.516935, 0.226600, 0.830184, 1.000000, 0.000000, 0.000000, 0.000000, 25.000000, 0.000000, 0.000000, 0.000000, - -18.962601, 3.866987, 102.847389, -0.623129, 0.586932, 0.516935, 0.255674, 0.823565, 0.600000, 0.400000, 0.000000, 0.000000, 37.000000, 25.000000, 0.000000, 0.000000, - -15.582500, 3.039597, 107.861290, -0.623129, 0.586932, 0.516935, 0.255131, 0.866487, 0.950000, 0.050000, 0.000000, 0.000000, 25.000000, 37.000000, 0.000000, 0.000000, - -13.414790, 6.906407, 106.448593, -0.721527, -0.460561, 0.516994, 0.355548, 0.869814, 1.000000, 0.000000, 0.000000, 0.000000, 25.000000, 0.000000, 0.000000, 0.000000, - -14.549890, 10.427307, 108.000999, -0.721527, -0.460561, 0.516994, 0.328348, 0.874183, 1.000000, 0.000000, 0.000000, 0.000000, 25.000000, 0.000000, 0.000000, 0.000000, - -17.068790, 10.156007, 104.243889, -0.721527, -0.460561, 0.516994, 0.330662, 0.842595, 0.850000, 0.150000, 0.000000, 0.000000, 25.000000, 37.000000, 0.000000, 0.000000, - -17.068790, 10.156007, 104.243889, -0.724238, -0.475673, 0.499214, 0.330662, 0.842595, 0.850000, 0.150000, 0.000000, 0.000000, 25.000000, 37.000000, 0.000000, 0.000000, - -16.271790, 7.067407, 102.457191, -0.724238, -0.475673, 0.499214, 0.356818, 0.835594, 1.000000, 0.000000, 0.000000, 0.000000, 25.000000, 0.000000, 0.000000, 0.000000, - -13.414790, 6.906407, 106.448593, -0.724238, -0.475673, 0.499214, 0.355548, 0.869814, 1.000000, 0.000000, 0.000000, 0.000000, 25.000000, 0.000000, 0.000000, 0.000000, - -19.830690, 9.029297, 106.229088, 0.812135, -0.000056, -0.583470, 0.304247, 0.841691, 0.850000, 0.150000, 0.000000, 0.000000, 25.000000, 37.000000, 0.000000, 0.000000, - -20.466190, 5.352307, 105.344887, 0.812135, -0.000056, -0.583470, 0.277886, 0.832922, 0.700000, 0.300000, 0.000000, 0.000000, 25.000000, 37.000000, 0.000000, 0.000000, - -20.955000, 9.599007, 104.664101, 0.812135, -0.000056, -0.583470, 0.306969, 0.828510, 0.500000, 0.500000, 0.000000, 0.000000, 25.000000, 37.000000, 0.000000, 0.000000, - -17.068790, 10.156007, 104.243889, 0.088172, -0.913980, -0.396065, 0.330662, 0.842595, 0.850000, 0.150000, 0.000000, 0.000000, 25.000000, 37.000000, 0.000000, 0.000000, - -19.830690, 9.029297, 106.229088, 0.088172, -0.913980, -0.396065, 0.304247, 0.841691, 0.850000, 0.150000, 0.000000, 0.000000, 25.000000, 37.000000, 0.000000, 0.000000, - -20.955000, 9.599007, 104.664101, 0.088172, -0.913980, -0.396065, 0.306969, 0.828510, 0.500000, 0.500000, 0.000000, 0.000000, 25.000000, 37.000000, 0.000000, 0.000000, - -20.955000, 9.599007, 104.664101, 0.065070, -0.849265, -0.523942, 0.306969, 0.828510, 0.500000, 0.500000, 0.000000, 0.000000, 25.000000, 37.000000, 0.000000, 0.000000, - -18.187771, 10.951007, 102.816292, 0.065070, -0.849265, -0.523942, 0.329345, 0.830198, 0.500000, 0.500000, 0.000000, 0.000000, 25.000000, 37.000000, 0.000000, 0.000000, - -17.068790, 10.156007, 104.243889, 0.065070, -0.849265, -0.523942, 0.330662, 0.842595, 0.850000, 0.150000, 0.000000, 0.000000, 25.000000, 37.000000, 0.000000, 0.000000, - -16.271790, 7.067407, 102.457191, -0.810048, -0.435903, 0.392187, 0.356818, 0.835594, 1.000000, 0.000000, 0.000000, 0.000000, 25.000000, 0.000000, 0.000000, 0.000000, - -17.068790, 10.156007, 104.243889, -0.810048, -0.435903, 0.392187, 0.330662, 0.842595, 0.850000, 0.150000, 0.000000, 0.000000, 25.000000, 37.000000, 0.000000, 0.000000, - -18.187771, 10.951007, 102.816292, -0.810048, -0.435903, 0.392187, 0.329345, 0.830198, 0.500000, 0.500000, 0.000000, 0.000000, 25.000000, 37.000000, 0.000000, 0.000000, - -20.466190, 5.352307, 105.344887, 0.806331, 0.009855, -0.591382, 0.277886, 0.832922, 0.700000, 0.300000, 0.000000, 0.000000, 25.000000, 37.000000, 0.000000, 0.000000, - -21.870100, 5.303997, 103.429893, 0.806331, 0.009855, -0.591382, 0.278463, 0.815989, 1.000000, 0.000000, 0.000000, 0.000000, 37.000000, 0.000000, 0.000000, 0.000000, - -22.111900, 8.867597, 103.159592, 0.806331, 0.009855, -0.591382, 0.304759, 0.815310, 1.000000, 0.000000, 0.000000, 0.000000, 37.000000, 0.000000, 0.000000, 0.000000, - -22.111900, 8.867597, 103.159592, 0.794126, -0.006017, -0.607723, 0.304759, 0.815310, 1.000000, 0.000000, 0.000000, 0.000000, 37.000000, 0.000000, 0.000000, 0.000000, - -20.955000, 9.599007, 104.664101, 0.794127, -0.006017, -0.607723, 0.306969, 0.828510, 0.500000, 0.500000, 0.000000, 0.000000, 25.000000, 37.000000, 0.000000, 0.000000, - -20.466190, 5.352307, 105.344887, 0.794126, -0.006017, -0.607723, 0.277886, 0.832922, 0.700000, 0.300000, 0.000000, 0.000000, 25.000000, 37.000000, 0.000000, 0.000000, - -20.466190, 5.352307, 105.344887, 0.374658, 0.878365, -0.296826, 0.277886, 0.832922, 0.700000, 0.300000, 0.000000, 0.000000, 25.000000, 37.000000, 0.000000, 0.000000, - -18.962601, 3.866987, 102.847389, 0.374658, 0.878365, -0.296826, 0.255674, 0.823565, 0.600000, 0.400000, 0.000000, 0.000000, 37.000000, 25.000000, 0.000000, 0.000000, - -21.870100, 5.303997, 103.429893, 0.374658, 0.878365, -0.296826, 0.278463, 0.815989, 1.000000, 0.000000, 0.000000, 0.000000, 37.000000, 0.000000, 0.000000, 0.000000, - -20.955000, 9.599007, 104.664101, 0.479372, -0.875751, 0.057127, 0.306969, 0.828510, 0.500000, 0.500000, 0.000000, 0.000000, 25.000000, 37.000000, 0.000000, 0.000000, - -22.111900, 8.867597, 103.159592, 0.479372, -0.875751, 0.057127, 0.304759, 0.815310, 1.000000, 0.000000, 0.000000, 0.000000, 37.000000, 0.000000, 0.000000, 0.000000, - -19.615589, 10.102197, 101.138481, 0.479372, -0.875751, 0.057127, 0.330129, 0.815073, 1.000000, 0.000000, 0.000000, 0.000000, 37.000000, 0.000000, 0.000000, 0.000000, - -19.615589, 10.102197, 101.138481, 0.465584, -0.883546, 0.050776, 0.330129, 0.815073, 1.000000, 0.000000, 0.000000, 0.000000, 37.000000, 0.000000, 0.000000, 0.000000, - -18.187771, 10.951007, 102.816292, 0.465584, -0.883546, 0.050776, 0.329345, 0.830198, 0.500000, 0.500000, 0.000000, 0.000000, 25.000000, 37.000000, 0.000000, 0.000000, - -20.955000, 9.599007, 104.664101, 0.465584, -0.883546, 0.050776, 0.306969, 0.828510, 0.500000, 0.500000, 0.000000, 0.000000, 25.000000, 37.000000, 0.000000, 0.000000, - -18.962601, 3.866987, 102.847389, -0.634551, 0.593824, 0.494690, 0.255674, 0.823565, 0.600000, 0.400000, 0.000000, 0.000000, 37.000000, 25.000000, 0.000000, 0.000000, - -16.271790, 7.067407, 102.457191, -0.634551, 0.593824, 0.494690, 0.226600, 0.830184, 1.000000, 0.000000, 0.000000, 0.000000, 25.000000, 0.000000, 0.000000, 0.000000, - -18.105000, 7.054406, 100.121292, -0.634551, 0.593824, 0.494690, 0.227819, 0.810558, 1.000000, 0.000000, 0.000000, 0.000000, 37.000000, 0.000000, 0.000000, 0.000000, - -16.271790, 7.067407, 102.457191, -0.609344, -0.365675, 0.703549, 0.356818, 0.835594, 1.000000, 0.000000, 0.000000, 0.000000, 25.000000, 0.000000, 0.000000, 0.000000, - -18.187771, 10.951007, 102.816292, -0.609344, -0.365675, 0.703549, 0.329345, 0.830198, 0.500000, 0.500000, 0.000000, 0.000000, 25.000000, 37.000000, 0.000000, 0.000000, - -19.615589, 10.102197, 101.138481, -0.609344, -0.365675, 0.703549, 0.330129, 0.815073, 1.000000, 0.000000, 0.000000, 0.000000, 37.000000, 0.000000, 0.000000, 0.000000, - -19.615589, 10.102197, 101.138481, -0.674416, -0.511860, 0.532130, 0.330129, 0.815073, 1.000000, 0.000000, 0.000000, 0.000000, 37.000000, 0.000000, 0.000000, 0.000000, - -18.105000, 7.054406, 100.121292, -0.674416, -0.511860, 0.532130, 0.355427, 0.813016, 1.000000, 0.000000, 0.000000, 0.000000, 37.000000, 0.000000, 0.000000, 0.000000, - -16.271790, 7.067407, 102.457191, -0.674416, -0.511860, 0.532130, 0.356818, 0.835594, 1.000000, 0.000000, 0.000000, 0.000000, 25.000000, 0.000000, 0.000000, 0.000000, - -21.870100, 5.303997, 103.429893, 0.698617, -0.004905, -0.715479, 0.278463, 0.815989, 1.000000, 0.000000, 0.000000, 0.000000, 37.000000, 0.000000, 0.000000, 0.000000, - -24.720690, 4.631006, 100.651100, 0.698617, -0.004905, -0.715479, 0.279210, 0.788514, 1.000000, 0.000000, 0.000000, 0.000000, 37.000000, 0.000000, 0.000000, 0.000000, - -24.980391, 8.382597, 100.371803, 0.698617, -0.004905, -0.715479, 0.303377, 0.788432, 1.000000, 0.000000, 0.000000, 0.000000, 37.000000, 0.000000, 0.000000, 0.000000, - -24.980391, 8.382597, 100.371803, 0.697540, -0.007018, -0.716512, 0.303377, 0.788432, 1.000000, 0.000000, 0.000000, 0.000000, 37.000000, 0.000000, 0.000000, 0.000000, - -22.111900, 8.867597, 103.159592, 0.697540, -0.007018, -0.716512, 0.304759, 0.815310, 1.000000, 0.000000, 0.000000, 0.000000, 37.000000, 0.000000, 0.000000, 0.000000, - -21.870100, 5.303997, 103.429893, 0.697540, -0.007018, -0.716512, 0.278463, 0.815989, 1.000000, 0.000000, 0.000000, 0.000000, 37.000000, 0.000000, 0.000000, 0.000000, - -21.870100, 5.303997, 103.429893, 0.344085, 0.854199, -0.389807, 0.278463, 0.815989, 1.000000, 0.000000, 0.000000, 0.000000, 37.000000, 0.000000, 0.000000, 0.000000, - -18.962601, 3.866987, 102.847389, 0.344085, 0.854199, -0.389807, 0.255674, 0.823565, 0.600000, 0.400000, 0.000000, 0.000000, 37.000000, 25.000000, 0.000000, 0.000000, - -22.132700, 3.300796, 98.808403, 0.344085, 0.854199, -0.389807, 0.257357, 0.786876, 1.000000, 0.000000, 0.000000, 0.000000, 37.000000, 0.000000, 0.000000, 0.000000, - -22.132700, 3.300796, 98.808403, 0.177490, 0.899228, -0.399858, 0.257357, 0.786876, 1.000000, 0.000000, 0.000000, 0.000000, 37.000000, 0.000000, 0.000000, 0.000000, - -24.720690, 4.631006, 100.651100, 0.177490, 0.899228, -0.399858, 0.279210, 0.788514, 1.000000, 0.000000, 0.000000, 0.000000, 37.000000, 0.000000, 0.000000, 0.000000, - -21.870100, 5.303997, 103.429893, 0.177490, 0.899228, -0.399858, 0.278463, 0.815989, 1.000000, 0.000000, 0.000000, 0.000000, 37.000000, 0.000000, 0.000000, 0.000000, - -22.111900, 8.867597, 103.159592, 0.316932, -0.934236, -0.163575, 0.304759, 0.815310, 1.000000, 0.000000, 0.000000, 0.000000, 37.000000, 0.000000, 0.000000, 0.000000, - -24.980391, 8.382597, 100.371803, 0.316932, -0.934236, -0.163575, 0.303377, 0.788432, 1.000000, 0.000000, 0.000000, 0.000000, 37.000000, 0.000000, 0.000000, 0.000000, - -22.090200, 9.719697, 98.334991, 0.316932, -0.934236, -0.163575, 0.328437, 0.788802, 1.000000, 0.000000, 0.000000, 0.000000, 37.000000, 0.000000, 0.000000, 0.000000, - -22.090200, 9.719697, 98.334991, 0.328310, -0.930426, -0.162851, 0.328437, 0.788802, 1.000000, 0.000000, 0.000000, 0.000000, 37.000000, 0.000000, 0.000000, 0.000000, - -19.615589, 10.102197, 101.138481, 0.328310, -0.930426, -0.162851, 0.330129, 0.815073, 1.000000, 0.000000, 0.000000, 0.000000, 37.000000, 0.000000, 0.000000, 0.000000, - -22.111900, 8.867597, 103.159592, 0.328310, -0.930426, -0.162851, 0.304759, 0.815310, 1.000000, 0.000000, 0.000000, 0.000000, 37.000000, 0.000000, 0.000000, 0.000000, - -18.105000, 7.054406, 100.121292, -0.702501, 0.676510, 0.220967, 0.227819, 0.810558, 1.000000, 0.000000, 0.000000, 0.000000, 37.000000, 0.000000, 0.000000, 0.000000, - -19.744200, 6.375296, 96.989090, -0.702501, 0.676511, 0.220967, 0.228344, 0.785025, 1.000000, 0.000000, 0.000000, 0.000000, 37.000000, 0.000000, 0.000000, 0.000000, - -22.132700, 3.300796, 98.808403, -0.702501, 0.676510, 0.220967, 0.257357, 0.786876, 1.000000, 0.000000, 0.000000, 0.000000, 37.000000, 0.000000, 0.000000, 0.000000, - -22.132700, 3.300796, 98.808403, -0.681970, 0.572627, 0.454989, 0.257357, 0.786876, 1.000000, 0.000000, 0.000000, 0.000000, 37.000000, 0.000000, 0.000000, 0.000000, - -18.962601, 3.866987, 102.847389, -0.681970, 0.572627, 0.454989, 0.255674, 0.823565, 0.600000, 0.400000, 0.000000, 0.000000, 37.000000, 25.000000, 0.000000, 0.000000, - -18.105000, 7.054406, 100.121292, -0.681970, 0.572627, 0.454989, 0.227819, 0.810558, 1.000000, 0.000000, 0.000000, 0.000000, 37.000000, 0.000000, 0.000000, 0.000000, - -18.105000, 7.054406, 100.121292, -0.611214, -0.506042, 0.608555, 0.355427, 0.813016, 1.000000, 0.000000, 0.000000, 0.000000, 37.000000, 0.000000, 0.000000, 0.000000, - -19.615589, 10.102197, 101.138481, -0.611214, -0.506042, 0.608555, 0.330129, 0.815073, 1.000000, 0.000000, 0.000000, 0.000000, 37.000000, 0.000000, 0.000000, 0.000000, - -22.090200, 9.719697, 98.334991, -0.611214, -0.506042, 0.608555, 0.328437, 0.788802, 1.000000, 0.000000, 0.000000, 0.000000, 37.000000, 0.000000, 0.000000, 0.000000, - -22.090200, 9.719697, 98.334991, -0.626699, -0.626242, 0.463755, 0.328437, 0.788802, 1.000000, 0.000000, 0.000000, 0.000000, 37.000000, 0.000000, 0.000000, 0.000000, - -19.744200, 6.375296, 96.989090, -0.626699, -0.626242, 0.463755, 0.358129, 0.786615, 1.000000, 0.000000, 0.000000, 0.000000, 37.000000, 0.000000, 0.000000, 0.000000, - -18.105000, 7.054406, 100.121292, -0.626699, -0.626242, 0.463755, 0.355427, 0.813016, 1.000000, 0.000000, 0.000000, 0.000000, 37.000000, 0.000000, 0.000000, 0.000000, - -24.980391, 8.382597, 100.371803, 0.876675, 0.024920, -0.480437, 0.303377, 0.788432, 1.000000, 0.000000, 0.000000, 0.000000, 37.000000, 0.000000, 0.000000, 0.000000, - -24.720690, 4.631006, 100.651100, 0.876675, 0.024920, -0.480436, 0.279210, 0.788514, 1.000000, 0.000000, 0.000000, 0.000000, 37.000000, 0.000000, 0.000000, 0.000000, - -31.421490, 3.992306, 88.390701, 0.876675, 0.024920, -0.480436, 0.282801, 0.691570, 0.710705, 0.289295, 0.000000, 0.000000, 30.000000, 37.000000, 0.000000, 0.000000, - -31.421490, 3.992306, 88.390701, 0.886173, -0.040465, -0.461583, 0.282801, 0.691570, 0.710705, 0.289295, 0.000000, 0.000000, 30.000000, 37.000000, 0.000000, 0.000000, - -31.518980, 6.739496, 87.962700, 0.886173, -0.040465, -0.461583, 0.303395, 0.690573, 0.554465, 0.445535, 0.000000, 0.000000, 30.000000, 37.000000, 0.000000, 0.000000, - -24.980391, 8.382597, 100.371803, 0.886173, -0.040465, -0.461583, 0.303377, 0.788432, 1.000000, 0.000000, 0.000000, 0.000000, 37.000000, 0.000000, 0.000000, 0.000000, - -22.132700, 3.300796, 98.808403, 0.333621, 0.912455, -0.236901, 0.257357, 0.786876, 1.000000, 0.000000, 0.000000, 0.000000, 37.000000, 0.000000, 0.000000, 0.000000, - -29.713301, 2.984705, 86.915390, 0.333621, 0.912455, -0.236901, 0.265064, 0.688490, 0.734959, 0.265041, 0.000000, 0.000000, 30.000000, 37.000000, 0.000000, 0.000000, - -31.421490, 3.992306, 88.390701, 0.333621, 0.912455, -0.236901, 0.282801, 0.691570, 0.710705, 0.289295, 0.000000, 0.000000, 30.000000, 37.000000, 0.000000, 0.000000, - -31.421490, 3.992306, 88.390701, 0.316666, 0.922403, -0.221123, 0.282801, 0.691570, 0.710705, 0.289295, 0.000000, 0.000000, 30.000000, 37.000000, 0.000000, 0.000000, - -24.720690, 4.631006, 100.651100, 0.316666, 0.922403, -0.221123, 0.279210, 0.788514, 1.000000, 0.000000, 0.000000, 0.000000, 37.000000, 0.000000, 0.000000, 0.000000, - -22.132700, 3.300796, 98.808403, 0.316666, 0.922403, -0.221123, 0.257357, 0.786876, 1.000000, 0.000000, 0.000000, 0.000000, 37.000000, 0.000000, 0.000000, 0.000000, - -22.090200, 9.719697, 98.334991, 0.374646, -0.924126, -0.075044, 0.328437, 0.788802, 1.000000, 0.000000, 0.000000, 0.000000, 37.000000, 0.000000, 0.000000, 0.000000, - -24.980391, 8.382597, 100.371803, 0.374646, -0.924126, -0.075044, 0.303377, 0.788432, 1.000000, 0.000000, 0.000000, 0.000000, 37.000000, 0.000000, 0.000000, 0.000000, - -31.518980, 6.739496, 87.962700, 0.374646, -0.924126, -0.075044, 0.303395, 0.690573, 0.554465, 0.445535, 0.000000, 0.000000, 30.000000, 37.000000, 0.000000, 0.000000, - -31.518980, 6.739496, 87.962700, 0.598809, -0.727293, -0.335370, 0.303395, 0.690573, 0.554465, 0.445535, 0.000000, 0.000000, 30.000000, 37.000000, 0.000000, 0.000000, - -30.389290, 8.197596, 86.817703, 0.598809, -0.727293, -0.335370, 0.318820, 0.689290, 0.500000, 0.500000, 0.000000, 0.000000, 30.000000, 37.000000, 0.000000, 0.000000, - -22.090200, 9.719697, 98.334991, 0.598809, -0.727293, -0.335370, 0.328437, 0.788802, 1.000000, 0.000000, 0.000000, 0.000000, 37.000000, 0.000000, 0.000000, 0.000000, - -19.744200, 6.375296, 96.989090, -0.668417, 0.579314, 0.466491, 0.228344, 0.785025, 1.000000, 0.000000, 0.000000, 0.000000, 37.000000, 0.000000, 0.000000, 0.000000, - -28.429190, 5.466195, 85.673691, -0.668417, 0.579314, 0.466491, 0.243776, 0.685443, 0.529336, 0.470664, 0.000000, 0.000000, 30.000000, 37.000000, 0.000000, 0.000000, - -29.713301, 2.984705, 86.915390, -0.668417, 0.579314, 0.466491, 0.265064, 0.688490, 0.734959, 0.265041, 0.000000, 0.000000, 30.000000, 37.000000, 0.000000, 0.000000, - -29.713301, 2.984705, 86.915390, -0.613185, 0.696690, 0.372327, 0.265064, 0.688490, 0.734959, 0.265041, 0.000000, 0.000000, 30.000000, 37.000000, 0.000000, 0.000000, - -22.132700, 3.300796, 98.808403, -0.613185, 0.696690, 0.372327, 0.257357, 0.786876, 1.000000, 0.000000, 0.000000, 0.000000, 37.000000, 0.000000, 0.000000, 0.000000, - -19.744200, 6.375296, 96.989090, -0.613185, 0.696690, 0.372327, 0.228344, 0.785025, 1.000000, 0.000000, 0.000000, 0.000000, 37.000000, 0.000000, 0.000000, 0.000000, - -22.090200, 9.719697, 98.334991, -0.586242, -0.632647, 0.506042, 0.328437, 0.788802, 1.000000, 0.000000, 0.000000, 0.000000, 37.000000, 0.000000, 0.000000, 0.000000, - -30.389290, 8.197596, 86.817703, -0.586242, -0.632647, 0.506042, 0.318820, 0.689290, 0.500000, 0.500000, 0.000000, 0.000000, 30.000000, 37.000000, 0.000000, 0.000000, - -28.429190, 5.466195, 85.673691, -0.586242, -0.632647, 0.506042, 0.343755, 0.687014, 0.529336, 0.470664, 0.000000, 0.000000, 30.000000, 37.000000, 0.000000, 0.000000, - -28.429190, 5.466195, 85.673691, -0.596010, -0.622302, 0.507457, 0.343755, 0.687014, 0.529336, 0.470664, 0.000000, 0.000000, 30.000000, 37.000000, 0.000000, 0.000000, - -19.744200, 6.375296, 96.989090, -0.596010, -0.622302, 0.507457, 0.358129, 0.786615, 1.000000, 0.000000, 0.000000, 0.000000, 37.000000, 0.000000, 0.000000, 0.000000, - -22.090200, 9.719697, 98.334991, -0.596010, -0.622302, 0.507457, 0.328437, 0.788802, 1.000000, 0.000000, 0.000000, 0.000000, 37.000000, 0.000000, 0.000000, 0.000000, - -3.282490, -0.059682, 122.675499, 0.783247, 0.339641, -0.520738, 0.553429, 0.936429, 1.000000, 0.000000, 0.000000, 0.000000, 2.000000, 0.000000, 0.000000, 0.000000, - -4.827590, -0.059682, 120.351501, 0.783247, 0.339641, -0.520738, 0.537803, 0.923970, 0.900000, 0.100000, 0.000000, 0.000000, 2.000000, 24.000000, 0.000000, 0.000000, - -5.862690, 4.941008, 122.056198, 0.783247, 0.339641, -0.520738, 0.568673, 0.897398, 0.500000, 0.500000, 0.000000, 0.000000, 2.000000, 24.000000, 0.000000, 0.000000, - -5.862690, 4.941008, 122.056198, 0.839165, 0.385465, -0.383692, 0.568673, 0.897398, 0.500000, 0.500000, 0.000000, 0.000000, 2.000000, 24.000000, 0.000000, 0.000000, - -4.711200, 4.941008, 124.574600, 0.839165, 0.385465, -0.383692, 0.585328, 0.907752, 1.000000, 0.000000, 0.000000, 0.000000, 2.000000, 0.000000, 0.000000, 0.000000, - -3.282490, -0.059682, 122.675499, 0.839165, 0.385465, -0.383692, 0.553429, 0.936429, 1.000000, 0.000000, 0.000000, 0.000000, 2.000000, 0.000000, 0.000000, 0.000000, - -3.282490, -0.059682, 122.675499, -0.125528, 0.850081, -0.511474, 0.553429, 0.936429, 1.000000, 0.000000, 0.000000, 0.000000, 2.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -0.194582, 121.645691, -0.125528, 0.850081, -0.511474, 0.542809, 0.959428, 1.000000, 0.000000, 0.000000, 0.000000, 2.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -1.601182, 119.307892, -0.125528, 0.850081, -0.511474, 0.522817, 0.958509, 1.000000, 0.000000, 0.000000, 0.000000, 2.000000, 0.000000, 0.000000, 0.000000, - 0.000000, -1.601182, 119.307892, 0.264705, 0.948135, -0.175988, 0.522817, 0.958509, 1.000000, 0.000000, 0.000000, 0.000000, 2.000000, 0.000000, 0.000000, 0.000000, - -4.827590, -0.059682, 120.351501, 0.264705, 0.948135, -0.175988, 0.537803, 0.923970, 0.900000, 0.100000, 0.000000, 0.000000, 2.000000, 24.000000, 0.000000, 0.000000, - -3.282490, -0.059682, 122.675499, 0.264705, 0.948135, -0.175988, 0.553429, 0.936429, 1.000000, 0.000000, 0.000000, 0.000000, 2.000000, 0.000000, 0.000000, 0.000000, - -8.976800, 8.902997, 111.039101, 0.133443, 0.087010, 0.987229, 0.350258, 0.914446, 0.805265, 0.194735, 0.000000, 0.000000, 2.000000, 25.000000, 0.000000, 0.000000, - -9.651800, 8.949997, 111.126198, 0.133443, 0.087010, 0.987229, 0.347407, 0.911837, 0.800000, 0.200000, 0.000000, 0.000000, 25.000000, 24.000000, 0.000000, 0.000000, - -9.661190, 5.298397, 111.449303, 0.133443, 0.087010, 0.987229, 0.373299, 0.910453, 0.800000, 0.200000, 0.000000, 0.000000, 25.000000, 24.000000, 0.000000, 0.000000, - -9.661190, 5.298397, 111.449303, 0.952421, -0.150683, 0.264931, 0.373299, 0.910453, 0.800000, 0.200000, 0.000000, 0.000000, 25.000000, 24.000000, 0.000000, 0.000000, - -9.496980, 5.135097, 110.766090, 0.952421, -0.150683, 0.264931, 0.375082, 0.914309, 0.587867, 0.238650, 0.173483, 0.000000, 2.000000, 7.000000, 25.000000, 0.000000, - -8.976800, 8.902997, 111.039101, 0.952421, -0.150683, 0.264931, 0.350258, 0.914446, 0.805265, 0.194735, 0.000000, 0.000000, 2.000000, 25.000000, 0.000000, 0.000000, - -8.976800, 8.902997, 111.039101, -0.196364, -0.903966, 0.379852, 0.350258, 0.914446, 0.805265, 0.194735, 0.000000, 0.000000, 2.000000, 25.000000, 0.000000, 0.000000, - -9.643900, 11.183098, 116.120392, -0.196364, -0.903965, 0.379852, 0.324217, 0.942406, 0.500000, 0.500000, 0.000000, 0.000000, 24.000000, 25.000000, 0.000000, 0.000000, - -11.116790, 10.775288, 114.388481, -0.196364, -0.903965, 0.379852, 0.322533, 0.925528, 0.800000, 0.200000, 0.000000, 0.000000, 25.000000, 24.000000, 0.000000, 0.000000, - -11.116790, 10.775288, 114.388481, 0.002376, -0.872230, 0.489091, 0.322533, 0.925528, 0.800000, 0.200000, 0.000000, 0.000000, 25.000000, 24.000000, 0.000000, 0.000000, - -9.651800, 8.949997, 111.126198, 0.002376, -0.872230, 0.489091, 0.347407, 0.911837, 0.800000, 0.200000, 0.000000, 0.000000, 25.000000, 24.000000, 0.000000, 0.000000, - -8.976800, 8.902997, 111.039101, 0.002376, -0.872230, 0.489091, 0.350258, 0.914446, 0.805265, 0.194735, 0.000000, 0.000000, 2.000000, 25.000000, 0.000000, 0.000000, - 6.803290, -2.382584, 100.167900, -0.931868, 0.162497, -0.324370, 0.804244, 0.955238, 0.640083, 0.359917, 0.000000, 0.000000, 7.000000, 5.000000, 0.000000, 0.000000, - 7.208000, 0.656896, 100.527893, -0.931868, 0.162497, -0.324370, 0.827754, 0.945657, 0.671550, 0.328450, 0.000000, 0.000000, 7.000000, 5.000000, 0.000000, 0.000000, - 8.452590, -0.422384, 96.411690, -0.931868, 0.162497, -0.324370, 0.804259, 0.917728, 0.775763, 0.208862, 0.015374, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - 8.452590, -0.422384, 96.411690, -0.902321, 0.384039, -0.195783, 0.804259, 0.917728, 0.775763, 0.208862, 0.015374, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - 7.235300, -2.820484, 97.317902, -0.902321, 0.384039, -0.195783, 0.789897, 0.936089, 0.704676, 0.289893, 0.005431, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - 6.803290, -2.382584, 100.167900, -0.902321, 0.384039, -0.195783, 0.804244, 0.955238, 0.640083, 0.359917, 0.000000, 0.000000, 7.000000, 5.000000, 0.000000, 0.000000, - 7.235300, -2.820484, 97.317902, -0.850652, 0.258887, -0.457568, 0.789897, 0.936089, 0.704676, 0.289893, 0.005431, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - 8.452590, -0.422384, 96.411690, -0.850652, 0.258887, -0.457568, 0.804259, 0.917728, 0.775763, 0.208862, 0.015374, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - 9.206200, -3.166994, 93.457802, -0.850652, 0.258887, -0.457568, 0.773222, 0.904316, 0.869324, 0.097125, 0.033551, 0.000000, 5.000000, 6.000000, 7.000000, 0.000000, - 9.206200, -3.166994, 93.457802, -0.811122, 0.376112, -0.447907, 0.773222, 0.904316, 0.869324, 0.097125, 0.033551, 0.000000, 5.000000, 6.000000, 7.000000, 0.000000, - 7.581290, -5.203394, 94.690392, -0.811122, 0.376112, -0.447907, 0.762509, 0.925505, 0.885240, 0.061273, 0.053487, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - 7.235300, -2.820484, 97.317902, -0.811122, 0.376112, -0.447907, 0.789897, 0.936089, 0.704676, 0.289893, 0.005431, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - 8.452590, -0.422384, 96.411690, -0.862637, 0.139407, -0.486234, 0.804259, 0.917728, 0.775763, 0.208862, 0.015374, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - 10.814290, 1.506196, 92.774689, -0.862637, 0.139407, -0.486234, 0.805277, 0.878740, 0.833447, 0.129948, 0.036605, 0.000000, 5.000000, 6.000000, 7.000000, 0.000000, - 10.622890, -1.244194, 92.325699, -0.862637, 0.139407, -0.486234, 0.783280, 0.884869, 0.845756, 0.137855, 0.016389, 0.000000, 5.000000, 6.000000, 7.000000, 0.000000, - 10.622890, -1.244194, 92.325699, -0.813059, 0.308274, -0.493864, 0.783280, 0.884869, 0.845756, 0.137855, 0.016389, 0.000000, 5.000000, 6.000000, 7.000000, 0.000000, - 9.206200, -3.166994, 93.457802, -0.813059, 0.308274, -0.493864, 0.773222, 0.904316, 0.869324, 0.097125, 0.033551, 0.000000, 5.000000, 6.000000, 7.000000, 0.000000, - 8.452590, -0.422384, 96.411690, -0.813059, 0.308274, -0.493864, 0.804259, 0.917728, 0.775763, 0.208862, 0.015374, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - 10.814290, 1.506196, 92.774689, -0.856627, -0.143680, -0.495526, 0.805277, 0.878740, 0.833447, 0.129948, 0.036605, 0.000000, 5.000000, 6.000000, 7.000000, 0.000000, - 11.508890, 5.094406, 90.533501, -0.856627, -0.143680, -0.495526, 0.825574, 0.850384, 1.000000, 0.000000, 0.000000, 0.000000, 6.000000, 0.000000, 0.000000, 0.000000, - 13.464200, 2.031605, 88.041389, -0.856627, -0.143680, -0.495526, 0.793062, 0.835145, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 11.000000, 0.000000, 0.000000, - 13.464200, 2.031605, 88.041389, -0.870691, 0.137671, -0.472169, 0.793062, 0.835145, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 11.000000, 0.000000, 0.000000, - 10.622890, -1.244194, 92.325699, -0.870691, 0.137671, -0.472169, 0.783280, 0.884869, 0.845756, 0.137855, 0.016389, 0.000000, 5.000000, 6.000000, 7.000000, 0.000000, - 10.814290, 1.506196, 92.774689, -0.870691, 0.137671, -0.472169, 0.805277, 0.878740, 0.833447, 0.129948, 0.036605, 0.000000, 5.000000, 6.000000, 7.000000, 0.000000, - 11.508890, 5.094406, 90.533501, -0.756810, -0.473323, -0.450781, 0.825574, 0.850384, 1.000000, 0.000000, 0.000000, 0.000000, 6.000000, 0.000000, 0.000000, 0.000000, - 10.269880, 10.273096, 87.176003, -0.756810, -0.473323, -0.450781, 0.864623, 0.816861, 0.810000, 0.100000, 0.090000, 0.000000, 6.000000, 8.000000, 11.000000, 0.000000, - 13.003000, 6.381696, 86.673401, -0.756810, -0.473323, -0.450781, 0.825302, 0.814793, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 11.000000, 0.000000, 0.000000, - 6.803290, -2.382584, 100.167900, -0.987079, 0.140545, -0.076952, 0.804244, 0.955238, 0.640083, 0.359917, 0.000000, 0.000000, 7.000000, 5.000000, 0.000000, 0.000000, - 6.413090, -3.362983, 103.382492, -0.987079, 0.140545, -0.076952, 0.809659, 0.982598, 0.914915, 0.084946, 0.000139, 0.000000, 7.000000, 5.000000, 2.000000, 0.000000, - 7.208000, 0.656896, 100.527893, -0.987079, 0.140545, -0.076952, 0.827754, 0.945657, 0.671550, 0.328450, 0.000000, 0.000000, 7.000000, 5.000000, 0.000000, 0.000000, - 0.000000, 17.679937, 82.159988, -0.191551, -0.813232, -0.549511, 0.983108, 0.752008, 0.690102, 0.278806, 0.029003, 0.002088, 8.000000, 12.000000, 6.000000, 9.000000, - 6.951190, 16.478527, 81.514900, -0.191551, -0.813232, -0.549511, 0.929022, 0.770933, 0.665410, 0.170572, 0.091263, 0.072756, 8.000000, 12.000000, 6.000000, 9.000000, - 5.867590, 12.656106, 87.549500, -0.191551, -0.813232, -0.549511, 0.917924, 0.823795, 0.662025, 0.150031, 0.119744, 0.068200, 8.000000, 6.000000, 9.000000, 5.000000, - 5.867590, 12.656106, 87.549500, -0.048617, -0.756473, -0.652216, 0.917924, 0.823795, 0.662025, 0.150031, 0.119744, 0.068200, 8.000000, 6.000000, 9.000000, 5.000000, - 0.000000, 13.033206, 87.549500, -0.048617, -0.756473, -0.652216, 0.981894, 0.813882, 0.818206, 0.131337, 0.025228, 0.025228, 8.000000, 6.000000, 9.000000, 10.000000, - 0.000000, 17.679937, 82.159988, -0.048617, -0.756473, -0.652216, 0.983108, 0.752008, 0.690102, 0.278806, 0.029003, 0.002088, 8.000000, 12.000000, 6.000000, 9.000000, - 0.000000, 13.033206, 87.549500, -0.048513, -0.754848, -0.654103, 0.981894, 0.813882, 0.818206, 0.131337, 0.025228, 0.025228, 8.000000, 6.000000, 9.000000, 10.000000, - 5.867590, 12.656106, 87.549500, -0.048513, -0.754848, -0.654103, 0.917924, 0.823795, 0.662025, 0.150031, 0.119744, 0.068200, 8.000000, 6.000000, 9.000000, 5.000000, - 4.693600, 8.792206, 92.095589, -0.048513, -0.754848, -0.654103, 0.909922, 0.874371, 0.500000, 0.500000, 0.000000, 0.000000, 5.000000, 6.000000, 0.000000, 0.000000, - 4.693600, 8.792206, 92.095589, 0.069910, -0.692404, -0.718115, 0.909922, 0.874371, 0.500000, 0.500000, 0.000000, 0.000000, 5.000000, 6.000000, 0.000000, 0.000000, - 0.000000, 8.318306, 92.095589, 0.069910, -0.692404, -0.718115, 0.981499, 0.867661, 0.550000, 0.450000, 0.000000, 0.000000, 5.000000, 6.000000, 0.000000, 0.000000, - 0.000000, 13.033206, 87.549500, 0.069910, -0.692404, -0.718115, 0.981894, 0.813882, 0.818206, 0.131337, 0.025228, 0.025228, 8.000000, 6.000000, 9.000000, 10.000000, - 10.269880, 10.273096, 87.176003, -0.460856, -0.557788, -0.690278, 0.864623, 0.816861, 0.810000, 0.100000, 0.090000, 0.000000, 6.000000, 8.000000, 11.000000, 0.000000, - 11.508890, 5.094406, 90.533501, -0.460856, -0.557788, -0.690278, 0.825574, 0.850384, 1.000000, 0.000000, 0.000000, 0.000000, 6.000000, 0.000000, 0.000000, 0.000000, - 4.693600, 8.792206, 92.095589, -0.460856, -0.557788, -0.690278, 0.909922, 0.874371, 0.500000, 0.500000, 0.000000, 0.000000, 5.000000, 6.000000, 0.000000, 0.000000, - 4.693600, 8.792206, 92.095589, -0.403383, -0.643187, -0.650840, 0.909922, 0.874371, 0.500000, 0.500000, 0.000000, 0.000000, 5.000000, 6.000000, 0.000000, 0.000000, - 5.867590, 12.656106, 87.549500, -0.403383, -0.643187, -0.650840, 0.917924, 0.823795, 0.662025, 0.150031, 0.119744, 0.068200, 8.000000, 6.000000, 9.000000, 5.000000, - 10.269880, 10.273096, 87.176003, -0.403383, -0.643187, -0.650840, 0.864623, 0.816861, 0.810000, 0.100000, 0.090000, 0.000000, 6.000000, 8.000000, 11.000000, 0.000000, - 10.814290, 1.506196, 92.774689, -0.678062, -0.290457, -0.675179, 0.805277, 0.878740, 0.833447, 0.129948, 0.036605, 0.000000, 5.000000, 6.000000, 7.000000, 0.000000, - 8.484680, 3.985206, 94.047791, -0.678062, -0.290457, -0.675179, 0.833670, 0.888643, 0.819179, 0.087369, 0.082954, 0.010499, 5.000000, 7.000000, 6.000000, 8.000000, - 11.508890, 5.094406, 90.533501, -0.678062, -0.290457, -0.675179, 0.825574, 0.850384, 1.000000, 0.000000, 0.000000, 0.000000, 6.000000, 0.000000, 0.000000, 0.000000, - 10.814290, 1.506196, 92.774689, -0.700020, -0.333558, -0.631435, 0.805277, 0.878740, 0.833447, 0.129948, 0.036605, 0.000000, 5.000000, 6.000000, 7.000000, 0.000000, - 8.452590, -0.422384, 96.411690, -0.700020, -0.333558, -0.631435, 0.804259, 0.917728, 0.775763, 0.208862, 0.015374, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - 8.484680, 3.985206, 94.047791, -0.700020, -0.333558, -0.631435, 0.833670, 0.888643, 0.819179, 0.087369, 0.082954, 0.010499, 5.000000, 7.000000, 6.000000, 8.000000, - 11.508890, 5.094406, 90.533501, -0.480916, -0.627825, -0.612009, 0.825574, 0.850384, 1.000000, 0.000000, 0.000000, 0.000000, 6.000000, 0.000000, 0.000000, 0.000000, - 8.484680, 3.985206, 94.047791, -0.480916, -0.627825, -0.612009, 0.833670, 0.888643, 0.819179, 0.087369, 0.082954, 0.010499, 5.000000, 7.000000, 6.000000, 8.000000, - 4.693600, 8.792206, 92.095589, -0.480916, -0.627825, -0.612009, 0.909922, 0.874371, 0.500000, 0.500000, 0.000000, 0.000000, 5.000000, 6.000000, 0.000000, 0.000000, - 6.944600, 21.211004, 71.986893, -0.192411, -0.878928, -0.436422, 0.924187, 0.666336, 0.523605, 0.473987, 0.001952, 0.000457, 12.000000, 8.000000, 38.000000, 9.000000, - 6.951190, 16.478527, 81.514900, -0.192411, -0.878928, -0.436422, 0.929022, 0.770933, 0.665410, 0.170572, 0.091263, 0.072756, 8.000000, 12.000000, 6.000000, 9.000000, - 0.000000, 17.679937, 82.159988, -0.192411, -0.878927, -0.436422, 0.983108, 0.752008, 0.690102, 0.278806, 0.029003, 0.002088, 8.000000, 12.000000, 6.000000, 9.000000, - 0.000000, 17.679937, 82.159988, -0.128631, -0.906377, -0.402411, 0.983108, 0.752008, 0.690102, 0.278806, 0.029003, 0.002088, 8.000000, 12.000000, 6.000000, 9.000000, - 0.000000, 22.412384, 71.500793, -0.128631, -0.906377, -0.402411, 0.981974, 0.659272, 0.489666, 0.489666, 0.020667, 0.000000, 8.000000, 12.000000, 38.000000, 0.000000, - 6.944600, 21.211004, 71.986893, -0.128631, -0.906377, -0.402411, 0.924187, 0.666336, 0.523605, 0.473987, 0.001952, 0.000457, 12.000000, 8.000000, 38.000000, 9.000000, - 7.528690, 25.055393, 57.090488, -0.147744, -0.956232, -0.252572, 0.919855, 0.538917, 0.504412, 0.495588, 0.000000, 0.000000, 12.000000, 38.000000, 0.000000, 0.000000, - 6.944600, 21.211004, 71.986893, -0.147744, -0.956232, -0.252572, 0.924187, 0.666336, 0.523605, 0.473987, 0.001952, 0.000457, 12.000000, 8.000000, 38.000000, 9.000000, - 0.000000, 22.412384, 71.500793, -0.147744, -0.956232, -0.252572, 0.981974, 0.659272, 0.489666, 0.489666, 0.020667, 0.000000, 8.000000, 12.000000, 38.000000, 0.000000, - 0.000000, 22.412384, 71.500793, -0.137074, -0.959135, -0.247530, 0.981974, 0.659272, 0.489666, 0.489666, 0.020667, 0.000000, 8.000000, 12.000000, 38.000000, 0.000000, - 0.000000, 26.256794, 56.604401, -0.137073, -0.959135, -0.247530, 0.982540, 0.533025, 0.500000, 0.500000, 0.000000, 0.000000, 12.000000, 38.000000, 0.000000, 0.000000, - 7.528690, 25.055393, 57.090488, -0.137074, -0.959135, -0.247530, 0.919855, 0.538917, 0.504412, 0.495588, 0.000000, 0.000000, 12.000000, 38.000000, 0.000000, 0.000000, - 11.508890, 5.094406, 90.533501, -0.881328, -0.224232, -0.415910, 0.825574, 0.850384, 1.000000, 0.000000, 0.000000, 0.000000, 6.000000, 0.000000, 0.000000, 0.000000, - 13.003000, 6.381696, 86.673401, -0.881328, -0.224232, -0.415910, 0.825302, 0.814793, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 11.000000, 0.000000, 0.000000, - 13.464200, 2.031605, 88.041389, -0.881328, -0.224232, -0.415910, 0.793062, 0.835145, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 11.000000, 0.000000, 0.000000, - 17.262390, 3.295795, 80.337891, -0.855777, -0.235576, -0.460598, 0.778965, 0.764825, 1.000000, 0.000000, 0.000000, 0.000000, 11.000000, 0.000000, 0.000000, 0.000000, - 13.464200, 2.031605, 88.041389, -0.855777, -0.235576, -0.460598, 0.793062, 0.835145, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 11.000000, 0.000000, 0.000000, - 13.003000, 6.381696, 86.673401, -0.855777, -0.235576, -0.460598, 0.825302, 0.814793, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 11.000000, 0.000000, 0.000000, - 13.003000, 6.381696, 86.673401, -0.844540, -0.078043, -0.529775, 0.825302, 0.814793, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 11.000000, 0.000000, 0.000000, - 16.832890, 8.844385, 80.205200, -0.844540, -0.078043, -0.529775, 0.822439, 0.750146, 1.000000, 0.000000, 0.000000, 0.000000, 11.000000, 0.000000, 0.000000, 0.000000, - 17.262390, 3.295795, 80.337891, -0.844540, -0.078043, -0.529775, 0.778965, 0.764825, 1.000000, 0.000000, 0.000000, 0.000000, 11.000000, 0.000000, 0.000000, 0.000000, - 20.440590, 6.930195, 71.679298, -0.924314, -0.080470, -0.373053, 0.783429, 0.682579, 0.500000, 0.500000, 0.000000, 0.000000, 11.000000, 39.000000, 0.000000, 0.000000, - 17.262390, 3.295795, 80.337891, -0.924314, -0.080470, -0.373053, 0.778965, 0.764825, 1.000000, 0.000000, 0.000000, 0.000000, 11.000000, 0.000000, 0.000000, 0.000000, - 16.832890, 8.844385, 80.205200, -0.924314, -0.080470, -0.373053, 0.822439, 0.750146, 1.000000, 0.000000, 0.000000, 0.000000, 11.000000, 0.000000, 0.000000, 0.000000, - 16.832890, 8.844385, 80.205200, -0.924224, -0.069623, -0.375450, 0.822439, 0.750146, 1.000000, 0.000000, 0.000000, 0.000000, 11.000000, 0.000000, 0.000000, 0.000000, - 19.979401, 12.337894, 71.811790, -0.924224, -0.069623, -0.375450, 0.826396, 0.672114, 0.500000, 0.500000, 0.000000, 0.000000, 11.000000, 39.000000, 0.000000, 0.000000, - 20.440590, 6.930195, 71.679298, -0.924224, -0.069623, -0.375450, 0.783429, 0.682579, 0.500000, 0.500000, 0.000000, 0.000000, 11.000000, 39.000000, 0.000000, 0.000000, - 23.447800, 9.781504, 61.389900, -0.951531, -0.073835, -0.298558, 0.782425, 0.590986, 0.500000, 0.500000, 0.000000, 0.000000, 39.000000, 40.000000, 0.000000, 0.000000, - 20.440590, 6.930195, 71.679298, -0.951531, -0.073835, -0.298558, 0.783429, 0.682579, 0.500000, 0.500000, 0.000000, 0.000000, 11.000000, 39.000000, 0.000000, 0.000000, - 19.979401, 12.337894, 71.811790, -0.951531, -0.073835, -0.298558, 0.826396, 0.672114, 0.500000, 0.500000, 0.000000, 0.000000, 11.000000, 39.000000, 0.000000, 0.000000, - 19.979401, 12.337894, 71.811790, -0.907635, -0.361472, -0.213395, 0.826396, 0.672114, 0.500000, 0.500000, 0.000000, 0.000000, 11.000000, 39.000000, 0.000000, 0.000000, - 21.556801, 15.337304, 60.021881, -0.907635, -0.361472, -0.213395, 0.828140, 0.571857, 0.511632, 0.488368, 0.000000, 0.000000, 39.000000, 40.000000, 0.000000, 0.000000, - 23.447800, 9.781504, 61.389900, -0.907635, -0.361472, -0.213395, 0.782425, 0.590986, 0.500000, 0.500000, 0.000000, 0.000000, 39.000000, 40.000000, 0.000000, 0.000000, - 23.635889, 12.860094, 53.310291, -0.922780, -0.352438, -0.155772, 0.793984, 0.520747, 1.000000, 0.000000, 0.000000, 0.000000, 40.000000, 0.000000, 0.000000, 0.000000, - 23.447800, 9.781504, 61.389900, -0.922780, -0.352438, -0.155772, 0.782425, 0.590986, 0.500000, 0.500000, 0.000000, 0.000000, 39.000000, 40.000000, 0.000000, 0.000000, - 21.556801, 15.337304, 60.021881, -0.922780, -0.352438, -0.155772, 0.828140, 0.571857, 0.511632, 0.488368, 0.000000, 0.000000, 39.000000, 40.000000, 0.000000, 0.000000, - 21.556801, 15.337304, 60.021881, -0.933932, -0.312197, -0.174079, 0.828140, 0.571857, 0.511632, 0.488368, 0.000000, 0.000000, 39.000000, 40.000000, 0.000000, 0.000000, - 23.042900, 17.435204, 48.286591, -0.933932, -0.312197, -0.174079, 0.823439, 0.472896, 1.000000, 0.000000, 0.000000, 0.000000, 40.000000, 0.000000, 0.000000, 0.000000, - 23.635889, 12.860094, 53.310291, -0.933932, -0.312197, -0.174080, 0.793984, 0.520747, 1.000000, 0.000000, 0.000000, 0.000000, 40.000000, 0.000000, 0.000000, 0.000000, - 6.951190, 16.478527, 81.514900, -0.544543, -0.705303, -0.453894, 0.929022, 0.770933, 0.665410, 0.170572, 0.091263, 0.072756, 8.000000, 12.000000, 6.000000, 9.000000, - 12.492200, 12.889794, 80.443787, -0.544543, -0.705303, -0.453894, 0.871367, 0.754977, 0.550000, 0.450000, 0.000000, 0.000000, 8.000000, 11.000000, 0.000000, 0.000000, - 10.269880, 10.273096, 87.176003, -0.544543, -0.705303, -0.453894, 0.864623, 0.816861, 0.810000, 0.100000, 0.090000, 0.000000, 6.000000, 8.000000, 11.000000, 0.000000, - 10.269880, 10.273096, 87.176003, -0.436589, -0.722521, -0.536054, 0.864623, 0.816861, 0.810000, 0.100000, 0.090000, 0.000000, 6.000000, 8.000000, 11.000000, 0.000000, - 5.867590, 12.656106, 87.549500, -0.436589, -0.722521, -0.536053, 0.917924, 0.823795, 0.662025, 0.150031, 0.119744, 0.068200, 8.000000, 6.000000, 9.000000, 5.000000, - 6.951190, 16.478527, 81.514900, -0.436589, -0.722521, -0.536054, 0.929022, 0.770933, 0.665410, 0.170572, 0.091263, 0.072756, 8.000000, 12.000000, 6.000000, 9.000000, - 12.492200, 12.889794, 80.443787, -0.578454, -0.587289, -0.566112, 0.871367, 0.754977, 0.550000, 0.450000, 0.000000, 0.000000, 8.000000, 11.000000, 0.000000, 0.000000, - 16.832890, 8.844385, 80.205200, -0.578454, -0.587289, -0.566112, 0.822439, 0.750146, 1.000000, 0.000000, 0.000000, 0.000000, 11.000000, 0.000000, 0.000000, 0.000000, - 13.003000, 6.381696, 86.673401, -0.578454, -0.587289, -0.566112, 0.825302, 0.814793, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 11.000000, 0.000000, 0.000000, - 13.003000, 6.381696, 86.673401, -0.761522, -0.478372, -0.437315, 0.825302, 0.814793, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 11.000000, 0.000000, 0.000000, - 10.269880, 10.273096, 87.176003, -0.761522, -0.478372, -0.437315, 0.864623, 0.816861, 0.810000, 0.100000, 0.090000, 0.000000, 6.000000, 8.000000, 11.000000, 0.000000, - 12.492200, 12.889794, 80.443787, -0.761522, -0.478372, -0.437315, 0.871367, 0.754977, 0.550000, 0.450000, 0.000000, 0.000000, 8.000000, 11.000000, 0.000000, 0.000000, - 16.971291, 14.280905, 71.811790, -0.474808, -0.735083, -0.483952, 0.855498, 0.673989, 0.500000, 0.500000, 0.000000, 0.000000, 11.000000, 39.000000, 0.000000, 0.000000, - 19.979401, 12.337894, 71.811790, -0.474808, -0.735083, -0.483952, 0.826396, 0.672114, 0.500000, 0.500000, 0.000000, 0.000000, 11.000000, 39.000000, 0.000000, 0.000000, - 16.832890, 8.844385, 80.205200, -0.474808, -0.735083, -0.483952, 0.822439, 0.750146, 1.000000, 0.000000, 0.000000, 0.000000, 11.000000, 0.000000, 0.000000, 0.000000, - 16.832890, 8.844385, 80.205200, -0.627969, -0.648425, -0.430348, 0.822439, 0.750146, 1.000000, 0.000000, 0.000000, 0.000000, 11.000000, 0.000000, 0.000000, 0.000000, - 12.492200, 12.889794, 80.443787, -0.627969, -0.648425, -0.430348, 0.871367, 0.754977, 0.550000, 0.450000, 0.000000, 0.000000, 8.000000, 11.000000, 0.000000, 0.000000, - 16.971291, 14.280905, 71.811790, -0.627969, -0.648425, -0.430348, 0.855498, 0.673989, 0.500000, 0.500000, 0.000000, 0.000000, 11.000000, 39.000000, 0.000000, 0.000000, - 19.979401, 12.337894, 71.811790, -0.521623, -0.807561, -0.275237, 0.826396, 0.672114, 0.500000, 0.500000, 0.000000, 0.000000, 11.000000, 39.000000, 0.000000, 0.000000, - 16.971291, 14.280905, 71.811790, -0.521623, -0.807561, -0.275237, 0.855498, 0.673989, 0.500000, 0.500000, 0.000000, 0.000000, 11.000000, 39.000000, 0.000000, 0.000000, - 21.556801, 15.337304, 60.021881, -0.521623, -0.807561, -0.275237, 0.828140, 0.571857, 0.511632, 0.488368, 0.000000, 0.000000, 39.000000, 40.000000, 0.000000, 0.000000, - 7.528690, 27.695002, 43.015388, -0.143442, -0.972701, -0.182418, 0.920117, 0.420771, 1.000000, 0.000000, 0.000000, 0.000000, 38.000000, 0.000000, 0.000000, 0.000000, - 7.528690, 25.055393, 57.090488, -0.143442, -0.972701, -0.182418, 0.919855, 0.538917, 0.504412, 0.495588, 0.000000, 0.000000, 12.000000, 38.000000, 0.000000, 0.000000, - 0.000000, 26.256794, 56.604401, -0.143442, -0.972701, -0.182418, 0.982540, 0.533025, 0.500000, 0.500000, 0.000000, 0.000000, 12.000000, 38.000000, 0.000000, 0.000000, - 0.000000, 26.256794, 56.604401, -0.094563, -0.983150, -0.156443, 0.982540, 0.533025, 0.500000, 0.500000, 0.000000, 0.000000, 12.000000, 38.000000, 0.000000, 0.000000, - 0.000000, 28.896402, 40.016102, -0.094563, -0.983150, -0.156443, 0.982406, 0.394743, 1.000000, 0.000000, 0.000000, 0.000000, 38.000000, 0.000000, 0.000000, 0.000000, - 7.528690, 27.695002, 43.015388, -0.094563, -0.983150, -0.156443, 0.920117, 0.420771, 1.000000, 0.000000, 0.000000, 0.000000, 38.000000, 0.000000, 0.000000, 0.000000, - -6.803290, -2.382584, 100.167900, 0.902321, 0.384039, -0.195783, 0.804244, 0.955238, 0.640082, 0.359917, 0.000000, 0.000000, 7.000000, 5.000000, 0.000000, 0.000000, - -7.235300, -2.820484, 97.317902, 0.902321, 0.384039, -0.195783, 0.789897, 0.936089, 0.704676, 0.289893, 0.005431, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - -8.452590, -0.422384, 96.411690, 0.902321, 0.384039, -0.195783, 0.804259, 0.917728, 0.775763, 0.208862, 0.015374, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - -8.452590, -0.422384, 96.411690, 0.931868, 0.162497, -0.324370, 0.804259, 0.917728, 0.775763, 0.208862, 0.015374, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - -7.208000, 0.656896, 100.527893, 0.931868, 0.162497, -0.324370, 0.827754, 0.945657, 0.671549, 0.328451, 0.000000, 0.000000, 7.000000, 5.000000, 0.000000, 0.000000, - -6.803290, -2.382584, 100.167900, 0.931868, 0.162497, -0.324370, 0.804244, 0.955238, 0.640082, 0.359917, 0.000000, 0.000000, 7.000000, 5.000000, 0.000000, 0.000000, - -7.235300, -2.820484, 97.317902, 0.811122, 0.376112, -0.447907, 0.789897, 0.936089, 0.704676, 0.289893, 0.005431, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - -7.581290, -5.203394, 94.690392, 0.811122, 0.376112, -0.447907, 0.762509, 0.925505, 0.885240, 0.061273, 0.053487, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - -9.206200, -3.166994, 93.457802, 0.811122, 0.376112, -0.447907, 0.773222, 0.904316, 0.869324, 0.097125, 0.033551, 0.000000, 5.000000, 6.000000, 7.000000, 0.000000, - -9.206200, -3.166994, 93.457802, 0.850652, 0.258887, -0.457568, 0.773222, 0.904316, 0.869324, 0.097125, 0.033551, 0.000000, 5.000000, 6.000000, 7.000000, 0.000000, - -8.452590, -0.422384, 96.411690, 0.850652, 0.258887, -0.457568, 0.804259, 0.917728, 0.775763, 0.208862, 0.015374, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - -7.235300, -2.820484, 97.317902, 0.850652, 0.258887, -0.457568, 0.789897, 0.936089, 0.704676, 0.289893, 0.005431, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - -8.452590, -0.422384, 96.411690, 0.813059, 0.308274, -0.493864, 0.804259, 0.917728, 0.775763, 0.208862, 0.015374, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - -9.206200, -3.166994, 93.457802, 0.813059, 0.308274, -0.493864, 0.773222, 0.904316, 0.869324, 0.097125, 0.033551, 0.000000, 5.000000, 6.000000, 7.000000, 0.000000, - -10.622890, -1.244194, 92.325699, 0.813059, 0.308274, -0.493864, 0.783280, 0.884869, 0.845756, 0.137855, 0.016389, 0.000000, 5.000000, 6.000000, 7.000000, 0.000000, - -10.622890, -1.244194, 92.325699, 0.862637, 0.139407, -0.486234, 0.783280, 0.884869, 0.845756, 0.137855, 0.016389, 0.000000, 5.000000, 6.000000, 7.000000, 0.000000, - -10.814290, 1.506196, 92.774689, 0.862637, 0.139407, -0.486234, 0.805277, 0.878740, 0.833447, 0.129948, 0.036605, 0.000000, 5.000000, 6.000000, 7.000000, 0.000000, - -8.452590, -0.422384, 96.411690, 0.862637, 0.139407, -0.486234, 0.804259, 0.917728, 0.775763, 0.208862, 0.015374, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - -10.814290, 1.506196, 92.774689, 0.870691, 0.137671, -0.472169, 0.805277, 0.878740, 0.833447, 0.129948, 0.036605, 0.000000, 5.000000, 6.000000, 7.000000, 0.000000, - -10.622890, -1.244194, 92.325699, 0.870691, 0.137671, -0.472169, 0.783280, 0.884869, 0.845756, 0.137855, 0.016389, 0.000000, 5.000000, 6.000000, 7.000000, 0.000000, - -13.464200, 2.031605, 88.041389, 0.870691, 0.137671, -0.472169, 0.793062, 0.835145, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 26.000000, 0.000000, 0.000000, - -13.464200, 2.031605, 88.041389, 0.856627, -0.143680, -0.495526, 0.793062, 0.835145, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 26.000000, 0.000000, 0.000000, - -11.508890, 5.094406, 90.533501, 0.856627, -0.143680, -0.495526, 0.825574, 0.850384, 1.000000, 0.000000, 0.000000, 0.000000, 6.000000, 0.000000, 0.000000, 0.000000, - -10.814290, 1.506196, 92.774689, 0.856627, -0.143680, -0.495526, 0.805277, 0.878740, 0.833447, 0.129948, 0.036605, 0.000000, 5.000000, 6.000000, 7.000000, 0.000000, - -11.508890, 5.094406, 90.533501, 0.756810, -0.473323, -0.450781, 0.825574, 0.850384, 1.000000, 0.000000, 0.000000, 0.000000, 6.000000, 0.000000, 0.000000, 0.000000, - -13.003000, 6.381696, 86.673401, 0.756810, -0.473323, -0.450781, 0.825302, 0.814793, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 26.000000, 0.000000, 0.000000, - -10.269880, 10.273096, 87.176003, 0.756810, -0.473323, -0.450781, 0.864623, 0.816861, 0.810000, 0.100000, 0.090000, 0.000000, 6.000000, 8.000000, 26.000000, 0.000000, - -6.803290, -2.382584, 100.167900, 0.987079, 0.140545, -0.076952, 0.804244, 0.955238, 0.640082, 0.359917, 0.000000, 0.000000, 7.000000, 5.000000, 0.000000, 0.000000, - -7.208000, 0.656896, 100.527893, 0.987079, 0.140545, -0.076952, 0.827754, 0.945657, 0.671549, 0.328451, 0.000000, 0.000000, 7.000000, 5.000000, 0.000000, 0.000000, - -6.413090, -3.362983, 103.382492, 0.987079, 0.140545, -0.076952, 0.809659, 0.982598, 0.914915, 0.084946, 0.000139, 0.000000, 7.000000, 5.000000, 2.000000, 0.000000, - 0.000000, 17.679937, 82.159988, 0.048617, -0.756473, -0.652216, 0.983108, 0.752008, 0.690102, 0.278806, 0.029003, 0.002088, 8.000000, 12.000000, 6.000000, 9.000000, - 0.000000, 13.033206, 87.549500, 0.048617, -0.756473, -0.652216, 0.981894, 0.813882, 0.818206, 0.131337, 0.025228, 0.025228, 8.000000, 6.000000, 9.000000, 10.000000, - -5.867590, 12.656106, 87.549500, 0.048617, -0.756473, -0.652216, 0.917924, 0.823795, 0.662025, 0.150031, 0.119744, 0.068200, 8.000000, 6.000000, 10.000000, 5.000000, - -5.867590, 12.656106, 87.549500, 0.191551, -0.813232, -0.549511, 0.917924, 0.823795, 0.662025, 0.150031, 0.119744, 0.068200, 8.000000, 6.000000, 10.000000, 5.000000, - -6.951190, 16.478527, 81.514900, 0.191551, -0.813232, -0.549511, 0.929022, 0.770933, 0.665564, 0.170612, 0.091051, 0.072773, 8.000000, 12.000000, 6.000000, 10.000000, - 0.000000, 17.679937, 82.159988, 0.191551, -0.813232, -0.549511, 0.983108, 0.752008, 0.690102, 0.278806, 0.029003, 0.002088, 8.000000, 12.000000, 6.000000, 9.000000, - 0.000000, 13.033206, 87.549500, -0.069910, -0.692404, -0.718115, 0.981894, 0.813882, 0.818206, 0.131337, 0.025228, 0.025228, 8.000000, 6.000000, 9.000000, 10.000000, - 0.000000, 8.318306, 92.095589, -0.069910, -0.692404, -0.718115, 0.981499, 0.867661, 0.550000, 0.450000, 0.000000, 0.000000, 5.000000, 6.000000, 0.000000, 0.000000, - -4.693600, 8.792206, 92.095589, -0.069910, -0.692404, -0.718115, 0.909922, 0.874371, 0.500000, 0.500000, 0.000000, 0.000000, 5.000000, 6.000000, 0.000000, 0.000000, - -4.693600, 8.792206, 92.095589, 0.048513, -0.754848, -0.654103, 0.909922, 0.874371, 0.500000, 0.500000, 0.000000, 0.000000, 5.000000, 6.000000, 0.000000, 0.000000, - -5.867590, 12.656106, 87.549500, 0.048513, -0.754848, -0.654103, 0.917924, 0.823795, 0.662025, 0.150031, 0.119744, 0.068200, 8.000000, 6.000000, 10.000000, 5.000000, - 0.000000, 13.033206, 87.549500, 0.048513, -0.754848, -0.654103, 0.981894, 0.813882, 0.818206, 0.131337, 0.025228, 0.025228, 8.000000, 6.000000, 9.000000, 10.000000, - -10.269880, 10.273096, 87.176003, 0.403383, -0.643187, -0.650840, 0.864623, 0.816861, 0.810000, 0.100000, 0.090000, 0.000000, 6.000000, 8.000000, 26.000000, 0.000000, - -5.867590, 12.656106, 87.549500, 0.403383, -0.643187, -0.650840, 0.917924, 0.823795, 0.662025, 0.150031, 0.119744, 0.068200, 8.000000, 6.000000, 10.000000, 5.000000, - -4.693600, 8.792206, 92.095589, 0.403383, -0.643187, -0.650840, 0.909922, 0.874371, 0.500000, 0.500000, 0.000000, 0.000000, 5.000000, 6.000000, 0.000000, 0.000000, - -4.693600, 8.792206, 92.095589, 0.460856, -0.557788, -0.690278, 0.909922, 0.874371, 0.500000, 0.500000, 0.000000, 0.000000, 5.000000, 6.000000, 0.000000, 0.000000, - -11.508890, 5.094406, 90.533501, 0.460856, -0.557788, -0.690278, 0.825574, 0.850384, 1.000000, 0.000000, 0.000000, 0.000000, 6.000000, 0.000000, 0.000000, 0.000000, - -10.269880, 10.273096, 87.176003, 0.460856, -0.557788, -0.690278, 0.864623, 0.816861, 0.810000, 0.100000, 0.090000, 0.000000, 6.000000, 8.000000, 26.000000, 0.000000, - -10.814290, 1.506196, 92.774689, 0.678062, -0.290457, -0.675179, 0.805277, 0.878740, 0.833447, 0.129948, 0.036605, 0.000000, 5.000000, 6.000000, 7.000000, 0.000000, - -11.508890, 5.094406, 90.533501, 0.678062, -0.290457, -0.675179, 0.825574, 0.850384, 1.000000, 0.000000, 0.000000, 0.000000, 6.000000, 0.000000, 0.000000, 0.000000, - -8.484680, 3.985206, 94.047791, 0.678062, -0.290457, -0.675179, 0.833670, 0.888643, 0.819179, 0.087369, 0.082954, 0.010499, 5.000000, 7.000000, 6.000000, 8.000000, - -10.814290, 1.506196, 92.774689, 0.700020, -0.333558, -0.631435, 0.805277, 0.878740, 0.833447, 0.129948, 0.036605, 0.000000, 5.000000, 6.000000, 7.000000, 0.000000, - -8.484680, 3.985206, 94.047791, 0.700020, -0.333558, -0.631435, 0.833670, 0.888643, 0.819179, 0.087369, 0.082954, 0.010499, 5.000000, 7.000000, 6.000000, 8.000000, - -8.452590, -0.422384, 96.411690, 0.700020, -0.333558, -0.631435, 0.804259, 0.917728, 0.775763, 0.208862, 0.015374, 0.000000, 5.000000, 7.000000, 6.000000, 0.000000, - -11.508890, 5.094406, 90.533501, 0.480916, -0.627825, -0.612009, 0.825574, 0.850384, 1.000000, 0.000000, 0.000000, 0.000000, 6.000000, 0.000000, 0.000000, 0.000000, - -4.693600, 8.792206, 92.095589, 0.480916, -0.627825, -0.612009, 0.909922, 0.874371, 0.500000, 0.500000, 0.000000, 0.000000, 5.000000, 6.000000, 0.000000, 0.000000, - -8.484680, 3.985206, 94.047791, 0.480916, -0.627825, -0.612009, 0.833670, 0.888643, 0.819179, 0.087369, 0.082954, 0.010499, 5.000000, 7.000000, 6.000000, 8.000000, - -6.944600, 21.211004, 71.986893, 0.128631, -0.906377, -0.402411, 0.924187, 0.666336, 0.523605, 0.473987, 0.001952, 0.000457, 12.000000, 8.000000, 38.000000, 10.000000, - 0.000000, 22.412384, 71.500793, 0.128631, -0.906377, -0.402411, 0.981974, 0.659272, 0.489666, 0.489666, 0.020667, 0.000000, 8.000000, 12.000000, 38.000000, 0.000000, - 0.000000, 17.679937, 82.159988, 0.128631, -0.906377, -0.402411, 0.983108, 0.752008, 0.690102, 0.278806, 0.029003, 0.002088, 8.000000, 12.000000, 6.000000, 9.000000, - 0.000000, 17.679937, 82.159988, 0.192411, -0.878927, -0.436422, 0.983108, 0.752008, 0.690102, 0.278806, 0.029003, 0.002088, 8.000000, 12.000000, 6.000000, 9.000000, - -6.951190, 16.478527, 81.514900, 0.192411, -0.878928, -0.436422, 0.929022, 0.770933, 0.665564, 0.170612, 0.091051, 0.072773, 8.000000, 12.000000, 6.000000, 10.000000, - -6.944600, 21.211004, 71.986893, 0.192411, -0.878928, -0.436422, 0.924187, 0.666336, 0.523605, 0.473987, 0.001952, 0.000457, 12.000000, 8.000000, 38.000000, 10.000000, - -7.528690, 25.055393, 57.090488, 0.137074, -0.959135, -0.247530, 0.919855, 0.538917, 0.504412, 0.495588, 0.000000, 0.000000, 12.000000, 38.000000, 0.000000, 0.000000, - 0.000000, 26.256794, 56.604401, 0.137073, -0.959135, -0.247530, 0.982540, 0.533025, 0.500000, 0.500000, 0.000000, 0.000000, 12.000000, 38.000000, 0.000000, 0.000000, - 0.000000, 22.412384, 71.500793, 0.137074, -0.959135, -0.247530, 0.981974, 0.659272, 0.489666, 0.489666, 0.020667, 0.000000, 8.000000, 12.000000, 38.000000, 0.000000, - 0.000000, 22.412384, 71.500793, 0.147744, -0.956232, -0.252572, 0.981974, 0.659272, 0.489666, 0.489666, 0.020667, 0.000000, 8.000000, 12.000000, 38.000000, 0.000000, - -6.944600, 21.211004, 71.986893, 0.147744, -0.956232, -0.252572, 0.924187, 0.666336, 0.523605, 0.473987, 0.001952, 0.000457, 12.000000, 8.000000, 38.000000, 10.000000, - -7.528690, 25.055393, 57.090488, 0.147744, -0.956232, -0.252572, 0.919855, 0.538917, 0.504412, 0.495588, 0.000000, 0.000000, 12.000000, 38.000000, 0.000000, 0.000000, - -11.508890, 5.094406, 90.533501, 0.881328, -0.224232, -0.415910, 0.825574, 0.850384, 1.000000, 0.000000, 0.000000, 0.000000, 6.000000, 0.000000, 0.000000, 0.000000, - -13.464200, 2.031605, 88.041389, 0.881328, -0.224232, -0.415910, 0.793062, 0.835145, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 26.000000, 0.000000, 0.000000, - -13.003000, 6.381696, 86.673401, 0.881328, -0.224232, -0.415910, 0.825302, 0.814793, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 26.000000, 0.000000, 0.000000, - -17.262390, 3.295795, 80.337891, 0.844540, -0.078043, -0.529775, 0.778965, 0.764825, 1.000000, 0.000000, 0.000000, 0.000000, 26.000000, 0.000000, 0.000000, 0.000000, - -16.832890, 8.844385, 80.205200, 0.844540, -0.078043, -0.529775, 0.822439, 0.750146, 1.000000, 0.000000, 0.000000, 0.000000, 26.000000, 0.000000, 0.000000, 0.000000, - -13.003000, 6.381696, 86.673401, 0.844540, -0.078043, -0.529775, 0.825302, 0.814793, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 26.000000, 0.000000, 0.000000, - -13.003000, 6.381696, 86.673401, 0.855777, -0.235576, -0.460598, 0.825302, 0.814793, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 26.000000, 0.000000, 0.000000, - -13.464200, 2.031605, 88.041389, 0.855777, -0.235576, -0.460598, 0.793062, 0.835145, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 26.000000, 0.000000, 0.000000, - -17.262390, 3.295795, 80.337891, 0.855777, -0.235576, -0.460598, 0.778965, 0.764825, 1.000000, 0.000000, 0.000000, 0.000000, 26.000000, 0.000000, 0.000000, 0.000000, - -20.440590, 6.930195, 71.679298, 0.924224, -0.069623, -0.375450, 0.783429, 0.682579, 0.500000, 0.500000, 0.000000, 0.000000, 26.000000, 41.000000, 0.000000, 0.000000, - -19.979401, 12.337894, 71.811790, 0.924224, -0.069623, -0.375450, 0.826396, 0.672114, 0.500000, 0.500000, 0.000000, 0.000000, 26.000000, 41.000000, 0.000000, 0.000000, - -16.832890, 8.844385, 80.205200, 0.924224, -0.069623, -0.375450, 0.822439, 0.750146, 1.000000, 0.000000, 0.000000, 0.000000, 26.000000, 0.000000, 0.000000, 0.000000, - -16.832890, 8.844385, 80.205200, 0.924314, -0.080470, -0.373053, 0.822439, 0.750146, 1.000000, 0.000000, 0.000000, 0.000000, 26.000000, 0.000000, 0.000000, 0.000000, - -17.262390, 3.295795, 80.337891, 0.924314, -0.080470, -0.373053, 0.778965, 0.764825, 1.000000, 0.000000, 0.000000, 0.000000, 26.000000, 0.000000, 0.000000, 0.000000, - -20.440590, 6.930195, 71.679298, 0.924314, -0.080470, -0.373053, 0.783429, 0.682579, 0.500000, 0.500000, 0.000000, 0.000000, 26.000000, 41.000000, 0.000000, 0.000000, - -23.447800, 9.781504, 61.389900, 0.907635, -0.361472, -0.213395, 0.782425, 0.590986, 0.500000, 0.500000, 0.000000, 0.000000, 41.000000, 42.000000, 0.000000, 0.000000, - -21.556801, 15.337304, 60.021881, 0.907635, -0.361472, -0.213395, 0.828140, 0.571857, 0.511632, 0.488368, 0.000000, 0.000000, 41.000000, 42.000000, 0.000000, 0.000000, - -19.979401, 12.337894, 71.811790, 0.907635, -0.361472, -0.213395, 0.826396, 0.672114, 0.500000, 0.500000, 0.000000, 0.000000, 26.000000, 41.000000, 0.000000, 0.000000, - -19.979401, 12.337894, 71.811790, 0.951531, -0.073835, -0.298558, 0.826396, 0.672114, 0.500000, 0.500000, 0.000000, 0.000000, 26.000000, 41.000000, 0.000000, 0.000000, - -20.440590, 6.930195, 71.679298, 0.951531, -0.073835, -0.298558, 0.783429, 0.682579, 0.500000, 0.500000, 0.000000, 0.000000, 26.000000, 41.000000, 0.000000, 0.000000, - -23.447800, 9.781504, 61.389900, 0.951531, -0.073835, -0.298558, 0.782425, 0.590986, 0.500000, 0.500000, 0.000000, 0.000000, 41.000000, 42.000000, 0.000000, 0.000000, - -23.635889, 12.860094, 53.310291, 0.933932, -0.312197, -0.174080, 0.793984, 0.520747, 1.000000, 0.000000, 0.000000, 0.000000, 42.000000, 0.000000, 0.000000, 0.000000, - -23.042900, 17.435204, 48.286591, 0.933932, -0.312197, -0.174079, 0.823439, 0.472896, 1.000000, 0.000000, 0.000000, 0.000000, 42.000000, 0.000000, 0.000000, 0.000000, - -21.556801, 15.337304, 60.021881, 0.933932, -0.312197, -0.174079, 0.828140, 0.571857, 0.511632, 0.488368, 0.000000, 0.000000, 41.000000, 42.000000, 0.000000, 0.000000, - -21.556801, 15.337304, 60.021881, 0.922780, -0.352438, -0.155772, 0.828140, 0.571857, 0.511632, 0.488368, 0.000000, 0.000000, 41.000000, 42.000000, 0.000000, 0.000000, - -23.447800, 9.781504, 61.389900, 0.922780, -0.352438, -0.155772, 0.782425, 0.590986, 0.500000, 0.500000, 0.000000, 0.000000, 41.000000, 42.000000, 0.000000, 0.000000, - -23.635889, 12.860094, 53.310291, 0.922780, -0.352438, -0.155772, 0.793984, 0.520747, 1.000000, 0.000000, 0.000000, 0.000000, 42.000000, 0.000000, 0.000000, 0.000000, - -6.951190, 16.478527, 81.514900, 0.436589, -0.722521, -0.536054, 0.929022, 0.770933, 0.665564, 0.170612, 0.091051, 0.072773, 8.000000, 12.000000, 6.000000, 10.000000, - -5.867590, 12.656106, 87.549500, 0.436589, -0.722521, -0.536053, 0.917924, 0.823795, 0.662025, 0.150031, 0.119744, 0.068200, 8.000000, 6.000000, 10.000000, 5.000000, - -10.269880, 10.273096, 87.176003, 0.436589, -0.722521, -0.536054, 0.864623, 0.816861, 0.810000, 0.100000, 0.090000, 0.000000, 6.000000, 8.000000, 26.000000, 0.000000, - -10.269880, 10.273096, 87.176003, 0.544543, -0.705303, -0.453894, 0.864623, 0.816861, 0.810000, 0.100000, 0.090000, 0.000000, 6.000000, 8.000000, 26.000000, 0.000000, - -12.492200, 12.889794, 80.443787, 0.544543, -0.705303, -0.453894, 0.871367, 0.754977, 0.550000, 0.450000, 0.000000, 0.000000, 8.000000, 26.000000, 0.000000, 0.000000, - -6.951190, 16.478527, 81.514900, 0.544543, -0.705303, -0.453894, 0.929022, 0.770933, 0.665564, 0.170612, 0.091051, 0.072773, 8.000000, 12.000000, 6.000000, 10.000000, - -12.492200, 12.889794, 80.443787, 0.761522, -0.478372, -0.437315, 0.871367, 0.754977, 0.550000, 0.450000, 0.000000, 0.000000, 8.000000, 26.000000, 0.000000, 0.000000, - -10.269880, 10.273096, 87.176003, 0.761522, -0.478372, -0.437315, 0.864623, 0.816861, 0.810000, 0.100000, 0.090000, 0.000000, 6.000000, 8.000000, 26.000000, 0.000000, - -13.003000, 6.381696, 86.673401, 0.761522, -0.478372, -0.437315, 0.825302, 0.814793, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 26.000000, 0.000000, 0.000000, - -13.003000, 6.381696, 86.673401, 0.578454, -0.587289, -0.566112, 0.825302, 0.814793, 0.750000, 0.250000, 0.000000, 0.000000, 6.000000, 26.000000, 0.000000, 0.000000, - -16.832890, 8.844385, 80.205200, 0.578454, -0.587289, -0.566112, 0.822439, 0.750146, 1.000000, 0.000000, 0.000000, 0.000000, 26.000000, 0.000000, 0.000000, 0.000000, - -12.492200, 12.889794, 80.443787, 0.578454, -0.587289, -0.566112, 0.871367, 0.754977, 0.550000, 0.450000, 0.000000, 0.000000, 8.000000, 26.000000, 0.000000, 0.000000, - -16.971291, 14.280905, 71.811790, 0.627969, -0.648425, -0.430348, 0.855498, 0.673989, 0.500000, 0.500000, 0.000000, 0.000000, 26.000000, 41.000000, 0.000000, 0.000000, - -12.492200, 12.889794, 80.443787, 0.627969, -0.648425, -0.430348, 0.871367, 0.754977, 0.550000, 0.450000, 0.000000, 0.000000, 8.000000, 26.000000, 0.000000, 0.000000, - -16.832890, 8.844385, 80.205200, 0.627969, -0.648425, -0.430348, 0.822439, 0.750146, 1.000000, 0.000000, 0.000000, 0.000000, 26.000000, 0.000000, 0.000000, 0.000000, - -16.832890, 8.844385, 80.205200, 0.474808, -0.735083, -0.483952, 0.822439, 0.750146, 1.000000, 0.000000, 0.000000, 0.000000, 26.000000, 0.000000, 0.000000, 0.000000, - -19.979401, 12.337894, 71.811790, 0.474808, -0.735083, -0.483952, 0.826396, 0.672114, 0.500000, 0.500000, 0.000000, 0.000000, 26.000000, 41.000000, 0.000000, 0.000000, - -16.971291, 14.280905, 71.811790, 0.474808, -0.735083, -0.483952, 0.855498, 0.673989, 0.500000, 0.500000, 0.000000, 0.000000, 26.000000, 41.000000, 0.000000, 0.000000, - -19.979401, 12.337894, 71.811790, 0.521623, -0.807561, -0.275236, 0.826396, 0.672114, 0.500000, 0.500000, 0.000000, 0.000000, 26.000000, 41.000000, 0.000000, 0.000000, - -21.556801, 15.337304, 60.021881, 0.521623, -0.807561, -0.275237, 0.828140, 0.571857, 0.511632, 0.488368, 0.000000, 0.000000, 41.000000, 42.000000, 0.000000, 0.000000, - -16.971291, 14.280905, 71.811790, 0.521623, -0.807561, -0.275236, 0.855498, 0.673989, 0.500000, 0.500000, 0.000000, 0.000000, 26.000000, 41.000000, 0.000000, 0.000000, - -7.528690, 27.695002, 43.015388, 0.094563, -0.983150, -0.156443, 0.920117, 0.420771, 1.000000, 0.000000, 0.000000, 0.000000, 38.000000, 0.000000, 0.000000, 0.000000, - 0.000000, 28.896402, 40.016102, 0.094563, -0.983150, -0.156443, 0.982406, 0.394743, 1.000000, 0.000000, 0.000000, 0.000000, 38.000000, 0.000000, 0.000000, 0.000000, - 0.000000, 26.256794, 56.604401, 0.094563, -0.983150, -0.156443, 0.982540, 0.533025, 0.500000, 0.500000, 0.000000, 0.000000, 12.000000, 38.000000, 0.000000, 0.000000, - 0.000000, 26.256794, 56.604401, 0.143442, -0.972701, -0.182418, 0.982540, 0.533025, 0.500000, 0.500000, 0.000000, 0.000000, 12.000000, 38.000000, 0.000000, 0.000000, - -7.528690, 25.055393, 57.090488, 0.143442, -0.972701, -0.182418, 0.919855, 0.538917, 0.504412, 0.495588, 0.000000, 0.000000, 12.000000, 38.000000, 0.000000, 0.000000, - -7.528690, 27.695002, 43.015388, 0.143442, -0.972701, -0.182418, 0.920117, 0.420771, 1.000000, 0.000000, 0.000000, 0.000000, 38.000000, 0.000000, 0.000000, 0.000000, - 8.511590, 11.053563, 140.741699, -0.707210, -0.699201, -0.104749, 0.338878, 0.200366, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 5.461990, 13.545063, 144.700195, -0.707210, -0.699200, -0.104749, 0.304365, 0.214934, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 4.683590, 15.298064, 138.254272, -0.707210, -0.699200, -0.104749, 0.305150, 0.169730, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 4.683590, 15.298064, 138.254272, -0.691181, -0.708075, -0.144560, 0.305150, 0.169730, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 7.486990, 12.799354, 137.089478, -0.691181, -0.708075, -0.144560, 0.333584, 0.169910, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 8.511590, 11.053563, 140.741699, -0.691181, -0.708075, -0.144560, 0.338878, 0.200366, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 5.461990, 13.545063, 144.700195, -0.157640, -0.951911, -0.262707, 0.304365, 0.214934, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.128090, 14.213252, 145.633423, -0.157640, -0.951911, -0.262707, 0.269007, 0.217371, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.128090, 16.081663, 138.863297, -0.157640, -0.951911, -0.262707, 0.270873, 0.169905, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.128090, 16.081663, 138.863297, -0.185305, -0.953678, -0.236980, 0.270873, 0.169905, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 4.683590, 15.298064, 138.254272, -0.185305, -0.953678, -0.236980, 0.305150, 0.169730, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 5.461990, 13.545063, 144.700195, -0.185305, -0.953678, -0.236980, 0.304365, 0.214934, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 7.486990, 12.799354, 137.089478, -0.569469, -0.771352, 0.284114, 0.333584, 0.169910, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 4.683590, 15.298064, 138.254272, -0.569469, -0.771352, 0.284114, 0.305150, 0.169730, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 4.030790, 13.881366, 133.099579, -0.569469, -0.771352, 0.284114, 0.307401, 0.132454, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 4.030790, 13.881366, 133.099579, -0.395729, -0.913432, 0.095083, 0.307401, 0.132454, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.760300, 12.687945, 132.994797, -0.395729, -0.913432, 0.095083, 0.332325, 0.140061, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 7.486990, 12.799354, 137.089478, -0.395729, -0.913432, 0.095083, 0.333584, 0.169910, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 4.683590, 15.298064, 138.254272, -0.126795, -0.963099, 0.237410, 0.305150, 0.169730, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.128090, 16.081663, 138.863297, -0.126795, -0.963099, 0.237410, 0.270873, 0.169905, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.128090, 14.670655, 133.139282, -0.126795, -0.963099, 0.237410, 0.271583, 0.129135, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.128090, 14.670655, 133.139282, -0.176318, -0.943206, 0.281557, 0.271583, 0.129135, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 4.030790, 13.881366, 133.099579, -0.176318, -0.943206, 0.281557, 0.307401, 0.132454, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 4.683590, 15.298064, 138.254272, -0.176318, -0.943206, 0.281557, 0.305150, 0.169730, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.768790, 11.693163, 143.199097, 0.658355, -0.719270, -0.221856, 0.224338, 0.214421, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -7.629380, 12.684664, 137.430801, 0.658355, -0.719270, -0.221856, 0.211146, 0.172705, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -4.461990, 15.298064, 138.357193, 0.658355, -0.719270, -0.221856, 0.240768, 0.169884, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -4.461990, 15.298064, 138.357193, 0.617358, -0.742846, -0.258940, 0.240768, 0.169884, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -3.854600, 13.545063, 144.834305, 0.617358, -0.742846, -0.258940, 0.247943, 0.215862, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.768790, 11.693163, 143.199097, 0.617358, -0.742846, -0.258940, 0.224338, 0.214421, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -7.629380, 12.684664, 137.430801, 0.601349, -0.749508, 0.276799, 0.211146, 0.172705, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -7.035790, 11.522666, 132.994797, 0.601349, -0.749508, 0.276799, 0.206411, 0.138640, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -4.144190, 13.881366, 133.099579, 0.601349, -0.749508, 0.276799, 0.237235, 0.132641, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -4.144190, 13.881366, 133.099579, 0.573289, -0.781770, 0.245306, 0.237235, 0.132641, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -4.461990, 15.298064, 138.357193, 0.573289, -0.781770, 0.245306, 0.240768, 0.169884, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -7.629380, 12.684664, 137.430801, 0.573289, -0.781770, 0.245306, 0.211146, 0.172705, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -3.854600, 13.545063, 144.834305, 0.201972, -0.940438, -0.273465, 0.247943, 0.215862, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -4.461990, 15.298064, 138.357193, 0.201972, -0.940438, -0.273465, 0.240768, 0.169884, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.128090, 16.081663, 138.863297, 0.201972, -0.940438, -0.273465, 0.270873, 0.169905, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.128090, 16.081663, 138.863297, 0.224050, -0.939458, -0.259270, 0.270873, 0.169905, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.128090, 14.213252, 145.633423, 0.224050, -0.939458, -0.259270, 0.269007, 0.217371, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -3.854600, 13.545063, 144.834305, 0.224050, -0.939458, -0.259270, 0.247943, 0.215862, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -4.461990, 15.298064, 138.357193, 0.183357, -0.946351, 0.266084, 0.240768, 0.169884, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -4.144190, 13.881366, 133.099579, 0.183357, -0.946351, 0.266084, 0.237235, 0.132641, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.128090, 14.670655, 133.139282, 0.183357, -0.946351, 0.266084, 0.271583, 0.129135, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.128090, 14.670655, 133.139282, 0.146020, -0.960528, 0.236777, 0.271583, 0.129135, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.128090, 16.081663, 138.863297, 0.146020, -0.960528, 0.236777, 0.270873, 0.169905, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -4.461990, 15.298064, 138.357193, 0.146020, -0.960528, 0.236777, 0.240768, 0.169884, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.958600, -2.222337, 140.796707, -0.536940, 0.833592, -0.129689, 0.372732, 0.298304, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 7.186200, -2.547106, 137.766907, -0.536940, 0.833592, -0.129689, 0.395346, 0.298634, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 3.731600, -4.607426, 138.826721, -0.536940, 0.833592, -0.129689, 0.381688, 0.331178, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 3.731600, -4.607426, 138.826721, -0.492987, 0.843414, -0.213581, 0.381688, 0.331178, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 3.598300, -3.393228, 143.929184, -0.492987, 0.843414, -0.213581, 0.341473, 0.322436, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.958600, -2.222337, 140.796707, -0.492987, 0.843414, -0.213581, 0.372732, 0.298304, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 3.598300, -3.393228, 143.929184, -0.380675, 0.897300, -0.223469, 0.341473, 0.322436, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 3.731600, -4.607426, 138.826721, -0.380675, 0.897300, -0.223469, 0.381688, 0.331178, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.486790, -5.869194, 139.287781, -0.380675, 0.897300, -0.223469, 0.370400, 0.357662, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.486790, -5.869194, 139.287781, -0.114111, 0.906289, -0.406964, 0.370400, 0.357662, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.128090, -3.490301, 144.757874, -0.114111, 0.906289, -0.406964, 0.322347, 0.347282, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 3.598300, -3.393228, 143.929184, -0.114111, 0.906289, -0.406964, 0.341473, 0.322436, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -7.629380, 12.684664, 137.430801, 0.948020, -0.315601, 0.040682, 0.211146, 0.172705, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -9.260700, 8.114452, 139.991196, 0.948020, -0.315601, 0.040682, 0.187641, 0.209992, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -9.380480, 7.338064, 136.759415, 0.948020, -0.315601, 0.040682, 0.168931, 0.187128, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -8.777390, 4.588064, 136.930801, 0.974265, 0.208293, -0.086149, 0.152048, 0.219251, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -9.380480, 7.338064, 136.759415, 0.974265, 0.208293, -0.086149, 0.168931, 0.187128, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -9.260700, 8.114452, 139.991196, 0.974265, 0.208293, -0.086149, 0.187641, 0.209992, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -9.260700, 8.114452, 139.991196, 0.994416, 0.062482, 0.085047, 0.187641, 0.209992, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -9.079928, 4.510563, 140.525192, 0.994416, 0.062482, 0.085047, 0.175255, 0.237637, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -8.777390, 4.588064, 136.930801, 0.994416, 0.062482, 0.085047, 0.152048, 0.219251, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -7.035790, 11.522666, 132.994797, 0.921231, -0.327986, 0.209187, 0.206411, 0.138640, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -7.629380, 12.684664, 137.430801, 0.921231, -0.327986, 0.209187, 0.211146, 0.172705, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -9.380480, 7.338064, 136.759415, 0.921231, -0.327986, 0.209187, 0.168931, 0.187128, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -9.380480, 7.338064, 136.759415, 0.918832, -0.348887, 0.184460, 0.168931, 0.187128, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -8.829380, 6.728665, 132.861664, 0.918832, -0.348887, 0.184460, 0.166245, 0.139829, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -7.035790, 11.522666, 132.994797, 0.918832, -0.348887, 0.184460, 0.206411, 0.138640, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -8.777390, 4.588064, 136.930801, 0.956542, 0.278465, 0.086516, 0.152048, 0.219251, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -9.079928, 4.510563, 140.525192, 0.956542, 0.278465, 0.086516, 0.175255, 0.237637, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -7.834854, 0.312050, 140.272919, 0.956542, 0.278465, 0.086516, 0.160698, 0.272661, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -7.834854, 0.312050, 140.272919, 0.979273, 0.201739, -0.018060, 0.160698, 0.272661, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -7.896180, 0.253764, 136.296585, 0.979273, 0.201739, -0.018060, 0.131169, 0.250801, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -8.777390, 4.588064, 136.930801, 0.979273, 0.201739, -0.018060, 0.152048, 0.219251, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.768790, 11.693163, 143.199097, 0.643224, -0.500680, -0.579295, 0.224338, 0.214421, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -3.854600, 13.545063, 144.834305, 0.643224, -0.500680, -0.579295, 0.247943, 0.215862, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -4.294590, 9.531441, 147.814697, 0.643224, -0.500680, -0.579295, 0.243382, 0.248846, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -4.294590, 9.531441, 147.814697, 0.677702, -0.456018, -0.576860, 0.243382, 0.248846, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -7.591600, 8.689863, 144.606613, 0.677702, -0.456018, -0.576860, 0.214373, 0.236764, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.768790, 11.693163, 143.199097, 0.677702, -0.456018, -0.576860, 0.224338, 0.214421, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.128090, 14.213252, 145.633423, 0.270491, -0.593781, -0.757799, 0.269007, 0.217371, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.128090, 9.887641, 149.022797, 0.270491, -0.593781, -0.757799, 0.269194, 0.251840, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -4.294590, 9.531441, 147.814697, 0.270491, -0.593781, -0.757799, 0.243382, 0.248846, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -4.294590, 9.531441, 147.814697, 0.269072, -0.593027, -0.758893, 0.243382, 0.248846, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -3.854600, 13.545063, 144.834305, 0.269072, -0.593027, -0.758893, 0.247943, 0.215862, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.128090, 14.213252, 145.633423, 0.269072, -0.593027, -0.758893, 0.269007, 0.217371, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -7.591600, 8.689863, 144.606613, 0.706954, -0.101382, -0.699955, 0.214373, 0.236764, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -4.294590, 9.531441, 147.814697, 0.706954, -0.101382, -0.699955, 0.243382, 0.248846, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -4.666190, 4.268362, 148.201691, 0.706954, -0.101382, -0.699955, 0.236783, 0.283820, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -4.666190, 4.268362, 148.201691, 0.676852, -0.139809, -0.722720, 0.236783, 0.283820, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -7.984982, 4.412752, 145.065598, 0.676852, -0.139809, -0.722720, 0.202183, 0.265134, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -7.591600, 8.689863, 144.606613, 0.676852, -0.139809, -0.722720, 0.214373, 0.236764, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -4.294590, 9.531441, 147.814697, 0.285113, -0.102921, -0.952952, 0.243382, 0.248846, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.128090, 9.887641, 149.022797, 0.285113, -0.102921, -0.952952, 0.269194, 0.251840, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.128090, 4.212751, 149.635696, 0.285113, -0.102921, -0.952952, 0.272031, 0.288349, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.128090, 4.212751, 149.635696, 0.299045, -0.090960, -0.949894, 0.272031, 0.288349, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -4.666190, 4.268362, 148.201691, 0.299045, -0.090960, -0.949894, 0.236783, 0.283820, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -4.294590, 9.531441, 147.814697, 0.299045, -0.090960, -0.949894, 0.243382, 0.248846, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 8.511590, 11.053563, 140.741699, -0.898507, -0.201536, -0.389960, 0.338878, 0.200366, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 8.745480, 7.990553, 141.785797, -0.898507, -0.201536, -0.389960, 0.350692, 0.220734, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.072500, 9.531362, 147.148300, -0.898507, -0.201536, -0.389960, 0.311220, 0.241584, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.072500, 9.531362, 147.148300, -0.833429, -0.374588, -0.406301, 0.311220, 0.241584, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 5.461990, 13.545063, 144.700195, -0.833429, -0.374588, -0.406301, 0.304365, 0.214934, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 8.511590, 11.053563, 140.741699, -0.833429, -0.374588, -0.406301, 0.338878, 0.200366, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.072500, 9.531362, 147.148300, -0.899425, -0.048580, -0.434367, 0.311220, 0.241584, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 8.745480, 7.990553, 141.785797, -0.899425, -0.048580, -0.434367, 0.350692, 0.220734, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 8.717100, 4.412653, 142.244720, -0.899425, -0.048580, -0.434367, 0.358476, 0.246665, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 8.717100, 4.412653, 142.244720, -0.881130, -0.002244, -0.472869, 0.358476, 0.246665, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 5.715500, 4.268362, 147.838501, -0.881130, -0.002244, -0.472869, 0.316174, 0.273157, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.072500, 9.531362, 147.148300, -0.881130, -0.002244, -0.472869, 0.311220, 0.241584, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.128090, 14.213252, 145.633423, -0.200914, -0.532195, -0.822437, 0.269007, 0.217371, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 5.461990, 13.545063, 144.700195, -0.200914, -0.532195, -0.822437, 0.304365, 0.214934, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.072500, 9.531362, 147.148300, -0.200914, -0.532195, -0.822437, 0.311220, 0.241584, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.072500, 9.531362, 147.148300, -0.263721, -0.594938, -0.759276, 0.311220, 0.241584, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.128090, 9.887641, 149.022797, -0.263721, -0.594938, -0.759276, 0.269194, 0.251840, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.128090, 14.213252, 145.633423, -0.263721, -0.594938, -0.759276, 0.269007, 0.217371, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.128090, 9.887641, 149.022797, -0.293293, -0.104726, -0.950269, 0.269194, 0.251840, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.072500, 9.531362, 147.148300, -0.293293, -0.104726, -0.950269, 0.311220, 0.241584, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 5.715500, 4.268362, 147.838501, -0.293293, -0.104726, -0.950269, 0.316174, 0.273157, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 5.715500, 4.268362, 147.838501, -0.291514, -0.102714, -0.951036, 0.316174, 0.273157, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.128090, 4.212751, 149.635696, -0.291514, -0.102714, -0.951036, 0.272031, 0.288349, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.128090, 9.887641, 149.022797, -0.291514, -0.102714, -0.951036, 0.269194, 0.251840, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 3.598300, -3.393228, 143.929184, -0.675963, 0.609787, -0.413805, 0.341473, 0.322436, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 4.612890, -0.119039, 147.096695, -0.675963, 0.609787, -0.413805, 0.319426, 0.300349, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 8.064500, 0.366643, 142.174088, -0.675963, 0.609787, -0.413805, 0.363675, 0.277422, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 8.064500, 0.366643, 142.174088, -0.663308, 0.552101, -0.505180, 0.363675, 0.277422, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.958600, -2.222337, 140.796707, -0.663308, 0.552101, -0.505180, 0.372732, 0.298304, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 3.598300, -3.393228, 143.929184, -0.663308, 0.552101, -0.505180, 0.341473, 0.322436, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 3.598300, -3.393228, 143.929184, -0.164757, 0.737960, -0.654424, 0.341473, 0.322436, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.128090, -3.490301, 144.757874, -0.164757, 0.737960, -0.654424, 0.322347, 0.347282, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.128090, -0.498739, 148.131302, -0.164757, 0.737960, -0.654424, 0.278577, 0.322375, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.128090, -0.498739, 148.131302, -0.203585, 0.712597, -0.671386, 0.278577, 0.322375, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 4.612890, -0.119039, 147.096695, -0.203585, 0.712597, -0.671386, 0.319426, 0.300349, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 3.598300, -3.393228, 143.929184, -0.203585, 0.712597, -0.671386, 0.341473, 0.322436, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 8.064500, 0.366643, 142.174088, -0.796832, 0.289885, -0.530118, 0.363675, 0.277422, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 4.612890, -0.119039, 147.096695, -0.796832, 0.289885, -0.530118, 0.319426, 0.300349, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 5.715500, 4.268362, 147.838501, -0.796832, 0.289885, -0.530118, 0.316174, 0.273157, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 5.715500, 4.268362, 147.838501, -0.872927, 0.148909, -0.464568, 0.316174, 0.273157, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 8.717100, 4.412653, 142.244720, -0.872927, 0.148909, -0.464568, 0.358476, 0.246665, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 8.064500, 0.366643, 142.174088, -0.872928, 0.148909, -0.464568, 0.363675, 0.277422, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 4.612890, -0.119039, 147.096695, -0.226226, 0.296288, -0.927920, 0.319426, 0.300349, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.128090, -0.498739, 148.131302, -0.226226, 0.296288, -0.927920, 0.278577, 0.322375, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.128090, 4.212751, 149.635696, -0.226226, 0.296288, -0.927920, 0.272031, 0.288349, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.128090, 4.212751, 149.635696, -0.288104, 0.229590, -0.929669, 0.272031, 0.288349, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 5.715500, 4.268362, 147.838501, -0.288104, 0.229590, -0.929669, 0.316174, 0.273157, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 4.612890, -0.119039, 147.096695, -0.288104, 0.229589, -0.929669, 0.319426, 0.300349, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -4.525826, -0.119038, 146.612854, 0.690590, 0.302900, -0.656762, 0.230756, 0.314536, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -7.226299, 0.366642, 143.997284, 0.690590, 0.302900, -0.656762, 0.188355, 0.293135, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -7.984982, 4.412752, 145.065598, 0.690590, 0.302900, -0.656762, 0.202183, 0.265134, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -7.984982, 4.412752, 145.065598, 0.667072, 0.272443, -0.693390, 0.202183, 0.265134, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -4.666190, 4.268362, 148.201691, 0.667072, 0.272443, -0.693390, 0.236783, 0.283820, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -4.525826, -0.119038, 146.612854, 0.667072, 0.272443, -0.693390, 0.230756, 0.314536, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -4.525826, -0.119038, 146.612854, 0.287702, 0.334225, -0.897509, 0.230756, 0.314536, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -4.666190, 4.268362, 148.201691, 0.287702, 0.334225, -0.897509, 0.236783, 0.283820, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.128090, 4.212751, 149.635696, 0.287702, 0.334225, -0.897509, 0.272031, 0.288349, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.128090, 4.212751, 149.635696, 0.334697, 0.286631, -0.897675, 0.272031, 0.288349, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.128090, -0.498739, 148.131302, 0.334696, 0.286631, -0.897675, 0.278577, 0.322375, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -4.525826, -0.119038, 146.612854, 0.334697, 0.286631, -0.897675, 0.230756, 0.314536, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 8.511590, 11.053563, 140.741699, -0.957800, -0.243878, 0.152127, 0.338878, 0.200366, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 7.486990, 12.799354, 137.089478, -0.957800, -0.243878, 0.152127, 0.333584, 0.169910, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 8.997590, 6.780464, 136.951279, -0.957800, -0.243878, 0.152127, 0.380207, 0.193166, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 8.997590, 6.780464, 136.951279, -0.995802, -0.086371, -0.030310, 0.380207, 0.193166, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 8.745480, 7.990553, 141.785797, -0.995802, -0.086371, -0.030310, 0.350692, 0.220734, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 8.511590, 11.053563, 140.741699, -0.995802, -0.086371, -0.030310, 0.338878, 0.200366, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 7.486990, 12.799354, 137.089478, -0.964575, -0.196049, 0.176519, 0.333584, 0.169910, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.760300, 12.687945, 132.994797, -0.964575, -0.196049, 0.176519, 0.332325, 0.140061, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 7.704780, 7.921165, 132.861664, -0.964575, -0.196049, 0.176519, 0.369792, 0.139968, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 7.704780, 7.921165, 132.861664, -0.942539, -0.241848, 0.230498, 0.369792, 0.139968, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 8.997590, 6.780464, 136.951279, -0.942539, -0.241848, 0.230498, 0.380207, 0.193166, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 7.486990, 12.799354, 137.089478, -0.942539, -0.241848, 0.230498, 0.333584, 0.169910, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 8.997590, 6.780464, 136.951279, -0.998621, 0.038475, -0.035705, 0.380207, 0.193166, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 8.887380, 3.788154, 136.809280, -0.998621, 0.038475, -0.035705, 0.398396, 0.233767, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 8.717100, 4.412653, 142.244720, -0.998621, 0.038475, -0.035705, 0.358476, 0.246665, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 8.717100, 4.412653, 142.244720, -0.998627, 0.001203, -0.052377, 0.358476, 0.246665, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 8.745480, 7.990553, 141.785797, -0.998627, 0.001203, -0.052377, 0.350692, 0.220734, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 8.997590, 6.780464, 136.951279, -0.998627, 0.001203, -0.052377, 0.380207, 0.193166, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.958600, -2.222337, 140.796707, -0.879825, 0.452762, -0.144618, 0.372732, 0.298304, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 8.064500, 0.366643, 142.174088, -0.879825, 0.452762, -0.144618, 0.363675, 0.277422, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 8.809380, 0.253764, 137.289001, -0.879825, 0.452762, -0.144618, 0.401502, 0.269101, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 8.809380, 0.253764, 137.289001, -0.867798, 0.482956, -0.116958, 0.401502, 0.269101, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 7.186200, -2.547106, 137.766907, -0.867798, 0.482956, -0.116958, 0.395346, 0.298634, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.958600, -2.222337, 140.796707, -0.867798, 0.482956, -0.116958, 0.372732, 0.298304, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 8.064500, 0.366643, 142.174088, -0.985907, 0.159881, -0.049256, 0.363675, 0.277422, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 8.717100, 4.412653, 142.244720, -0.985907, 0.159881, -0.049256, 0.358476, 0.246665, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 8.887380, 3.788154, 136.809280, -0.985907, 0.159881, -0.049256, 0.398396, 0.233767, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 8.887380, 3.788154, 136.809280, -0.988568, 0.001353, -0.150769, 0.398396, 0.233767, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 8.809380, 0.253764, 137.289001, -0.988568, 0.001353, -0.150769, 0.401502, 0.269101, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 8.064500, 0.366643, 142.174088, -0.988568, 0.001353, -0.150769, 0.363675, 0.277422, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 7.217400, 0.084065, 132.711914, -0.943247, 0.065019, 0.325665, 0.438434, 0.259792, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 8.809380, 0.253764, 137.289001, -0.943247, 0.065019, 0.325665, 0.401502, 0.269101, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 8.887380, 3.788154, 136.809280, -0.943247, 0.065019, 0.325665, 0.398396, 0.233767, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 8.887380, 3.788154, 136.809280, -0.953864, 0.131459, 0.269929, 0.398396, 0.233767, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 7.759800, 3.919165, 132.760880, -0.953864, 0.131459, 0.269929, 0.431399, 0.230446, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 7.217400, 0.084065, 132.711914, -0.953864, 0.131459, 0.269929, 0.438434, 0.259792, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 4.389590, -4.473235, 133.473495, -0.521388, 0.852250, -0.042722, 0.425283, 0.328648, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 3.731600, -4.607426, 138.826721, -0.521388, 0.852250, -0.042722, 0.381688, 0.331178, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 7.186200, -2.547106, 137.766907, -0.521388, 0.852250, -0.042722, 0.395346, 0.298634, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 7.186200, -2.547106, 137.766907, -0.641470, 0.763440, 0.075338, 0.395346, 0.298634, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.969090, -2.303635, 133.451080, -0.641470, 0.763440, 0.075338, 0.427901, 0.302104, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 4.389590, -4.473235, 133.473495, -0.641470, 0.763440, 0.075338, 0.425283, 0.328648, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 8.040780, 0.253765, 133.937973, -0.924706, 0.374622, 0.067652, 0.428434, 0.279763, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.969090, -2.303635, 133.451080, -0.924706, 0.374622, 0.067652, 0.427901, 0.302104, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 7.186200, -2.547106, 137.766907, -0.924706, 0.374622, 0.067652, 0.395346, 0.298634, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 7.186200, -2.547106, 137.766907, -0.834682, 0.516386, 0.191445, 0.395346, 0.298634, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 8.809380, 0.253764, 137.289001, -0.834682, 0.516386, 0.191445, 0.401502, 0.269101, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 8.040780, 0.253765, 133.937973, -0.834682, 0.516386, 0.191445, 0.428434, 0.279763, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 3.883600, -3.574624, 129.007706, -0.626587, 0.747255, 0.221358, 0.461110, 0.330121, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 4.389590, -4.473235, 133.473495, -0.626587, 0.747255, 0.221358, 0.425283, 0.328648, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.969090, -2.303635, 133.451080, -0.626587, 0.747255, 0.221358, 0.427901, 0.302104, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.969090, -2.303635, 133.451080, -0.666668, 0.697224, 0.263501, 0.427901, 0.302104, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.364800, -1.301634, 129.270905, -0.666668, 0.697224, 0.263501, 0.461664, 0.303746, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 3.883600, -3.574624, 129.007706, -0.666668, 0.697224, 0.263501, 0.461110, 0.330121, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 7.024200, 0.693666, 129.655807, -0.940973, 0.272145, 0.201262, 0.462458, 0.287042, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.364800, -1.301634, 129.270905, -0.940973, 0.272145, 0.201262, 0.461664, 0.303746, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.969090, -2.303635, 133.451080, -0.940973, 0.272145, 0.201262, 0.427901, 0.302104, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.969090, -2.303635, 133.451080, -0.909046, 0.333334, 0.250049, 0.427901, 0.302104, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 8.040780, 0.253765, 133.937973, -0.909046, 0.333334, 0.250049, 0.428434, 0.279763, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 7.024200, 0.693666, 129.655807, -0.909046, 0.333334, 0.250049, 0.462458, 0.287042, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -4.765481, -2.982469, 143.588394, 0.716634, 0.574789, -0.395035, 0.197117, 0.337349, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.760839, -2.625221, 140.488419, 0.716634, 0.574789, -0.395035, 0.164747, 0.322878, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -7.226299, 0.366642, 143.997284, 0.716634, 0.574789, -0.395035, 0.188355, 0.293135, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -7.226299, 0.366642, 143.997284, 0.635491, 0.534916, -0.556791, 0.188355, 0.293135, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -4.525826, -0.119038, 146.612854, 0.635491, 0.534916, -0.556791, 0.230756, 0.314536, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -4.765481, -2.982469, 143.588394, 0.635491, 0.534916, -0.556791, 0.197117, 0.337349, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.184101, -3.958629, 138.613922, 0.840619, 0.528735, -0.117473, 0.155744, 0.344254, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -7.591600, -2.364894, 135.715317, 0.840619, 0.528735, -0.117473, 0.128606, 0.340874, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.760839, -2.625221, 140.488419, 0.840619, 0.528735, -0.117473, 0.164747, 0.322878, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.760839, -2.625221, 140.488419, 0.621873, 0.715736, -0.317798, 0.164747, 0.322878, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -4.765481, -2.982469, 143.588394, 0.621873, 0.715736, -0.317798, 0.197117, 0.337349, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.184101, -3.958629, 138.613922, 0.621873, 0.715736, -0.317798, 0.155744, 0.344254, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 1.205684, -4.281226, 144.972610, 0.222808, 0.607330, -0.762566, 0.260065, 0.365955, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -2.922530, -4.289351, 143.759949, 0.222808, 0.607330, -0.762566, 0.229969, 0.361453, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -4.525826, -0.119038, 146.612854, 0.222808, 0.607330, -0.762566, 0.230756, 0.314536, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -4.525826, -0.119038, 146.612854, 0.292960, 0.671603, -0.680532, 0.230756, 0.314536, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.128090, -0.498739, 148.131302, 0.292960, 0.671604, -0.680532, 0.278577, 0.322375, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 1.205684, -4.281226, 144.972610, 0.292960, 0.671604, -0.680532, 0.260065, 0.365955, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.829845, -6.861777, 138.242554, 0.111279, 0.916200, -0.384961, 0.225074, 0.405104, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -2.922530, -4.289351, 143.759949, 0.111279, 0.916200, -0.384961, 0.229969, 0.361453, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 1.205684, -4.281226, 144.972610, 0.111279, 0.916200, -0.384961, 0.260065, 0.365955, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 1.205684, -4.281226, 144.972610, 0.066013, 0.924840, -0.374584, 0.260065, 0.365955, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 3.119226, -6.758428, 139.193665, 0.066013, 0.924840, -0.374584, 0.258161, 0.410868, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.829845, -6.861777, 138.242554, 0.066013, 0.924840, -0.374584, 0.225074, 0.405104, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 1.693090, -5.978436, 134.757584, -0.374719, 0.919084, -0.121943, 0.406823, 0.359182, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.486790, -5.869194, 139.287781, -0.374719, 0.919084, -0.121943, 0.370400, 0.357662, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 3.731600, -4.607426, 138.826721, -0.374719, 0.919084, -0.121943, 0.381688, 0.331178, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 3.731600, -4.607426, 138.826721, -0.194280, 0.954931, -0.224416, 0.381688, 0.331178, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 5.552900, -5.301525, 134.296478, -0.194280, 0.954931, -0.224416, 0.420016, 0.331596, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 1.693090, -5.978436, 134.757584, -0.194280, 0.954931, -0.224416, 0.406823, 0.359182, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -8.329500, 4.145465, 132.673782, 0.978841, 0.186781, 0.083566, 0.118622, 0.209843, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -8.777390, 4.588064, 136.930801, 0.978841, 0.186781, 0.083566, 0.152048, 0.219251, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -7.896180, 0.253764, 136.296585, 0.978841, 0.186781, 0.083566, 0.131169, 0.250801, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -7.896180, 0.253764, 136.296585, 0.946794, 0.269374, 0.176123, 0.131169, 0.250801, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -7.158237, 0.253765, 132.329575, 0.946794, 0.269374, 0.176123, 0.103209, 0.236889, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -8.329500, 4.145465, 132.673782, 0.946794, 0.269374, 0.176123, 0.118622, 0.209843, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -7.834490, 3.482956, 129.120087, 0.956385, 0.280683, 0.080892, 0.090403, 0.203534, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -8.329500, 4.145465, 132.673782, 0.956386, 0.280683, 0.080892, 0.118622, 0.209843, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -7.158237, 0.253765, 132.329575, 0.956386, 0.280683, 0.080892, 0.103209, 0.236889, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -7.158237, 0.253765, 132.329575, 0.932857, 0.332693, 0.138179, 0.103209, 0.236889, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.174337, -0.294313, 127.006783, 0.932857, 0.332693, 0.138179, 0.062311, 0.224844, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -7.834490, 3.482956, 129.120087, 0.932857, 0.332693, 0.138179, 0.090403, 0.203534, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.015600, 1.567347, 123.984993, 0.932169, 0.284307, 0.224123, 0.045286, 0.202602, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -7.834490, 3.482956, 129.120087, 0.932169, 0.284307, 0.224123, 0.090403, 0.203534, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.174337, -0.294313, 127.006783, 0.932169, 0.284307, 0.224123, 0.062311, 0.224844, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.174337, -0.294313, 127.006783, 0.943396, 0.257956, 0.208479, 0.062311, 0.224844, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -4.742103, -1.382122, 121.871689, 0.943396, 0.257956, 0.208479, 0.020586, 0.217813, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.015600, 1.567347, 123.984993, 0.943396, 0.257956, 0.208479, 0.045286, 0.202602, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -8.279090, 0.342654, 137.836914, 0.929443, 0.332404, -0.160134, 0.139890, 0.299362, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -7.226299, 0.366642, 143.997284, 0.929443, 0.332404, -0.160134, 0.188355, 0.293135, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.760839, -2.625221, 140.488419, 0.929443, 0.332404, -0.160134, 0.164747, 0.322878, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.760839, -2.625221, 140.488419, 0.879940, 0.474314, 0.027055, 0.164747, 0.322878, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.930090, -2.152823, 137.711304, 0.879940, 0.474314, 0.027055, 0.142524, 0.322173, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -8.279090, 0.342654, 137.836914, 0.879940, 0.474314, 0.027055, 0.139890, 0.299362, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -7.409090, 0.366645, 133.150589, 0.871199, 0.462691, 0.164104, 0.103384, 0.308311, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -8.279090, 0.342654, 137.836914, 0.871199, 0.462691, 0.164104, 0.139890, 0.299362, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.930090, -2.152823, 137.711304, 0.871199, 0.462691, 0.164104, 0.142524, 0.322173, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.930090, -2.152823, 137.711304, 0.883834, 0.442540, 0.151645, 0.142524, 0.322173, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.347351, -1.710835, 133.025085, 0.883834, 0.442540, 0.151645, 0.105387, 0.326481, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -7.409090, 0.366645, 133.150589, 0.883834, 0.442540, 0.151645, 0.103384, 0.308311, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -5.985090, -0.249334, 128.763016, 0.873473, 0.432952, 0.222705, 0.070218, 0.323136, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -7.409090, 0.366645, 133.150589, 0.873473, 0.432952, 0.222705, 0.103384, 0.308311, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.347351, -1.710835, 133.025085, 0.873473, 0.432952, 0.222705, 0.105387, 0.326481, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.347351, -1.710835, 133.025085, 0.922666, 0.333876, 0.192912, 0.105387, 0.326481, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -4.502799, -3.064023, 126.544891, 0.922666, 0.333876, 0.192912, 0.057774, 0.349647, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -5.985090, -0.249334, 128.763016, 0.922666, 0.333876, 0.192912, 0.070218, 0.323136, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.768790, 11.693163, 143.199097, 0.886914, -0.371592, -0.274413, 0.224338, 0.214421, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -7.591600, 8.689863, 144.606613, 0.886914, -0.371592, -0.274413, 0.214373, 0.236764, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -9.260700, 8.114452, 139.991196, 0.886914, -0.371592, -0.274413, 0.187641, 0.209992, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -9.260700, 8.114452, 139.991196, 0.879800, -0.428878, -0.204979, 0.187641, 0.209992, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -7.629380, 12.684664, 137.430801, 0.879800, -0.428878, -0.204979, 0.211146, 0.172705, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.768790, 11.693163, 143.199097, 0.879800, -0.428878, -0.204979, 0.224338, 0.214421, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -9.079928, 4.510563, 140.525192, 0.940517, -0.003162, -0.339731, 0.175255, 0.237637, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -9.260700, 8.114452, 139.991196, 0.940517, -0.003162, -0.339731, 0.187641, 0.209992, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -7.591600, 8.689863, 144.606613, 0.940517, -0.003162, -0.339731, 0.214373, 0.236764, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -7.591600, 8.689863, 144.606613, 0.965229, -0.114018, -0.235227, 0.214373, 0.236764, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -7.984982, 4.412752, 145.065598, 0.965230, -0.114018, -0.235227, 0.202183, 0.265134, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -9.079928, 4.510563, 140.525192, 0.965230, -0.114018, -0.235227, 0.175255, 0.237637, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -7.226299, 0.366642, 143.997284, 0.943978, 0.289461, -0.158487, 0.188355, 0.293135, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -7.834854, 0.312050, 140.272919, 0.943978, 0.289461, -0.158487, 0.160698, 0.272661, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -9.079928, 4.510563, 140.525192, 0.943978, 0.289461, -0.158487, 0.175255, 0.237637, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -9.079928, 4.510563, 140.525192, 0.945768, 0.236217, -0.222989, 0.175255, 0.237637, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -7.984982, 4.412752, 145.065598, 0.945768, 0.236217, -0.222989, 0.202183, 0.265134, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -7.226299, 0.366642, 143.997284, 0.945768, 0.236217, -0.222989, 0.188355, 0.293135, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 5.968290, 1.292956, 127.617699, -0.955091, 0.131690, 0.265441, 0.476955, 0.243121, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 7.217400, 0.084065, 132.711914, -0.955091, 0.131690, 0.265441, 0.438434, 0.259792, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 7.759800, 3.919165, 132.760880, -0.955091, 0.131690, 0.265441, 0.431399, 0.230446, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 7.759800, 3.919165, 132.760880, -0.954804, 0.156766, 0.252536, 0.431399, 0.230446, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.510700, 4.517667, 127.666679, -0.954804, 0.156766, 0.252536, 0.470901, 0.218366, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 5.968290, 1.292956, 127.617699, -0.954804, 0.156766, 0.252536, 0.476955, 0.243121, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 2.626690, 10.309867, 128.417282, -0.410260, -0.603300, 0.683897, 0.309286, 0.087082, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 4.206790, 9.116457, 128.312393, -0.410260, -0.603300, 0.683897, 0.336708, 0.091799, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.760300, 12.687945, 132.994797, -0.410260, -0.603300, 0.683897, 0.332325, 0.140061, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.760300, 12.687945, 132.994797, -0.289288, -0.717294, 0.633878, 0.332325, 0.140061, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 4.030790, 13.881366, 133.099579, -0.289288, -0.717294, 0.633878, 0.307401, 0.132454, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 2.626690, 10.309867, 128.417282, -0.289288, -0.717294, 0.633878, 0.309286, 0.087082, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -2.041770, 10.309867, 128.417282, 0.460506, -0.593857, 0.659748, 0.238956, 0.086121, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -4.144190, 13.881366, 133.099579, 0.460506, -0.593857, 0.659748, 0.237235, 0.132641, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -7.035790, 11.522666, 132.994797, 0.460506, -0.593857, 0.659748, 0.206411, 0.138640, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -7.035790, 11.522666, 132.994797, 0.460494, -0.593876, 0.659740, 0.206411, 0.138640, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -4.933400, 7.951166, 128.312393, 0.460494, -0.593876, 0.659740, 0.198432, 0.091218, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -2.041770, 10.309867, 128.417282, 0.460494, -0.593876, 0.659739, 0.238956, 0.086121, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.128090, 11.099167, 128.456894, 0.148600, -0.786280, 0.599735, 0.271102, 0.085612, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.128090, 14.670655, 133.139282, 0.148600, -0.786280, 0.599735, 0.271583, 0.129135, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -4.144190, 13.881366, 133.099579, 0.148600, -0.786280, 0.599735, 0.237235, 0.132641, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -4.144190, 13.881366, 133.099579, 0.275390, -0.700721, 0.658141, 0.237235, 0.132641, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -2.041770, 10.309867, 128.417282, 0.275390, -0.700721, 0.658141, 0.238956, 0.086121, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.128090, 11.099167, 128.456894, 0.275390, -0.700721, 0.658141, 0.271102, 0.085612, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -4.933400, 7.951166, 128.312393, 0.762739, -0.301257, 0.572252, 0.198432, 0.091218, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -7.035790, 11.522666, 132.994797, 0.762739, -0.301257, 0.572252, 0.206411, 0.138640, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -8.829380, 6.728665, 132.861664, 0.762739, -0.301257, 0.572252, 0.166245, 0.139829, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -8.829380, 6.728665, 132.861664, 0.716391, -0.509561, 0.476583, 0.166245, 0.139829, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -6.727000, 5.305156, 128.179398, 0.716391, -0.509561, 0.476583, 0.169782, 0.092917, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -4.933400, 7.951166, 128.312393, 0.716391, -0.509561, 0.476583, 0.198432, 0.091218, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 4.206790, 9.116457, 128.312393, -0.709029, -0.586862, 0.390987, 0.336708, 0.091799, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 5.122790, 7.921166, 128.179398, -0.709029, -0.586862, 0.390987, 0.352674, 0.094018, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 7.704780, 7.921165, 132.861664, -0.709029, -0.586861, 0.390987, 0.369792, 0.139968, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 7.704780, 7.921165, 132.861664, -0.802198, -0.174890, 0.570869, 0.369792, 0.139968, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 6.760300, 12.687945, 132.994797, -0.802198, -0.174890, 0.570869, 0.332325, 0.140061, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 4.206790, 9.116457, 128.312393, -0.802198, -0.174890, 0.570869, 0.336708, 0.091799, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.128090, 11.099167, 128.456894, -0.205109, -0.747566, 0.631725, 0.271102, 0.085612, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 2.626690, 10.309867, 128.417282, -0.205109, -0.747566, 0.631725, 0.309286, 0.087082, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 4.030790, 13.881366, 133.099579, -0.205109, -0.747566, 0.631725, 0.307401, 0.132454, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 4.030790, 13.881366, 133.099579, -0.143605, -0.786867, 0.600182, 0.307401, 0.132454, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.128090, 14.670655, 133.139282, -0.143605, -0.786867, 0.600182, 0.271583, 0.129135, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -0.128090, 11.099167, 128.456894, -0.143605, -0.786867, 0.600182, 0.271102, 0.085612, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, 16.154316, 142.056107, -0.497216, -0.514140, 0.698882, 0.581807, 0.019588, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, 14.792213, 141.054062, -0.497216, -0.514140, 0.698882, 0.589829, 0.011300, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 3.109990, 13.792527, 142.531219, -0.497216, -0.514140, 0.698882, 0.608438, 0.026478, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 3.109990, 13.792527, 142.531219, -0.497277, -0.514243, 0.698763, 0.608438, 0.026478, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 3.109990, 15.154497, 143.533539, -0.497277, -0.514243, 0.698763, 0.601315, 0.035847, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, 16.154316, 142.056107, -0.497277, -0.514243, 0.698763, 0.581807, 0.019588, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 3.109990, 15.154497, 143.533539, -0.999986, -0.003097, 0.004209, 0.601315, 0.035847, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 3.109990, 13.792527, 142.531219, -0.999986, -0.003097, 0.004209, 0.608438, 0.026478, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 3.128790, 11.774703, 145.513275, -0.999986, -0.003097, 0.004209, 0.636560, 0.038151, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 3.128790, 11.774703, 145.513275, -0.999986, -0.003098, 0.004207, 0.636560, 0.038151, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 3.128790, 13.136616, 146.516068, -0.999986, -0.003098, 0.004207, 0.631218, 0.044150, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 3.109990, 15.154497, 143.533539, -0.999986, -0.003098, 0.004207, 0.601315, 0.035847, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, 11.938869, 148.623596, -0.609793, 0.469927, -0.638217, 0.653265, 0.070295, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 3.128790, 13.136616, 146.516068, -0.609793, 0.469927, -0.638217, 0.631218, 0.044150, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 3.128790, 11.774703, 145.513275, -0.609793, 0.469927, -0.638217, 0.636560, 0.038151, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 3.128790, 11.774703, 145.513275, -0.664090, 0.301942, -0.683970, 0.636560, 0.038151, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, 10.092729, 147.808609, -0.664090, 0.301942, -0.683970, 0.662101, 0.066496, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, 11.938869, 148.623596, -0.664090, 0.301942, -0.683970, 0.653265, 0.070295, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 4.292500, 14.375145, 148.782318, -0.475147, 0.851592, -0.221418, 0.624475, 0.050477, 0.815921, 0.184079, 0.000000, 0.000000, 0.000000, 43.000000, 0.000000, 0.000000, - 3.128790, 13.136616, 146.516068, -0.475147, 0.851592, -0.221418, 0.631218, 0.044150, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, 11.938869, 148.623596, -0.475147, 0.851592, -0.221418, 0.653265, 0.070295, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, 11.938869, 148.623596, -0.432266, 0.789948, -0.434889, 0.653265, 0.070295, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, 13.102611, 150.737457, -0.432266, 0.789948, -0.434889, 0.646807, 0.073072, 0.746870, 0.253130, 0.000000, 0.000000, 0.000000, 43.000000, 0.000000, 0.000000, - 4.292500, 14.375145, 148.782318, -0.432266, 0.789948, -0.434889, 0.624475, 0.050477, 0.815921, 0.184079, 0.000000, 0.000000, 0.000000, 43.000000, 0.000000, 0.000000, - 4.292500, 17.067873, 150.504868, -0.477488, 0.473478, -0.740151, 0.615766, 0.058911, 0.584804, 0.415196, 0.000000, 0.000000, 0.000000, 43.000000, 0.000000, 0.000000, - 4.292500, 14.375145, 148.782318, -0.477488, 0.473478, -0.740152, 0.624475, 0.050477, 0.815921, 0.184079, 0.000000, 0.000000, 0.000000, 43.000000, 0.000000, 0.000000, - 0.000000, 13.102611, 150.737457, -0.477488, 0.473478, -0.740151, 0.646807, 0.073072, 0.746870, 0.253130, 0.000000, 0.000000, 0.000000, 43.000000, 0.000000, 0.000000, - 0.000000, 13.102611, 150.737457, -0.496849, 0.496084, -0.712068, 0.646807, 0.073072, 0.746870, 0.253130, 0.000000, 0.000000, 0.000000, 43.000000, 0.000000, 0.000000, - 0.000000, 16.179203, 152.880859, -0.496849, 0.496084, -0.712068, 0.632856, 0.079071, 0.500733, 0.499267, 0.000000, 0.000000, 0.000000, 43.000000, 0.000000, 0.000000, - 4.292500, 17.067873, 150.504868, -0.496849, 0.496084, -0.712068, 0.615766, 0.058911, 0.584804, 0.415196, 0.000000, 0.000000, 0.000000, 43.000000, 0.000000, 0.000000, - 3.128790, 20.436140, 150.748993, -0.466461, -0.097439, -0.879159, 0.605541, 0.072913, 0.731565, 0.267239, 0.001196, 0.000000, 43.000000, 0.000000, 44.000000, 0.000000, - 4.292500, 17.067873, 150.504868, -0.466461, -0.097439, -0.879159, 0.615766, 0.058911, 0.584804, 0.415196, 0.000000, 0.000000, 0.000000, 43.000000, 0.000000, 0.000000, - 0.000000, 16.179203, 152.880859, -0.466461, -0.097439, -0.879159, 0.632856, 0.079071, 0.500733, 0.499267, 0.000000, 0.000000, 0.000000, 43.000000, 0.000000, 0.000000, - 0.000000, 16.179203, 152.880859, -0.434954, -0.126769, -0.891484, 0.632856, 0.079071, 0.500733, 0.499267, 0.000000, 0.000000, 0.000000, 43.000000, 0.000000, 0.000000, - 0.000000, 21.188545, 152.168533, -0.434954, -0.126769, -0.891485, 0.612278, 0.087920, 0.779213, 0.220787, 0.000000, 0.000000, 43.000000, 0.000000, 0.000000, 0.000000, - 3.128790, 20.436140, 150.748993, -0.434954, -0.126769, -0.891485, 0.605541, 0.072913, 0.731565, 0.267239, 0.001196, 0.000000, 43.000000, 0.000000, 44.000000, 0.000000, - 0.000000, 24.276123, 148.315491, -0.502050, -0.716241, -0.484711, 0.590630, 0.097229, 0.644789, 0.292133, 0.063078, 0.000000, 43.000000, 0.000000, 44.000000, 0.000000, - 3.128790, 22.807703, 147.244614, -0.502050, -0.716241, -0.484711, 0.583842, 0.081680, 0.592068, 0.312565, 0.095366, 0.000000, 43.000000, 0.000000, 44.000000, 0.000000, - 3.128790, 20.436140, 150.748993, -0.502050, -0.716241, -0.484711, 0.605541, 0.072913, 0.731565, 0.267239, 0.001196, 0.000000, 43.000000, 0.000000, 44.000000, 0.000000, - 3.128790, 20.436140, 150.748993, -0.426378, -0.705871, -0.565639, 0.605541, 0.072913, 0.731565, 0.267239, 0.001196, 0.000000, 43.000000, 0.000000, 44.000000, 0.000000, - 0.000000, 21.188545, 152.168533, -0.426378, -0.705871, -0.565639, 0.612278, 0.087920, 0.779213, 0.220787, 0.000000, 0.000000, 43.000000, 0.000000, 0.000000, 0.000000, - 0.000000, 24.276123, 148.315491, -0.426378, -0.705871, -0.565639, 0.590630, 0.097229, 0.644789, 0.292133, 0.063078, 0.000000, 43.000000, 0.000000, 44.000000, 0.000000, - 0.000000, 24.216600, 139.775314, -0.346472, -0.937524, -0.031708, 0.546893, 0.114212, 0.496677, 0.496677, 0.006646, 0.000000, 43.000000, 44.000000, 45.000000, 0.000000, - 3.887500, 22.788065, 139.534897, -0.346472, -0.937524, -0.031708, 0.545382, 0.083823, 0.547236, 0.450532, 0.002233, 0.000000, 43.000000, 44.000000, 45.000000, 0.000000, - 3.128790, 22.807703, 147.244614, -0.346472, -0.937524, -0.031708, 0.583842, 0.081680, 0.592068, 0.312565, 0.095366, 0.000000, 43.000000, 0.000000, 44.000000, 0.000000, - 3.128790, 22.807703, 147.244614, -0.423080, -0.906070, 0.006315, 0.583842, 0.081680, 0.592068, 0.312565, 0.095366, 0.000000, 43.000000, 0.000000, 44.000000, 0.000000, - 0.000000, 24.276123, 148.315491, -0.423080, -0.906070, 0.006315, 0.590630, 0.097229, 0.644789, 0.292133, 0.063078, 0.000000, 43.000000, 0.000000, 44.000000, 0.000000, - 0.000000, 24.216600, 139.775314, -0.423080, -0.906070, 0.006315, 0.546893, 0.114212, 0.496677, 0.496677, 0.006646, 0.000000, 43.000000, 44.000000, 45.000000, 0.000000, - 4.555690, 17.386158, 143.292664, -0.325826, 0.307569, 0.894002, 0.582654, 0.048238, 0.570252, 0.318894, 0.110854, 0.000000, 0.000000, 43.000000, 44.000000, 0.000000, - 0.000000, 16.154316, 142.056107, -0.325826, 0.307569, 0.894002, 0.581807, 0.019588, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 3.109990, 15.154497, 143.533539, -0.325826, 0.307569, 0.894002, 0.601315, 0.035847, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 3.881290, 19.412880, 138.910416, -0.195290, 0.791577, 0.579023, 0.539630, 0.056699, 0.454085, 0.310515, 0.234770, 0.000631, 0.000000, 43.000000, 44.000000, 45.000000, - 0.000000, 18.529583, 138.808899, -0.195290, 0.791577, 0.579023, 0.549811, 0.021387, 0.340190, 0.340190, 0.317303, 0.002317, 0.000000, 43.000000, 44.000000, 45.000000, - 0.000000, 16.154316, 142.056107, -0.195290, 0.791577, 0.579023, 0.581807, 0.019588, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, 16.154316, 142.056107, -0.343434, 0.831178, 0.437259, 0.581807, 0.019588, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 4.555690, 17.386158, 143.292664, -0.343434, 0.831178, 0.437259, 0.582654, 0.048238, 0.570252, 0.318894, 0.110854, 0.000000, 0.000000, 43.000000, 44.000000, 0.000000, - 3.881290, 19.412880, 138.910416, -0.343433, 0.831178, 0.437259, 0.539630, 0.056699, 0.454085, 0.310515, 0.234770, 0.000631, 0.000000, 43.000000, 44.000000, 45.000000, - 4.740600, 20.174307, 145.183044, -0.990073, -0.023808, 0.138524, 0.579002, 0.065492, 0.450093, 0.421679, 0.128229, 0.000000, 43.000000, 0.000000, 44.000000, 0.000000, - 3.887500, 22.788065, 139.534897, -0.990073, -0.023808, 0.138524, 0.545382, 0.083823, 0.547236, 0.450532, 0.002233, 0.000000, 43.000000, 44.000000, 45.000000, 0.000000, - 3.881290, 19.412880, 138.910416, -0.990073, -0.023808, 0.138524, 0.539630, 0.056699, 0.454085, 0.310515, 0.234770, 0.000631, 0.000000, 43.000000, 44.000000, 45.000000, - 3.881290, 19.412880, 138.910416, -0.989866, -0.028651, 0.139083, 0.539630, 0.056699, 0.454085, 0.310515, 0.234770, 0.000631, 0.000000, 43.000000, 44.000000, 45.000000, - 4.555690, 17.386158, 143.292664, -0.989866, -0.028651, 0.139083, 0.582654, 0.048238, 0.570252, 0.318894, 0.110854, 0.000000, 0.000000, 43.000000, 44.000000, 0.000000, - 4.740600, 20.174307, 145.183044, -0.989866, -0.028651, 0.139083, 0.579002, 0.065492, 0.450093, 0.421679, 0.128229, 0.000000, 43.000000, 0.000000, 44.000000, 0.000000, - 3.128790, 22.807703, 147.244614, -0.878135, -0.470763, -0.085218, 0.583842, 0.081680, 0.592068, 0.312565, 0.095366, 0.000000, 43.000000, 0.000000, 44.000000, 0.000000, - 3.887500, 22.788065, 139.534897, -0.878135, -0.470763, -0.085218, 0.545382, 0.083823, 0.547236, 0.450532, 0.002233, 0.000000, 43.000000, 44.000000, 45.000000, 0.000000, - 4.740600, 20.174307, 145.183044, -0.878135, -0.470763, -0.085218, 0.579002, 0.065492, 0.450093, 0.421679, 0.128229, 0.000000, 43.000000, 0.000000, 44.000000, 0.000000, - 4.292500, 14.375145, 148.782318, -0.797239, 0.544577, 0.260472, 0.624475, 0.050477, 0.815921, 0.184079, 0.000000, 0.000000, 0.000000, 43.000000, 0.000000, 0.000000, - 4.555690, 17.386158, 143.292664, -0.797239, 0.544577, 0.260472, 0.582654, 0.048238, 0.570252, 0.318894, 0.110854, 0.000000, 0.000000, 43.000000, 44.000000, 0.000000, - 3.109990, 15.154497, 143.533539, -0.797239, 0.544577, 0.260472, 0.601315, 0.035847, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 3.109990, 15.154497, 143.533539, -0.892908, 0.370276, 0.256145, 0.601315, 0.035847, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 3.128790, 13.136616, 146.516068, -0.892908, 0.370276, 0.256145, 0.631218, 0.044150, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 4.292500, 14.375145, 148.782318, -0.892908, 0.370276, 0.256145, 0.624475, 0.050477, 0.815921, 0.184079, 0.000000, 0.000000, 0.000000, 43.000000, 0.000000, 0.000000, - 4.740600, 20.174307, 145.183044, -0.997380, 0.071848, -0.008409, 0.579002, 0.065492, 0.450093, 0.421679, 0.128229, 0.000000, 43.000000, 0.000000, 44.000000, 0.000000, - 4.555690, 17.386158, 143.292664, -0.997380, 0.071848, -0.008409, 0.582654, 0.048238, 0.570252, 0.318894, 0.110854, 0.000000, 0.000000, 43.000000, 44.000000, 0.000000, - 4.292500, 14.375145, 148.782318, -0.997380, 0.071848, -0.008409, 0.624475, 0.050477, 0.815921, 0.184079, 0.000000, 0.000000, 0.000000, 43.000000, 0.000000, 0.000000, - 4.292500, 14.375145, 148.782318, -0.997362, 0.039115, -0.061146, 0.624475, 0.050477, 0.815921, 0.184079, 0.000000, 0.000000, 0.000000, 43.000000, 0.000000, 0.000000, - 4.292500, 17.067873, 150.504868, -0.997362, 0.039115, -0.061146, 0.615766, 0.058911, 0.584804, 0.415196, 0.000000, 0.000000, 0.000000, 43.000000, 0.000000, 0.000000, - 4.740600, 20.174307, 145.183044, -0.997362, 0.039115, -0.061146, 0.579002, 0.065492, 0.450093, 0.421679, 0.128229, 0.000000, 43.000000, 0.000000, 44.000000, 0.000000, - 3.128790, 20.436140, 150.748993, -0.900430, -0.360259, -0.243803, 0.605541, 0.072913, 0.731565, 0.267239, 0.001196, 0.000000, 43.000000, 0.000000, 44.000000, 0.000000, - 3.128790, 22.807703, 147.244614, -0.900430, -0.360259, -0.243803, 0.583842, 0.081680, 0.592068, 0.312565, 0.095366, 0.000000, 43.000000, 0.000000, 44.000000, 0.000000, - 4.740600, 20.174307, 145.183044, -0.900430, -0.360259, -0.243803, 0.579002, 0.065492, 0.450093, 0.421679, 0.128229, 0.000000, 43.000000, 0.000000, 44.000000, 0.000000, - 4.740600, 20.174307, 145.183044, -0.920089, -0.299594, -0.252350, 0.579002, 0.065492, 0.450093, 0.421679, 0.128229, 0.000000, 43.000000, 0.000000, 44.000000, 0.000000, - 4.292500, 17.067873, 150.504868, -0.920089, -0.299594, -0.252350, 0.615766, 0.058911, 0.584804, 0.415196, 0.000000, 0.000000, 0.000000, 43.000000, 0.000000, 0.000000, - 3.128790, 20.436140, 150.748993, -0.920089, -0.299594, -0.252350, 0.605541, 0.072913, 0.731565, 0.267239, 0.001196, 0.000000, 43.000000, 0.000000, 44.000000, 0.000000, - 2.848700, 23.354582, 133.765778, -0.346384, -0.937622, -0.029702, 0.506309, 0.103818, 0.534590, 0.390247, 0.075163, 0.000000, 44.000000, 45.000000, 43.000000, 0.000000, - 3.887500, 22.788065, 139.534897, -0.346384, -0.937622, -0.029702, 0.545382, 0.083823, 0.547236, 0.450532, 0.002233, 0.000000, 43.000000, 44.000000, 45.000000, 0.000000, - 0.000000, 24.216600, 139.775314, -0.346384, -0.937622, -0.029702, 0.546893, 0.114212, 0.496677, 0.496677, 0.006646, 0.000000, 43.000000, 44.000000, 45.000000, 0.000000, - 0.000000, 24.216600, 139.775314, -0.452427, -0.887533, -0.087155, 0.546893, 0.114212, 0.496677, 0.496677, 0.006646, 0.000000, 43.000000, 44.000000, 45.000000, 0.000000, - 0.000000, 24.783133, 134.006073, -0.452427, -0.887533, -0.087155, 0.511942, 0.128727, 0.462973, 0.462973, 0.074055, 0.000000, 44.000000, 45.000000, 43.000000, 0.000000, - 2.848700, 23.354582, 133.765778, -0.452427, -0.887533, -0.087155, 0.506309, 0.103818, 0.534590, 0.390247, 0.075163, 0.000000, 44.000000, 45.000000, 43.000000, 0.000000, - 2.063090, 25.151978, 127.641441, -0.452708, -0.869593, -0.197140, 0.469606, 0.123155, 0.726982, 0.273018, 0.000000, 0.000000, 45.000000, 44.000000, 0.000000, 0.000000, - 2.848700, 23.354582, 133.765778, -0.452708, -0.869593, -0.197140, 0.506309, 0.103818, 0.534590, 0.390247, 0.075163, 0.000000, 44.000000, 45.000000, 43.000000, 0.000000, - 0.000000, 24.783133, 134.006073, -0.452708, -0.869593, -0.197140, 0.511942, 0.128727, 0.462973, 0.462973, 0.074055, 0.000000, 44.000000, 45.000000, 43.000000, 0.000000, - 0.000000, 24.783133, 134.006073, -0.611977, -0.752939, -0.242006, 0.511942, 0.128727, 0.462973, 0.462973, 0.074055, 0.000000, 44.000000, 45.000000, 43.000000, 0.000000, - 0.210500, 26.580538, 127.881615, -0.611977, -0.752939, -0.242006, 0.473903, 0.137517, 0.742667, 0.257333, 0.000000, 0.000000, 45.000000, 44.000000, 0.000000, 0.000000, - 2.063090, 25.151978, 127.641441, -0.611977, -0.752939, -0.242006, 0.469606, 0.123155, 0.726982, 0.273018, 0.000000, 0.000000, 45.000000, 44.000000, 0.000000, 0.000000, - 1.136800, 27.434258, 119.476074, -0.615900, -0.774085, -0.146494, 0.420083, 0.146368, 1.000000, 0.000000, 0.000000, 0.000000, 45.000000, 0.000000, 0.000000, 0.000000, - 2.063090, 25.151978, 127.641441, -0.615900, -0.774085, -0.146494, 0.469606, 0.123155, 0.726982, 0.273018, 0.000000, 0.000000, 45.000000, 44.000000, 0.000000, 0.000000, - 0.210500, 26.580538, 127.881615, -0.615900, -0.774085, -0.146494, 0.473903, 0.137517, 0.742667, 0.257333, 0.000000, 0.000000, 45.000000, 44.000000, 0.000000, 0.000000, - 2.842490, 19.542404, 134.097626, -0.297483, 0.954381, 0.025688, 0.517902, 0.038871, 0.564587, 0.270836, 0.164577, 0.000000, 44.000000, 45.000000, 43.000000, 0.000000, - 0.000000, 18.659124, 133.996124, -0.297483, 0.954381, 0.025688, 0.519808, 0.019981, 0.566889, 0.269762, 0.163349, 0.000000, 44.000000, 45.000000, 43.000000, 0.000000, - 0.000000, 18.529583, 138.808899, -0.297483, 0.954381, 0.025688, 0.549811, 0.021387, 0.340190, 0.340190, 0.317303, 0.002317, 0.000000, 43.000000, 44.000000, 45.000000, - 0.000000, 18.529583, 138.808899, -0.223138, 0.971950, 0.074320, 0.549811, 0.021387, 0.340190, 0.340190, 0.317303, 0.002317, 0.000000, 43.000000, 44.000000, 45.000000, - 3.881290, 19.412880, 138.910416, -0.223138, 0.971950, 0.074320, 0.539630, 0.056699, 0.454085, 0.310515, 0.234770, 0.000631, 0.000000, 43.000000, 44.000000, 45.000000, - 2.842490, 19.542404, 134.097626, -0.223138, 0.971949, 0.074320, 0.517902, 0.038871, 0.564587, 0.270836, 0.164577, 0.000000, 44.000000, 45.000000, 43.000000, 0.000000, - 2.050270, 19.859558, 128.768646, -0.428294, 0.902783, 0.039333, 0.483926, 0.027776, 0.534451, 0.465277, 0.000273, 0.000000, 45.000000, 44.000000, 43.000000, 0.000000, - 0.179290, 18.976345, 128.667435, -0.428295, 0.902783, 0.039333, 0.486162, 0.014746, 0.522088, 0.477676, 0.000235, 0.000000, 45.000000, 44.000000, 43.000000, 0.000000, - 0.000000, 18.659124, 133.996124, -0.428295, 0.902783, 0.039333, 0.519808, 0.019981, 0.566889, 0.269762, 0.163349, 0.000000, 44.000000, 45.000000, 43.000000, 0.000000, - 0.000000, 18.659124, 133.996124, -0.298514, 0.949061, 0.100861, 0.519808, 0.019981, 0.566889, 0.269762, 0.163349, 0.000000, 44.000000, 45.000000, 43.000000, 0.000000, - 2.842490, 19.542404, 134.097626, -0.298514, 0.949061, 0.100861, 0.517902, 0.038871, 0.564587, 0.270836, 0.164577, 0.000000, 44.000000, 45.000000, 43.000000, 0.000000, - 2.050270, 19.859558, 128.768646, -0.298514, 0.949061, 0.100861, 0.483926, 0.027776, 0.534451, 0.465277, 0.000273, 0.000000, 45.000000, 44.000000, 43.000000, 0.000000, - 1.114790, 20.503546, 123.993156, -0.426979, 0.881299, 0.202487, 0.454167, 0.016899, 0.955404, 0.044596, 0.000000, 0.000000, 45.000000, 44.000000, 0.000000, 0.000000, - 0.179290, 18.976345, 128.667435, -0.426979, 0.881299, 0.202487, 0.486162, 0.014746, 0.522088, 0.477676, 0.000235, 0.000000, 45.000000, 44.000000, 43.000000, 0.000000, - 2.050270, 19.859558, 128.768646, -0.426979, 0.881299, 0.202487, 0.483926, 0.027776, 0.534451, 0.465277, 0.000273, 0.000000, 45.000000, 44.000000, 43.000000, 0.000000, - 2.842490, 21.375158, 134.023712, -0.980277, -0.034210, 0.194647, 0.503974, 0.072551, 0.563399, 0.327071, 0.109530, 0.000000, 44.000000, 45.000000, 43.000000, 0.000000, - 3.881290, 19.412880, 138.910416, -0.980277, -0.034210, 0.194647, 0.539630, 0.056699, 0.454085, 0.310515, 0.234770, 0.000631, 0.000000, 43.000000, 44.000000, 45.000000, - 3.887500, 22.788065, 139.534897, -0.980277, -0.034210, 0.194647, 0.545382, 0.083823, 0.547236, 0.450532, 0.002233, 0.000000, 43.000000, 44.000000, 45.000000, 0.000000, - 3.887500, 22.788065, 139.534897, -0.913810, -0.316568, 0.254432, 0.545382, 0.083823, 0.547236, 0.450532, 0.002233, 0.000000, 43.000000, 44.000000, 45.000000, 0.000000, - 2.254370, 23.388002, 134.415848, -0.913810, -0.316568, 0.254432, 0.505864, 0.095725, 0.512407, 0.377576, 0.110017, 0.000000, 44.000000, 45.000000, 43.000000, 0.000000, - 2.842490, 21.375158, 134.023712, -0.913810, -0.316568, 0.254432, 0.503974, 0.072551, 0.563399, 0.327071, 0.109530, 0.000000, 44.000000, 45.000000, 43.000000, 0.000000, - 2.781990, 22.870596, 128.390396, -0.961215, -0.268953, -0.061074, 0.466885, 0.078060, 0.637984, 0.362016, 0.000000, 0.000000, 45.000000, 44.000000, 0.000000, 0.000000, - 2.842490, 21.375158, 134.023712, -0.961215, -0.268953, -0.061074, 0.503974, 0.072551, 0.563399, 0.327071, 0.109530, 0.000000, 44.000000, 45.000000, 43.000000, 0.000000, - 2.254370, 23.388002, 134.415848, -0.961215, -0.268953, -0.061074, 0.505864, 0.095725, 0.512407, 0.377576, 0.110017, 0.000000, 44.000000, 45.000000, 43.000000, 0.000000, - 2.254370, 23.388002, 134.415848, -0.813327, -0.581417, -0.021293, 0.505864, 0.095725, 0.512407, 0.377576, 0.110017, 0.000000, 44.000000, 45.000000, 43.000000, 0.000000, - 1.177300, 25.099648, 128.819168, -0.813327, -0.581417, -0.021293, 0.468235, 0.095689, 0.583532, 0.416468, 0.000000, 0.000000, 45.000000, 44.000000, 0.000000, 0.000000, - 2.781990, 22.870596, 128.390396, -0.813327, -0.581417, -0.021293, 0.466885, 0.078060, 0.637984, 0.362016, 0.000000, 0.000000, 45.000000, 44.000000, 0.000000, 0.000000, - 3.650000, 24.720686, 120.945839, -0.810408, -0.539448, -0.228552, 0.417376, 0.080849, 1.000000, 0.000000, 0.000000, 0.000000, 45.000000, 0.000000, 0.000000, 0.000000, - 2.781990, 22.870596, 128.390396, -0.810408, -0.539448, -0.228552, 0.466885, 0.078060, 0.637984, 0.362016, 0.000000, 0.000000, 45.000000, 44.000000, 0.000000, 0.000000, - 1.177300, 25.099648, 128.819168, -0.810408, -0.539448, -0.228552, 0.468235, 0.095689, 0.583532, 0.416468, 0.000000, 0.000000, 45.000000, 44.000000, 0.000000, 0.000000, - 1.824590, 19.561350, 133.711517, -0.842581, 0.413447, 0.345135, 0.499099, 0.050199, 0.560381, 0.317562, 0.122057, 0.000000, 44.000000, 45.000000, 43.000000, 0.000000, - 3.881290, 19.412880, 138.910416, -0.842581, 0.413447, 0.345135, 0.539630, 0.056699, 0.454085, 0.310515, 0.234770, 0.000631, 0.000000, 43.000000, 44.000000, 45.000000, - 2.842490, 21.375158, 134.023712, -0.842581, 0.413447, 0.345135, 0.503974, 0.072551, 0.563399, 0.327071, 0.109530, 0.000000, 44.000000, 45.000000, 43.000000, 0.000000, - 2.545390, 22.941502, 128.691986, -0.889538, 0.427800, 0.160344, 0.464643, 0.068442, 0.610807, 0.389193, 0.000000, 0.000000, 45.000000, 44.000000, 0.000000, 0.000000, - 1.033880, 19.988201, 128.186050, -0.889538, 0.427800, 0.160344, 0.463483, 0.047017, 0.589590, 0.410410, 0.000000, 0.000000, 45.000000, 44.000000, 0.000000, 0.000000, - 1.824590, 19.561350, 133.711517, -0.889538, 0.427800, 0.160344, 0.499099, 0.050199, 0.560381, 0.317562, 0.122057, 0.000000, 44.000000, 45.000000, 43.000000, 0.000000, - 1.824590, 19.561350, 133.711517, -0.870464, 0.457041, 0.182773, 0.499099, 0.050199, 0.560381, 0.317562, 0.122057, 0.000000, 44.000000, 45.000000, 43.000000, 0.000000, - 2.842490, 21.375158, 134.023712, -0.870464, 0.457041, 0.182773, 0.503974, 0.072551, 0.563399, 0.327071, 0.109530, 0.000000, 44.000000, 45.000000, 43.000000, 0.000000, - 2.545390, 22.941502, 128.691986, -0.870464, 0.457041, 0.182773, 0.464643, 0.068442, 0.610807, 0.389193, 0.000000, 0.000000, 45.000000, 44.000000, 0.000000, 0.000000, - 3.137990, 21.746344, 121.643654, -0.868851, 0.470874, -0.152894, 0.419546, 0.058747, 1.000000, 0.000000, 0.000000, 0.000000, 45.000000, 0.000000, 0.000000, 0.000000, - 1.033880, 19.988201, 128.186050, -0.868851, 0.470873, -0.152894, 0.463483, 0.047017, 0.589590, 0.410410, 0.000000, 0.000000, 45.000000, 44.000000, 0.000000, 0.000000, - 2.545390, 22.941502, 128.691986, -0.868851, 0.470873, -0.152894, 0.464643, 0.068442, 0.610807, 0.389193, 0.000000, 0.000000, 45.000000, 44.000000, 0.000000, 0.000000, - 0.000000, 14.792213, 141.054062, 0.497216, -0.514140, 0.698882, 0.652447, 0.156921, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, 16.154316, 142.056107, 0.497216, -0.514140, 0.698882, 0.640913, 0.157042, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -3.109990, 13.792527, 142.531219, 0.497216, -0.514140, 0.698882, 0.654232, 0.132974, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -3.109990, 15.154510, 143.533417, 0.497255, -0.514207, 0.698805, 0.642532, 0.131699, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -3.109990, 13.792527, 142.531219, 0.497255, -0.514207, 0.698805, 0.654232, 0.132974, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, 16.154316, 142.056107, 0.497255, -0.514207, 0.698805, 0.640913, 0.157042, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -3.109990, 15.154510, 143.533417, 0.999986, -0.003098, 0.004207, 0.642532, 0.131699, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -3.128790, 13.136616, 146.516068, 0.999986, -0.003098, 0.004207, 0.657075, 0.104283, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -3.128790, 11.774703, 145.513275, 0.999986, -0.003098, 0.004207, 0.665104, 0.104532, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -3.128790, 11.774703, 145.513275, 0.999986, -0.003097, 0.004209, 0.665104, 0.104532, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -3.109990, 13.792527, 142.531219, 0.999986, -0.003097, 0.004209, 0.654232, 0.132974, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -3.109990, 15.154510, 143.533417, 0.999986, -0.003097, 0.004209, 0.642532, 0.131699, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -3.128790, 11.774703, 145.513275, 0.609793, 0.469927, -0.638217, 0.665104, 0.104532, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -3.128790, 13.136616, 146.516068, 0.609793, 0.469927, -0.638217, 0.657075, 0.104283, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, 11.938869, 148.623596, 0.609793, 0.469927, -0.638217, 0.653265, 0.070295, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, 11.938869, 148.623596, 0.664090, 0.301942, -0.683970, 0.653265, 0.070295, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, 10.092729, 147.808609, 0.664090, 0.301942, -0.683970, 0.662101, 0.066496, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -3.128790, 11.774703, 145.513275, 0.664090, 0.301942, -0.683970, 0.665104, 0.104532, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -4.292500, 14.375145, 148.782318, 0.432266, 0.789948, -0.434889, 0.647845, 0.104824, 0.815921, 0.184079, 0.000000, 0.000000, 0.000000, 43.000000, 0.000000, 0.000000, - 0.000000, 13.102611, 150.737457, 0.432266, 0.789948, -0.434889, 0.646807, 0.073072, 0.746870, 0.253130, 0.000000, 0.000000, 0.000000, 43.000000, 0.000000, 0.000000, - 0.000000, 11.938869, 148.623596, 0.432266, 0.789948, -0.434889, 0.653265, 0.070295, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, 11.938869, 148.623596, 0.475147, 0.851592, -0.221418, 0.653265, 0.070295, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -3.128790, 13.136616, 146.516068, 0.475147, 0.851592, -0.221418, 0.657075, 0.104283, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -4.292500, 14.375145, 148.782318, 0.475147, 0.851592, -0.221418, 0.647845, 0.104824, 0.815921, 0.184079, 0.000000, 0.000000, 0.000000, 43.000000, 0.000000, 0.000000, - -4.292500, 17.067873, 150.504868, 0.496849, 0.496084, -0.712068, 0.635733, 0.105343, 0.584804, 0.415196, 0.000000, 0.000000, 0.000000, 43.000000, 0.000000, 0.000000, - 0.000000, 16.179203, 152.880859, 0.496849, 0.496084, -0.712068, 0.632856, 0.079071, 0.500733, 0.499267, 0.000000, 0.000000, 0.000000, 43.000000, 0.000000, 0.000000, - 0.000000, 13.102611, 150.737457, 0.496849, 0.496084, -0.712068, 0.646807, 0.073072, 0.746870, 0.253130, 0.000000, 0.000000, 0.000000, 43.000000, 0.000000, 0.000000, - 0.000000, 13.102611, 150.737457, 0.477488, 0.473478, -0.740151, 0.646807, 0.073072, 0.746870, 0.253130, 0.000000, 0.000000, 0.000000, 43.000000, 0.000000, 0.000000, - -4.292500, 14.375145, 148.782318, 0.477488, 0.473478, -0.740152, 0.647845, 0.104824, 0.815921, 0.184079, 0.000000, 0.000000, 0.000000, 43.000000, 0.000000, 0.000000, - -4.292500, 17.067873, 150.504868, 0.477488, 0.473478, -0.740151, 0.635733, 0.105343, 0.584804, 0.415196, 0.000000, 0.000000, 0.000000, 43.000000, 0.000000, 0.000000, - -3.128790, 20.436140, 150.748993, 0.434954, -0.126769, -0.891485, 0.618536, 0.103133, 0.731592, 0.267211, 0.001196, 0.000000, 43.000000, 0.000000, 44.000000, 0.000000, - 0.000000, 21.188545, 152.168533, 0.434954, -0.126769, -0.891485, 0.612278, 0.087920, 0.779213, 0.220787, 0.000000, 0.000000, 43.000000, 0.000000, 0.000000, 0.000000, - 0.000000, 16.179203, 152.880859, 0.434954, -0.126769, -0.891484, 0.632856, 0.079071, 0.500733, 0.499267, 0.000000, 0.000000, 0.000000, 43.000000, 0.000000, 0.000000, - 0.000000, 16.179203, 152.880859, 0.466461, -0.097439, -0.879159, 0.632856, 0.079071, 0.500733, 0.499267, 0.000000, 0.000000, 0.000000, 43.000000, 0.000000, 0.000000, - -4.292500, 17.067873, 150.504868, 0.466461, -0.097439, -0.879159, 0.635733, 0.105343, 0.584804, 0.415196, 0.000000, 0.000000, 0.000000, 43.000000, 0.000000, 0.000000, - -3.128790, 20.436140, 150.748993, 0.466461, -0.097439, -0.879159, 0.618536, 0.103133, 0.731592, 0.267211, 0.001196, 0.000000, 43.000000, 0.000000, 44.000000, 0.000000, - -3.128790, 20.436140, 150.748993, 0.502058, -0.716242, -0.484701, 0.618536, 0.103133, 0.731592, 0.267211, 0.001196, 0.000000, 43.000000, 0.000000, 44.000000, 0.000000, - -3.128790, 22.807714, 147.244522, 0.502058, -0.716242, -0.484701, 0.597246, 0.112852, 0.592089, 0.312536, 0.095374, 0.000000, 43.000000, 0.000000, 44.000000, 0.000000, - 0.000000, 24.276123, 148.315491, 0.502058, -0.716242, -0.484701, 0.590630, 0.097229, 0.644789, 0.292133, 0.063078, 0.000000, 43.000000, 0.000000, 44.000000, 0.000000, - 0.000000, 24.276123, 148.315491, 0.426378, -0.705871, -0.565639, 0.590630, 0.097229, 0.644789, 0.292133, 0.063078, 0.000000, 43.000000, 0.000000, 44.000000, 0.000000, - 0.000000, 21.188545, 152.168533, 0.426378, -0.705871, -0.565639, 0.612278, 0.087920, 0.779213, 0.220787, 0.000000, 0.000000, 43.000000, 0.000000, 0.000000, 0.000000, - -3.128790, 20.436140, 150.748993, 0.426378, -0.705871, -0.565639, 0.618536, 0.103133, 0.731592, 0.267211, 0.001196, 0.000000, 43.000000, 0.000000, 44.000000, 0.000000, - -3.128790, 22.807714, 147.244522, 0.346472, -0.937524, -0.031707, 0.597246, 0.112852, 0.592089, 0.312536, 0.095374, 0.000000, 43.000000, 0.000000, 44.000000, 0.000000, - -3.887500, 22.788065, 139.534897, 0.346472, -0.937524, -0.031707, 0.562660, 0.131280, 0.547236, 0.450532, 0.002233, 0.000000, 43.000000, 44.000000, 45.000000, 0.000000, - 0.000000, 24.216600, 139.775314, 0.346472, -0.937524, -0.031707, 0.546893, 0.114212, 0.496677, 0.496677, 0.006646, 0.000000, 43.000000, 44.000000, 45.000000, 0.000000, - 0.000000, 24.216600, 139.775314, 0.423077, -0.906072, 0.006315, 0.546893, 0.114212, 0.496677, 0.496677, 0.006646, 0.000000, 43.000000, 44.000000, 45.000000, 0.000000, - 0.000000, 24.276123, 148.315491, 0.423077, -0.906072, 0.006315, 0.590630, 0.097229, 0.644789, 0.292133, 0.063078, 0.000000, 43.000000, 0.000000, 44.000000, 0.000000, - -3.128790, 22.807714, 147.244522, 0.423077, -0.906072, 0.006315, 0.597246, 0.112852, 0.592089, 0.312536, 0.095374, 0.000000, 43.000000, 0.000000, 44.000000, 0.000000, - 0.000000, 16.154316, 142.056107, 0.325818, 0.307519, 0.894022, 0.640913, 0.157042, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -4.555690, 17.386158, 143.292664, 0.325817, 0.307519, 0.894022, 0.620701, 0.136719, 0.570254, 0.318893, 0.110853, 0.000000, 0.000000, 43.000000, 44.000000, 0.000000, - -3.109990, 15.154510, 143.533417, 0.325818, 0.307519, 0.894022, 0.642532, 0.131699, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, 16.154316, 142.056107, 0.195279, 0.791579, 0.579024, 0.640913, 0.157042, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 0.000000, 18.529583, 138.808899, 0.195279, 0.791579, 0.579024, 0.619435, 0.179999, 0.340190, 0.340190, 0.317303, 0.002317, 0.000000, 43.000000, 44.000000, 45.000000, - -3.881290, 19.412891, 138.910324, 0.195279, 0.791579, 0.579024, 0.588348, 0.152491, 0.454089, 0.310511, 0.234769, 0.000631, 0.000000, 43.000000, 44.000000, 45.000000, - -3.881290, 19.412891, 138.910324, 0.343433, 0.831182, 0.437254, 0.588348, 0.152491, 0.454089, 0.310511, 0.234769, 0.000631, 0.000000, 43.000000, 44.000000, 45.000000, - -4.555690, 17.386158, 143.292664, 0.343433, 0.831182, 0.437254, 0.620701, 0.136719, 0.570254, 0.318893, 0.110853, 0.000000, 0.000000, 43.000000, 44.000000, 0.000000, - 0.000000, 16.154316, 142.056107, 0.343433, 0.831182, 0.437254, 0.640913, 0.157042, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -3.881290, 19.412891, 138.910324, 0.990073, -0.023812, 0.138522, 0.588348, 0.152491, 0.454089, 0.310511, 0.234769, 0.000631, 0.000000, 43.000000, 44.000000, 45.000000, - -3.887500, 22.788065, 139.534897, 0.990073, -0.023812, 0.138522, 0.562660, 0.131280, 0.547236, 0.450532, 0.002233, 0.000000, 43.000000, 44.000000, 45.000000, 0.000000, - -4.740600, 20.174307, 145.183044, 0.990073, -0.023812, 0.138522, 0.605666, 0.127500, 0.450135, 0.421625, 0.128240, 0.000000, 43.000000, 0.000000, 44.000000, 0.000000, - -4.740600, 20.174307, 145.183044, 0.989866, -0.028650, 0.139081, 0.605666, 0.127500, 0.450135, 0.421625, 0.128240, 0.000000, 43.000000, 0.000000, 44.000000, 0.000000, - -4.555690, 17.386158, 143.292664, 0.989866, -0.028650, 0.139081, 0.620701, 0.136719, 0.570254, 0.318893, 0.110853, 0.000000, 0.000000, 43.000000, 44.000000, 0.000000, - -3.881290, 19.412891, 138.910324, 0.989866, -0.028650, 0.139081, 0.588348, 0.152491, 0.454089, 0.310511, 0.234769, 0.000631, 0.000000, 43.000000, 44.000000, 45.000000, - -3.887500, 22.788065, 139.534897, 0.878134, -0.470763, -0.085218, 0.562660, 0.131280, 0.547236, 0.450532, 0.002233, 0.000000, 43.000000, 44.000000, 45.000000, 0.000000, - -3.128790, 22.807714, 147.244522, 0.878134, -0.470763, -0.085218, 0.597246, 0.112852, 0.592089, 0.312536, 0.095374, 0.000000, 43.000000, 0.000000, 44.000000, 0.000000, - -4.740600, 20.174307, 145.183044, 0.878134, -0.470763, -0.085218, 0.605666, 0.127500, 0.450135, 0.421625, 0.128240, 0.000000, 43.000000, 0.000000, 44.000000, 0.000000, - -3.109990, 15.154510, 143.533417, 0.797246, 0.544569, 0.260468, 0.642532, 0.131699, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -4.555690, 17.386158, 143.292664, 0.797246, 0.544569, 0.260468, 0.620701, 0.136719, 0.570254, 0.318893, 0.110853, 0.000000, 0.000000, 43.000000, 44.000000, 0.000000, - -4.292500, 14.375145, 148.782318, 0.797246, 0.544569, 0.260468, 0.647845, 0.104824, 0.815921, 0.184079, 0.000000, 0.000000, 0.000000, 43.000000, 0.000000, 0.000000, - -4.292500, 14.375145, 148.782318, 0.892907, 0.370283, 0.256141, 0.647845, 0.104824, 0.815921, 0.184079, 0.000000, 0.000000, 0.000000, 43.000000, 0.000000, 0.000000, - -3.128790, 13.136616, 146.516068, 0.892907, 0.370283, 0.256141, 0.657075, 0.104283, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -3.109990, 15.154510, 143.533417, 0.892907, 0.370283, 0.256141, 0.642532, 0.131699, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -4.740600, 20.174307, 145.183044, 0.997362, 0.039115, -0.061146, 0.605666, 0.127500, 0.450135, 0.421625, 0.128240, 0.000000, 43.000000, 0.000000, 44.000000, 0.000000, - -4.292500, 17.067873, 150.504868, 0.997362, 0.039115, -0.061146, 0.635733, 0.105343, 0.584804, 0.415196, 0.000000, 0.000000, 0.000000, 43.000000, 0.000000, 0.000000, - -4.292500, 14.375145, 148.782318, 0.997362, 0.039115, -0.061146, 0.647845, 0.104824, 0.815921, 0.184079, 0.000000, 0.000000, 0.000000, 43.000000, 0.000000, 0.000000, - -4.292500, 14.375145, 148.782318, 0.997380, 0.071848, -0.008409, 0.647845, 0.104824, 0.815921, 0.184079, 0.000000, 0.000000, 0.000000, 43.000000, 0.000000, 0.000000, - -4.555690, 17.386158, 143.292664, 0.997380, 0.071848, -0.008409, 0.620701, 0.136719, 0.570254, 0.318893, 0.110853, 0.000000, 0.000000, 43.000000, 44.000000, 0.000000, - -4.740600, 20.174307, 145.183044, 0.997380, 0.071848, -0.008409, 0.605666, 0.127500, 0.450135, 0.421625, 0.128240, 0.000000, 43.000000, 0.000000, 44.000000, 0.000000, - -4.740600, 20.174307, 145.183044, 0.900427, -0.360266, -0.243802, 0.605666, 0.127500, 0.450135, 0.421625, 0.128240, 0.000000, 43.000000, 0.000000, 44.000000, 0.000000, - -3.128790, 22.807714, 147.244522, 0.900427, -0.360266, -0.243802, 0.597246, 0.112852, 0.592089, 0.312536, 0.095374, 0.000000, 43.000000, 0.000000, 44.000000, 0.000000, - -3.128790, 20.436140, 150.748993, 0.900427, -0.360265, -0.243802, 0.618536, 0.103133, 0.731592, 0.267211, 0.001196, 0.000000, 43.000000, 0.000000, 44.000000, 0.000000, - -3.128790, 20.436140, 150.748993, 0.920089, -0.299594, -0.252350, 0.618536, 0.103133, 0.731592, 0.267211, 0.001196, 0.000000, 43.000000, 0.000000, 44.000000, 0.000000, - -4.292500, 17.067873, 150.504868, 0.920089, -0.299594, -0.252350, 0.635733, 0.105343, 0.584804, 0.415196, 0.000000, 0.000000, 0.000000, 43.000000, 0.000000, 0.000000, - -4.740600, 20.174307, 145.183044, 0.920089, -0.299594, -0.252350, 0.605666, 0.127500, 0.450135, 0.421625, 0.128240, 0.000000, 43.000000, 0.000000, 44.000000, 0.000000, - -2.848700, 23.354582, 133.765778, 0.452427, -0.887533, -0.087155, 0.525418, 0.152482, 0.534590, 0.390247, 0.075163, 0.000000, 44.000000, 45.000000, 43.000000, 0.000000, - 0.000000, 24.783133, 134.006073, 0.452427, -0.887533, -0.087155, 0.511942, 0.128727, 0.462973, 0.462973, 0.074055, 0.000000, 44.000000, 45.000000, 43.000000, 0.000000, - 0.000000, 24.216600, 139.775314, 0.452427, -0.887533, -0.087155, 0.546893, 0.114212, 0.496677, 0.496677, 0.006646, 0.000000, 43.000000, 44.000000, 45.000000, 0.000000, - 0.000000, 24.216600, 139.775314, 0.346384, -0.937622, -0.029702, 0.546893, 0.114212, 0.496677, 0.496677, 0.006646, 0.000000, 43.000000, 44.000000, 45.000000, 0.000000, - -3.887500, 22.788065, 139.534897, 0.346384, -0.937622, -0.029702, 0.562660, 0.131280, 0.547236, 0.450532, 0.002233, 0.000000, 43.000000, 44.000000, 45.000000, 0.000000, - -2.848700, 23.354582, 133.765778, 0.346384, -0.937622, -0.029702, 0.525418, 0.152482, 0.534590, 0.390247, 0.075163, 0.000000, 44.000000, 45.000000, 43.000000, 0.000000, - -2.063090, 25.151978, 127.641441, 0.611977, -0.752939, -0.242006, 0.486137, 0.165823, 0.726982, 0.273018, 0.000000, 0.000000, 45.000000, 44.000000, 0.000000, 0.000000, - -0.210500, 26.580538, 127.881615, 0.611977, -0.752939, -0.242006, 0.478668, 0.152825, 0.742667, 0.257333, 0.000000, 0.000000, 45.000000, 44.000000, 0.000000, 0.000000, - 0.000000, 24.783133, 134.006073, 0.611977, -0.752939, -0.242006, 0.511942, 0.128727, 0.462973, 0.462973, 0.074055, 0.000000, 44.000000, 45.000000, 43.000000, 0.000000, - 0.000000, 24.783133, 134.006073, 0.452708, -0.869593, -0.197140, 0.511942, 0.128727, 0.462973, 0.462973, 0.074055, 0.000000, 44.000000, 45.000000, 43.000000, 0.000000, - -2.848700, 23.354582, 133.765778, 0.452708, -0.869593, -0.197140, 0.525418, 0.152482, 0.534590, 0.390247, 0.075163, 0.000000, 44.000000, 45.000000, 43.000000, 0.000000, - -2.063090, 25.151978, 127.641441, 0.452708, -0.869593, -0.197140, 0.486137, 0.165823, 0.726982, 0.273018, 0.000000, 0.000000, 45.000000, 44.000000, 0.000000, 0.000000, - -2.063090, 25.151978, 127.641441, 0.615900, -0.774085, -0.146494, 0.486137, 0.165823, 0.726982, 0.273018, 0.000000, 0.000000, 45.000000, 44.000000, 0.000000, 0.000000, - -1.136800, 27.434258, 119.476074, 0.615900, -0.774085, -0.146494, 0.435223, 0.185804, 1.000000, 0.000000, 0.000000, 0.000000, 45.000000, 0.000000, 0.000000, 0.000000, - -0.210500, 26.580538, 127.881615, 0.615900, -0.774085, -0.146494, 0.478668, 0.152825, 0.742667, 0.257333, 0.000000, 0.000000, 45.000000, 44.000000, 0.000000, 0.000000, - 0.000000, 18.529583, 138.808899, 0.297483, 0.954381, 0.025688, 0.619435, 0.179999, 0.340190, 0.340190, 0.317303, 0.002317, 0.000000, 43.000000, 44.000000, 45.000000, - 0.000000, 18.659124, 133.996124, 0.297483, 0.954381, 0.025688, 0.599815, 0.202742, 0.566889, 0.269762, 0.163349, 0.000000, 44.000000, 45.000000, 43.000000, 0.000000, - -2.842490, 19.542404, 134.097626, 0.297483, 0.954381, 0.025688, 0.584795, 0.191130, 0.564587, 0.270836, 0.164577, 0.000000, 44.000000, 45.000000, 43.000000, 0.000000, - -2.842490, 19.542404, 134.097626, 0.223139, 0.971949, 0.074319, 0.584795, 0.191130, 0.564587, 0.270836, 0.164577, 0.000000, 44.000000, 45.000000, 43.000000, 0.000000, - -3.881290, 19.412891, 138.910324, 0.223139, 0.971949, 0.074319, 0.588348, 0.152491, 0.454089, 0.310511, 0.234769, 0.000631, 0.000000, 43.000000, 44.000000, 45.000000, - 0.000000, 18.529583, 138.808899, 0.223139, 0.971949, 0.074319, 0.619435, 0.179999, 0.340190, 0.340190, 0.317303, 0.002317, 0.000000, 43.000000, 44.000000, 45.000000, - 0.000000, 18.659124, 133.996124, 0.428295, 0.902783, 0.039333, 0.599815, 0.202742, 0.566889, 0.269762, 0.163349, 0.000000, 44.000000, 45.000000, 43.000000, 0.000000, - -0.179290, 18.976345, 128.667435, 0.428295, 0.902783, 0.039333, 0.580468, 0.230762, 0.522088, 0.477676, 0.000235, 0.000000, 45.000000, 44.000000, 43.000000, 0.000000, - -2.050270, 19.859558, 128.768646, 0.428294, 0.902783, 0.039333, 0.569473, 0.223421, 0.534451, 0.465277, 0.000273, 0.000000, 45.000000, 44.000000, 43.000000, 0.000000, - -2.050270, 19.859558, 128.768646, 0.298514, 0.949061, 0.100861, 0.569473, 0.223421, 0.534451, 0.465277, 0.000273, 0.000000, 45.000000, 44.000000, 43.000000, 0.000000, - -2.842490, 19.542404, 134.097626, 0.298514, 0.949061, 0.100861, 0.584795, 0.191130, 0.564587, 0.270836, 0.164577, 0.000000, 44.000000, 45.000000, 43.000000, 0.000000, - 0.000000, 18.659124, 133.996124, 0.298514, 0.949061, 0.100861, 0.599815, 0.202742, 0.566889, 0.269762, 0.163349, 0.000000, 44.000000, 45.000000, 43.000000, 0.000000, - -0.179290, 18.976345, 128.667435, 0.426979, 0.881299, 0.202487, 0.580468, 0.230762, 0.522088, 0.477676, 0.000235, 0.000000, 45.000000, 44.000000, 43.000000, 0.000000, - -1.114790, 20.503546, 123.993156, 0.426979, 0.881299, 0.202487, 0.556895, 0.252502, 0.955404, 0.044596, 0.000000, 0.000000, 45.000000, 44.000000, 0.000000, 0.000000, - -2.050270, 19.859558, 128.768646, 0.426979, 0.881299, 0.202487, 0.569473, 0.223421, 0.534451, 0.465277, 0.000273, 0.000000, 45.000000, 44.000000, 43.000000, 0.000000, - -2.842490, 21.375158, 134.023712, 0.913810, -0.316568, 0.254432, 0.556462, 0.167949, 0.563399, 0.327071, 0.109530, 0.000000, 44.000000, 45.000000, 43.000000, 0.000000, - -2.254370, 23.388002, 134.415848, 0.913810, -0.316568, 0.254432, 0.534572, 0.156272, 0.512407, 0.377576, 0.110017, 0.000000, 44.000000, 45.000000, 43.000000, 0.000000, - -3.887500, 22.788065, 139.534897, 0.913810, -0.316568, 0.254432, 0.562660, 0.131280, 0.547236, 0.450532, 0.002233, 0.000000, 43.000000, 44.000000, 45.000000, 0.000000, - -3.887500, 22.788065, 139.534897, 0.980276, -0.034216, 0.194648, 0.562660, 0.131280, 0.547236, 0.450532, 0.002233, 0.000000, 43.000000, 44.000000, 45.000000, 0.000000, - -3.881290, 19.412891, 138.910324, 0.980276, -0.034216, 0.194648, 0.588348, 0.152491, 0.454089, 0.310511, 0.234769, 0.000631, 0.000000, 43.000000, 44.000000, 45.000000, - -2.842490, 21.375158, 134.023712, 0.980276, -0.034216, 0.194648, 0.556462, 0.167949, 0.563399, 0.327071, 0.109530, 0.000000, 44.000000, 45.000000, 43.000000, 0.000000, - -2.781990, 22.870609, 128.390289, 0.813326, -0.581418, -0.021294, 0.524533, 0.198435, 0.637984, 0.362016, 0.000000, 0.000000, 45.000000, 44.000000, 0.000000, 0.000000, - -1.177300, 25.099648, 128.819168, 0.813326, -0.581418, -0.021294, 0.505463, 0.184552, 0.583532, 0.416468, 0.000000, 0.000000, 45.000000, 44.000000, 0.000000, 0.000000, - -2.254370, 23.388002, 134.415848, 0.813326, -0.581418, -0.021294, 0.534572, 0.156272, 0.512407, 0.377576, 0.110017, 0.000000, 44.000000, 45.000000, 43.000000, 0.000000, - -2.254370, 23.388002, 134.415848, 0.961215, -0.268953, -0.061073, 0.534572, 0.156272, 0.512407, 0.377576, 0.110017, 0.000000, 44.000000, 45.000000, 43.000000, 0.000000, - -2.842490, 21.375158, 134.023712, 0.961215, -0.268953, -0.061073, 0.556462, 0.167949, 0.563399, 0.327071, 0.109530, 0.000000, 44.000000, 45.000000, 43.000000, 0.000000, - -2.781990, 22.870609, 128.390289, 0.961215, -0.268953, -0.061073, 0.524533, 0.198435, 0.637984, 0.362016, 0.000000, 0.000000, 45.000000, 44.000000, 0.000000, 0.000000, - -2.781990, 22.870609, 128.390289, 0.810411, -0.539442, -0.228553, 0.524533, 0.198435, 0.637984, 0.362016, 0.000000, 0.000000, 45.000000, 44.000000, 0.000000, 0.000000, - -3.650000, 24.720686, 120.945839, 0.810411, -0.539442, -0.228553, 0.488257, 0.234765, 1.000000, 0.000000, 0.000000, 0.000000, 45.000000, 0.000000, 0.000000, 0.000000, - -1.177300, 25.099648, 128.819168, 0.810411, -0.539442, -0.228553, 0.505463, 0.184552, 0.583532, 0.416468, 0.000000, 0.000000, 45.000000, 44.000000, 0.000000, 0.000000, - -3.881290, 19.412891, 138.910324, 0.842580, 0.413446, 0.345140, 0.588348, 0.152491, 0.454089, 0.310511, 0.234769, 0.000631, 0.000000, 43.000000, 44.000000, 45.000000, - -1.824590, 19.561350, 133.711517, 0.842580, 0.413446, 0.345140, 0.576136, 0.181389, 0.560381, 0.317562, 0.122057, 0.000000, 44.000000, 45.000000, 43.000000, 0.000000, - -2.842490, 21.375158, 134.023712, 0.842580, 0.413446, 0.345140, 0.556462, 0.167949, 0.563399, 0.327071, 0.109530, 0.000000, 44.000000, 45.000000, 43.000000, 0.000000, - -1.824590, 19.561350, 133.711517, 0.889538, 0.427800, 0.160344, 0.576136, 0.181389, 0.560381, 0.317562, 0.122057, 0.000000, 44.000000, 45.000000, 43.000000, 0.000000, - -1.033880, 19.988201, 128.186050, 0.889538, 0.427800, 0.160344, 0.556798, 0.212316, 0.589590, 0.410410, 0.000000, 0.000000, 45.000000, 44.000000, 0.000000, 0.000000, - -2.545390, 22.941502, 128.691986, 0.889538, 0.427800, 0.160344, 0.538614, 0.200926, 0.610807, 0.389193, 0.000000, 0.000000, 45.000000, 44.000000, 0.000000, 0.000000, - -2.545390, 22.941502, 128.691986, 0.870464, 0.457041, 0.182773, 0.538614, 0.200926, 0.610807, 0.389193, 0.000000, 0.000000, 45.000000, 44.000000, 0.000000, 0.000000, - -2.842490, 21.375158, 134.023712, 0.870464, 0.457041, 0.182773, 0.556462, 0.167949, 0.563399, 0.327071, 0.109530, 0.000000, 44.000000, 45.000000, 43.000000, 0.000000, - -1.824590, 19.561350, 133.711517, 0.870464, 0.457041, 0.182773, 0.576136, 0.181389, 0.560381, 0.317562, 0.122057, 0.000000, 44.000000, 45.000000, 43.000000, 0.000000, - -1.033880, 19.988201, 128.186050, 0.868851, 0.470873, -0.152891, 0.556798, 0.212316, 0.589590, 0.410410, 0.000000, 0.000000, 45.000000, 44.000000, 0.000000, 0.000000, - -3.137990, 21.746355, 121.643547, 0.868851, 0.470873, -0.152891, 0.525259, 0.245078, 1.000000, 0.000000, 0.000000, 0.000000, 45.000000, 0.000000, 0.000000, 0.000000, - -2.545390, 22.941502, 128.691986, 0.868851, 0.470873, -0.152891, 0.538614, 0.200926, 0.610807, 0.389193, 0.000000, 0.000000, 45.000000, 44.000000, 0.000000, 0.000000, - -1.422100, -4.421100, 129.565796, 0.610205, 0.715462, 0.340242, 0.025325, 0.721688, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -1.438590, -3.927344, 128.557098, 0.610205, 0.715462, 0.340242, 0.025562, 0.706482, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - -2.008100, -3.376790, 128.420776, 0.610205, 0.715462, 0.340242, 0.036674, 0.700049, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 1.422100, -4.421100, 129.565796, -0.547139, 0.747191, 0.377286, 0.025325, 0.721688, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 1.438590, -3.899695, 128.557098, -0.547139, 0.747191, 0.377286, 0.025562, 0.706482, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, - 1.022790, -4.283705, 128.714615, -0.547139, 0.747191, 0.377286, 0.018068, 0.709414, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000 - ], - "vertexsize": 104336, - "indices": [ - 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, - 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, - 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, - 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, - 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, - 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, - 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, - 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, - 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, - 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, - 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, - 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, - 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, - 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, - 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, - 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, - 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, - 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, - 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, - 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, - 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, - 252, 253, 254, 255, 256, 257, 258, 259, 260, 261, 262, 263, - 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, - 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, - 288, 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, - 300, 301, 302, 303, 304, 305, 306, 307, 308, 309, 310, 311, - 312, 313, 314, 315, 316, 317, 318, 319, 320, 321, 322, 323, - 324, 325, 326, 327, 328, 329, 330, 331, 332, 333, 334, 335, - 336, 337, 338, 339, 340, 341, 342, 343, 344, 345, 346, 347, - 348, 349, 350, 351, 352, 353, 354, 355, 356, 357, 358, 359, - 360, 361, 362, 363, 364, 365, 366, 367, 368, 369, 370, 371, - 372, 373, 374, 375, 376, 377, 378, 379, 380, 381, 382, 383, - 384, 385, 386, 387, 388, 389, 390, 391, 392, 393, 394, 395, - 396, 397, 398, 399, 400, 401, 402, 403, 404, 405, 406, 407, - 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, 418, 419, - 420, 421, 422, 423, 424, 425, 426, 427, 428, 429, 430, 431, - 432, 433, 434, 435, 436, 437, 438, 439, 440, 441, 442, 443, - 444, 445, 446, 447, 448, 449, 450, 451, 452, 453, 454, 455, - 456, 457, 458, 459, 460, 461, 462, 463, 464, 465, 466, 467, - 468, 469, 470, 471, 472, 473, 474, 475, 476, 477, 478, 479, - 480, 481, 482, 483, 484, 485, 486, 487, 488, 489, 490, 491, - 492, 493, 494, 495, 496, 497, 498, 499, 500, 501, 502, 503, - 504, 505, 506, 507, 508, 509, 510, 511, 512, 513, 514, 515, - 516, 517, 518, 519, 520, 521, 522, 523, 524, 525, 526, 527, - 528, 529, 530, 531, 532, 533, 534, 535, 536, 537, 538, 539, - 540, 541, 542, 543, 544, 545, 546, 547, 548, 549, 550, 551, - 552, 553, 554, 555, 556, 557, 558, 559, 560, 561, 562, 563, - 564, 565, 566, 567, 568, 569, 570, 571, 572, 573, 574, 575, - 576, 577, 578, 579, 580, 581, 582, 583, 584, 585, 586, 587, - 588, 589, 590, 591, 592, 593, 594, 595, 596, 597, 598, 599, - 600, 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, 611, - 612, 613, 614, 615, 616, 617, 618, 619, 620, 621, 622, 623, - 624, 625, 626, 627, 628, 629, 630, 631, 632, 633, 634, 635, - 636, 637, 638, 639, 640, 641, 642, 643, 644, 645, 646, 647, - 648, 649, 650, 651, 652, 653, 654, 655, 656, 657, 658, 659, - 660, 661, 662, 663, 664, 665, 666, 667, 668, 669, 670, 671, - 672, 673, 674, 675, 676, 677, 678, 679, 680, 681, 682, 683, - 684, 685, 686, 687, 688, 689, 690, 691, 692, 693, 694, 695, - 696, 697, 698, 699, 700, 701, 702, 703, 704, 705, 706, 707, - 708, 709, 710, 711, 712, 713, 714, 715, 716, 717, 718, 719, - 720, 721, 722, 723, 724, 725, 726, 727, 728, 729, 730, 731, - 732, 733, 734, 735, 736, 737, 738, 739, 740, 741, 742, 743, - 744, 745, 746, 747, 748, 749, 750, 751, 752, 753, 754, 755, - 756, 757, 758, 759, 760, 761, 762, 763, 764, 765, 766, 767, - 768, 769, 770, 771, 772, 773, 774, 775, 776, 777, 778, 779, - 780, 781, 782, 783, 784, 785, 786, 787, 788, 789, 790, 791, - 792, 793, 794, 795, 796, 797, 798, 799, 800, 801, 802, 803, - 804, 805, 806, 807, 808, 809, 810, 811, 812, 813, 814, 815, - 816, 817, 818, 819, 820, 821, 822, 823, 824, 825, 826, 827, - 828, 829, 830, 831, 832, 833, 834, 835, 836, 837, 838, 839, - 840, 841, 842, 843, 844, 845, 846, 847, 848, 849, 850, 851, - 852, 853, 854, 855, 856, 857, 858, 859, 860, 861, 862, 863, - 864, 865, 866, 867, 868, 869, 870, 871, 872, 873, 874, 875, - 876, 877, 878, 879, 880, 881, 882, 883, 884, 885, 886, 887, - 888, 889, 890, 891, 892, 893, 894, 895, 896, 897, 898, 899, - 900, 901, 902, 903, 904, 905, 906, 907, 908, 909, 910, 911, - 912, 913, 914, 915, 916, 917, 918, 919, 920, 921, 922, 923, - 924, 925, 926, 927, 928, 929, 930, 931, 932, 933, 934, 935, - 936, 937, 938, 939, 940, 941, 942, 943, 944, 945, 946, 947, - 948, 949, 950, 951, 952, 953, 954, 955, 956, 957, 958, 959, - 960, 961, 962, 963, 964, 965, 966, 967, 968, 969, 970, 971, - 972, 973, 974, 975, 976, 977, 978, 979, 980, 981, 982, 983, - 984, 985, 986, 987, 988, 989, 990, 991, 992, 993, 994, 995, - 996, 997, 998, 999, 1000, 1001, 1002, 1003, 1004, 1005, 1006, 1007, - 1008, 1009, 1010, 1011, 1012, 1013, 1014, 1015, 1016, 1017, 1018, 1019, - 1020, 1021, 1022, 1023, 1024, 1025, 1026, 1027, 1028, 1029, 1030, 1031, - 1032, 1033, 1034, 1035, 1036, 1037, 1038, 1039, 1040, 1041, 1042, 1043, - 1044, 1045, 1046, 1047, 1048, 1049, 1050, 1051, 1052, 1053, 1054, 1055, - 1056, 1057, 1058, 1059, 1060, 1061, 1062, 1063, 1064, 1065, 1066, 1067, - 1068, 1069, 1070, 1071, 1072, 1073, 1074, 1075, 1076, 1077, 1078, 1079, - 1080, 1081, 1082, 1083, 1084, 1085, 1086, 1087, 1088, 1089, 1090, 1091, - 1092, 1093, 1094, 1095, 1096, 1097, 1098, 1099, 1100, 1101, 1102, 1103, - 1104, 1105, 1106, 1107, 1108, 1109, 1110, 1111, 1112, 1113, 1114, 1115, - 1116, 1117, 1118, 1119, 1120, 1121, 1122, 1123, 1124, 1125, 1126, 1127, - 1128, 1129, 1130, 1131, 1132, 1133, 1134, 1135, 1136, 1137, 1138, 1139, - 1140, 1141, 1142, 1143, 1144, 1145, 1146, 1147, 1148, 1149, 1150, 1151, - 1152, 1153, 1154, 1155, 1156, 1157, 1158, 1159, 1160, 1161, 1162, 1163, - 1164, 1165, 1166, 1167, 1168, 1169, 1170, 1171, 1172, 1173, 1174, 1175, - 1176, 1177, 1178, 1179, 1180, 1181, 1182, 1183, 1184, 1185, 1186, 1187, - 1188, 1189, 1190, 1191, 1192, 1193, 1194, 1195, 1196, 1197, 1198, 1199, - 1200, 1201, 1202, 1203, 1204, 1205, 1206, 1207, 1208, 1209, 1210, 1211, - 1212, 1213, 1214, 1215, 1216, 1217, 1218, 1219, 1220, 1221, 1222, 1223, - 1224, 1225, 1226, 1227, 1228, 1229, 1230, 1231, 1232, 1233, 1234, 1235, - 1236, 1237, 1238, 1239, 1240, 1241, 1242, 1243, 1244, 1245, 1246, 1247, - 1248, 1249, 1250, 1251, 1252, 1253, 1254, 1255, 1256, 1257, 1258, 1259, - 1260, 1261, 1262, 1263, 1264, 1265, 1266, 1267, 1268, 1269, 1270, 1271, - 1272, 1273, 1274, 1275, 1276, 1277, 1278, 1279, 1280, 1281, 1282, 1283, - 1284, 1285, 1286, 1287, 1288, 1289, 1290, 1291, 1292, 1293, 1294, 1295, - 1296, 1297, 1298, 1299, 1300, 1301, 1302, 1303, 1304, 1305, 1306, 1307, - 1308, 1309, 1310, 1311, 1312, 1313, 1314, 1315, 1316, 1317, 1318, 1319, - 1320, 1321, 1322, 1323, 1324, 1325, 1326, 1327, 1328, 1329, 1330, 1331, - 1332, 1333, 1334, 1335, 1336, 1337, 1338, 1339, 1340, 1341, 1342, 1343, - 1344, 1345, 1346, 1347, 1348, 1349, 1350, 1351, 1352, 1353, 1354, 1355, - 1356, 1357, 1358, 1359, 1360, 1361, 1362, 1363, 1364, 1365, 1366, 1367, - 1368, 1369, 1370, 1371, 1372, 1373, 1374, 1375, 1376, 1377, 1378, 1379, - 1380, 1381, 1382, 1383, 1384, 1385, 1386, 1387, 1388, 1389, 1390, 1391, - 1392, 1393, 1394, 1395, 1396, 1397, 1398, 1399, 1400, 1401, 1402, 1403, - 1404, 1405, 1406, 1407, 1408, 1409, 1410, 1411, 1412, 1413, 1414, 1415, - 1416, 1417, 1418, 1419, 1420, 1421, 1422, 1423, 1424, 1425, 1426, 1427, - 1428, 1429, 1430, 1431, 1432, 1433, 1434, 1435, 1436, 1437, 1438, 1439, - 1440, 1441, 1442, 1443, 1444, 1445, 1446, 1447, 1448, 1449, 1450, 1451, - 1452, 1453, 1454, 1455, 1456, 1457, 1458, 1459, 1460, 1461, 1462, 1463, - 1464, 1465, 1466, 1467, 1468, 1469, 1470, 1471, 1472, 1473, 1474, 1475, - 1476, 1477, 1478, 1479, 1480, 1481, 1482, 1483, 1484, 1485, 1486, 1487, - 1488, 1489, 1490, 1491, 1492, 1493, 1494, 1495, 1496, 1497, 1498, 1499, - 1500, 1501, 1502, 1503, 1504, 1505, 1506, 1507, 1508, 1509, 1510, 1511, - 1512, 1513, 1514, 1515, 1516, 1517, 1518, 1519, 1520, 1521, 1522, 1523, - 1524, 1525, 1526, 1527, 1528, 1529, 1530, 1531, 1532, 1533, 1534, 1535, - 1536, 1537, 1538, 1539, 1540, 1541, 1542, 1543, 1544, 1545, 1546, 1547, - 1548, 1549, 1550, 1551, 1552, 1553, 1554, 1555, 1556, 1557, 1558, 1559, - 1560, 1561, 1562, 1563, 1564, 1565, 1566, 1567, 1568, 1569, 1570, 1571, - 1571, 1572, 1573, 1574, 1575, 1576, 1577, 1578, 1579, 1580, 1581, 1582, - 1583, 1584, 1580, 1585, 1586, 1587, 1587, 1588, 1589, 1590, 1591, 1592, - 1593, 1594, 1595, 1596, 1597, 1598, 1599, 1600, 1601, 1602, 1603, 1604, - 1605, 1606, 1607, 1608, 1609, 1610, 1611, 1612, 1613, 1614, 1615, 1616, - 1616, 1617, 1614, 1618, 1619, 1620, 1621, 1622, 1623, 1624, 1625, 1626, - 1627, 1628, 1629, 1630, 1631, 1632, 1633, 1634, 1635, 1636, 1637, 1638, - 1639, 1640, 1641, 1642, 1643, 1644, 1645, 1646, 1647, 1648, 1649, 1650, - 1651, 1652, 1653, 1654, 1655, 1656, 1657, 1658, 1659, 1660, 1661, 1662, - 1663, 1664, 1665, 1666, 1667, 1668, 1669, 1670, 1671, 1672, 1673, 1674, - 1675, 1676, 1677, 1678, 1679, 1680, 1681, 1682, 1683, 1684, 1685, 1686, - 1687, 1688, 1689, 1690, 1691, 1692, 1693, 1694, 1695, 1696, 1697, 1698, - 1699, 1700, 1701, 1702, 1703, 1704, 1705, 1706, 1707, 1708, 1709, 1710, - 1711, 1712, 1713, 1714, 1715, 1716, 1717, 1718, 1719, 1720, 1721, 1722, - 1723, 1724, 1725, 1726, 1727, 1728, 1729, 1730, 1731, 1732, 1733, 1734, - 1735, 1736, 1737, 1738, 1739, 1740, 1741, 1742, 1743, 1744, 1745, 1746, - 1747, 1748, 1749, 1750, 1751, 1752, 1753, 1754, 1755, 1756, 1757, 1758, - 1759, 1760, 1761, 1762, 1763, 1764, 1765, 1766, 1767, 1768, 1769, 1770, - 1771, 1772, 1773, 1774, 1775, 1776, 1777, 1778, 1779, 1780, 1781, 1782, - 1783, 1784, 1785, 1786, 1787, 1788, 1789, 1790, 1791, 1792, 1793, 1794, - 1795, 1796, 1797, 1798, 1799, 1800, 1801, 1802, 1803, 1804, 1805, 1806, - 1807, 1808, 1809, 1810, 1811, 1812, 1813, 1814, 1815, 1816, 1817, 1818, - 1819, 1820, 1821, 1822, 1823, 1824, 1825, 1826, 1827, 1828, 1829, 1830, - 1831, 1832, 1833, 1834, 1835, 1836, 1837, 1838, 1839, 1840, 1841, 1842, - 1843, 1844, 1845, 1846, 1847, 1848, 1849, 1850, 1851, 1852, 1853, 1854, - 1855, 1856, 1857, 1858, 1859, 1860, 1861, 1862, 1863, 1864, 1865, 1866, - 1867, 1868, 1869, 1870, 1871, 1872, 1873, 1874, 1875, 1876, 1877, 1878, - 1879, 1880, 1881, 1882, 1883, 1884, 1885, 1886, 1887, 1888, 1889, 1890, - 1891, 1892, 1893, 1894, 1895, 1896, 1897, 1898, 1899, 1900, 1901, 1902, - 1903, 1904, 1905, 1906, 1907, 1908, 1909, 1910, 1911, 1912, 1913, 1914, - 1915, 1916, 1917, 1918, 1919, 1920, 1921, 1922, 1923, 1924, 1925, 1926, - 1927, 1928, 1929, 1930, 1931, 1932, 1933, 1934, 1935, 1936, 1937, 1938, - 1939, 1940, 1941, 1942, 1943, 1944, 1945, 1946, 1947, 1948, 1949, 1950, - 1951, 1952, 1953, 1954, 1955, 1956, 1957, 1958, 1959, 1960, 1961, 1962, - 1963, 1964, 1965, 1966, 1967, 1968, 1969, 1970, 1971, 1972, 1973, 1974, - 1975, 1976, 1977, 1978, 1979, 1980, 1981, 1982, 1983, 1984, 1985, 1986, - 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, - 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, - 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022, - 2023, 2024, 2025, 2026, 2027, 2028, 2029, 2030, 2031, 2032, 2033, 2034, - 2035, 2036, 2037, 2038, 2039, 2040, 2041, 2042, 2043, 2044, 2045, 2046, - 2047, 2048, 2049, 2050, 2051, 2052, 2053, 2054, 2055, 2056, 2057, 2058, - 2059, 2060, 2061, 2062, 2063, 2064, 2065, 2066, 2067, 2068, 2069, 2070, - 2071, 2072, 2073, 2074, 2075, 2076, 2077, 2078, 2079, 2080, 2081, 2082, - 2083, 2084, 2085, 2086, 2087, 2088, 2089, 2090, 2091, 2092, 2093, 2094, - 2095, 2096, 2097, 2098, 2099, 2100, 2101, 2102, 2103, 2104, 2105, 2106, - 2107, 2108, 2109, 2110, 2111, 2112, 2113, 2114, 2115, 2116, 2117, 2118, - 2119, 2120, 2121, 2122, 2123, 2124, 2125, 2126, 2127, 2128, 2129, 2130, - 2131, 2132, 2133, 2134, 2135, 2136, 2137, 2138, 2139, 2140, 2141, 2142, - 2143, 2144, 2145, 2146, 2147, 2148, 2149, 2150, 2151, 2152, 2153, 2154, - 2155, 2156, 2157, 2158, 2159, 2160, 2161, 2162, 2163, 2164, 2165, 2166, - 2167, 2168, 2169, 2170, 2171, 2172, 2173, 2174, 2175, 2176, 2177, 2178, - 2179, 2180, 2181, 2182, 2183, 2184, 2185, 2186, 2187, 2188, 2189, 2190, - 2191, 2192, 2193, 2194, 2195, 2196, 2197, 2198, 2199, 2200, 2201, 2202, - 2203, 2204, 2205, 2206, 2207, 2208, 2209, 2210, 2211, 2212, 2213, 2214, - 2215, 2216, 2217, 2218, 2219, 2220, 2221, 2222, 2223, 2224, 2225, 2226, - 2227, 2228, 2229, 2230, 2231, 2232, 2233, 2234, 2235, 2236, 2237, 2238, - 2239, 2240, 2241, 2242, 2243, 2244, 2245, 2246, 2247, 2248, 2249, 2250, - 2251, 2252, 2253, 2254, 2255, 2256, 2257, 2258, 2259, 2260, 2261, 2262, - 2263, 2264, 2265, 2266, 2267, 2268, 2269, 2270, 2271, 2272, 2273, 2274, - 2275, 2276, 2277, 2278, 2279, 2280, 2281, 2282, 2283, 2284, 2285, 2286, - 2287, 2288, 2289, 2290, 2291, 2292, 2293, 2294, 2295, 2296, 2297, 2298, - 2299, 2300, 2301, 2302, 2303, 2304, 2305, 2306, 2307, 2308, 2309, 2310, - 2311, 2312, 2313, 2314, 2315, 2316, 2317, 2318, 2319, 2320, 2321, 2322, - 2323, 2324, 2325, 2326, 2327, 2328, 2329, 2330, 2331, 2332, 2333, 2334, - 2335, 2336, 2337, 2338, 2339, 2340, 2341, 2342, 2343, 2344, 2345, 2346, - 2347, 2348, 2349, 2350, 2351, 2352, 2353, 2354, 2355, 2356, 2357, 2358, - 2359, 2360, 2361, 2362, 2363, 2364, 2365, 2366, 2367, 2368, 2369, 2370, - 2371, 2372, 2373, 2374, 2375, 2376, 2377, 2378, 2379, 2380, 2381, 2382, - 2383, 2384, 2385, 2386, 2387, 2388, 2389, 2390, 2391, 2392, 2393, 2394, - 2395, 2396, 2397, 2398, 2399, 2400, 2401, 2402, 2403, 2404, 2405, 2406, - 2407, 2408, 2409, 2410, 2411, 2412, 2413, 2414, 2415, 2416, 2417, 2418, - 2419, 2420, 2421, 2422, 2423, 2424, 2425, 2426, 2427, 2428, 2429, 2430, - 2431, 2432, 2433, 2434, 2435, 2436, 2437, 2438, 2439, 2440, 2441, 2442, - 2443, 2444, 2445, 2446, 2447, 2448, 2449, 2450, 2451, 2452, 2453, 2454, - 2455, 2456, 2457, 2458, 2459, 2460, 2461, 2462, 2463, 2464, 2465, 2466, - 2467, 2468, 2469, 2470, 2471, 2472, 2473, 2474, 2475, 2476, 2477, 2478, - 2479, 2480, 2481, 2482, 2483, 2484, 2485, 2486, 2487, 2488, 2489, 2490, - 2491, 2492, 2493, 2494, 2495, 2496, 2497, 2498, 2499, 2500, 2501, 2502, - 2503, 2504, 2505, 2506, 2507, 2508, 2509, 2510, 2511, 2512, 2513, 2514, - 2515, 2516, 2517, 2518, 2519, 2520, 2521, 2522, 2523, 2524, 2525, 2526, - 2527, 2528, 2529, 2530, 2531, 2532, 2533, 2534, 2535, 2536, 2537, 2538, - 2539, 2540, 2541, 2542, 2543, 2544, 2545, 2546, 2547, 2548, 2549, 2550, - 2551, 2552, 2553, 2554, 2555, 2556, 2557, 2558, 2559, 2560, 2561, 2562, - 2563, 2564, 2565, 2566, 2567, 2568, 2569, 2570, 2571, 2572, 2573, 2574, - 2575, 2576, 2577, 2578, 2579, 2580, 2581, 2582, 2583, 2584, 2585, 2586, - 2587, 2588, 2589, 2590, 2591, 2592, 2593, 2594, 2595, 2596, 2597, 2598, - 2599, 2600, 2601, 2602, 2603, 2604, 2605, 2606, 2607, 2608, 2609, 2610, - 2611, 2612, 2613, 2614, 2615, 2616, 2617, 2618, 2619, 2620, 2621, 2622, - 2623, 2624, 2625, 2626, 2627, 2628, 2629, 2630, 2631, 2632, 2633, 2634, - 2635, 2636, 2637, 2638, 2639, 2640, 2641, 2642, 2643, 2644, 2645, 2646, - 2647, 2648, 2649, 2650, 2651, 2652, 2653, 2654, 2655, 2656, 2657, 2658, - 2659, 2660, 2661, 2662, 2663, 2664, 2665, 2666, 2667, 2668, 2669, 2670, - 2671, 2672, 2673, 2674, 2675, 2676, 2677, 2678, 2679, 2680, 2681, 2682, - 2683, 2684, 2685, 2686, 2687, 2688, 2689, 2690, 2691, 2692, 2693, 2694, - 2695, 2696, 2697, 2698, 2699, 2700, 2701, 2702, 2703, 2704, 2705, 2706, - 2707, 2708, 2709, 2710, 2711, 2712, 2713, 2714, 2715, 2716, 2717, 2718, - 2719, 2720, 2721, 2722, 2723, 2724, 2725, 2726, 2727, 2728, 2729, 2730, - 2731, 2732, 2733, 2734, 2735, 2736, 2737, 2738, 2739, 2740, 2741, 2742, - 2743, 2744, 2745, 2746, 2747, 2748, 2749, 2750, 2751, 2752, 2753, 2754, - 2755, 2756, 2757, 2758, 2759, 2760, 2761, 2762, 2763, 2764, 2765, 2766, - 2767, 2768, 2769, 2770, 2771, 2772, 2773, 2774, 2775, 2776, 2777, 2778, - 2779, 2780, 2781, 2782, 2783, 2784, 2785, 2786, 2787, 2788, 2789, 2790, - 2791, 2792, 2793, 2794, 2795, 2796, 2797, 2798, 2799, 2800, 2801, 2802, - 2803, 2804, 2805, 2806, 2807, 2808, 2809, 2810, 2811, 2812, 2813, 2814, - 2815, 2816, 2817, 2818, 2819, 2820, 2821, 2822, 2823, 2824, 2825, 2826, - 2827, 2828, 2829, 2830, 2831, 2832, 2833, 2834, 2835, 2836, 2837, 2838, - 2839, 2840, 2841, 2842, 2843, 2844, 2845, 2846, 2847, 2848, 2849, 2850, - 2851, 2852, 2853, 2854, 2855, 2856, 2857, 2858, 2859, 2860, 2861, 2862, - 2863, 2864, 2865, 2866, 2867, 2868, 2869, 2870, 2871, 2872, 2873, 2874, - 2875, 2876, 2877, 2878, 2879, 2880, 2881, 2882, 2883, 2884, 2885, 2886, - 2887, 2888, 2889, 2890, 2891, 2892, 2893, 2894, 2895, 2896, 2897, 2898, - 2899, 2900, 2901, 2902, 2903, 2904, 2905, 2906, 2907, 2908, 2909, 2910, - 2911, 2912, 2913, 2914, 2915, 2916, 2917, 2918, 2919, 2920, 2921, 2922, - 2923, 2924, 2925, 2926, 2927, 2928, 2929, 2930, 2931, 2932, 2933, 2934, - 2935, 2936, 2937, 2938, 2939, 2940, 2941, 2942, 2943, 2944, 2945, 2946, - 2947, 2948, 2949, 2950, 2951, 2952, 2953, 2954, 2955, 2956, 2957, 2958, - 2959, 2960, 2961, 2962, 2963, 2964, 2965, 2966, 2967, 2968, 2969, 2970, - 2971, 2972, 2973, 2974, 2975, 2976, 2977, 2978, 2979, 2980, 2981, 2982, - 2983, 2984, 2985, 2986, 2987, 2988, 2989, 2990, 2991, 2992, 2993, 2994, - 2995, 2996, 2997, 2998, 2999, 3000, 3001, 3002, 3003, 3004, 3005, 3006, - 3007, 3008, 3009, 3010, 3011, 3012, 3013, 3014, 3015, 3016, 3017, 3018, - 3019, 3020, 3021, 3022, 3023, 3024, 3025, 3026, 3027, 3028, 3029, 3030, - 3031, 3032, 3033, 3034, 3035, 3036, 3037, 3038, 3039, 3040, 3041, 3042, - 3043, 3044, 3045, 3046, 3047, 3048, 3049, 3050, 3051, 3052, 3053, 3054, - 3055, 3056, 3057, 3058, 3059, 3060, 3061, 3062, 3063, 3064, 3065, 3066, - 3067, 3068, 3069, 3070, 3071, 3072, 3073, 3074, 3075, 3076, 3077, 3078, - 3079, 3080, 3081, 3082, 3083, 3084, 3085, 3086, 3087, 3088, 3089, 3090, - 3091, 3092, 3093, 3094, 3095, 3096, 3097, 3098, 3099, 3100, 3101, 3102, - 3103, 3104, 3105, 3106, 3107, 3108, 3109, 3110, 3111, 3112, 3113, 3114, - 3115, 3116, 3117, 3118, 3119, 3120, 3121, 3122, 3123, 3124, 3125, 3126, - 3127, 3128, 3129, 3130, 3131, 3132, 3133, 3134, 3135, 3136, 3137, 3138, - 3139, 3140, 3141, 3142, 3143, 3144, 3145, 3146, 3147, 3148, 3149, 3150, - 3151, 3152, 3153, 3154, 3155, 3156, 3157, 3158, 3159, 3160, 3161, 3162, - 3163, 3164, 3165, 3166, 3167, 3168, 3169, 3170, 3171, 3172, 3173, 3174, - 3175, 3176, 3177, 3178, 3179, 3180, 3181, 3182, 3183, 3184, 3185, 3186, - 3187, 3188, 3189, 3190, 3191, 3192, 3193, 3194, 3195, 3196, 3197, 3198, - 3199, 3200, 3201, 3202, 3203, 3204, 3205, 3206, 3207, 3208, 3209, 3210, - 3211, 3212, 3213, 3214, 3215, 3216, 3217, 3218, 3219, 3220, 3221, 3222, - 3223, 3224, 3225, 3226, 3227, 3228, 3229, 3230, 3231, 3232, 3233, 3234, - 3235, 3236, 3237, 3238, 3239, 3240, 3241, 3242, 3243, 3244, 3245, 3246, - 3247, 3248, 3249, 3250, 3251, 3252, 3253, 3254, 3255, 3256, 3257, 3258, - 3259, 3260, 3261, 3262, 3263, 3264, 3265, 3266, 3267, 3268, 3269, 3270, - 3271, 3272, 3273, 3274, 3275, 3276, 3277, 3278, 3279, 3280, 3281, 3282, - 3283, 3284, 3285, 3286, 3287, 3288, 3289, 3290, 3291, 3292, 3293, 3294, - 3295, 3296, 3297, 3298, 3299, 3300, 3301, 3302, 3303, 3304, 3305, 3306, - 3307, 3308, 3309, 3310, 3311, 3312, 3313, 3314, 3315, 3316, 3317, 3318, - 3319, 3320, 3321, 3322, 3323, 3324, 3325, 3326, 3327, 3328, 3329, 3330, - 3331, 3332, 3333, 3334, 3335, 3336, 3337, 3338, 3339, 3340, 3341, 3342, - 3343, 3344, 3345, 3346, 3347, 3348, 3349, 3350, 3351, 3352, 3353, 3354, - 3355, 3356, 3357, 3358, 3359, 3360, 3361, 3362, 3363, 3364, 3365, 3366, - 3367, 3368, 3369, 3370, 3371, 3372, 3373, 3374, 3375, 3376, 3377, 3378, - 3379, 3380, 3381, 3382, 3383, 3384, 3385, 3386, 3387, 3388, 3389, 3390, - 3391, 3392, 3393, 3394, 3395, 3396, 3397, 3398, 3399, 3400, 3401, 3402, - 3403, 3404, 3405, 3406, 3407, 3408, 3409, 3410, 3411, 3412, 3413, 3414, - 3415, 3416, 3417, 3418, 3419, 3420, 3421, 3422, 3423, 3424, 3425, 3426, - 3427, 3428, 3429, 3430, 3431, 3432, 3433, 3434, 3435, 3436, 3437, 3438, - 3439, 3440, 3441, 3442, 3443, 3444, 3445, 3446, 3447, 3448, 3449, 3450, - 3451, 3452, 3453, 3454, 3455, 3456, 3457, 3458, 3459, 3460, 3461, 3462, - 3463, 3464, 3465, 3466, 3467, 3468, 3469, 3470, 3471, 3472, 3473, 3474, - 3475, 3476, 3477, 3478, 3479, 3480, 3481, 3482, 3483, 3484, 3485, 3486, - 3487, 3488, 3489, 3490, 3491, 3492, 3493, 3494, 3495, 3496, 3497, 3498, - 3499, 3500, 3501, 3502, 3503, 3504, 3505, 3506, 3507, 3508, 3509, 3510, - 3511, 3512, 3513, 3514, 3515, 3516, 3517, 3518, 3519, 3520, 3521, 3522, - 3523, 3524, 3525, 3526, 3527, 3528, 3529, 3530, 3531, 3532, 3533, 3534, - 3535, 3536, 3537, 3538, 3539, 3540, 3541, 3542, 3543, 3544, 3545, 3546, - 3547, 3548, 3549, 3550, 3551, 3552, 3553, 3554, 3555, 3556, 3557, 3558, - 3559, 3560, 3561, 3562, 3563, 3564, 3565, 3566, 3567, 3568, 3569, 3570, - 3571, 3572, 3573, 3574, 3575, 3576, 3577, 3578, 3579, 3580, 3581, 3582, - 3583, 3584, 3585, 3586, 3587, 3588, 3589, 3590, 3591, 3592, 3593, 3594, - 3595, 3596, 3597, 3598, 3599, 3600, 3601, 3602, 3603, 3604, 3605, 3606, - 3607, 3608, 3609, 3610, 3611, 3612, 3613, 3614, 3615, 3616, 3617, 3618, - 3619, 3620, 3621, 3622, 3623, 3624, 3625, 3626, 3627, 3628, 3629, 3630, - 3631, 3632, 3633, 3634, 3635, 3636, 3637, 3638, 3639, 3640, 3641, 3642, - 3643, 3644, 3645, 3646, 3647, 3648, 3649, 3650, 3651, 3652, 3653, 3654, - 3655, 3656, 3657, 3658, 3659, 3660, 3661, 3662, 3663, 3664, 3665, 3666, - 3667, 3668, 3669, 3670, 3671, 3672, 3673, 3674, 3675, 3676, 3677, 3678, - 3679, 3680, 3681, 3682, 3683, 3684, 3685, 3686, 3687, 3688, 3689, 3690, - 3691, 3692, 3693, 3694, 3695, 3696, 3697, 3698, 3699, 3699, 3700, 3701, - 3702, 3703, 3704, 3705, 3706, 3707, 3708, 3709, 3710, 3711, 3712, 3708, - 3713, 3714, 3715, 3715, 3716, 3717, 3718, 3719, 3720, 3721, 3722, 3723, - 3724, 3725, 3726, 3727, 3728, 3729, 3730, 3731, 3732, 3733, 3734, 3735, - 3736, 3737, 3738, 3739, 3740, 3741, 3742, 3743, 3744, 3744, 3745, 3742, - 3746, 3747, 3748, 3749, 3750, 3751, 3752, 3753, 3754, 3755, 3756, 3757, - 3758, 3759, 3760, 3761, 3762, 3763, 3764, 3765, 3766, 3767, 3768, 3769, - 3770, 3771, 3772, 3773, 3774, 3775, 3776, 3777, 3778, 3779, 3780, 3781, - 3782, 3783, 3784, 3785, 3786, 3787, 3788, 3789, 3790, 3791, 3792, 3793, - 3794, 3795, 3796, 3797, 3798, 3799, 3800, 3801, 3802, 3803, 3804, 3805, - 3806, 3807, 3808, 3809, 3810, 3811, 3812, 3813, 3814, 3815, 3816, 3817, - 3818, 3819, 3820, 3821, 3822, 3823, 3824, 3825, 3826, 3827, 3828, 3829, - 3830, 3831, 3832, 3833, 3834, 3835, 3836, 3837, 3838, 3839, 3840, 3841, - 3842, 3843, 3844, 3845, 3846, 3847, 3848, 3849, 3850, 3851, 3852, 3853, - 3854, 3855, 3856, 3857, 3858, 3859, 3860, 3861, 3862, 3863, 3864, 3865, - 3866, 3867, 3868, 3869, 3870, 3871, 3872, 3873, 3874, 3875, 3876, 3877, - 3878, 3879, 3880, 3881, 3882, 3883, 3884, 3885, 3886, 3887, 3888, 3889, - 3890, 3891, 3892, 3893, 3894, 3895, 3896, 3897, 3898, 3899, 3900, 3901, - 3902, 3903, 3904, 3905, 3906, 3907, 3908, 3909, 3910, 3911, 3912, 3913, - 3914, 3915, 3916, 3917, 3918, 3919, 3920, 3921, 3922, 3923, 3924, 3925, - 3926, 3927, 3928, 3929, 3930, 3931, 3932, 3933, 3934, 3935, 3936, 3937, - 3938, 3939, 3940, 3941, 3942, 3943, 3944, 3945, 3946, 3947, 3948, 3949, - 3950, 3951, 3952, 3953, 3954, 3955, 3956, 3957, 3958, 3959, 3960, 3961, - 3962, 3963, 3964, 3965, 3966, 3967, 3968, 3969, 3970, 3971, 3972, 3973, - 3974, 3975, 3976, 3977, 3978, 3979, 3980, 3981, 3982, 3983, 3984, 3985, - 3986, 3987, 3988, 3989, 3990, 3991, 3992, 3993, 3994, 3995, 3996, 3997, - 3998, 3999, 4000, 4001, 4002, 4003, 4004, 4005, 4006, 4007, 4008, 4009, - 4010, 4011, 4012, 4013, 4014, 4015, 4016, 4017, 4018, 4019, 4020, 4021, - 4022, 4023, 4024, 4025, 4026, 4027, 4028, 4029, 4030, 4031, 4032, 4033, - 4034, 4035, 4036, 4037, 4038, 4039, 4040, 4041, 4042, 4043, 4044, 4045, - 4046, 4047, 4048, 4049, 4050, 4051, 4052, 4053, 4054, 4055, 4056, 4057, - 4058, 4059, 4060, 4061, 4062, 4063, 4064, 4065, 4066, 4067, 4068, 4069, - 4070, 4071, 4072, 4073, 4074, 4075, 4076, 4077, 4078, 4079, 4080, 4081, - 4082, 4083, 4084, 4085, 4086, 4087, 4088, 4089, 4090, 4091, 4092, 4093, - 4094, 4095, 4096, 4097, 4098, 4099, 4100, 4101, 4102, 4103, 4104, 4105, - 4106, 4107, 4108, 4109, 4110, 4111, 4112, 4113, 4114, 4115, 4116, 4117, - 4118, 4119, 4120, 4121, 4122, 4123, 4124, 4125, 4126, 4127, 4128, 4129, - 4130, 4131, 4132, 4133, 4134, 4135, 4136, 4137, 4138, 4139, 4140, 4141, - 4142, 4143, 4144, 4145, 4146, 4147, 4148, 4149, 4150, 4151, 4152, 4153, - 4154, 4155, 4156, 4157, 4158, 4159, 4160, 4161, 4162, 4163, 4164, 4165, - 4166, 4167, 4168, 4169, 4170, 4171, 4172, 4173, 4174, 4175, 4176, 4177, - 4178, 4179, 4180, 4181, 4182, 4183, 4184, 4185, 4186, 4187, 4188, 4189, - 4190, 4191, 4192, 4193, 4194, 4195, 4196, 4197, 4198, 4199, 4200, 4201, - 4202, 4203, 4204, 4205, 4206, 4207, 4208, 4209, 4210, 4211, 4212, 4213, - 4214, 4215, 4216, 4217, 4218, 4219, 4220, 4221, 4222, 4223, 4224, 4225, - 4226, 4227, 4228, 4229, 4230, 4231, 4232, 4233, 4234, 4235, 4236, 4237, - 4238, 4239, 4240, 4241, 4242, 4243, 4244, 4245, 4246, 4247, 4248, 4249, - 4250, 4251, 4252, 4253, 4254, 4255, 4256, 4257, 4258, 4259, 4260, 4261, - 4262, 4263, 4264, 4265, 4266, 4267, 4268, 4269, 4270, 4271, 4272, 4273, - 4274, 4275, 4276, 4277, 4278, 4279, 4280, 4281, 4282, 4283, 4284, 4285, - 4286, 4287, 4288, 4289, 4290, 4291, 4292, 4293, 4294, 4295, 4296, 4297, - 4298, 4299, 4300, 4301, 4302, 4303, 4304, 4305, 4306, 4307, 4308, 4309, - 4310, 4311, 4312, 4313, 4314, 4315, 4316, 4317, 4318, 4319, 4320, 4321, - 4322, 4323, 4324, 4325, 4326, 4327, 4328, 4329, 4330, 4331, 4332, 4333, - 4334, 4335, 4336, 4337, 4338, 4339, 4340, 4341, 4342, 4343, 4344, 4345, - 4346, 4347, 4348, 4349, 4350, 4351, 4352, 4353, 4354, 4355, 4356, 4357, - 4358, 4359, 4360, 4361, 4362, 4363, 4364, 4365, 4366, 4367, 4368, 4369, - 4370, 4371, 4372, 4373, 4374, 4375, 4376, 4377, 4378, 4379, 4380, 4381, - 4382, 4383, 4384, 4385, 4386, 4387, 4388, 4389, 4390, 4391, 4392, 4393, - 4394, 4395, 4396, 4397, 4398, 4399, 4400, 4401, 4402, 4403, 4404, 4405, - 4406, 4407, 4408, 4409, 4410, 4411, 4412, 4413, 4414, 4415, 4416, 4417, - 4418, 4419, 4420, 4421, 4422, 4423, 4424, 4425, 4426, 4427, 4428, 4429, - 4430, 4431, 4432, 4433, 4434, 4435, 4436, 4437, 4438, 4439, 4440, 4441, - 4442, 4443, 4444, 4445, 4446, 4447, 4448, 4449, 4450, 4451, 4452, 4453, - 4454, 4455, 4456, 4457, 4458, 4459, 4460, 4461, 4462, 4463, 4464, 4465, - 4466, 4467, 4468, 4469, 4470, 4471, 4472, 4473, 4474, 4475, 4476, 4477, - 4478, 4479, 4480, 4481, 4482, 4483, 4484, 4485, 4486, 4487, 4488, 4489, - 4490, 4491, 4492, 4493, 4494, 4495, 4496, 4497, 4498, 4499, 4500, 4501, - 4502, 4503, 4504, 4505, 4506, 4507, 4508, 4509, 4510, 4511, 4512, 4513, - 4514, 4515, 4516, 4517, 4518, 4519, 4520, 4521, 4522, 4523, 4524, 4525, - 4526, 4527, 4528, 4529, 4530, 4531, 4532, 4533, 4534, 4535, 4536, 4537, - 4538, 4539, 4540, 4541, 4542, 4543, 4544, 4545, 4546, 4547, 4548, 4549, - 4550, 4551, 4552, 4553, 4554, 4555, 4556, 4557, 4558, 4559, 4560, 4561, - 4562, 4563, 4564, 4565, 4566, 4567, 4568, 4569, 4570, 4571, 4572, 4573, - 4574, 4575, 4576, 4577, 4578, 4579, 4580, 4581, 4582, 4583, 4584, 4585, - 4586, 4587, 4588, 4589, 4590, 4591, 4592, 4593, 4594, 4595, 4596, 4597, - 4598, 4599, 4600, 4601, 4602, 4603, 4604, 4605, 4606, 4607, 4608, 4609, - 4610, 4611, 4612, 4613, 4614, 4615, 4616, 4617, 4618, 4619, 4620, 4621, - 4622, 4623, 4624, 4625, 4626, 4627, 4628, 4629, 4630, 4631, 4632, 4633, - 4634, 4635, 4636, 4637, 4638, 4639, 4640, 4641, 4642, 4643, 4644, 4645, - 4646, 4647, 4648, 4649, 4650, 4651, 4652, 4653, 4654, 4655, 4656, 4657, - 4658, 4659, 4660, 4661, 4662, 4663, 4664, 4665, 4666, 4667, 4668, 4669, - 4670, 4671, 4672, 4673, 4674, 4675, 4676, 4677, 4678, 4679, 4680, 4681, - 4682, 4683, 4684, 4685, 4686, 4687, 4688, 4689, 4690, 4691, 4692, 4693, - 4694, 4695, 4696, 4697, 4698, 4699, 4700, 4701, 4702, 4703, 4704, 4705, - 4706, 4707, 4708, 4709, 4710, 4711, 4712, 4713, 4714, 4715, 4716, 4717, - 4718, 4719, 4720, 4721, 4722, 4723, 4724, 4725, 4726, 4727, 4728, 4729, - 4730, 4731, 4732, 4733, 4734, 4735, 4736, 4737, 4738, 4739, 4740, 4741, - 4742, 4743, 4744, 4745, 4746, 4747, 4748, 4749, 4750, 4751, 4752, 4753, - 4754, 4755, 4756, 4757, 4758, 4759, 4760, 4761, 4762, 4763, 4764, 4765, - 4766, 4767, 4768, 4769, 4770, 4771, 4772, 4773, 4774, 4775, 4776, 4777, - 4778, 4779, 4780, 4781, 4782, 4783, 4784, 4785, 4786, 4787, 4788, 4789, - 4790, 4791, 4792, 4793, 4794, 4795, 4796, 4797, 4798, 4799, 4800, 4801, - 4802, 4803, 4804, 4805, 4806, 4807, 4808, 4809, 4810, 4811, 4812, 4813, - 4814, 4815, 4816, 4817, 4818, 4819, 4820, 4821, 4822, 4823, 4824, 4825, - 4826, 4827, 4828, 4829, 4830, 4831, 4832, 4833, 4834, 4835, 4836, 4837, - 4838, 4839, 4840, 4841, 4842, 4843, 4844, 4845, 4846, 4847, 4848, 4849, - 4850, 4851, 4852, 4853, 4854, 4855, 4856, 4857, 4858, 4859, 4860, 4861, - 4862, 4863, 4864, 4865, 4866, 4867, 4868, 4869, 4870, 4871, 4872, 4873, - 4874, 4875, 4876, 4877, 4878, 4879, 4880, 4881, 4882, 4883, 4884, 4885, - 4886, 4887, 4888, 4889, 4890, 4891, 4892, 4893, 4894, 4895, 4896, 4897, - 4898, 4899, 4900, 4901, 4902, 4903, 4904, 4905, 4906, 4907, 4908, 4909, - 4910, 4911, 4912, 4913, 4914, 4915, 4916, 4917, 4918, 4919, 4920, 4921, - 4922, 4923, 4924, 4925, 4926, 4927, 4928, 4929, 4930, 4931, 4932, 4933, - 4934, 4935, 4936, 4937, 4938, 4939, 4940, 4941, 4942, 4943, 4944, 4945, - 4946, 4947, 4948, 4949, 4950, 4951, 4952, 4953, 4954, 4955, 4956, 4957, - 4958, 4959, 4960, 4961, 4962, 4963, 4964, 4965, 4966, 4967, 4968, 4969, - 4970, 4971, 4972, 4973, 4974, 4975, 4976, 4977, 4978, 4979, 4980, 4981, - 4982, 4983, 4984, 4985, 4986, 4987, 4988, 4989, 4990, 4991, 4992, 4993, - 4994, 4995, 4996, 4997, 4998, 4999, 5000, 5001, 5002, 5003, 5004, 5005, - 5006, 5007, 5008, 5009, 5010, 5011, 5012, 5013, 5014, 5015, 5016, 5017, - 5018, 5019, 5020, 5021, 5022, 5023, 5024, 5025, 5026, 5027, 5028, 5029, - 5030, 5031, 5032, 5033, 5034, 5035, 5036, 5037, 5038, 5039, 5040, 5041, - 5042, 5043, 5044, 5045, 5046, 5047, 5048, 5049, 5050, 5051, 5052, 5053, - 5054, 5055, 5056, 5057, 5058, 5059, 5060, 5061, 5062, 5063, 5064, 5065, - 5066, 5067, 5068, 5069, 5070, 5071, 5072, 5073, 5074, 5075, 5076, 5077, - 5078, 5079, 5080, 5081, 5082, 5083, 5084, 5085, 5086, 5087, 5088, 5089, - 5090, 5091, 5092, 5093, 5094, 5095, 5096, 5097, 5098, 5099, 5100, 5101, - 5102, 5103, 5104, 5105, 5106, 5107, 5108, 5109, 5110, 5111, 5112, 5113, - 5114, 5115, 5116, 5117, 5118, 5119, 5120, 5121, 5122, 5123, 5124, 5125, - 5126, 5127, 5128, 5129, 5130, 5131, 5132, 5133, 5134, 5135, 5136, 5137, - 5138, 5139, 5140, 5141, 5142, 5143, 5144, 5145, 5146, 5147, 5148, 5149, - 5150, 5151, 5152, 5153, 5154, 5155, 5156, 5157, 5158, 5159, 5160, 5161, - 5162, 5163, 5164, 5165, 5166, 5167, 5168, 5169, 5170, 5171, 5172, 5173, - 5174, 5175, 5176, 5177, 5178, 5179, 5180, 5181, 5182, 5183, 5184, 5185, - 5186, 5187, 5188, 5189, 5190, 5191, 5192, 5193, 5194, 5195, 5196, 5197, - 5198, 5199, 5200, 5201, 5202, 5203, 5204, 5205, 5206, 5207, 5208, 5209, - 5210, 5211, 5212, 5213, 5214, 5215, 5216, 5217, 5218, 5219, 5220, 5221, - 5222, 5223, 5224, 5225, 5226, 5227, 5228, 5229, 5230, 5231, 5232, 5233, - 5234, 5235, 5236, 5237, 5238, 5239, 5240, 5241, 5242, 5243, 5244, 5245, - 5246, 5247, 5248, 5249, 5250, 5251, 5252, 5253, 5254, 5255, 5256, 5257, - 5258, 5259, 5260, 5261, 5262, 5263, 5264, 5265, 5266, 5267, 5268, 5269, - 5270, 5271, 5272, 5273, 5274, 5275, 5276, 5277, 5278, 5279, 5280, 5281, - 5282, 5283, 5284, 5285, 5286, 5287, 5288, 5289, 5290, 5291, 5292, 5293, - 5294, 5295, 5296, 5297, 5298, 5299, 5300, 5301, 5302, 5303, 5304, 5305, - 5306, 5307, 5308, 5309, 5310, 5311, 5312, 5313, 5314, 5315, 5316, 5317, - 5318, 5319, 5320, 5321, 5322, 5323, 5324, 5325, 5326, 5327, 5328, 5329, - 5330, 5331, 5332, 5333, 5334, 5335, 5336, 5337, 5338, 5339, 5340, 5341, - 5342, 5343, 5344, 5345, 5346, 5347, 5348, 5349, 5350, 5351, 5352, 5353, - 5354, 5355, 5356, 5357, 5358, 5359, 5360, 5361, 5362, 5363, 5364, 5365, - 5366, 5367, 5368, 5369, 5370, 5371, 5372, 5373, 5374, 5375, 5376, 5377, - 5378, 5379, 5380, 5381, 5382, 5383, 5384, 5385, 5386, 5387, 5388, 5389, - 5390, 5391, 5392, 5393, 5394, 5395, 5396, 5397, 5398, 5399, 5400, 5401, - 5402, 5403, 5404, 5405, 5406, 5407, 5408, 5409, 5410, 5411, 5412, 5413, - 5414, 5415, 5416, 5417, 5418, 5419, 5420, 5421, 5422, 5423, 5424, 5425, - 5426, 5427, 5428, 5429, 5430, 5431, 5432, 5433, 5434, 5435, 5436, 5437, - 5438, 5439, 5440, 5441, 5442, 5443, 5444, 5445, 5446, 5447, 5448, 5449, - 5450, 5451, 5452, 5453, 5454, 5455, 5456, 5457, 5458, 5459, 5460, 5461, - 5462, 5463, 5464, 5465, 5466, 5467, 5468, 5469, 5470, 5471, 5472, 5473, - 5474, 5475, 5476, 5477, 5478, 5479, 5480, 5481, 5482, 5483, 5484, 5485, - 5486, 5487, 5488, 5489, 5490, 5491, 5492, 5493, 5494, 5495, 5496, 5497, - 5498, 5499, 5500, 5501, 5502, 5503, 5504, 5505, 5506, 5507, 5508, 5509, - 5510, 5511, 5512, 5513, 5514, 5515, 5516, 5517, 5518, 5519, 5520, 5521, - 5522, 5523, 5524, 5525, 5526, 5527, 5528, 5529, 5530, 5531, 5532, 5533, - 5534, 5535, 5536, 5537, 5538, 5539, 5540, 5541, 5542, 5543, 5544, 5545, - 5546, 5547, 5548, 5549, 5550, 5551, 5552, 5553, 5554, 5555, 5556, 5557, - 5558, 5559, 5560, 5561, 5562, 5563, 5564, 5565, 5566, 5567, 5568, 5569, - 5570, 5571, 5572, 5573, 5574, 5575, 5576, 5577, 5578, 5579, 5580, 5581, - 5582, 5583, 5584, 5585, 5586, 5587, 5588, 5589, 5590, 5591, 5592, 5593, - 5594, 5595, 5596, 5597, 5598, 5599, 5600, 5601, 5602, 5603, 5604, 5605, - 5606, 5607, 5608, 5609, 5610, 5611, 5612, 5613, 5614, 5615, 5616, 5617, - 5618, 5619, 5620, 5621, 5622, 5623, 5624, 5625, 5626, 5627, 5628, 5629, - 5630, 5631, 5632, 5633, 5634, 5635, 5636, 5637, 5638, 5639, 5640, 5641, - 5642, 5643, 5644, 5645, 5646, 5647, 5648, 5649, 5650, 5651, 5652, 5653, - 5654, 5655, 5656, 5657, 5658, 5659, 5660, 5661, 5662, 5663, 5664, 5665, - 5666, 5667, 5668, 5669, 5670, 5671, 5672, 5673, 5674, 5675, 5676, 5677, - 5678, 5679, 5680, 5681, 5682, 5683, 5684, 5685, 5686, 5687, 5688, 5689, - 5690, 5691, 5692, 5693, 5694, 5695, 5696, 5697, 5698, 5699, 5700, 5701, - 5702, 5703, 5704, 5705, 5706, 5707, 5708, 5709, 5710, 5711, 5712, 5713, - 5714, 5715, 5716, 5717, 5718, 5719, 5720, 5721, 5722, 5723, 5724, 5725, - 5726, 5727, 5728, 5729, 5730, 5731, 5732, 5733, 5734, 5735, 5736, 5737, - 5738, 5739, 5740, 5741, 5742, 5743, 5744, 5745, 5746, 5747, 5748, 5749, - 5750, 5751, 5752, 5753, 5754, 5755, 5756, 5757, 5758, 5759, 5760, 5761, - 5762, 5763, 5764, 5765, 5766, 5767, 5768, 5769, 5770, 5771, 5772, 5773, - 5774, 5775, 5776, 5777, 5778, 5779, 5780, 5781, 5782, 5783, 5784, 5785, - 5786, 5787, 5788, 5789, 5790, 5791, 5792, 5793, 5794, 5795, 5796, 5797, - 5798, 5799, 5800, 5801, 5802, 5803, 5804, 5805, 5806, 5807, 5808, 5809, - 5810, 5811, 5812, 5813, 5814, 5815, 5816, 5817, 5818, 5819, 5820, 5821, - 5822, 5823, 5824, 5825, 5826, 5827, 5828, 5829, 5830, 5831, 5832, 5833, - 5834, 5835, 5836, 5837, 5838, 5839, 5840, 5841, 5842, 5843, 5844, 5845, - 5846, 5847, 5848, 5849, 5850, 5851, 5852, 5853, 5854, 5855, 5856, 5857, - 5858, 5859, 5860, 5861, 5862, 5863, 5864, 5865, 5866, 5867, 5868, 5869, - 5870, 5871, 5872, 5873, 5874, 5875, 5876, 5877, 5878, 5879, 5880, 5881, - 5882, 5883, 5884, 5885, 5886, 5887, 5888, 5889, 5890, 5891, 5892, 5893, - 5894, 5895, 5896, 5897, 5898, 5899, 5900, 5901, 5902, 5903, 5904, 5905, - 5906, 5907, 5908, 5909, 5910, 5911, 5912, 5913, 5914, 5915, 5916, 5917, - 5918, 5919, 5920, 5921, 5922, 5923, 5924, 5925, 5926, 5927, 5928, 5929, - 5930, 5931, 5932, 5933, 5934, 5935, 5936, 5937, 5938, 5939, 5940, 5941, - 5942, 5943, 5944, 5945, 5946, 5947, 5948, 5949, 5950, 5951, 5952, 5953, - 5954, 5955, 5956, 5957, 5958, 5959, 5960, 5961, 5962, 5963, 5964, 5965, - 5966, 5967, 5968, 5969, 5970, 5971, 5972, 5973, 5974, 5975, 5976, 5977, - 5978, 5979, 5980, 5981, 5982, 5983, 5984, 5985, 5986, 5987, 5988, 5989, - 5990, 5991, 5992, 5993, 5994, 5995, 5996, 5997, 5998, 5999, 6000, 6001, - 6002, 6003, 6004, 6005, 6006, 6007, 6008, 6009, 6010, 6011, 6012, 6013, - 6014, 6015, 6016, 6017, 6018, 6019, 6020, 6021, 6022, 6023, 6024, 6025, - 6026, 6027, 6028, 6029, 6030, 6031, 6032, 6033, 6034, 6035, 6036, 6037, - 6038, 6039, 6040, 6041, 6042, 6043, 6044, 6045, 6046, 6047, 6048, 6049, - 6050, 6051, 6052, 6053, 6054, 6055, 6056, 6057, 6058, 6059, 6060, 6061, - 6062, 6063, 6064, 6065, 6066, 6067, 6068, 6069, 6070, 6071, 6072, 6073, - 6074, 6075, 6076, 6077, 6078, 6079, 6080, 6081, 6082, 6083, 6084, 6085, - 6086, 6087, 6088, 6089, 6090, 6091, 6092, 6093, 6094, 6095, 6096, 6097, - 6098, 6099, 6100, 6101, 6102, 6103, 6104, 6105, 6106, 6107, 6108, 6109, - 6110, 6111, 6112, 6113, 6114, 6115, 6116, 6117, 6118, 6119, 6120, 6121, - 6122, 6123, 6124, 6125, 6126, 6127, 6128, 6129, 6130, 6131, 6132, 6133, - 6134, 6135, 6136, 6137, 6138, 6139, 6140, 6141, 6142, 6143, 6144, 6145, - 6146, 6147, 6148, 6149, 6150, 6151, 6152, 6153, 6154, 6155, 6156, 6157, - 6158, 6159, 6160, 6161, 6162, 6163, 6164, 6165, 6166, 6167, 6168, 6169, - 6170, 6171, 6172, 6173, 6174, 6175, 6176, 6177, 6178, 6179, 6180, 6181, - 6182, 6183, 6184, 6185, 6186, 6187, 6188, 6189, 6190, 6191, 6192, 6193, - 6194, 6195, 6196, 6197, 6198, 6199, 6200, 6201, 6202, 6203, 6204, 6205, - 6206, 6207, 6208, 6209, 6210, 6211, 6212, 6213, 6214, 6215, 6216, 6217, - 6218, 6219, 6220, 6221, 6222, 6223, 6224, 6225, 6226, 6227, 6228, 6229, - 6230, 6231, 6232, 6233, 6234, 6235, 6236, 6237, 6238, 6239, 6240, 6241, - 6242, 6243, 6244, 6245, 6246, 6247, 6248, 6249, 6250, 6251, 6252, 6253, - 6254, 6255, 6256, 6257, 6258, 6259, 6260, 6261, 6262, 6263, 6264, 6265, - 6266, 6267, 6268, 6269, 6270, 6271, 6272, 6273, 6274, 6275, 6276, 6277, - 6278, 6279, 6280, 6281, 6282, 6283, 6284, 6285, 6286, 6287, 6288, 6289, - 6290, 6291, 6292, 6293, 6294, 6295, 6296, 6297, 6298, 6299, 6300, 6301, - 6302, 6303, 6304, 6305, 6306, 6307, 6308, 6309, 6310, 6311, 6312, 6313, - 6314, 6315, 6316, 6317, 6318, 6319, 6320, 6321, 6322, 6323, 6324, 6325, - 6326, 6327, 6328, 6329, 6330, 6331, 6332, 6333, 6334, 6335, 6336, 6337, - 6338, 6339, 6340, 6341, 6342, 6343, 6344, 6345, 6346, 6347, 6348, 6349, - 6350, 6351, 6352, 6353, 6354, 6355, 6356, 6357, 6358, 6359, 6360, 6361, - 6362, 6363, 6364, 6365, 6366, 6367, 6368, 6369, 6370, 6371, 6372, 6373, - 6374, 6375, 6376, 6377, 6378, 6379, 6380, 6381, 6382, 6383, 6384, 6385, - 6386, 6387, 6388, 6389, 6390, 6391, 6392, 6393, 6394, 6395, 6396, 6397, - 6398, 6399, 6400, 6401, 6402, 6403, 6404, 6405, 6406, 6407, 6408, 6409, - 6410, 6411, 6412, 6413, 6414, 6415, 6416, 6417, 6418, 6419, 6420, 6421, - 6422, 6423, 6424, 6425, 6426, 6427, 6428, 6429, 6430, 6431, 6432, 6433, - 6434, 6435, 6436, 6437, 6438, 6439, 6440, 6441, 6442, 6443, 6444, 6445, - 6446, 6447, 6448, 6449, 6450, 6451, 6452, 6453, 6454, 6455, 6456, 6457, - 6458, 6459, 6460, 6461, 6462, 6463, 6464, 6465, 6466, 6467, 6468, 6469, - 6470, 6471, 6472, 6473, 6474, 6475, 6476, 6477, 6478, 6479, 6480, 6481, - 6482, 6483, 6484, 6485, 6486, 6487, 6488, 6489, 6490, 6491, 6492, 6493, - 6494, 6495, 6496, 6497, 6498, 6499, 6500, 6501, 6502, 6503, 6504, 6505, - 6506, 6507, 6508, 6509, 6510, 6511, 6512, 6513, 6514, 6515, 6516, 6517, - 6518, 6519, 6520 - ], - "indexnum": 6531 - } - ] - } - ], - "material": [ - { - "version": "1.2", - "base": [ - { - "filename": "body.png" - } - ] - } - ], - "skin": [ - { - "id": "girl", - "tansform": [-1.000000, 0.000000, -0.000000, 0.000000, 0.000000, -0.000000, -1.000000, 0.000000, 0.000000, 1.000000, -0.000000, 0.000000, -0.275246, 1.744384, -0.346279, 1.000000], - "bones": [ - { - "node": "Bip001 Head", - "bindshape": [-0.000000, 0.000001, -1.000000, 0.000000, -0.000000, -1.000000, -0.000001, 0.000000, 1.000000, -0.000000, -0.000000, 0.000000, -126.623352, 5.982112, 0.000010, 1.000000] - }, - { - "node": "Bip001 Neck", - "bindshape": [-0.000000, 0.000001, -1.000000, 0.000000, -0.140618, -0.990064, -0.000001, 0.000000, 0.990064, -0.140618, -0.000000, 0.000000, -119.054855, 23.728090, 0.000059, 1.000000] - }, - { - "node": "Bip001 Spine2", - "bindshape": [ 0.000000, 0.000001, -1.000000, 0.000000, 0.178669, -0.983909, -0.000001, 0.000000, 0.983909, 0.178669, 0.000000, 0.000000, -107.832481, -16.616243, -0.000050, 1.000000] - }, - { - "node": "Bip001 R Clavicle", - "bindshape": [ 1.000000, 0.000001, -0.000000, 0.000000, -0.000001, 0.983767, -0.179453, 0.000000, -0.000000, -0.179453, -0.983767, 0.000000, -2.450506, 16.711939, 120.159500, 1.000000] - }, - { - "node": "Bip001 R UpperArm", - "bindshape": [ 0.522074, 0.000001, -0.852900, 0.000000, 0.085148, 0.995004, 0.052122, 0.000000, -0.848639, 0.099834, -0.519466, 0.000000, 97.909058, -17.197380, 70.074997, 1.000000] - }, - { - "node": "Bip001 Spine", - "bindshape": [-0.000000, 0.000001, -1.000000, 0.000000, -0.074127, -0.997249, -0.000001, 0.000000, 0.997249, -0.074127, -0.000000, 0.000000, -89.617531, 9.743832, 0.000023, 1.000000] - }, - { - "node": "Bip001 Pelvis", - "bindshape": [ 0.000001, -0.000003, -1.000000, 0.000000, -0.077523, -0.996991, 0.000003, 0.000000, 0.996991, -0.077523, 0.000001, 0.000000, -80.588539, 9.342752, -0.000129, 1.000000] - }, - { - "node": "Bip001 Spine1", - "bindshape": [ 0.000000, 0.000001, -1.000000, 0.000000, 0.043705, -0.999045, -0.000001, 0.000000, 0.999044, 0.043705, 0.000000, 0.000000, -98.613335, -1.861749, -0.000009, 1.000000] - }, - { - "node": "Bip001 Tail", - "bindshape": [-0.000001, 0.000004, -1.000000, 0.000000, 0.492067, 0.870557, 0.000003, 0.000000, -0.870557, 0.492067, 0.000003, 0.000000, 68.882889, -54.339874, -0.000318, 1.000000] - }, - { - "node": "Bip001 R Thigh", - "bindshape": [ 0.121988, 0.009725, 0.992484, 0.000000, 0.044223, -0.999012, 0.004354, 0.000000, -0.991546, -0.043360, 0.122298, 0.000000, 79.194443, 6.495221, -18.510088, 1.000000] - }, - { - "node": "Bip001 L Thigh", - "bindshape": [-0.121988, -0.009728, 0.992484, 0.000000, 0.044224, -0.999012, -0.004357, 0.000000, -0.991546, -0.043360, -0.122297, 0.000000, 79.194443, 6.495222, 18.510082, 1.000000] - }, - { - "node": "R_side01", - "bindshape": [ 0.369975, -0.928816, 0.020458, 0.000000, 0.233874, 0.071802, -0.969612, 0.000000, -0.899123, -0.363517, -0.243791, 0.000000, 69.943817, 42.782661, 27.410345, 1.000000] - }, - { - "node": "Bip001 Tail1", - "bindshape": [-0.000001, 0.000005, -1.000000, 0.000000, 0.325869, 0.945415, 0.000004, 0.000000, -0.945415, 0.325869, 0.000002, 0.000000, 63.768791, -43.474506, -0.000241, 1.000000] - }, - { - "node": "Bip001 R Calf", - "bindshape": [ 0.120378, 0.022020, 0.992484, 0.000000, 0.145093, -0.989408, 0.004354, 0.000000, -0.982068, -0.143479, 0.122298, 0.000000, 48.607388, 11.473042, -18.510088, 1.000000] - }, - { - "node": "Bip001 R Foot", - "bindshape": [-0.000000, -0.000001, 1.000000, 0.000000, 0.000000, -1.000000, -0.000001, 0.000000, -1.000000, -0.000000, -0.000000, 0.000000, 15.838189, 9.669826, -16.656189, 1.000000] - }, - { - "node": "Bip001 R Toe0", - "bindshape": [-0.000000, 0.000000, 1.000000, 0.000000, -1.000000, -0.000000, 0.000000, 0.000000, -0.000000, 1.000000, -0.000000, 0.000000, -1.122707, 1.588766, -16.656187, 1.000000] - }, - { - "node": "Bip001 R Hand", - "bindshape": [ 0.517118, -0.852843, -0.072443, 0.000000, -0.052431, 0.052916, -0.997222, 0.000000, -0.854307, -0.519480, 0.017352, 0.000000, 58.598820, 70.069283, 7.206688, 1.000000] - }, - { - "node": "Bip001 R Finger2", - "bindshape": [ 0.191620, -0.981373, 0.013720, 0.000000, -0.040367, -0.021847, -0.998946, 0.000000, -0.980639, -0.190865, 0.043802, 0.000000, 71.135628, 49.897686, 2.521364, 1.000000] - }, - { - "node": "Bip001 R Finger1", - "bindshape": [ 0.182637, -0.980558, -0.071764, 0.000000, -0.030649, 0.067278, -0.997263, 0.000000, -0.982702, -0.184337, 0.017765, 0.000000, 71.594475, 49.945732, 3.729282, 1.000000] - }, - { - "node": "Bip001 R Finger11", - "bindshape": [-0.164667, -0.983735, -0.071764, 0.000000, -0.005721, 0.073709, -0.997263, 0.000000, -0.986332, 0.163806, 0.017765, 0.000000, 79.670639, 24.087183, 3.729283, 1.000000] - }, - { - "node": "Bip001 R Finger21", - "bindshape": [-0.138589, -0.990255, 0.013719, 0.000000, -0.045283, -0.007502, -0.998946, 0.000000, -0.989314, 0.139064, 0.043802, 0.000000, 79.158875, 25.497377, 2.521367, 1.000000] - }, - { - "node": "Bip001 R Finger0", - "bindshape": [ 0.306625, 0.292612, -0.905737, 0.000000, -0.218358, 0.947820, 0.232286, 0.000000, -0.926445, -0.126550, -0.354519, 0.000000, 65.172890, 0.853525, 57.597904, 1.000000] - }, - { - "node": "Bip001 R Finger01", - "bindshape": [ 0.371329, 0.204342, -0.905737, 0.000000, 0.031621, 0.972133, 0.232286, 0.000000, -0.927963, 0.114895, -0.354519, 0.000000, 59.475628, -14.871659, 57.597900, 1.000000] - }, - { - "node": "Bip001 R Forearm", - "bindshape": [ 0.519456, 0.052220, -0.852900, 0.000000, -0.014802, 0.998531, 0.052122, 0.000000, -0.854369, 0.014450, -0.519466, 0.000000, 78.878540, -9.354672, 70.074997, 1.000000] - }, - { - "node": "Bip001 L Clavicle", - "bindshape": [-1.000000, 0.000001, 0.000000, 0.000000, 0.000001, 0.983767, 0.179453, 0.000000, -0.000000, -0.179453, 0.983767, 0.000000, -2.450515, 16.711939, -120.159500, 1.000000] - }, - { - "node": "Bip001 L UpperArm", - "bindshape": [-0.522074, 0.000001, -0.852900, 0.000000, 0.085149, 0.995004, -0.052119, 0.000000, -0.848639, 0.099834, 0.519466, 0.000000, 97.909058, -17.197380, -70.075005, 1.000000] - }, - { - "node": "L_side01", - "bindshape": [-0.332146, -0.928816, -0.020458, 0.000000, 0.209960, -0.071802, -0.969612, 0.000000, -0.807189, 0.363517, -0.243791, 0.000000, 62.416172, -43.834061, 27.387180, 1.000000] - }, - { - "node": "Bip001 L Calf", - "bindshape": [-0.120377, -0.022023, 0.992484, 0.000000, 0.145094, -0.989408, -0.004357, 0.000000, -0.982068, -0.143479, -0.122297, 0.000000, 48.607391, 11.473042, 18.510082, 1.000000] - }, - { - "node": "Bip001 L Foot", - "bindshape": [-0.000000, -0.000001, 1.000000, 0.000000, 0.000000, -1.000000, -0.000001, 0.000000, -1.000000, -0.000000, -0.000000, 0.000000, 15.838189, 9.669826, 16.656183, 1.000000] - }, - { - "node": "Bip001 L Toe0", - "bindshape": [-0.000000, -0.000000, 1.000000, 0.000000, -1.000000, -0.000000, -0.000000, 0.000000, -0.000000, 1.000000, 0.000000, 0.000000, -1.122661, 1.588766, 16.656187, 1.000000] - }, - { - "node": "Bip001 L Hand", - "bindshape": [-0.517118, 0.852843, -0.072440, 0.000000, -0.052429, 0.052914, 0.997222, 0.000000, -0.854307, -0.519480, -0.017352, 0.000000, 58.598820, 70.069290, -7.206689, 1.000000] - }, - { - "node": "Bip001 L Finger2", - "bindshape": [-0.191621, 0.981373, 0.013722, 0.000000, -0.040367, -0.021850, 0.998946, 0.000000, -0.980639, -0.190865, -0.043802, 0.000000, 71.135628, 49.897694, -2.521363, 1.000000] - }, - { - "node": "Bip001 L Finger1", - "bindshape": [-0.182637, 0.980558, -0.071761, 0.000000, -0.030648, 0.067275, 0.997264, 0.000000, -0.982702, -0.184337, -0.017765, 0.000000, 71.594475, 49.945740, -3.729283, 1.000000] - }, - { - "node": "Bip001 L Finger11", - "bindshape": [ 0.164667, 0.983735, -0.071761, 0.000000, -0.005721, 0.073706, 0.997264, 0.000000, -0.986332, 0.163806, -0.017765, 0.000000, 79.670647, 24.087191, -3.729284, 1.000000] - }, - { - "node": "Bip001 L Finger21", - "bindshape": [ 0.138588, 0.990255, 0.013722, 0.000000, -0.045283, -0.007505, 0.998946, 0.000000, -0.989314, 0.139064, -0.043802, 0.000000, 79.158875, 25.497387, -2.521367, 1.000000] - }, - { - "node": "Bip001 L Finger0", - "bindshape": [-0.306625, -0.292610, -0.905737, 0.000000, -0.218357, 0.947821, -0.232283, 0.000000, -0.926445, -0.126550, 0.354519, 0.000000, 65.172890, 0.853521, -57.597900, 1.000000] - }, - { - "node": "Bip001 L Finger01", - "bindshape": [-0.371328, -0.204340, -0.905737, 0.000000, 0.031622, 0.972134, -0.232283, 0.000000, -0.927963, 0.114895, 0.354519, 0.000000, 59.475632, -14.871662, -57.597900, 1.000000] - }, - { - "node": "Bip001 L Forearm", - "bindshape": [-0.519456, -0.052218, -0.852900, 0.000000, -0.014801, 0.998531, -0.052119, 0.000000, -0.854369, 0.014450, 0.519466, 0.000000, 78.878540, -9.354673, -70.074997, 1.000000] - }, - { - "node": "Bip001 Tail2", - "bindshape": [ 0.000000, 0.000005, -1.000000, 0.000000, 0.134550, 0.990907, 0.000005, 0.000000, -0.990907, 0.134550, 0.000000, 0.000000, 55.676582, -33.206036, -0.000160, 1.000000] - }, - { - "node": "R_side02", - "bindshape": [ 0.312680, -0.949808, 0.009815, 0.000000, 0.235810, 0.067612, -0.969445, 0.000000, -0.920122, -0.305440, -0.245115, 0.000000, 61.361565, 38.827190, 27.693588, 1.000000] - }, - { - "node": "R_side03", - "bindshape": [ 0.186362, -0.982392, -0.013230, 0.000000, 0.239065, 0.058404, -0.969245, 0.000000, -0.952952, -0.177467, -0.245740, 0.000000, 54.956722, 31.321520, 28.213345, 1.000000] - }, - { - "node": "L_side02", - "bindshape": [-0.219913, -0.949278, 0.010082, 0.000000, 0.165849, -0.087854, -0.967815, 0.000000, -0.647138, 0.300073, -0.251459, 0.000000, 42.907715, -39.291973, 28.512152, 1.000000] - }, - { - "node": "L_side03", - "bindshape": [-0.168036, -0.968687, 0.129835, 0.000000, 0.215557, -0.172209, -0.955429, 0.000000, -0.859244, 0.146237, -0.265077, 0.000000, 49.362400, -28.697226, 31.880779, 1.000000] - }, - { - "node": "Bip001 Ponytail1", - "bindshape": [ 0.000000, 0.000004, -1.000000, 0.000000, 0.255247, 0.966876, 0.000004, 0.000000, -0.966876, 0.255247, 0.000001, 0.000000, 139.583328, -56.698380, -0.000174, 1.000000] - }, - { - "node": "Bip001 Ponytail11", - "bindshape": [ 0.000000, 0.000004, -1.000000, 0.000000, 0.188371, 0.982098, 0.000004, 0.000000, -0.982098, 0.188371, 0.000001, 0.000000, 135.069794, -47.543880, -0.000149, 1.000000] - }, - { - "node": "Bip001 Ponytail12", - "bindshape": [ 0.000000, 0.000004, -1.000000, 0.000000, 0.167683, 0.985841, 0.000004, 0.000000, -0.985841, 0.167683, 0.000000, 0.000000, 126.132118, -44.889996, -0.000142, 1.000000] - } - ] - }, - { - "id": "Bip001", - "tansform": [-0.682038, -0.035225, 0.730468, 0.000000, 0.731315, -0.035225, 0.681130, 0.000000, 0.001738, 0.998758, 0.049786, 0.000000, -0.882000, 78.798103, -0.868362, 1.000000], - "children": [ - { - "id": "Bip001 Pelvis", - "tansform": [ 0.000000, -0.040639, 0.999174, 0.000000, 0.998122, 0.061203, 0.002489, 0.000000, -0.061253, 0.997298, 0.040562, 0.000000, 0.000000, 0.000000, 0.000000, 1.000000], - "children": [ - { - "id": "Bip001 Spine", - "tansform": [ 0.997345, 0.025709, 0.068136, 0.000000, -0.034710, 0.990319, 0.134401, 0.000000, -0.064021, -0.136409, 0.988582, 0.000000, 9.015236, 0.015734, 0.365063, 1.000000], - "children": [ - { - "id": "Bip001 Spine1", - "tansform": [ 0.992919, 0.100912, -0.062680, 0.000000, -0.092632, 0.988036, 0.123309, 0.000000, 0.074374, -0.116630, 0.990387, 0.000000, 8.531822, -0.008244, -0.001028, 1.000000], - "children": [ - { - "id": "Bip001 Spine2", - "tansform": [ 0.989795, 0.120282, -0.076405, 0.000000, -0.124049, 0.991181, -0.046606, 0.000000, 0.070126, 0.055609, 0.995987, 0.000000, 10.478699, -0.009742, 0.000458, 1.000000], - "children": [ - { - "id": "Bip001 Neck", - "tansform": [ 0.983182, -0.158327, 0.091022, 0.000000, 0.131257, 0.959151, 0.250601, 0.000000, -0.126981, -0.234439, 0.963802, 0.000000, 12.629974, -1.602533, -0.001093, 1.000000], - "children": [ - { - "id": "Bip001 L Clavicle", - "tansform": [ 0.168816, 0.375090, 0.911487, 0.000000, 0.167331, -0.922243, 0.348525, 0.000000, 0.971340, 0.093683, -0.218453, 0.000000, -0.315392, 2.113420, 2.023955, 1.000000], - "children": [ - { - "id": "Bip001 L UpperArm", - "tansform": [ 0.244994, -0.622901, -0.742948, 0.000000, 0.860955, 0.492130, -0.128703, 0.000000, 0.445797, -0.608113, 0.656859, 0.000000, 6.200712, -0.000004, -0.000008, 1.000000], - "children": [ - { - "id": "Bip001 L Forearm", - "tansform": [ 0.771192, -0.636602, 0.000000, 0.000000, 0.636602, 0.771192, -0.000000, 0.000000, 0.000000, 0.000000, 1.000000, 0.000000, 20.361755, 0.000004, 0.000008, 1.000000], - "children": [ - { - "id": "Bip001 L Hand", - "tansform": [ 0.962589, -0.198369, -0.184588, 0.000000, -0.184153, 0.020807, -0.982677, 0.000000, 0.198773, 0.979906, -0.016502, 0.000000, 20.590908, 0.000000, -0.000000, 1.000000], - "children": [ - { - "id": "Bip001 L Finger0", - "tansform": [ 0.961478, 0.208212, -0.179463, 0.000000, 0.209733, -0.133657, 0.968580, 0.000000, 0.177684, -0.968908, -0.172177, 0.000000, 5.991688, 0.806484, -6.254307, 1.000000], - "children": [ - { - "id": "Bip001 L Finger01", - "tansform": [ 0.963852, 0.266438, -0.000000, 0.000000, -0.266438, 0.963852, -0.000000, 0.000000, 0.000000, 0.000000, 1.000000, 0.000000, 3.872097, -0.000000, 0.000008, 1.000000], - "children": [ - { - "id": "Bip001 L Finger0Nub", - "tansform": [ 1.000000, -0.000000, -0.000000, 0.000000, 0.000000, 1.000000, -0.000000, 0.000000, 0.000000, 0.000000, 1.000000, 0.000000, 2.278824, -0.000004, 0.000004, 1.000000] - } - ] - } - ] - }, - { - "id": "Bip001 L Finger1", - "tansform": [ 0.854478, 0.519488, -0.000414, 0.000000, -0.519488, 0.854477, -0.000680, 0.000000, 0.000000, 0.000796, 1.000000, 0.000000, 9.252796, -1.936867, -3.420071, 1.000000], - "children": [ - { - "id": "Bip001 L Finger11", - "tansform": [ 0.879270, 0.476325, -0.000000, 0.000000, -0.476325, 0.879270, -0.000000, 0.000000, 0.000000, 0.000000, 1.000000, 0.000000, 5.013481, 0.000008, -0.000008, 1.000000], - "children": [ - { - "id": "Bip001 L Finger1Nub", - "tansform": [ 1.000000, 0.000000, -0.000000, 0.000000, -0.000000, 1.000000, 0.000000, 0.000000, 0.000000, -0.000000, 1.000000, 0.000000, 4.151039, -0.000002, 0.000004, 1.000000] - } - ] - } - ] - }, - { - "id": "Bip001 L Finger2", - "tansform": [ 0.722008, 0.690449, -0.044547, 0.000000, -0.691533, 0.718092, -0.078267, 0.000000, -0.022050, 0.087315, 0.995937, 0.000000, 8.877842, -0.823425, 0.439362, 1.000000], - "children": [ - { - "id": "Bip001 L Finger21", - "tansform": [ 0.847801, 0.530315, -0.000000, 0.000000, -0.530315, 0.847801, 0.000000, 0.000000, 0.000000, -0.000000, 1.000000, 0.000000, 4.603943, -0.000002, 0.000000, 1.000000], - "children": [ - { - "id": "Bip001 L Finger2Nub", - "tansform": [ 1.000000, -0.000000, 0.000000, 0.000000, 0.000000, 1.000000, -0.000000, 0.000000, 0.000000, 0.000000, 1.000000, 0.000000, 4.418678, 0.000004, 0.000004, 1.000000] - } - ] - } - ] - } - ] - } - ] - } - ] - } - ] - }, - { - "id": "Bip001 R Clavicle", - "tansform": [ 0.127898, -0.471714, -0.872426, 0.000000, 0.176373, -0.854812, 0.488047, 0.000000, -0.975979, -0.216292, -0.026131, 0.000000, -0.761497, 0.885230, -2.699672, 1.000000], - "children": [ - { - "id": "Bip001 R UpperArm", - "tansform": [ 0.097935, 0.063564, 0.993161, 0.000000, -0.189951, 0.980805, -0.044042, 0.000000, -0.976897, -0.184338, 0.108129, 0.000000, 6.200712, 0.000004, -0.000015, 1.000000], - "children": [ - { - "id": "Bip001 R Forearm", - "tansform": [ 0.936215, -0.351428, -0.000000, 0.000000, 0.351428, 0.936215, -0.000000, 0.000000, 0.000000, 0.000000, 1.000000, 0.000000, 20.361740, -0.000002, -0.000004, 1.000000], - "children": [ - { - "id": "Bip001 R Hand", - "tansform": [ 0.947421, 0.190539, 0.257075, 0.000000, -0.262171, 0.001591, 0.965020, 0.000000, 0.183465, -0.981678, 0.051461, 0.000000, 20.590912, -0.000000, 0.000000, 1.000000], - "children": [ - { - "id": "Bip001 R Finger0", - "tansform": [ 0.961478, 0.208212, 0.179463, 0.000000, 0.209733, -0.133657, -0.968580, 0.000000, -0.177684, 0.968908, -0.172177, 0.000000, 5.991684, 0.806471, 6.254312, 1.000000], - "children": [ - { - "id": "Bip001 R Finger01", - "tansform": [ 1.000000, 0.000000, 0.000000, 0.000000, -0.000000, 1.000000, -0.000000, 0.000000, -0.000000, 0.000000, 1.000000, 0.000000, 3.872101, 0.000002, 0.000004, 1.000000], - "children": [ - { - "id": "Bip001 R Finger0Nub", - "tansform": [ 1.000000, -0.000000, -0.000000, 0.000000, 0.000000, 1.000000, -0.000000, 0.000000, -0.000000, -0.000000, -1.000000, 0.000000, 2.278824, -0.000000, -0.000000, 1.000000] - } - ] - } - ] - }, - { - "id": "Bip001 R Finger1", - "tansform": [ 0.935581, 0.353112, 0.000281, 0.000000, -0.353112, 0.935581, 0.000745, 0.000000, 0.000000, -0.000796, 0.999999, 0.000000, 9.252800, -1.936865, 3.420065, 1.000000], - "children": [ - { - "id": "Bip001 R Finger11", - "tansform": [ 1.000000, -0.000000, -0.000000, 0.000000, 0.000000, 1.000000, -0.000000, 0.000000, 0.000000, 0.000000, 1.000000, 0.000000, 5.013489, 0.000000, 0.000000, 1.000000], - "children": [ - { - "id": "Bip001 R Finger1Nub", - "tansform": [ 1.000000, 0.000000, 0.000000, 0.000000, -0.000000, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, -1.000000, 0.000000, 4.151039, -0.000000, -0.000001, 1.000000] - } - ] - } - ] - }, - { - "id": "Bip001 R Finger2", - "tansform": [ 0.938973, 0.343864, 0.009358, 0.000000, -0.343283, 0.934951, 0.089569, 0.000000, 0.022050, -0.087315, 0.995937, 0.000000, 8.877846, -0.823423, -0.439368, 1.000000], - "children": [ - { - "id": "Bip001 R Finger21", - "tansform": [ 1.000000, -0.000000, -0.000000, 0.000000, 0.000000, 1.000000, -0.000000, 0.000000, 0.000000, 0.000000, 1.000000, 0.000000, 4.603928, -0.000006, 0.000001, 1.000000], - "children": [ - { - "id": "Bip001 R Finger2Nub", - "tansform": [ 1.000000, -0.000000, 0.000000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, -1.000000, 0.000000, 4.418686, 0.000000, 0.000001, 1.000000] - } - ] - } - ] - } - ] - } - ] - } - ] - } - ] - }, - { - "id": "Bip001 Head", - "tansform": [ 0.985542, 0.167319, -0.026683, 0.000000, -0.157796, 0.963757, 0.215111, 0.000000, 0.061709, -0.207790, 0.976225, 0.000000, 5.469170, 0.000002, -0.000001, 1.000000], - "children": [ - { - "id": "Bip001 HeadNub", - "tansform": [ 1.000000, -0.000000, -0.000000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000, 0.000000, -0.000000, 1.000000, 0.000000, 22.780975, 0.000000, -0.000000, 1.000000] - }, - { - "id": "Bip001 Ponytail1", - "tansform": [-0.959472, -0.253300, 0.123505, 0.000000, 0.255242, -0.966877, -0.000104, 0.000000, 0.119440, 0.031424, 0.992344, 0.000000, 22.808502, -13.210016, -0.000024, 1.000000], - "children": [ - { - "id": "Bip001 Ponytail11", - "tansform": [ 0.994430, -0.068321, -0.080254, 0.000000, 0.068548, 0.997648, 0.000064, 0.000000, 0.080061, -0.005565, 0.996774, 0.000000, 8.090157, -0.007874, -0.000008, 1.000000], - "children": [ - { - "id": "Bip001 Ponytail12", - "tansform": [ 0.982845, -0.020653, -0.183270, 0.000000, 0.021036, 0.999779, 0.000146, 0.000000, 0.183227, -0.003999, 0.983063, 0.000000, 9.909302, -0.012131, -0.000002, 1.000000], - "children": [ - { - "id": "Bip001 Ponytail1Nub", - "tansform": [ 0.000796, 1.000000, 0.000003, 0.000000, 1.000000, -0.000796, 0.000000, 0.000000, 0.000000, 0.000003, -1.000000, 0.000000, 15.228798, -0.000008, 0.000000, 1.000000] - } - ] - } - ] - } - ] - } - ] - } - ] - } - ] - } - ] - }, - { - "id": "Bip001 L Thigh", - "tansform": [-0.972648, -0.229280, 0.037233, 0.000000, -0.226499, 0.971712, 0.066887, 0.000000, -0.051515, 0.056624, -0.997066, 0.000000, -8.427422, 1.410457, 8.766703, 1.000000], - "children": [ - { - "id": "Bip001 L Calf", - "tansform": [ 0.918963, -0.394344, 0.000000, 0.000000, 0.394344, 0.918963, 0.000000, 0.000000, -0.000000, 0.000000, 1.000000, 0.000000, 29.675537, -0.000004, 0.000001, 1.000000], - "children": [ - { - "id": "Bip001 L Foot", - "tansform": [ 0.954187, 0.296365, 0.041163, 0.000000, -0.296235, 0.955069, -0.009374, 0.000000, -0.042092, -0.003249, 0.999108, 0.000000, 36.461250, -0.000004, 0.000001, 1.000000], - "children": [ - { - "id": "Bip001 L Toe0", - "tansform": [-0.000000, 1.000000, 0.000000, 0.000000, -1.000000, -0.000000, -0.000000, 0.000000, -0.000000, -0.000000, 1.000000, 0.000000, 17.426956, 10.792505, 0.000005, 1.000000], - "children": [ - { - "id": "Bip001 L Toe0Nub", - "tansform": [ 1.000000, -0.000000, -0.000000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000, -0.000000, 0.000000, -1.000000, 0.000000, 11.620661, 0.000000, 0.000000, 1.000000] - } - ] - } - ] - } - ] - } - ] - }, - { - "id": "Bip001 R Thigh", - "tansform": [-0.861229, 0.499427, -0.094117, 0.000000, 0.500618, 0.801772, -0.326410, 0.000000, -0.087557, -0.328230, -0.940531, 0.000000, -9.605743, -0.913906, -8.329864, 1.000000], - "children": [ - { - "id": "Bip001 R Calf", - "tansform": [ 0.981448, -0.191727, 0.000000, 0.000000, 0.191727, 0.981448, 0.000000, 0.000000, -0.000000, -0.000000, 1.000000, 0.000000, 29.675549, -0.000008, -0.000002, 1.000000], - "children": [ - { - "id": "Bip001 R Foot", - "tansform": [ 0.997275, 0.022034, 0.070411, 0.000000, -0.022524, 0.999727, 0.006179, 0.000000, -0.070256, -0.007748, 0.997499, 0.000000, 36.461250, -0.000002, 0.000001, 1.000000], - "children": [ - { - "id": "Bip001 R Toe0", - "tansform": [-0.000000, 1.000000, -0.000000, 0.000000, -1.000000, -0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 1.000000, 0.000000, 17.426960, 10.792509, -0.000001, 1.000000], - "children": [ - { - "id": "Bip001 R Toe0Nub", - "tansform": [ 1.000000, -0.000000, -0.000000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000, 0.000000, -0.000000, 1.000000, 0.000000, 11.620655, -0.000001, 0.000001, 1.000000] - } - ] - } - ] - } - ] - } - ] - }, - { - "id": "Bip001 Tail", - "tansform": [-0.981466, -0.188189, -0.036193, 0.000000, 0.178263, -0.965856, 0.188003, 0.000000, -0.070338, 0.178066, 0.981501, 0.000000, -3.604134, -10.040681, 2.116385, 1.000000], - "children": [ - { - "id": "Bip001 Tail1", - "tansform": [ 0.990307, 0.076794, -0.115740, 0.000000, -0.077303, 0.997008, 0.000092, 0.000000, 0.115401, 0.008856, 0.993280, 0.000000, 14.068230, -0.012442, 0.000002, 1.000000], - "children": [ - { - "id": "Bip001 Tail2", - "tansform": [ 0.985960, 0.076461, -0.148449, 0.000000, -0.077300, 0.997008, 0.000118, 0.000000, 0.148014, 0.011358, 0.988920, 0.000000, 15.671288, -0.014889, 0.000000, 1.000000], - "children": [ - { - "id": "Bip001 TailNub", - "tansform": [ 0.000796, 1.000000, 0.000003, 0.000000, 1.000000, -0.000796, 0.000000, 0.000000, 0.000000, 0.000003, -1.000000, 0.000000, 18.755024, 0.000000, 0.000000, 1.000000] - } - ] - } - ] - } - ] - } - ] - }, - { - "id": "L_side01", - "tansform": [-1.012626, -0.312196, 0.343339, 0.000000, 0.253477, 0.215049, 0.943135, 0.000000, -0.330622, 0.935521, -0.124455, 0.000000, 3.723862, -4.382171, 14.430992, 1.000000], - "children": [ - { - "id": "L_side02", - "tansform": [ 1.175770, -0.441929, -0.230337, 0.000000, 0.344711, 0.937865, -0.039806, 0.000000, 0.182938, -0.025526, 0.982793, 0.000000, 9.999767, 0.000000, 0.000000, 1.000000], - "children": [ - { - "id": "L_side03", - "tansform": [ 0.747694, -0.139687, 0.186120, 0.000000, 0.205382, 0.974163, -0.093941, 0.000000, -0.214781, 0.138513, 0.966790, 0.000000, 7.830887, 0.000007, -0.000008, 1.000000], - "children": [ - { - "id": "L_side_end", - "tansform": [ 1.000000, 0.000000, 0.000000, 0.000000, -0.000000, 1.000000, 0.000000, 0.000000, -0.000000, -0.000000, 1.000000, 0.000000, 10.000000, 0.000001, -0.000004, 1.000000] - } - ] - } - ] - } - ] - }, - { - "id": "R_side01", - "tansform": [-0.940467, -0.104333, -0.323473, 0.000000, -0.338429, 0.199501, 0.919602, 0.000000, -0.031412, 0.974328, -0.222934, 0.000000, 3.723907, -4.382370, -13.298973, 1.000000], - "children": [ - { - "id": "R_side02", - "tansform": [ 0.949329, 0.214476, -0.229727, 0.000000, -0.232111, 0.971278, -0.052382, 0.000000, 0.211894, 0.103050, 0.971844, 0.000000, 11.138695, 0.000000, 0.000008, 1.000000], - "children": [ - { - "id": "R_side03", - "tansform": [ 0.980933, 0.121952, -0.151324, 0.000000, -0.129671, 0.990659, -0.042195, 0.000000, 0.144764, 0.061013, 0.987584, 0.000000, 11.134212, -0.000006, -0.000013, 1.000000], - "children": [ - { - "id": "R_side_end", - "tansform": [ 1.000000, 0.000000, -0.000000, 0.000000, -0.000000, 1.000000, -0.000000, 0.000000, 0.000000, 0.000000, 1.000000, 0.000000, 11.090588, 0.000002, 0.000008, 1.000000] - } - ] - } - ] - } - ] - } - ] - } - ] - } - ], - "animation": [ - { - "version": "1.2", - "id": "Take 001", - "length": 1.200000, - "bones": [ - { - "boneId": "Bip001", - "keyframes": [ - { - "keytime": 0.000000, - "rotation": [ 0.275410, 0.631868, 0.664652, -0.288324], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.882000, 78.798103, -0.868362] - }, - { - "keytime": 0.027778, - "rotation": [ 0.279975, 0.629916, 0.662710, -0.292634], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.720266, 78.426430, -0.918222] - }, - { - "keytime": 0.055556, - "rotation": [ 0.284431, 0.627848, 0.660866, -0.296921], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.760500, 78.289093, -0.827979] - }, - { - "keytime": 0.083333, - "rotation": [ 0.291050, 0.624646, 0.658106, -0.303320], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.814312, 78.537842, -0.846725] - }, - { - "keytime": 0.111111, - "rotation": [ 0.297408, 0.621352, 0.655479, -0.309544], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.876078, 78.780281, -0.771310] - }, - { - "keytime": 0.138889, - "rotation": [ 0.302829, 0.620308, 0.651948, -0.313811], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.871080, 79.344803, -0.888585] - }, - { - "keytime": 0.166667, - "rotation": [ 0.308300, 0.619194, 0.648324, -0.318159], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.958683, 79.909004, -0.847979] - }, - { - "keytime": 0.194444, - "rotation": [ 0.307657, 0.623139, 0.646141, -0.315510], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.934917, 80.664825, -0.895076] - }, - { - "keytime": 0.222222, - "rotation": [ 0.307092, 0.626953, 0.643963, -0.312947], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.928410, 81.403069, -0.858301] - }, - { - "keytime": 0.250000, - "rotation": [ 0.297636, 0.631754, 0.648188, -0.303566], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.871353, 81.982079, -0.911636] - }, - { - "keytime": 0.277778, - "rotation": [ 0.288268, 0.636074, 0.652399, -0.294426], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.871995, 82.541962, -0.853881] - }, - { - "keytime": 0.305556, - "rotation": [ 0.279088, 0.637598, 0.658129, -0.287132], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.866900, 82.624275, -0.834164] - }, - { - "keytime": 0.333333, - "rotation": [ 0.269480, 0.638921, 0.664026, -0.279697], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.919083, 82.704498, -0.873734] - }, - { - "keytime": 0.361111, - "rotation": [ 0.263689, 0.639103, 0.667856, -0.275652], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.895580, 82.228905, -0.856812] - }, - { - "keytime": 0.388889, - "rotation": [ 0.258539, 0.639044, 0.671891, -0.270817], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.891539, 81.757706, -0.909287] - }, - { - "keytime": 0.416667, - "rotation": [ 0.251682, 0.641303, 0.674810, -0.264610], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.872055, 80.938019, -0.827408] - }, - { - "keytime": 0.444444, - "rotation": [ 0.244883, 0.643463, 0.677605, -0.258533], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.920019, 80.138016, -0.965122] - }, - { - "keytime": 0.472222, - "rotation": [ 0.238532, 0.646476, 0.678939, -0.253403], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.876546, 79.498924, -0.872956] - }, - { - "keytime": 0.500000, - "rotation": [ 0.232662, 0.649111, 0.680649, -0.247468], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.872662, 78.840462, -0.853836] - }, - { - "keytime": 0.527778, - "rotation": [ 0.228873, 0.649937, 0.682298, -0.244272], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.843588, 78.733513, -0.844773] - }, - { - "keytime": 0.555556, - "rotation": [ 0.224979, 0.650597, 0.684080, -0.241129], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.866534, 78.621353, -0.829351] - }, - { - "keytime": 0.583333, - "rotation": [ 0.222622, 0.650416, 0.685530, -0.239681], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.849493, 78.949181, -0.826070] - }, - { - "keytime": 0.611111, - "rotation": [ 0.220202, 0.650180, 0.687037, -0.238240], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.836071, 79.291245, -0.740212] - }, - { - "keytime": 0.638889, - "rotation": [ 0.222984, 0.650591, 0.685209, -0.239788], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.861794, 79.838768, -0.860426] - }, - { - "keytime": 0.666667, - "rotation": [ 0.225749, 0.651002, 0.683369, -0.241332], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.843644, 80.387001, -0.844554] - }, - { - "keytime": 0.694444, - "rotation": [ 0.236035, 0.652069, 0.676639, -0.247494], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.881960, 81.023308, -0.823635] - }, - { - "keytime": 0.722222, - "rotation": [ 0.245792, 0.652914, 0.670077, -0.253549], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.897916, 81.642563, -0.715755] - }, - { - "keytime": 0.750000, - "rotation": [ 0.258420, 0.651867, 0.662633, -0.263071], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.915392, 82.034508, -0.738238] - }, - { - "keytime": 0.777778, - "rotation": [ 0.271108, 0.650448, 0.654918, -0.272948], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.923438, 82.435547, -0.748213] - }, - { - "keytime": 0.805555, - "rotation": [ 0.281628, 0.645872, 0.650528, -0.283457], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.914563, 82.358910, -0.818401] - }, - { - "keytime": 0.833333, - "rotation": [ 0.292053, 0.641044, 0.646046, -0.293925], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.885937, 82.163727, -0.893578] - }, - { - "keytime": 0.861111, - "rotation": [ 0.296833, 0.635723, 0.646056, -0.300595], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.860687, 81.728264, -0.872988] - }, - { - "keytime": 0.888889, - "rotation": [ 0.301353, 0.630490, 0.646110, -0.306938], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.869772, 81.186462, -0.802693] - }, - { - "keytime": 0.916667, - "rotation": [ 0.303350, 0.628837, 0.645803, -0.309001], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.868107, 80.419128, -0.850884] - }, - { - "keytime": 0.944444, - "rotation": [ 0.295355, 0.629644, 0.651463, -0.303167], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.872003, 79.843872, -0.862182] - }, - { - "keytime": 0.972222, - "rotation": [ 0.285565, 0.630801, 0.658022, -0.295889], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.876924, 79.328690, -0.865246] - }, - { - "keytime": 1.000000, - "rotation": [ 0.275410, 0.631868, 0.664652, -0.288324], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.882000, 78.798103, -0.868362] - } - ] - }, - { - "boneId": "Bip001 Pelvis", - "keyframes": [ - { - "keytime": 0.000000, - "rotation": [-0.473876, -0.505134, -0.494813, 0.524825], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 0.000000, 0.000000, 0.000000] - }, - { - "keytime": 0.027778, - "rotation": [-0.467712, -0.499318, -0.500682, 0.530326], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 0.000000, 0.000000, 0.000000] - }, - { - "keytime": 0.055556, - "rotation": [-0.461455, -0.493407, -0.506507, 0.535779], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 0.000000, 0.000000, 0.000000] - }, - { - "keytime": 0.083333, - "rotation": [-0.456882, -0.489082, -0.510685, 0.539684], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 0.000000, 0.000000, 0.000000] - }, - { - "keytime": 0.111111, - "rotation": [-0.452393, -0.484832, -0.514721, 0.543452], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 0.000000, 0.000000, 0.000000] - }, - { - "keytime": 0.138889, - "rotation": [-0.452816, -0.485232, -0.514344, 0.543100], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 0.000000, 0.000000, 0.000000] - }, - { - "keytime": 0.166667, - "rotation": [-0.453213, -0.485608, -0.513989, 0.542769], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 0.000000, 0.000000, 0.000000] - }, - { - "keytime": 0.194444, - "rotation": [-0.457971, -0.490112, -0.509696, 0.538760], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 0.000000, 0.000000, 0.000000] - }, - { - "keytime": 0.222222, - "rotation": [-0.462641, -0.494528, -0.505413, 0.534756], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 0.000000, 0.000000, 0.000000] - }, - { - "keytime": 0.250000, - "rotation": [-0.467870, -0.499467, -0.500532, 0.530187], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 0.000000, 0.000000, 0.000000] - }, - { - "keytime": 0.277778, - "rotation": [-0.472895, -0.504209, -0.495756, 0.525709], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 0.000000, 0.000000, 0.000000] - }, - { - "keytime": 0.305556, - "rotation": [-0.475770, -0.506919, -0.492984, 0.523109], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 0.000000, 0.000000, 0.000000] - }, - { - "keytime": 0.333333, - "rotation": [-0.478743, -0.509719, -0.490088, 0.520390], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 0.000000, 0.000000, 0.000000] - }, - { - "keytime": 0.361111, - "rotation": [-0.478048, -0.509066, -0.490767, 0.521028], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 0.000000, 0.000000, 0.000000] - }, - { - "keytime": 0.388889, - "rotation": [-0.477924, -0.508948, -0.490889, 0.521142], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 0.000000, 0.000000, 0.000000] - }, - { - "keytime": 0.416667, - "rotation": [-0.477148, -0.508217, -0.491646, 0.521853], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 0.000000, 0.000000, 0.000000] - }, - { - "keytime": 0.444444, - "rotation": [-0.476363, -0.507477, -0.492409, 0.522569], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 0.000000, 0.000000, 0.000000] - }, - { - "keytime": 0.472222, - "rotation": [-0.481550, -0.512362, -0.487324, 0.517793], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 0.000000, 0.000000, 0.000000] - }, - { - "keytime": 0.500000, - "rotation": [-0.487409, -0.517873, -0.481464, 0.512282], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 0.000000, 0.000000, 0.000000] - }, - { - "keytime": 0.527778, - "rotation": [-0.496717, -0.526610, -0.471891, 0.503262], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 0.000000, 0.000000, 0.000000] - }, - { - "keytime": 0.555556, - "rotation": [ 0.505854, 0.535168, 0.462163, -0.494076], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 0.000000, 0.000000, 0.000000] - }, - { - "keytime": 0.583333, - "rotation": [ 0.511100, 0.540071, 0.456424, -0.488648], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 0.000000, 0.000000, 0.000000] - }, - { - "keytime": 0.611111, - "rotation": [ 0.516388, 0.545007, 0.450518, -0.483056], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 0.000000, 0.000000, 0.000000] - }, - { - "keytime": 0.638889, - "rotation": [ 0.515166, 0.543867, 0.451894, -0.484359], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 0.000000, 0.000000, 0.000000] - }, - { - "keytime": 0.666667, - "rotation": [ 0.513991, 0.542771, 0.453211, -0.485606], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 0.000000, 0.000000, 0.000000] - }, - { - "keytime": 0.694444, - "rotation": [ 0.509283, 0.538374, 0.458425, -0.490542], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 0.000000, 0.000000, 0.000000] - }, - { - "keytime": 0.722222, - "rotation": [ 0.504571, 0.533967, 0.463550, -0.495387], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 0.000000, 0.000000, 0.000000] - }, - { - "keytime": 0.750000, - "rotation": [ 0.500061, 0.529745, 0.468370, -0.499939], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 0.000000, 0.000000, 0.000000] - }, - { - "keytime": 0.777778, - "rotation": [-0.495260, -0.525245, -0.473411, 0.504695], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 0.000000, 0.000000, 0.000000] - }, - { - "keytime": 0.805555, - "rotation": [-0.492210, -0.522383, -0.476567, 0.507670], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 0.000000, 0.000000, 0.000000] - }, - { - "keytime": 0.833333, - "rotation": [-0.489104, -0.519465, -0.479746, 0.510664], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 0.000000, 0.000000, 0.000000] - }, - { - "keytime": 0.861111, - "rotation": [-0.486933, -0.517426, -0.481945, 0.512734], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 0.000000, 0.000000, 0.000000] - }, - { - "keytime": 0.888889, - "rotation": [-0.484484, -0.515123, -0.484405, 0.515049], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 0.000000, 0.000000, 0.000000] - }, - { - "keytime": 0.916667, - "rotation": [-0.483057, -0.513780, -0.485829, 0.516387], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 0.000000, 0.000000, 0.000000] - }, - { - "keytime": 0.944444, - "rotation": [-0.481365, -0.512188, -0.487507, 0.517965], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 0.000000, 0.000000, 0.000000] - }, - { - "keytime": 0.972222, - "rotation": [-0.477865, -0.508893, -0.490946, 0.521196], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 0.000000, 0.000000, 0.000000] - }, - { - "keytime": 1.000000, - "rotation": [-0.473876, -0.505134, -0.494813, 0.524825], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 0.000000, 0.000000, 0.000000] - } - ] - }, - { - "boneId": "Bip001 Spine", - "keyframes": [ - { - "keytime": 0.000000, - "rotation": [ 0.067905, -0.033138, 0.015150, 0.997026], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.015236, 0.015734, 0.365063] - }, - { - "keytime": 0.027778, - "rotation": [ 0.066990, -0.054854, 0.017513, 0.996091], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.004263, 0.028631, 0.575243] - }, - { - "keytime": 0.055556, - "rotation": [ 0.066039, -0.076628, 0.019862, 0.994672], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.988276, 0.041566, 0.786048] - }, - { - "keytime": 0.083333, - "rotation": [ 0.065725, -0.092703, 0.021507, 0.993289], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.973618, 0.050922, 0.938515] - }, - { - "keytime": 0.111111, - "rotation": [ 0.065383, -0.108357, 0.023098, 0.991691], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.956803, 0.060026, 1.086876] - }, - { - "keytime": 0.138889, - "rotation": [ 0.066627, -0.107296, 0.022912, 0.991728], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.958502, 0.059174, 1.072942] - }, - { - "keytime": 0.166667, - "rotation": [ 0.067844, -0.106311, 0.022732, 0.991755], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.960087, 0.058374, 1.059847] - }, - { - "keytime": 0.194444, - "rotation": [ 0.070449, -0.090182, 0.021040, 0.993208], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.977349, 0.048711, 0.902274] - }, - { - "keytime": 0.222222, - "rotation": [ 0.072846, -0.074207, 0.019258, 0.994392], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.991702, 0.039139, 0.746202] - }, - { - "keytime": 0.250000, - "rotation": [ 0.075603, -0.056000, 0.017205, 0.995416], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.004616, 0.028318, 0.569764] - }, - { - "keytime": 0.277778, - "rotation": [ 0.078228, -0.038359, 0.015108, 0.996083], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.013797, 0.017818, 0.398538] - }, - { - "keytime": 0.305556, - "rotation": [ 0.080084, -0.028275, 0.014045, 0.996288], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.017650, 0.011766, 0.299849] - }, - { - "keytime": 0.333333, - "rotation": [ 0.082060, -0.017798, 0.012887, 0.996385], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.020470, 0.005475, 0.197242] - }, - { - "keytime": 0.361111, - "rotation": [ 0.082704, -0.020571, 0.013646, 0.996268], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.019908, 0.006950, 0.221236] - }, - { - "keytime": 0.388889, - "rotation": [ 0.083404, -0.021159, 0.014107, 0.996191], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.019814, 0.007216, 0.225539] - }, - { - "keytime": 0.416667, - "rotation": [ 0.083777, -0.024407, 0.014912, 0.996074], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.019112, 0.008861, 0.252327] - }, - { - "keytime": 0.444444, - "rotation": [ 0.084139, -0.027666, 0.015715, 0.995946], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.018342, 0.010523, 0.279379] - }, - { - "keytime": 0.472222, - "rotation": [ 0.085090, -0.009726, 0.013090, 0.996240], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.022079, -0.000494, 0.099819] - }, - { - "keytime": 0.500000, - "rotation": [ 0.086090, 0.010942, 0.010014, 0.996177], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.021988, -0.013068, -0.105098] - }, - { - "keytime": 0.527778, - "rotation": [ 0.088946, 0.044699, 0.004375, 0.995023], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.011995, -0.033312, -0.435111] - }, - { - "keytime": 0.555556, - "rotation": [ 0.088274, 0.078369, -0.001180, 0.993008], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.989855, -0.053521, -0.764370] - }, - { - "keytime": 0.583333, - "rotation": [ 0.088193, 0.098108, -0.004791, 0.991249], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.971445, -0.065266, -0.955758] - }, - { - "keytime": 0.611111, - "rotation": [ 0.088110, 0.118176, -0.008480, 0.989039], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.948427, -0.077214, -1.150450] - }, - { - "keytime": 0.638889, - "rotation": [ 0.086384, 0.113745, -0.007881, 0.989716], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.954142, -0.074447, -1.105274] - }, - { - "keytime": 0.666667, - "rotation": [ 0.084325, 0.109502, -0.007340, 0.990376], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.959434, -0.071794, -1.061929] - }, - { - "keytime": 0.694444, - "rotation": [ 0.082066, 0.091991, -0.004121, 0.992364], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.978320, -0.061199, -0.889175] - }, - { - "keytime": 0.722222, - "rotation": [ 0.079755, 0.074602, -0.001057, 0.994018], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.993753, -0.050682, -0.717690] - }, - { - "keytime": 0.750000, - "rotation": [ 0.077517, 0.058205, 0.002109, 0.995288], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.005362, -0.040695, -0.554853] - }, - { - "keytime": 0.777778, - "rotation": [ 0.075418, 0.040842, 0.005324, 0.996301], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.014371, -0.030151, -0.382937] - }, - { - "keytime": 0.805555, - "rotation": [ 0.063622, 0.031075, 0.008471, 0.997454], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.018397, -0.023517, -0.274330] - }, - { - "keytime": 0.833333, - "rotation": [ 0.049331, 0.021836, 0.011698, 0.998475], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.021099, -0.016795, -0.164266] - }, - { - "keytime": 0.861111, - "rotation": [ 0.036679, 0.014392, 0.014293, 0.999121], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.022223, -0.012119, -0.087666] - }, - { - "keytime": 0.888889, - "rotation": [ 0.030864, 0.006615, 0.015857, 0.999376], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.022656, -0.007507, -0.012365] - }, - { - "keytime": 0.916667, - "rotation": [ 0.034177, -0.001027, 0.016130, 0.999285], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.022546, -0.003807, 0.047834] - }, - { - "keytime": 0.944444, - "rotation": [ 0.044196, -0.009131, 0.015564, 0.998860], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.022033, -0.000170, 0.106802] - }, - { - "keytime": 0.972222, - "rotation": [ 0.056510, -0.020670, 0.015158, 0.998073], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.019774, 0.007290, 0.227929] - }, - { - "keytime": 1.000000, - "rotation": [ 0.067905, -0.033138, 0.015150, 0.997026], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.015236, 0.015734, 0.365063] - } - ] - }, - { - "boneId": "Bip001 Spine1", - "keyframes": [ - { - "keytime": 0.000000, - "rotation": [ 0.060201, 0.034387, 0.048560, 0.996411], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.531822, -0.008244, -0.001028] - }, - { - "keytime": 0.027778, - "rotation": [ 0.059958, 0.041651, 0.045791, 0.996280], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.531776, -0.008248, -0.001029] - }, - { - "keytime": 0.055556, - "rotation": [ 0.059670, 0.049002, 0.043081, 0.996083], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.531715, -0.008253, -0.001028] - }, - { - "keytime": 0.083333, - "rotation": [ 0.061422, 0.052728, 0.040716, 0.995886], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.531662, -0.008253, -0.001055] - }, - { - "keytime": 0.111111, - "rotation": [ 0.063108, 0.056327, 0.038403, 0.995676], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.531631, -0.008252, -0.001087] - }, - { - "keytime": 0.138889, - "rotation": [ 0.067788, 0.053893, 0.037646, 0.995532], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.531624, -0.008243, -0.001160] - }, - { - "keytime": 0.166667, - "rotation": [ 0.072406, 0.051542, 0.036880, 0.995359], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.531601, -0.008234, -0.001234] - }, - { - "keytime": 0.194444, - "rotation": [ 0.080084, 0.045184, 0.038333, 0.995025], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.531609, -0.008210, -0.001357] - }, - { - "keytime": 0.222222, - "rotation": [ 0.087573, 0.038975, 0.039747, 0.994601], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.531647, -0.008189, -0.001478] - }, - { - "keytime": 0.250000, - "rotation": [ 0.098748, 0.032732, 0.041625, 0.993703], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.531685, -0.008152, -0.001660] - }, - { - "keytime": 0.277778, - "rotation": [ 0.109520, 0.026641, 0.043429, 0.992678], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.531731, -0.008111, -0.001834] - }, - { - "keytime": 0.305556, - "rotation": [ 0.118022, 0.022691, 0.045326, 0.991716], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.531761, -0.008077, -0.001970] - }, - { - "keytime": 0.333333, - "rotation": [ 0.126733, 0.018603, 0.047246, 0.990636], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.531792, -0.008038, -0.002109] - }, - { - "keytime": 0.361111, - "rotation": [ 0.130724, 0.017851, 0.049044, 0.990044], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.531822, -0.008018, -0.002174] - }, - { - "keytime": 0.388889, - "rotation": [ 0.134680, 0.017188, 0.050871, 0.989433], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.531853, -0.007997, -0.002238] - }, - { - "keytime": 0.416667, - "rotation": [ 0.137215, 0.015601, 0.052656, 0.989018], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.531883, -0.007983, -0.002278] - }, - { - "keytime": 0.444444, - "rotation": [ 0.139731, 0.014102, 0.054372, 0.988595], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.531906, -0.007968, -0.002318] - }, - { - "keytime": 0.472222, - "rotation": [ 0.140554, 0.005180, 0.055407, 0.988508], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.531960, -0.007963, -0.002323] - }, - { - "keytime": 0.500000, - "rotation": [ 0.141393, -0.004019, 0.056416, 0.988337], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.531982, -0.007957, -0.002328] - }, - { - "keytime": 0.527778, - "rotation": [ 0.140705, -0.016362, 0.055423, 0.988364], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.531998, -0.007962, -0.002306] - }, - { - "keytime": 0.555556, - "rotation": [ 0.139996, -0.028731, 0.054410, 0.988238], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.532013, -0.007967, -0.002282] - }, - { - "keytime": 0.583333, - "rotation": [ 0.136206, -0.035087, 0.052058, 0.988689], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.531998, -0.007989, -0.002216] - }, - { - "keytime": 0.611111, - "rotation": [ 0.132235, -0.041657, 0.049625, 0.989099], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.531952, -0.008011, -0.002149] - }, - { - "keytime": 0.638889, - "rotation": [ 0.125588, -0.039127, 0.047869, 0.990154], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.531921, -0.008042, -0.002043] - }, - { - "keytime": 0.666667, - "rotation": [ 0.118903, -0.036639, 0.046057, 0.991160], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.531876, -0.008072, -0.001939] - }, - { - "keytime": 0.694444, - "rotation": [ 0.111293, -0.029457, 0.047034, 0.992237], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.531883, -0.008100, -0.001819] - }, - { - "keytime": 0.722222, - "rotation": [ 0.103997, -0.022309, 0.048002, 0.993168], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.531876, -0.008125, -0.001707] - }, - { - "keytime": 0.750000, - "rotation": [ 0.095773, -0.014943, 0.050634, 0.994002], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.531914, -0.008148, -0.001576] - }, - { - "keytime": 0.777778, - "rotation": [ 0.087318, -0.007336, 0.053326, 0.994725], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.531952, -0.008169, -0.001443] - }, - { - "keytime": 0.805555, - "rotation": [ 0.083261, -0.001851, 0.053212, 0.995104], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.531937, -0.008180, -0.001381] - }, - { - "keytime": 0.833333, - "rotation": [ 0.079792, 0.003363, 0.052709, 0.995411], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.531929, -0.008191, -0.001328] - }, - { - "keytime": 0.861111, - "rotation": [ 0.076499, 0.008606, 0.052003, 0.995675], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.531906, -0.008201, -0.001278] - }, - { - "keytime": 0.888889, - "rotation": [ 0.073271, 0.013708, 0.051335, 0.995896], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.531891, -0.008210, -0.001229] - }, - { - "keytime": 0.916667, - "rotation": [ 0.069980, 0.018836, 0.050704, 0.996081], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.531868, -0.008219, -0.001179] - }, - { - "keytime": 0.944444, - "rotation": [ 0.066672, 0.024081, 0.049996, 0.996231], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.531860, -0.008228, -0.001128] - }, - { - "keytime": 0.972222, - "rotation": [ 0.063494, 0.029153, 0.049284, 0.996338], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.531845, -0.008236, -0.001080] - }, - { - "keytime": 1.000000, - "rotation": [ 0.060201, 0.034387, 0.048560, 0.996411], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.531822, -0.008244, -0.001028] - } - ] - }, - { - "boneId": "Bip001 Spine2", - "keyframes": [ - { - "keytime": 0.000000, - "rotation": [-0.025628, 0.036739, 0.061259, 0.997116], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 10.478699, -0.009741, 0.000458] - }, - { - "keytime": 0.027778, - "rotation": [-0.025899, 0.045731, 0.058661, 0.996894], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 10.478645, -0.009746, 0.000455] - }, - { - "keytime": 0.055556, - "rotation": [-0.026173, 0.054715, 0.056082, 0.996582], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 10.478607, -0.009752, 0.000453] - }, - { - "keytime": 0.083333, - "rotation": [-0.024059, 0.059385, 0.053592, 0.996505], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 10.478554, -0.009759, 0.000409] - }, - { - "keytime": 0.111111, - "rotation": [-0.022022, 0.063899, 0.051152, 0.996401], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 10.478500, -0.009765, 0.000368] - }, - { - "keytime": 0.138889, - "rotation": [-0.016468, 0.061058, 0.050034, 0.996743], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 10.478477, -0.009770, 0.000263] - }, - { - "keytime": 0.166667, - "rotation": [-0.010877, 0.058323, 0.048850, 0.997043], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 10.478455, -0.009777, 0.000157] - }, - { - "keytime": 0.194444, - "rotation": [-0.001661, 0.050592, 0.050014, 0.997465], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 10.478462, -0.009778, -0.000017] - }, - { - "keytime": 0.222222, - "rotation": [ 0.007282, 0.043037, 0.051149, 0.997737], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 10.478470, -0.009774, -0.000186] - }, - { - "keytime": 0.250000, - "rotation": [ 0.020727, 0.035345, 0.052778, 0.997765], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 10.478493, -0.009763, -0.000443] - }, - { - "keytime": 0.277778, - "rotation": [ 0.033708, 0.027894, 0.054387, 0.997561], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 10.478523, -0.009745, -0.000691] - }, - { - "keytime": 0.305556, - "rotation": [ 0.043962, 0.022939, 0.056247, 0.997185], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 10.478554, -0.009724, -0.000887] - }, - { - "keytime": 0.333333, - "rotation": [ 0.054481, 0.017873, 0.058174, 0.996659], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 10.478600, -0.009703, -0.001088] - }, - { - "keytime": 0.361111, - "rotation": [ 0.059251, 0.016810, 0.060312, 0.996278], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 10.478645, -0.009687, -0.001180] - }, - { - "keytime": 0.388889, - "rotation": [ 0.064088, 0.015791, 0.062330, 0.995871], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 10.478668, -0.009669, -0.001274] - }, - { - "keytime": 0.416667, - "rotation": [ 0.067157, 0.013734, 0.064375, 0.995569], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 10.478722, -0.009659, -0.001331] - }, - { - "keytime": 0.444444, - "rotation": [ 0.070201, 0.011780, 0.066236, 0.995262], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 10.478767, -0.009646, -0.001388] - }, - { - "keytime": 0.472222, - "rotation": [ 0.071199, 0.001069, 0.066661, 0.995232], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 10.478783, -0.009640, -0.001394] - }, - { - "keytime": 0.500000, - "rotation": [ 0.072215, -0.010082, 0.067036, 0.995083], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 10.478798, -0.009636, -0.001399] - }, - { - "keytime": 0.527778, - "rotation": [ 0.071284, -0.024709, 0.064720, 0.995047], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 10.478783, -0.009644, -0.001362] - }, - { - "keytime": 0.555556, - "rotation": [ 0.070446, -0.039470, 0.062330, 0.994784], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 10.478752, -0.009653, -0.001329] - }, - { - "keytime": 0.583333, - "rotation": [ 0.065874, -0.046801, 0.058988, 0.994983], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 10.478694, -0.009673, -0.001234] - }, - { - "keytime": 0.611111, - "rotation": [ 0.061091, -0.054381, 0.055476, 0.995105], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 10.478630, -0.009693, -0.001136] - }, - { - "keytime": 0.638889, - "rotation": [ 0.053045, -0.051252, 0.053609, 0.995834], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 10.478584, -0.009715, -0.000985] - }, - { - "keytime": 0.666667, - "rotation": [ 0.044908, -0.048060, 0.051663, 0.996496], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 10.478531, -0.009735, -0.000831] - }, - { - "keytime": 0.694444, - "rotation": [ 0.035762, -0.039554, 0.053487, 0.997144], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 10.478554, -0.009746, -0.000660] - }, - { - "keytime": 0.722222, - "rotation": [ 0.026945, -0.031089, 0.055350, 0.997619], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 10.478584, -0.009753, -0.000494] - }, - { - "keytime": 0.750000, - "rotation": [ 0.017085, -0.022513, 0.059168, 0.997848], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 10.478650, -0.009752, -0.000309] - }, - { - "keytime": 0.777778, - "rotation": [ 0.006906, -0.013600, 0.063131, 0.997889], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 10.478722, -0.009748, -0.000118] - }, - { - "keytime": 0.805555, - "rotation": [ 0.002024, -0.007020, 0.063508, 0.997955], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 10.478722, -0.009746, -0.000032] - }, - { - "keytime": 0.833333, - "rotation": [-0.002147, -0.000736, 0.063388, 0.997986], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 10.478722, -0.009748, 0.000043] - }, - { - "keytime": 0.861111, - "rotation": [-0.006104, 0.005598, 0.063025, 0.997978], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 10.478706, -0.009748, 0.000113] - }, - { - "keytime": 0.888889, - "rotation": [-0.009979, 0.011760, 0.062693, 0.997914], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 10.478714, -0.009748, 0.000182] - }, - { - "keytime": 0.916667, - "rotation": [-0.013925, 0.017951, 0.062408, 0.997792], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 10.478706, -0.009746, 0.000251] - }, - { - "keytime": 0.944444, - "rotation": [-0.017888, 0.024286, 0.062040, 0.997618], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 10.478714, -0.009747, 0.000322] - }, - { - "keytime": 0.972222, - "rotation": [-0.021690, 0.030416, 0.061650, 0.997398], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 10.478699, -0.009742, 0.000389] - }, - { - "keytime": 1.000000, - "rotation": [-0.025628, 0.036739, 0.061259, 0.997116], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 10.478699, -0.009741, 0.000458] - } - ] - }, - { - "boneId": "Bip001 Neck", - "keyframes": [ - { - "keytime": 0.000000, - "rotation": [ 0.122708, -0.055152, -0.073261, 0.988197], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 12.629967, -1.602531, -0.001094] - }, - { - "keytime": 0.027778, - "rotation": [ 0.122708, -0.055152, -0.073261, 0.988197], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 12.629959, -1.602531, -0.001096] - }, - { - "keytime": 0.055556, - "rotation": [ 0.122708, -0.055152, -0.073261, 0.988197], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 12.629959, -1.602530, -0.001093] - }, - { - "keytime": 0.083333, - "rotation": [ 0.122708, -0.055152, -0.073261, 0.988197], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 12.629959, -1.602531, -0.001094] - }, - { - "keytime": 0.111111, - "rotation": [ 0.122708, -0.055152, -0.073261, 0.988197], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 12.629974, -1.602533, -0.001093] - }, - { - "keytime": 0.138889, - "rotation": [ 0.122708, -0.055152, -0.073261, 0.988197], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 12.629967, -1.602531, -0.001093] - }, - { - "keytime": 0.166667, - "rotation": [ 0.122708, -0.055152, -0.073261, 0.988197], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 12.629959, -1.602530, -0.001094] - }, - { - "keytime": 0.194444, - "rotation": [ 0.122708, -0.055152, -0.073261, 0.988197], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 12.629959, -1.602531, -0.001093] - }, - { - "keytime": 0.222222, - "rotation": [ 0.122708, -0.055152, -0.073261, 0.988197], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 12.629959, -1.602530, -0.001093] - }, - { - "keytime": 0.277778, - "rotation": [ 0.122708, -0.055152, -0.073261, 0.988197], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 12.629951, -1.602531, -0.001094] - }, - { - "keytime": 0.305556, - "rotation": [ 0.122708, -0.055152, -0.073261, 0.988197], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 12.629967, -1.602533, -0.001094] - }, - { - "keytime": 0.333333, - "rotation": [ 0.122708, -0.055152, -0.073261, 0.988197], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 12.629959, -1.602531, -0.001094] - }, - { - "keytime": 0.361111, - "rotation": [ 0.122708, -0.055152, -0.073261, 0.988197], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 12.629967, -1.602533, -0.001093] - }, - { - "keytime": 0.388889, - "rotation": [ 0.122708, -0.055152, -0.073261, 0.988197], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 12.629959, -1.602531, -0.001093] - }, - { - "keytime": 0.416667, - "rotation": [ 0.122708, -0.055152, -0.073261, 0.988197], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 12.629951, -1.602533, -0.001094] - }, - { - "keytime": 0.444444, - "rotation": [ 0.122708, -0.055152, -0.073261, 0.988197], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 12.629959, -1.602528, -0.001094] - }, - { - "keytime": 0.472222, - "rotation": [ 0.122708, -0.055152, -0.073261, 0.988197], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 12.629974, -1.602535, -0.001094] - }, - { - "keytime": 0.500000, - "rotation": [ 0.122708, -0.055152, -0.073261, 0.988197], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 12.629967, -1.602535, -0.001094] - }, - { - "keytime": 0.527778, - "rotation": [ 0.122708, -0.055152, -0.073261, 0.988197], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 12.629951, -1.602526, -0.001094] - }, - { - "keytime": 0.555556, - "rotation": [ 0.122708, -0.055152, -0.073261, 0.988197], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 12.629959, -1.602528, -0.001094] - }, - { - "keytime": 0.583333, - "rotation": [ 0.122708, -0.055152, -0.073261, 0.988197], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 12.629974, -1.602531, -0.001094] - }, - { - "keytime": 0.611111, - "rotation": [ 0.122708, -0.055152, -0.073261, 0.988197], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 12.629959, -1.602531, -0.001094] - }, - { - "keytime": 0.638889, - "rotation": [ 0.122708, -0.055152, -0.073261, 0.988197], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 12.629967, -1.602531, -0.001094] - }, - { - "keytime": 0.666667, - "rotation": [ 0.122708, -0.055152, -0.073261, 0.988197], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 12.629959, -1.602531, -0.001094] - }, - { - "keytime": 0.694444, - "rotation": [ 0.122708, -0.055152, -0.073261, 0.988197], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 12.629967, -1.602531, -0.001094] - }, - { - "keytime": 0.722222, - "rotation": [ 0.122708, -0.055152, -0.073261, 0.988197], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 12.629951, -1.602530, -0.001093] - }, - { - "keytime": 0.750000, - "rotation": [ 0.122708, -0.055152, -0.073261, 0.988197], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 12.629967, -1.602531, -0.001094] - }, - { - "keytime": 0.777778, - "rotation": [ 0.122708, -0.055152, -0.073261, 0.988197], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 12.629959, -1.602531, -0.001094] - }, - { - "keytime": 0.805555, - "rotation": [ 0.122708, -0.055152, -0.073261, 0.988197], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 12.629967, -1.602533, -0.001093] - }, - { - "keytime": 0.833333, - "rotation": [ 0.122708, -0.055152, -0.073261, 0.988197], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 12.629951, -1.602528, -0.001094] - }, - { - "keytime": 0.861111, - "rotation": [ 0.122708, -0.055152, -0.073261, 0.988197], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 12.629959, -1.602533, -0.001095] - }, - { - "keytime": 0.888889, - "rotation": [ 0.122708, -0.055152, -0.073261, 0.988197], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 12.629951, -1.602530, -0.001094] - }, - { - "keytime": 0.916667, - "rotation": [ 0.122708, -0.055152, -0.073261, 0.988197], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 12.629967, -1.602533, -0.001093] - }, - { - "keytime": 0.944444, - "rotation": [ 0.122708, -0.055152, -0.073261, 0.988197], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 12.629974, -1.602533, -0.001093] - }, - { - "keytime": 0.972222, - "rotation": [ 0.122708, -0.055152, -0.073261, 0.988197], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 12.629967, -1.602533, -0.001093] - }, - { - "keytime": 1.000000, - "rotation": [ 0.122708, -0.055152, -0.073261, 0.988197], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 12.629967, -1.602531, -0.001094] - } - ] - }, - { - "boneId": "Bip001 L Clavicle", - "keyframes": [ - { - "keytime": 0.000000, - "rotation": [ 0.759854, 0.178462, 0.619470, 0.083846], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.315384, 2.113419, 2.023955] - }, - { - "keytime": 0.027778, - "rotation": [ 0.759589, 0.174874, 0.621355, 0.079757], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.315376, 2.113417, 2.023955] - }, - { - "keytime": 0.055556, - "rotation": [ 0.759297, 0.171266, 0.623224, 0.075682], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.315369, 2.113417, 2.023954] - }, - { - "keytime": 0.083333, - "rotation": [ 0.758964, 0.167460, 0.625163, 0.071423], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.315369, 2.113419, 2.023954] - }, - { - "keytime": 0.111111, - "rotation": [ 0.758611, 0.163701, 0.627047, 0.067255], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.315384, 2.113417, 2.023955] - }, - { - "keytime": 0.138889, - "rotation": [ 0.758232, 0.159932, 0.628905, 0.063116], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.315376, 2.113418, 2.023955] - }, - { - "keytime": 0.166667, - "rotation": [ 0.757826, 0.156136, 0.630747, 0.058984], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.315369, 2.113416, 2.023955] - }, - { - "keytime": 0.194444, - "rotation": [ 0.757375, 0.152178, 0.632638, 0.054715], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.315376, 2.113418, 2.023954] - }, - { - "keytime": 0.222222, - "rotation": [ 0.756902, 0.148272, 0.634476, 0.050540], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.315376, 2.113417, 2.023954] - }, - { - "keytime": 0.250000, - "rotation": [ 0.756375, 0.144161, 0.636381, 0.046187], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.315376, 2.113417, 2.023954] - }, - { - "keytime": 0.277778, - "rotation": [ 0.755820, 0.140069, 0.638249, 0.041894], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.315361, 2.113416, 2.023955] - }, - { - "keytime": 0.305556, - "rotation": [ 0.755167, 0.135494, 0.640300, 0.037142], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.315369, 2.113417, 2.023955] - }, - { - "keytime": 0.333333, - "rotation": [ 0.754366, 0.130149, 0.642644, 0.031654], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.315369, 2.113416, 2.023954] - }, - { - "keytime": 0.361111, - "rotation": [ 0.753507, 0.124729, 0.644969, 0.026157], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.315384, 2.113418, 2.023954] - }, - { - "keytime": 0.388889, - "rotation": [ 0.752629, 0.119474, 0.647178, 0.020891], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.315376, 2.113417, 2.023954] - }, - { - "keytime": 0.416667, - "rotation": [ 0.751781, 0.114655, 0.649169, 0.016114], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.315376, 2.113417, 2.023954] - }, - { - "keytime": 0.444444, - "rotation": [ 0.751098, 0.110967, 0.650679, 0.012491], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.315376, 2.113415, 2.023955] - }, - { - "keytime": 0.472222, - "rotation": [ 0.750644, 0.108675, 0.651628, 0.010251], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.315376, 2.113418, 2.023955] - }, - { - "keytime": 0.500000, - "rotation": [ 0.750392, 0.107518, 0.652127, 0.009120], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.315376, 2.113418, 2.023955] - }, - { - "keytime": 0.527778, - "rotation": [ 0.750286, 0.107120, 0.652319, 0.008729], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.315376, 2.113417, 2.023954] - }, - { - "keytime": 0.555556, - "rotation": [ 0.750331, 0.107557, 0.652190, 0.009147], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.315369, 2.113415, 2.023955] - }, - { - "keytime": 0.583333, - "rotation": [ 0.750540, 0.108950, 0.651698, 0.010490], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.315376, 2.113419, 2.023954] - }, - { - "keytime": 0.611111, - "rotation": [ 0.750934, 0.111510, 0.650766, 0.012972], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.315369, 2.113417, 2.023953] - }, - { - "keytime": 0.638889, - "rotation": [ 0.751489, 0.115201, 0.649398, 0.016574], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.315392, 2.113419, 2.023954] - }, - { - "keytime": 0.666667, - "rotation": [ 0.752204, 0.120180, 0.647522, 0.021476], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.315362, 2.113417, 2.023954] - }, - { - "keytime": 0.694444, - "rotation": [ 0.753150, 0.127332, 0.644774, 0.028602], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.315361, 2.113417, 2.023953] - }, - { - "keytime": 0.722222, - "rotation": [ 0.754210, 0.136308, 0.641223, 0.037692], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.315368, 2.113417, 2.023954] - }, - { - "keytime": 0.750000, - "rotation": [ 0.755261, 0.146524, 0.637011, 0.048247], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.315376, 2.113418, 2.023953] - }, - { - "keytime": 0.777778, - "rotation": [ 0.756214, 0.157561, 0.632239, 0.059913], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.315376, 2.113418, 2.023954] - }, - { - "keytime": 0.805555, - "rotation": [ 0.756946, 0.168049, 0.627466, 0.071268], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.315392, 2.113418, 2.023955] - }, - { - "keytime": 0.833333, - "rotation": [ 0.757475, 0.177636, 0.622872, 0.081898], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.315377, 2.113417, 2.023954] - }, - { - "keytime": 0.861111, - "rotation": [ 0.757847, 0.185901, 0.618690, 0.091276], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.315376, 2.113417, 2.023955] - }, - { - "keytime": 0.888889, - "rotation": [ 0.758113, 0.191760, 0.615527, 0.098079], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.315361, 2.113416, 2.023954] - }, - { - "keytime": 0.916667, - "rotation": [ 0.758451, 0.192975, 0.614477, 0.099649], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.315376, 2.113418, 2.023954] - }, - { - "keytime": 0.944444, - "rotation": [ 0.758943, 0.189172, 0.615708, 0.095516], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.315369, 2.113418, 2.023954] - }, - { - "keytime": 0.972222, - "rotation": [ 0.759424, 0.183419, 0.617798, 0.089208], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.315384, 2.113418, 2.023954] - }, - { - "keytime": 1.000000, - "rotation": [ 0.759854, 0.178462, 0.619470, 0.083846], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.315384, 2.113418, 2.023955] - } - ] - }, - { - "boneId": "Bip001 L UpperArm", - "keyframes": [ - { - "keytime": 0.000000, - "rotation": [ 0.154923, 0.384148, -0.479514, 0.773625], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 6.200710, -0.000004, -0.000008] - }, - { - "keytime": 0.027778, - "rotation": [ 0.150597, 0.407479, -0.478785, 0.762920], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 6.200716, -0.000000, -0.000008] - }, - { - "keytime": 0.055556, - "rotation": [ 0.146345, 0.430611, -0.477699, 0.751639], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 6.200712, -0.000002, 0.000008] - }, - { - "keytime": 0.083333, - "rotation": [ 0.151655, 0.448284, -0.469425, 0.745441], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 6.200712, 0.000000, -0.000008] - }, - { - "keytime": 0.111111, - "rotation": [ 0.161317, 0.464396, -0.451906, 0.744375], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 6.200712, 0.000000, -0.000000] - }, - { - "keytime": 0.138889, - "rotation": [ 0.177213, 0.472059, -0.437417, 0.744596], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 6.200712, 0.000000, 0.000008] - }, - { - "keytime": 0.166667, - "rotation": [ 0.193783, 0.478809, -0.420524, 0.745888], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 6.200712, -0.000000, 0.000000] - }, - { - "keytime": 0.194444, - "rotation": [ 0.212927, 0.479315, -0.408150, 0.747217], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 6.200714, 0.000000, 0.000008] - }, - { - "keytime": 0.222222, - "rotation": [ 0.231761, 0.478966, -0.394431, 0.749201], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 6.200712, 0.000000, 0.000008] - }, - { - "keytime": 0.250000, - "rotation": [ 0.253561, 0.475388, -0.385935, 0.748844], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 6.200710, 0.000000, -0.000008] - }, - { - "keytime": 0.277778, - "rotation": [ 0.274603, 0.471145, -0.376678, 0.748819], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 6.200710, 0.000000, -0.000000] - }, - { - "keytime": 0.305556, - "rotation": [ 0.291854, 0.469892, -0.360476, 0.751052], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 6.200714, -0.000002, -0.000007] - }, - { - "keytime": 0.333333, - "rotation": [ 0.310330, 0.468613, -0.338833, 0.754513], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 6.200714, 0.000002, -0.000015] - }, - { - "keytime": 0.361111, - "rotation": [ 0.320142, 0.472196, -0.308476, 0.761172], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 6.200712, 0.000000, -0.000000] - }, - { - "keytime": 0.388889, - "rotation": [ 0.329284, 0.475485, -0.278973, 0.766590], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 6.200714, 0.000002, 0.000008] - }, - { - "keytime": 0.416667, - "rotation": [ 0.334969, 0.476526, -0.248292, 0.773996], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 6.200713, 0.000002, 0.000008] - }, - { - "keytime": 0.444444, - "rotation": [ 0.338489, 0.475738, -0.224867, 0.780085], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 6.200712, 0.000002, 0.000000] - }, - { - "keytime": 0.472222, - "rotation": [ 0.344332, 0.468213, -0.202920, 0.788058], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 6.200714, 0.000000, -0.000008] - }, - { - "keytime": 0.500000, - "rotation": [ 0.349032, 0.459427, -0.188765, 0.794652], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 6.200712, -0.000002, -0.000008] - }, - { - "keytime": 0.527778, - "rotation": [ 0.358564, 0.448952, -0.174735, 0.799588], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 6.200714, -0.000000, 0.000008] - }, - { - "keytime": 0.555556, - "rotation": [ 0.365641, 0.439345, -0.163517, 0.804080], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 6.200713, 0.000002, 0.000000] - }, - { - "keytime": 0.583333, - "rotation": [ 0.368996, 0.437861, -0.155580, 0.804931], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 6.200712, 0.000000, -0.000000] - }, - { - "keytime": 0.611111, - "rotation": [ 0.372014, 0.435212, -0.153250, 0.805425], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 6.200712, 0.000002, 0.000008] - }, - { - "keytime": 0.638889, - "rotation": [ 0.364833, 0.442628, -0.158051, 0.803740], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 6.200712, 0.000000, 0.000000] - }, - { - "keytime": 0.666667, - "rotation": [ 0.357081, 0.448283, -0.168183, 0.802029], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 6.200712, 0.000002, -0.000000] - }, - { - "keytime": 0.694444, - "rotation": [ 0.338983, 0.454430, -0.192000, 0.801074], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 6.200713, 0.000000, 0.000000] - }, - { - "keytime": 0.722222, - "rotation": [ 0.319374, 0.456045, -0.222937, 0.800201], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 6.200712, -0.000004, -0.000000] - }, - { - "keytime": 0.750000, - "rotation": [ 0.293680, 0.453554, -0.259075, 0.800575], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 6.200712, 0.000002, 0.000008] - }, - { - "keytime": 0.777778, - "rotation": [ 0.265384, 0.445507, -0.297810, 0.801501], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 6.200712, 0.000000, 0.000008] - }, - { - "keytime": 0.805555, - "rotation": [ 0.241770, 0.436581, -0.331907, 0.800489], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 6.200714, 0.000002, 0.000000] - }, - { - "keytime": 0.833333, - "rotation": [ 0.217706, 0.426476, -0.361877, 0.799854], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 6.200712, 0.000002, -0.000008] - }, - { - "keytime": 0.861111, - "rotation": [ 0.195057, 0.414792, -0.389210, 0.799009], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 6.200711, -0.000002, -0.000008] - }, - { - "keytime": 0.888889, - "rotation": [ 0.177492, 0.402658, -0.413517, 0.797099], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 6.200714, -0.000002, -0.000000] - }, - { - "keytime": 0.916667, - "rotation": [ 0.166777, 0.393504, -0.433929, 0.793124], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 6.200712, -0.000000, 0.000000] - }, - { - "keytime": 0.944444, - "rotation": [ 0.161650, 0.389197, -0.450293, 0.787166], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 6.200714, 0.000004, -0.000000] - }, - { - "keytime": 0.972222, - "rotation": [ 0.159044, 0.387240, -0.464331, 0.780479], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 6.200714, 0.000002, 0.000008] - }, - { - "keytime": 1.000000, - "rotation": [ 0.154923, 0.384148, -0.479514, 0.773625], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 6.200710, -0.000004, -0.000008] - } - ] - }, - { - "boneId": "Bip001 L Finger0", - "keyframes": [ - { - "keytime": 0.000000, - "rotation": [ 0.752880, 0.138782, -0.000591, 0.643359], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.991688, 0.806480, -6.254307] - }, - { - "keytime": 0.027778, - "rotation": [ 0.752880, 0.138782, -0.000591, 0.643359], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.991680, 0.806473, -6.254311] - }, - { - "keytime": 0.055556, - "rotation": [ 0.752880, 0.138782, -0.000591, 0.643359], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.991680, 0.806469, -6.254311] - }, - { - "keytime": 0.083333, - "rotation": [ 0.752880, 0.138782, -0.000591, 0.643359], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.991680, 0.806473, -6.254311] - }, - { - "keytime": 0.111111, - "rotation": [ 0.752880, 0.138782, -0.000591, 0.643359], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.991684, 0.806477, -6.254314] - }, - { - "keytime": 0.166667, - "rotation": [ 0.752880, 0.138782, -0.000591, 0.643359], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.991684, 0.806477, -6.254311] - }, - { - "keytime": 0.194444, - "rotation": [ 0.752880, 0.138782, -0.000591, 0.643359], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.991684, 0.806473, -6.254314] - }, - { - "keytime": 0.222222, - "rotation": [ 0.752880, 0.138782, -0.000591, 0.643359], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.991684, 0.806477, -6.254311] - }, - { - "keytime": 0.250000, - "rotation": [ 0.752880, 0.138782, -0.000591, 0.643359], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.991676, 0.806473, -6.254311] - }, - { - "keytime": 0.277778, - "rotation": [ 0.752880, 0.138782, -0.000591, 0.643359], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.991684, 0.806473, -6.254311] - }, - { - "keytime": 0.305556, - "rotation": [ 0.752880, 0.138782, -0.000591, 0.643359], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.991684, 0.806473, -6.254314] - }, - { - "keytime": 0.333333, - "rotation": [ 0.752880, 0.138782, -0.000591, 0.643359], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.991692, 0.806469, -6.254313] - }, - { - "keytime": 0.361111, - "rotation": [ 0.752880, 0.138782, -0.000591, 0.643359], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.991684, 0.806469, -6.254314] - }, - { - "keytime": 0.388889, - "rotation": [ 0.752880, 0.138782, -0.000591, 0.643359], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.991669, 0.806471, -6.254313] - }, - { - "keytime": 0.416667, - "rotation": [ 0.752880, 0.138782, -0.000591, 0.643359], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.991684, 0.806473, -6.254314] - }, - { - "keytime": 0.444444, - "rotation": [ 0.752880, 0.138782, -0.000591, 0.643359], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.991692, 0.806473, -6.254312] - }, - { - "keytime": 0.500000, - "rotation": [ 0.752880, 0.138782, -0.000591, 0.643359], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.991684, 0.806473, -6.254312] - }, - { - "keytime": 0.527778, - "rotation": [ 0.752880, 0.138782, -0.000591, 0.643359], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.991676, 0.806473, -6.254311] - }, - { - "keytime": 0.555556, - "rotation": [ 0.752880, 0.138782, -0.000591, 0.643359], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.991676, 0.806471, -6.254307] - }, - { - "keytime": 0.583333, - "rotation": [ 0.752880, 0.138782, -0.000591, 0.643359], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.991676, 0.806473, -6.254311] - }, - { - "keytime": 0.611111, - "rotation": [ 0.752880, 0.138782, -0.000591, 0.643359], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.991688, 0.806474, -6.254311] - }, - { - "keytime": 0.638889, - "rotation": [ 0.752880, 0.138782, -0.000591, 0.643359], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.991684, 0.806473, -6.254318] - }, - { - "keytime": 0.666667, - "rotation": [ 0.752880, 0.138782, -0.000591, 0.643359], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.991680, 0.806473, -6.254311] - }, - { - "keytime": 0.694444, - "rotation": [ 0.752880, 0.138782, -0.000591, 0.643359], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.991684, 0.806471, -6.254314] - }, - { - "keytime": 0.722222, - "rotation": [ 0.752880, 0.138782, -0.000591, 0.643359], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.991688, 0.806472, -6.254311] - }, - { - "keytime": 0.750000, - "rotation": [ 0.752880, 0.138782, -0.000591, 0.643359], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.991676, 0.806471, -6.254307] - }, - { - "keytime": 0.777778, - "rotation": [ 0.752880, 0.138782, -0.000591, 0.643359], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.991684, 0.806473, -6.254311] - }, - { - "keytime": 0.805555, - "rotation": [ 0.752880, 0.138782, -0.000591, 0.643359], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.991684, 0.806471, -6.254313] - }, - { - "keytime": 0.833333, - "rotation": [ 0.752880, 0.138782, -0.000591, 0.643359], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.991692, 0.806475, -6.254311] - }, - { - "keytime": 0.861111, - "rotation": [ 0.752880, 0.138782, -0.000591, 0.643359], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.991684, 0.806469, -6.254311] - }, - { - "keytime": 0.888889, - "rotation": [ 0.752880, 0.138782, -0.000591, 0.643359], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.991676, 0.806473, -6.254312] - }, - { - "keytime": 0.916667, - "rotation": [ 0.752880, 0.138782, -0.000591, 0.643359], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.991676, 0.806469, -6.254311] - }, - { - "keytime": 0.944444, - "rotation": [ 0.752880, 0.138782, -0.000591, 0.643359], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.991692, 0.806477, -6.254314] - }, - { - "keytime": 0.972222, - "rotation": [ 0.752880, 0.138782, -0.000591, 0.643359], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.991688, 0.806473, -6.254311] - }, - { - "keytime": 1.000000, - "rotation": [ 0.752880, 0.138782, -0.000591, 0.643359], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.991684, 0.806473, -6.254311] - } - ] - }, - { - "boneId": "Bip001 L Forearm", - "keyframes": [ - { - "keytime": 0.000000, - "rotation": [-0.000000, 0.000000, -0.338236, 0.941061], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.361763, 0.000000, 0.000000] - }, - { - "keytime": 0.027778, - "rotation": [-0.000000, 0.000000, -0.332805, 0.942996], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.361755, -0.000002, 0.000000] - }, - { - "keytime": 0.055556, - "rotation": [-0.000000, 0.000000, -0.327347, 0.944904], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.361755, -0.000000, -0.000000] - }, - { - "keytime": 0.083333, - "rotation": [ 0.000000, -0.000000, -0.323445, 0.946247], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.361755, 0.000002, 0.000004] - }, - { - "keytime": 0.111111, - "rotation": [ 0.000000, 0.000000, -0.321647, 0.946860], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.361755, 0.000000, 0.000000] - }, - { - "keytime": 0.138889, - "rotation": [-0.000000, 0.000000, -0.320719, 0.947175], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.361763, -0.000000, -0.000004] - }, - { - "keytime": 0.166667, - "rotation": [ 0.000000, -0.000000, -0.320244, 0.947335], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.361755, -0.000000, -0.000000] - }, - { - "keytime": 0.194444, - "rotation": [-0.000000, 0.000000, -0.319790, 0.947488], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.361763, 0.000002, 0.000000] - }, - { - "keytime": 0.222222, - "rotation": [ 0.000000, 0.000000, -0.318961, 0.947768], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.361755, -0.000004, -0.000004] - }, - { - "keytime": 0.250000, - "rotation": [-0.000000, -0.000000, -0.317257, 0.948340], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.361755, 0.000000, 0.000000] - }, - { - "keytime": 0.277778, - "rotation": [-0.000000, -0.000000, -0.314348, 0.949308], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.361755, 0.000004, -0.000000] - }, - { - "keytime": 0.305556, - "rotation": [-0.000000, -0.000000, -0.311201, 0.950344], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.361748, -0.000004, 0.000004] - }, - { - "keytime": 0.333333, - "rotation": [-0.000000, 0.000000, -0.308458, 0.951238], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.361763, -0.000004, 0.000000] - }, - { - "keytime": 0.361111, - "rotation": [ 0.000000, 0.000000, -0.305413, 0.952220], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.361748, -0.000000, -0.000000] - }, - { - "keytime": 0.388889, - "rotation": [-0.000000, 0.000000, -0.301116, 0.953588], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.361755, 0.000000, -0.000000] - }, - { - "keytime": 0.416667, - "rotation": [-0.000000, -0.000000, -0.294455, 0.955665], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.361755, 0.000000, 0.000002] - }, - { - "keytime": 0.444444, - "rotation": [ 0.000000, 0.000000, -0.284929, 0.958549], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.361763, 0.000000, 0.000000] - }, - { - "keytime": 0.472222, - "rotation": [-0.000000, 0.000000, -0.271512, 0.962435], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.361748, -0.000000, 0.000000] - }, - { - "keytime": 0.500000, - "rotation": [-0.000000, 0.000000, -0.248787, 0.968558], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.361755, -0.000000, -0.000002] - }, - { - "keytime": 0.527778, - "rotation": [-0.000000, -0.000000, -0.217153, 0.976138], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.361755, -0.000000, -0.000000] - }, - { - "keytime": 0.555556, - "rotation": [ 0.000000, 0.000000, -0.180802, 0.983519], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.361755, 0.000000, 0.000000] - }, - { - "keytime": 0.583333, - "rotation": [-0.000000, 0.000000, -0.144597, 0.989491], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.361748, 0.000000, -0.000002] - }, - { - "keytime": 0.611111, - "rotation": [ 0.000000, 0.000000, -0.112739, 0.993625], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.361748, 0.000000, -0.000000] - }, - { - "keytime": 0.638889, - "rotation": [ 0.000000, 0.000000, -0.092224, 0.995738], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.361755, 0.000000, 0.000002] - }, - { - "keytime": 0.666667, - "rotation": [-0.000000, -0.000000, -0.087108, 0.996199], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.361748, 0.000000, 0.000000] - }, - { - "keytime": 0.694444, - "rotation": [-0.000000, 0.000000, -0.099520, 0.995036], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.361755, 0.000000, -0.000000] - }, - { - "keytime": 0.722222, - "rotation": [-0.000000, -0.000000, -0.124459, 0.992225], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.361763, -0.000004, 0.000000] - }, - { - "keytime": 0.750000, - "rotation": [-0.000000, 0.000000, -0.158429, 0.987370], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.361755, -0.000004, 0.000000] - }, - { - "keytime": 0.777778, - "rotation": [-0.000000, -0.000000, -0.199024, 0.979995], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.361748, -0.000000, 0.000000] - }, - { - "keytime": 0.805555, - "rotation": [-0.000000, -0.000000, -0.240195, 0.970725], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.361763, 0.000000, 0.000000] - }, - { - "keytime": 0.833333, - "rotation": [-0.000000, -0.000000, -0.279546, 0.960132], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.361755, 0.000000, -0.000000] - }, - { - "keytime": 0.861111, - "rotation": [ 0.000000, -0.000000, -0.314625, 0.949216], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.361755, 0.000000, 0.000004] - }, - { - "keytime": 0.888889, - "rotation": [-0.000000, 0.000000, -0.340147, 0.940372], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.361755, -0.000000, 0.000000] - }, - { - "keytime": 0.916667, - "rotation": [-0.000000, -0.000000, -0.351458, 0.936203], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.361755, 0.000002, -0.000000] - }, - { - "keytime": 0.944444, - "rotation": [ 0.000000, -0.000000, -0.349786, 0.936830], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.361763, 0.000000, 0.000008] - }, - { - "keytime": 0.972222, - "rotation": [ 0.000000, 0.000000, -0.342816, 0.939402], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.361748, -0.000000, 0.000000] - }, - { - "keytime": 1.000000, - "rotation": [-0.000000, 0.000000, -0.338236, 0.941061], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.361755, -0.000000, 0.000000] - } - ] - }, - { - "boneId": "Bip001 L Finger01", - "keyframes": [ - { - "keytime": 0.000000, - "rotation": [-0.000000, -0.000000, 0.134440, 0.990922], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 3.872093, -0.000004, 0.000004] - }, - { - "keytime": 0.027778, - "rotation": [ 0.000000, -0.000000, 0.083329, 0.996522], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 3.872097, -0.000000, 0.000000] - }, - { - "keytime": 0.055556, - "rotation": [ 0.000000, -0.000000, 0.031797, 0.999494], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 3.872097, 0.000008, -0.000000] - }, - { - "keytime": 0.083333, - "rotation": [-0.000000, -0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 3.872101, 0.000000, 0.000000] - }, - { - "keytime": 0.111111, - "rotation": [ 0.000000, 0.000000, -0.009839, 0.999952], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 3.872093, 0.000004, -0.000000] - }, - { - "keytime": 0.138889, - "rotation": [ 0.000000, 0.000000, -0.013726, 0.999906], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 3.872089, 0.000000, 0.000004] - }, - { - "keytime": 0.166667, - "rotation": [-0.000000, 0.000000, -0.013266, 0.999912], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 3.872097, -0.000000, 0.000000] - }, - { - "keytime": 0.194444, - "rotation": [ 0.000000, -0.000000, -0.009946, 0.999951], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 3.872093, -0.000000, -0.000000] - }, - { - "keytime": 0.222222, - "rotation": [ 0.000000, -0.000000, -0.005587, 0.999984], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 3.872093, 0.000004, 0.000000] - }, - { - "keytime": 0.250000, - "rotation": [-0.000000, 0.000000, -0.001651, 0.999999], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 3.872097, 0.000004, 0.000000] - }, - { - "keytime": 0.277778, - "rotation": [-0.000000, 0.000000, -0.000008, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 3.872086, -0.000004, 0.000004] - }, - { - "keytime": 0.305556, - "rotation": [-0.000000, 0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 3.872097, -0.000000, 0.000000] - }, - { - "keytime": 0.333333, - "rotation": [ 0.000000, 0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 3.872093, 0.000004, 0.000004] - }, - { - "keytime": 0.361111, - "rotation": [-0.000000, 0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 3.872097, 0.000000, 0.000000] - }, - { - "keytime": 0.388889, - "rotation": [ 0.000000, 0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 3.872093, 0.000000, 0.000002] - }, - { - "keytime": 0.416667, - "rotation": [-0.000000, -0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 3.872093, -0.000004, 0.000000] - }, - { - "keytime": 0.472222, - "rotation": [-0.000000, -0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 3.872093, 0.000000, 0.000000] - }, - { - "keytime": 0.555556, - "rotation": [ 0.000000, 0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 3.872093, -0.000000, -0.000000] - }, - { - "keytime": 0.583333, - "rotation": [ 0.000000, -0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 3.872101, 0.000000, 0.000002] - }, - { - "keytime": 0.611111, - "rotation": [-0.000000, -0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 3.872086, 0.000000, -0.000001] - }, - { - "keytime": 0.638889, - "rotation": [-0.000000, 0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 3.872097, 0.000000, -0.000000] - }, - { - "keytime": 0.666667, - "rotation": [-0.000000, 0.000000, 0.000017, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 3.872093, 0.000000, 0.000001] - }, - { - "keytime": 0.694444, - "rotation": [-0.000000, -0.000000, -0.001208, 0.999999], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 3.872093, 0.000000, 0.000001] - }, - { - "keytime": 0.722222, - "rotation": [-0.000000, -0.000000, -0.004147, 0.999991], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 3.872093, 0.000000, -0.000001] - }, - { - "keytime": 0.750000, - "rotation": [-0.000000, -0.000000, -0.007795, 0.999970], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 3.872101, -0.000004, 0.000001] - }, - { - "keytime": 0.777778, - "rotation": [ 0.000000, -0.000000, -0.011211, 0.999937], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 3.872086, -0.000002, -0.000002] - }, - { - "keytime": 0.805555, - "rotation": [-0.000000, 0.000000, -0.013154, 0.999914], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 3.872101, -0.000000, 0.000001] - }, - { - "keytime": 0.833333, - "rotation": [-0.000000, -0.000000, -0.012708, 0.999919], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 3.872094, 0.000000, -0.000001] - }, - { - "keytime": 0.861111, - "rotation": [ 0.000000, -0.000000, -0.008666, 0.999962], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 3.872078, -0.000002, 0.000002] - }, - { - "keytime": 0.888889, - "rotation": [ 0.000000, 0.000000, -0.000293, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 3.872086, -0.000000, 0.000000] - }, - { - "keytime": 0.916667, - "rotation": [-0.000000, -0.000000, 0.020233, 0.999795], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 3.872093, 0.000000, -0.000000] - }, - { - "keytime": 0.944444, - "rotation": [ 0.000000, 0.000000, 0.055778, 0.998443], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 3.872086, 0.000000, 0.000000] - }, - { - "keytime": 0.972222, - "rotation": [-0.000000, -0.000000, 0.095985, 0.995383], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 3.872086, -0.000004, 0.000000] - }, - { - "keytime": 1.000000, - "rotation": [-0.000000, -0.000000, 0.134440, 0.990922], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 3.872097, 0.000004, 0.000000] - } - ] - }, - { - "boneId": "Bip001 L Hand", - "keyframes": [ - { - "keytime": 0.000000, - "rotation": [-0.699693, 0.136675, -0.005068, 0.701230], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.590904, 0.000000, 0.000000] - }, - { - "keytime": 0.027778, - "rotation": [-0.699537, 0.125300, 0.010586, 0.703446], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.590919, 0.000000, -0.000000] - }, - { - "keytime": 0.055556, - "rotation": [-0.699108, 0.113856, 0.026382, 0.705400], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.590904, 0.000000, 0.000008] - }, - { - "keytime": 0.083333, - "rotation": [-0.699178, 0.104233, 0.027214, 0.706785], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.590908, -0.000004, 0.000004] - }, - { - "keytime": 0.111111, - "rotation": [-0.699785, 0.096088, 0.011296, 0.707771], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.590912, 0.000004, -0.000004] - }, - { - "keytime": 0.138889, - "rotation": [-0.700185, 0.087236, -0.010993, 0.708527], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.590897, -0.000004, 0.000008] - }, - { - "keytime": 0.166667, - "rotation": [-0.700161, 0.078433, -0.036957, 0.708701], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.590912, -0.000000, 0.000000] - }, - { - "keytime": 0.194444, - "rotation": [-0.699647, 0.070234, -0.064685, 0.708080], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.590919, 0.000002, -0.000000] - }, - { - "keytime": 0.222222, - "rotation": [-0.698839, 0.063927, -0.089806, 0.706734], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.590912, -0.000004, -0.000000] - }, - { - "keytime": 0.250000, - "rotation": [-0.698072, 0.059995, -0.110965, 0.704828], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.590919, 0.000004, 0.000000] - }, - { - "keytime": 0.277778, - "rotation": [-0.697881, 0.059482, -0.124213, 0.702848], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.590919, 0.000002, -0.000004] - }, - { - "keytime": 0.305556, - "rotation": [-0.698671, 0.064405, -0.131175, 0.700360], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.590912, 0.000001, -0.000000] - }, - { - "keytime": 0.333333, - "rotation": [-0.700357, 0.075178, -0.134604, 0.696944], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.590904, -0.000001, 0.000004] - }, - { - "keytime": 0.361111, - "rotation": [-0.702462, 0.088741, -0.134284, 0.693282], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.590904, 0.000000, 0.000000] - }, - { - "keytime": 0.388889, - "rotation": [-0.704690, 0.102930, -0.130356, 0.689800], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.590912, -0.000001, -0.000000] - }, - { - "keytime": 0.416667, - "rotation": [-0.706832, 0.115672, -0.122538, 0.687018], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.590904, -0.000000, 0.000000] - }, - { - "keytime": 0.444444, - "rotation": [-0.708548, 0.123801, -0.111311, 0.685742], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.590919, -0.000002, -0.000000] - }, - { - "keytime": 0.472222, - "rotation": [-0.709694, 0.125334, -0.096555, 0.686515], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.590912, 0.000002, 0.000004] - }, - { - "keytime": 0.500000, - "rotation": [-0.710054, 0.118094, -0.074981, 0.690113], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.590904, 0.000004, -0.000000] - }, - { - "keytime": 0.527778, - "rotation": [-0.709331, 0.103950, -0.046920, 0.695587], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.590912, 0.000004, -0.000000] - }, - { - "keytime": 0.555556, - "rotation": [-0.707273, 0.085349, -0.014353, 0.701623], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.590904, 0.000004, 0.000000] - }, - { - "keytime": 0.583333, - "rotation": [-0.703861, 0.064881, 0.020172, 0.707080], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.590919, -0.000004, -0.000002] - }, - { - "keytime": 0.611111, - "rotation": [-0.699318, 0.044652, 0.055065, 0.711287], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.590912, -0.000004, -0.000004] - }, - { - "keytime": 0.638889, - "rotation": [-0.694682, 0.028574, 0.085674, 0.713625], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.590912, -0.000008, -0.000000] - }, - { - "keytime": 0.666667, - "rotation": [-0.690923, 0.018769, 0.110455, 0.714194], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.590912, -0.000000, -0.000000] - }, - { - "keytime": 0.694444, - "rotation": [-0.688050, 0.014162, 0.132870, 0.713254], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.590904, 0.000000, 0.000002] - }, - { - "keytime": 0.722222, - "rotation": [-0.685485, 0.012087, 0.155204, 0.711250], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.590904, -0.000000, 0.000000] - }, - { - "keytime": 0.750000, - "rotation": [-0.683171, 0.012205, 0.176693, 0.708455], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.590912, -0.000000, -0.000004] - }, - { - "keytime": 0.777778, - "rotation": [-0.681177, 0.014486, 0.196418, 0.705130], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.590912, 0.000003, -0.000004] - }, - { - "keytime": 0.805555, - "rotation": [-0.679802, 0.018664, 0.211770, 0.701908], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.590904, -0.000001, 0.000004] - }, - { - "keytime": 0.833333, - "rotation": [-0.679195, 0.024640, 0.221962, 0.699156], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.590897, -0.000002, 0.000008] - }, - { - "keytime": 0.861111, - "rotation": [-0.679589, 0.032531, 0.225574, 0.697292], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.590912, 0.000002, 0.000000] - }, - { - "keytime": 0.888889, - "rotation": [-0.681070, 0.041668, 0.221092, 0.696796], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.590908, -0.000004, 0.000000] - }, - { - "keytime": 0.916667, - "rotation": [-0.686056, 0.057550, 0.192441, 0.699272], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.590916, 0.000006, -0.000008] - }, - { - "keytime": 0.944444, - "rotation": [-0.693600, 0.082801, 0.132758, 0.703163], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.590900, 0.000000, 0.000008] - }, - { - "keytime": 0.972222, - "rotation": [-0.698636, 0.110473, 0.062122, 0.704162], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.590908, -0.000006, 0.000008] - }, - { - "keytime": 1.000000, - "rotation": [-0.699693, 0.136675, -0.005068, 0.701230], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.590912, -0.000002, 0.000000] - } - ] - }, - { - "boneId": "Bip001 L Finger1", - "keyframes": [ - { - "keytime": 0.000000, - "rotation": [-0.000383, 0.000107, 0.269743, 0.962932], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.252796, -1.936867, -3.420071] - }, - { - "keytime": 0.027778, - "rotation": [-0.000387, 0.000094, 0.235550, 0.971862], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.252796, -1.936867, -3.420063] - }, - { - "keytime": 0.055556, - "rotation": [-0.000390, 0.000080, 0.200928, 0.979606], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.252796, -1.936867, -3.420063] - }, - { - "keytime": 0.083333, - "rotation": [-0.000392, 0.000071, 0.179470, 0.983763], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.252804, -1.936859, -3.420063] - }, - { - "keytime": 0.111111, - "rotation": [-0.000392, 0.000069, 0.172814, 0.984954], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.252796, -1.936867, -3.420067] - }, - { - "keytime": 0.138889, - "rotation": [-0.000392, 0.000068, 0.170181, 0.985413], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.252800, -1.936867, -3.420067] - }, - { - "keytime": 0.166667, - "rotation": [-0.000392, 0.000068, 0.170492, 0.985359], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.252796, -1.936867, -3.420071] - }, - { - "keytime": 0.194444, - "rotation": [-0.000392, 0.000069, 0.172741, 0.984967], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.252796, -1.936867, -3.420067] - }, - { - "keytime": 0.222222, - "rotation": [-0.000392, 0.000070, 0.175691, 0.984445], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.252800, -1.936863, -3.420067] - }, - { - "keytime": 0.250000, - "rotation": [-0.000392, 0.000071, 0.178353, 0.983966], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.252792, -1.936863, -3.420067] - }, - { - "keytime": 0.277778, - "rotation": [-0.000392, 0.000071, 0.179464, 0.983764], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.252804, -1.936859, -3.420059] - }, - { - "keytime": 0.305556, - "rotation": [-0.000392, 0.000071, 0.179470, 0.983763], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.252804, -1.936867, -3.420067] - }, - { - "keytime": 0.333333, - "rotation": [-0.000392, 0.000071, 0.179470, 0.983763], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.252811, -1.936863, -3.420065] - }, - { - "keytime": 0.361111, - "rotation": [-0.000392, 0.000071, 0.179470, 0.983763], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.252808, -1.936867, -3.420067] - }, - { - "keytime": 0.388889, - "rotation": [-0.000392, 0.000071, 0.179470, 0.983763], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.252792, -1.936865, -3.420067] - }, - { - "keytime": 0.416667, - "rotation": [-0.000392, 0.000071, 0.179470, 0.983763], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.252808, -1.936867, -3.420067] - }, - { - "keytime": 0.444444, - "rotation": [-0.000392, 0.000071, 0.179470, 0.983763], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.252808, -1.936863, -3.420064] - }, - { - "keytime": 0.472222, - "rotation": [-0.000392, 0.000071, 0.179470, 0.983763], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.252800, -1.936867, -3.420063] - }, - { - "keytime": 0.500000, - "rotation": [-0.000392, 0.000071, 0.179470, 0.983763], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.252792, -1.936863, -3.420068] - }, - { - "keytime": 0.555556, - "rotation": [-0.000392, 0.000071, 0.179470, 0.983763], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.252792, -1.936867, -3.420065] - }, - { - "keytime": 0.583333, - "rotation": [-0.000392, 0.000071, 0.179470, 0.983763], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.252792, -1.936864, -3.420067] - }, - { - "keytime": 0.611111, - "rotation": [-0.000392, 0.000071, 0.179470, 0.983763], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.252808, -1.936866, -3.420067] - }, - { - "keytime": 0.638889, - "rotation": [-0.000392, 0.000071, 0.179470, 0.983763], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.252808, -1.936866, -3.420074] - }, - { - "keytime": 0.666667, - "rotation": [-0.000392, 0.000071, 0.179482, 0.983761], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.252792, -1.936866, -3.420067] - }, - { - "keytime": 0.694444, - "rotation": [-0.000392, 0.000071, 0.178653, 0.983912], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.252804, -1.936867, -3.420063] - }, - { - "keytime": 0.722222, - "rotation": [-0.000392, 0.000070, 0.176665, 0.984271], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.252792, -1.936865, -3.420059] - }, - { - "keytime": 0.750000, - "rotation": [-0.000392, 0.000069, 0.174197, 0.984711], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.252800, -1.936867, -3.420067] - }, - { - "keytime": 0.777778, - "rotation": [-0.000392, 0.000068, 0.171885, 0.985117], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.252800, -1.936867, -3.420063] - }, - { - "keytime": 0.805555, - "rotation": [-0.000392, 0.000068, 0.170569, 0.985346], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.252792, -1.936865, -3.420067] - }, - { - "keytime": 0.833333, - "rotation": [-0.000392, 0.000068, 0.170871, 0.985293], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.252800, -1.936867, -3.420065] - }, - { - "keytime": 0.861111, - "rotation": [-0.000392, 0.000069, 0.173607, 0.984815], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.252792, -1.936867, -3.420066] - }, - { - "keytime": 0.888889, - "rotation": [-0.000392, 0.000071, 0.179272, 0.983799], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.252808, -1.936863, -3.420066] - }, - { - "keytime": 0.916667, - "rotation": [-0.000391, 0.000077, 0.193133, 0.981173], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.252792, -1.936871, -3.420069] - }, - { - "keytime": 0.944444, - "rotation": [-0.000389, 0.000086, 0.217061, 0.976158], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.252800, -1.936867, -3.420067] - }, - { - "keytime": 0.972222, - "rotation": [-0.000386, 0.000097, 0.244029, 0.969768], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.252800, -1.936867, -3.420067] - }, - { - "keytime": 1.000000, - "rotation": [-0.000383, 0.000107, 0.269743, 0.962932], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.252792, -1.936867, -3.420071] - } - ] - }, - { - "boneId": "Bip001 L Finger0Nub", - "keyframes": [ - { - "keytime": 0.000000, - "rotation": [ 0.000000, -0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 2.278828, -0.000004, 0.000004] - }, - { - "keytime": 0.027778, - "rotation": [-0.000000, 0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 2.278820, -0.000004, 0.000000] - }, - { - "keytime": 0.055556, - "rotation": [ 0.000000, 0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 2.278828, -0.000004, -0.000000] - }, - { - "keytime": 0.083333, - "rotation": [-0.000000, -0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 2.278824, 0.000000, 0.000000] - }, - { - "keytime": 0.111111, - "rotation": [-0.000000, -0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 2.278824, -0.000000, 0.000008] - }, - { - "keytime": 0.138889, - "rotation": [ 0.000000, -0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 2.278831, 0.000004, -0.000004] - }, - { - "keytime": 0.166667, - "rotation": [-0.000000, -0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 2.278820, -0.000004, -0.000000] - }, - { - "keytime": 0.194444, - "rotation": [ 0.000000, -0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 2.278831, -0.000000, -0.000000] - }, - { - "keytime": 0.222222, - "rotation": [-0.000000, -0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 2.278831, -0.000004, 0.000004] - }, - { - "keytime": 0.250000, - "rotation": [ 0.000000, 0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 2.278824, -0.000000, 0.000000] - }, - { - "keytime": 0.277778, - "rotation": [-0.000000, 0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 2.278831, 0.000000, -0.000004] - }, - { - "keytime": 0.305556, - "rotation": [-0.000000, 0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 2.278828, 0.000000, -0.000000] - }, - { - "keytime": 0.333333, - "rotation": [ 0.000000, 0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 2.278831, -0.000004, 0.000000] - }, - { - "keytime": 0.361111, - "rotation": [-0.000000, 0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 2.278824, -0.000000, 0.000000] - }, - { - "keytime": 0.388889, - "rotation": [ 0.000000, 0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 2.278831, -0.000000, 0.000000] - }, - { - "keytime": 0.416667, - "rotation": [-0.000000, -0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 2.278824, 0.000004, 0.000000] - }, - { - "keytime": 0.444444, - "rotation": [ 0.000000, 0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 2.278824, 0.000000, 0.000000] - }, - { - "keytime": 0.472222, - "rotation": [-0.000000, -0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 2.278831, -0.000000, -0.000001] - }, - { - "keytime": 0.500000, - "rotation": [ 0.000000, 0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 2.278824, 0.000000, 0.000000] - }, - { - "keytime": 0.527778, - "rotation": [ 0.000000, 0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 2.278831, -0.000000, 0.000001] - }, - { - "keytime": 0.555556, - "rotation": [ 0.000000, 0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 2.278816, 0.000001, 0.000001] - }, - { - "keytime": 0.583333, - "rotation": [ 0.000000, -0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 2.278824, 0.000000, -0.000001] - }, - { - "keytime": 0.611111, - "rotation": [-0.000000, -0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 2.278831, 0.000000, -0.000000] - }, - { - "keytime": 0.638889, - "rotation": [-0.000000, 0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 2.278831, -0.000004, 0.000000] - }, - { - "keytime": 0.694444, - "rotation": [ 0.000000, 0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 2.278824, 0.000000, -0.000001] - }, - { - "keytime": 0.722222, - "rotation": [ 0.000000, 0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 2.278824, -0.000000, 0.000002] - }, - { - "keytime": 0.777778, - "rotation": [-0.000000, 0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 2.278824, 0.000001, 0.000001] - }, - { - "keytime": 0.805555, - "rotation": [-0.000000, 0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 2.278831, 0.000000, -0.000001] - }, - { - "keytime": 0.833333, - "rotation": [-0.000000, -0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 2.278824, 0.000000, 0.000001] - }, - { - "keytime": 0.861111, - "rotation": [ 0.000000, 0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 2.278831, 0.000000, 0.000000] - }, - { - "keytime": 0.888889, - "rotation": [ 0.000000, 0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 2.278831, -0.000002, -0.000000] - }, - { - "keytime": 0.916667, - "rotation": [ 0.000000, 0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 2.278824, 0.000002, 0.000004] - }, - { - "keytime": 0.944444, - "rotation": [-0.000000, -0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 2.278824, 0.000000, 0.000000] - }, - { - "keytime": 0.972222, - "rotation": [-0.000000, -0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 2.278828, -0.000000, -0.000000] - }, - { - "keytime": 1.000000, - "rotation": [-0.000000, 0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 2.278831, 0.000000, -0.000000] - } - ] - }, - { - "boneId": "Bip001 L Finger11", - "keyframes": [ - { - "keytime": 0.000000, - "rotation": [ 0.000000, 0.000000, 0.245693, 0.969348], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.013481, 0.000004, -0.000004] - }, - { - "keytime": 0.027778, - "rotation": [-0.000000, 0.000000, 0.152972, 0.988231], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.013496, -0.000002, -0.000004] - }, - { - "keytime": 0.055556, - "rotation": [-0.000000, -0.000000, 0.058510, 0.998287], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.013493, 0.000004, 0.000004] - }, - { - "keytime": 0.083333, - "rotation": [ 0.000000, 0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.013481, 0.000000, 0.000004] - }, - { - "keytime": 0.111111, - "rotation": [ 0.000000, 0.000000, -0.018111, 0.999836], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.013489, -0.000002, 0.000000] - }, - { - "keytime": 0.138889, - "rotation": [ 0.000000, -0.000000, -0.025266, 0.999681], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.013493, 0.000002, -0.000000] - }, - { - "keytime": 0.166667, - "rotation": [-0.000000, 0.000000, -0.024420, 0.999702], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.013489, 0.000000, -0.000000] - }, - { - "keytime": 0.194444, - "rotation": [-0.000000, 0.000000, -0.018308, 0.999832], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.013481, -0.000000, 0.000004] - }, - { - "keytime": 0.222222, - "rotation": [ 0.000000, 0.000000, -0.010285, 0.999947], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.013496, 0.000000, 0.000004] - }, - { - "keytime": 0.250000, - "rotation": [-0.000000, 0.000000, -0.003040, 0.999995], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.013489, -0.000002, -0.000004] - }, - { - "keytime": 0.277778, - "rotation": [-0.000000, 0.000000, -0.000015, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.013489, -0.000002, -0.000000] - }, - { - "keytime": 0.305556, - "rotation": [ 0.000000, -0.000000, 0.000001, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.013489, 0.000002, -0.000004] - }, - { - "keytime": 0.361111, - "rotation": [ 0.000000, -0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.013489, -0.000002, -0.000000] - }, - { - "keytime": 0.388889, - "rotation": [ 0.000000, -0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.013489, 0.000002, 0.000002] - }, - { - "keytime": 0.444444, - "rotation": [ 0.000000, 0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.013489, -0.000001, -0.000000] - }, - { - "keytime": 0.472222, - "rotation": [-0.000000, 0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.013481, 0.000001, -0.000000] - }, - { - "keytime": 0.500000, - "rotation": [ 0.000000, -0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.013489, -0.000003, 0.000001] - }, - { - "keytime": 0.527778, - "rotation": [-0.000000, 0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.013489, 0.000002, 0.000000] - }, - { - "keytime": 0.555556, - "rotation": [-0.000000, -0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.013489, 0.000001, -0.000004] - }, - { - "keytime": 0.583333, - "rotation": [ 0.000000, 0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.013481, 0.000002, -0.000004] - }, - { - "keytime": 0.611111, - "rotation": [-0.000000, -0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.013489, 0.000000, -0.000000] - }, - { - "keytime": 0.638889, - "rotation": [-0.000000, -0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.013481, 0.000000, 0.000000] - }, - { - "keytime": 0.666667, - "rotation": [-0.000000, 0.000000, 0.000032, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.013489, -0.000002, -0.000000] - }, - { - "keytime": 0.694444, - "rotation": [ 0.000000, 0.000000, -0.002224, 0.999998], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.013489, -0.000002, 0.000000] - }, - { - "keytime": 0.722222, - "rotation": [ 0.000000, 0.000000, -0.007634, 0.999971], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.013489, -0.000000, 0.000000] - }, - { - "keytime": 0.750000, - "rotation": [ 0.000000, 0.000000, -0.014349, 0.999897], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.013485, 0.000000, 0.000000] - }, - { - "keytime": 0.777778, - "rotation": [ 0.000000, 0.000000, -0.020636, 0.999787], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.013496, -0.000002, -0.000000] - }, - { - "keytime": 0.805555, - "rotation": [-0.000000, -0.000000, -0.024212, 0.999707], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.013481, -0.000000, 0.000002] - }, - { - "keytime": 0.833333, - "rotation": [ 0.000000, -0.000000, -0.023392, 0.999726], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.013489, 0.000000, 0.000001] - }, - { - "keytime": 0.861111, - "rotation": [ 0.000000, -0.000000, -0.015953, 0.999873], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.013489, -0.000000, 0.000000] - }, - { - "keytime": 0.888889, - "rotation": [-0.000000, 0.000000, -0.000539, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.013481, -0.000000, -0.000002] - }, - { - "keytime": 0.916667, - "rotation": [-0.000000, 0.000000, 0.037240, 0.999306], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.013481, 0.000003, -0.000002] - }, - { - "keytime": 0.944444, - "rotation": [-0.000000, -0.000000, 0.102552, 0.994728], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.013489, -0.000002, 0.000004] - }, - { - "keytime": 0.972222, - "rotation": [ 0.000000, 0.000000, 0.176044, 0.984382], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.013489, -0.000002, -0.000004] - }, - { - "keytime": 1.000000, - "rotation": [ 0.000000, 0.000000, 0.245693, 0.969348], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.013489, -0.000002, -0.000004] - } - ] - }, - { - "boneId": "Bip001 L Finger2", - "keyframes": [ - { - "keytime": 0.000000, - "rotation": [-0.044664, 0.006068, 0.372772, 0.926827], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.877846, -0.823425, 0.439365] - }, - { - "keytime": 0.027778, - "rotation": [-0.044879, 0.004188, 0.333548, 0.941655], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.877842, -0.823425, 0.439373] - }, - { - "keytime": 0.055556, - "rotation": [-0.045015, 0.002296, 0.293628, 0.954857], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.877842, -0.823425, 0.439369] - }, - { - "keytime": 0.083333, - "rotation": [-0.045065, 0.000887, 0.263620, 0.963573], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.877842, -0.823425, 0.439369] - }, - { - "keytime": 0.111111, - "rotation": [-0.045074, 0.000019, 0.245013, 0.968472], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.877838, -0.823425, 0.439365] - }, - { - "keytime": 0.138889, - "rotation": [-0.045068, -0.000745, 0.228563, 0.972485], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.877846, -0.823421, 0.439369] - }, - { - "keytime": 0.166667, - "rotation": [-0.045052, -0.001410, 0.214177, 0.975754], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.877846, -0.823425, 0.439369] - }, - { - "keytime": 0.194444, - "rotation": [-0.045029, -0.001999, 0.201402, 0.978471], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.877838, -0.823429, 0.439365] - }, - { - "keytime": 0.222222, - "rotation": [-0.045005, -0.002483, 0.190879, 0.980578], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.877846, -0.823421, 0.439373] - }, - { - "keytime": 0.250000, - "rotation": [-0.044981, -0.002897, 0.181847, 0.982293], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.877846, -0.823425, 0.439369] - }, - { - "keytime": 0.277778, - "rotation": [-0.044958, -0.003223, 0.174711, 0.983588], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.877842, -0.823418, 0.439373] - }, - { - "keytime": 0.305556, - "rotation": [-0.044943, -0.003438, 0.170002, 0.984412], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.877842, -0.823425, 0.439365] - }, - { - "keytime": 0.333333, - "rotation": [-0.044936, -0.003525, 0.168101, 0.984739], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.877853, -0.823425, 0.439367] - }, - { - "keytime": 0.361111, - "rotation": [-0.044937, -0.003514, 0.168354, 0.984696], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.877846, -0.823425, 0.439363] - }, - { - "keytime": 0.388889, - "rotation": [-0.044942, -0.003443, 0.169899, 0.984430], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.877846, -0.823423, 0.439369] - }, - { - "keytime": 0.416667, - "rotation": [-0.044950, -0.003346, 0.172032, 0.984060], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.877846, -0.823425, 0.439365] - }, - { - "keytime": 0.444444, - "rotation": [-0.044956, -0.003263, 0.173852, 0.983740], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.877853, -0.823425, 0.439368] - }, - { - "keytime": 0.472222, - "rotation": [-0.044958, -0.003226, 0.174643, 0.983600], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.877846, -0.823427, 0.439370] - }, - { - "keytime": 0.500000, - "rotation": [-0.044958, -0.003226, 0.174651, 0.983598], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.877846, -0.823425, 0.439366] - }, - { - "keytime": 0.527778, - "rotation": [-0.044958, -0.003226, 0.174651, 0.983598], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.877846, -0.823425, 0.439367] - }, - { - "keytime": 0.555556, - "rotation": [-0.044958, -0.003226, 0.174651, 0.983598], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.877846, -0.823425, 0.439369] - }, - { - "keytime": 0.583333, - "rotation": [-0.044958, -0.003226, 0.174651, 0.983598], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.877838, -0.823424, 0.439369] - }, - { - "keytime": 0.611111, - "rotation": [-0.044958, -0.003226, 0.174651, 0.983598], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.877846, -0.823426, 0.439369] - }, - { - "keytime": 0.638889, - "rotation": [-0.044958, -0.003226, 0.174651, 0.983598], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.877838, -0.823424, 0.439362] - }, - { - "keytime": 0.666667, - "rotation": [-0.044958, -0.003225, 0.174678, 0.983593], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.877850, -0.823427, 0.439369] - }, - { - "keytime": 0.694444, - "rotation": [-0.044952, -0.003309, 0.172830, 0.983920], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.877846, -0.823424, 0.439365] - }, - { - "keytime": 0.722222, - "rotation": [-0.044937, -0.003512, 0.168396, 0.984688], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.877842, -0.823427, 0.439365] - }, - { - "keytime": 0.750000, - "rotation": [-0.044917, -0.003763, 0.162888, 0.985614], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.877846, -0.823423, 0.439365] - }, - { - "keytime": 0.777778, - "rotation": [-0.044896, -0.003998, 0.157726, 0.986454], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.877846, -0.823425, 0.439369] - }, - { - "keytime": 0.805555, - "rotation": [-0.044884, -0.004132, 0.154788, 0.986919], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.877846, -0.823427, 0.439365] - }, - { - "keytime": 0.833333, - "rotation": [-0.044887, -0.004101, 0.155462, 0.986813], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.877846, -0.823425, 0.439369] - }, - { - "keytime": 0.861111, - "rotation": [-0.044912, -0.003823, 0.161572, 0.985831], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.877846, -0.823429, 0.439368] - }, - { - "keytime": 0.888889, - "rotation": [-0.044958, -0.003246, 0.174210, 0.983676], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.877838, -0.823421, 0.439368] - }, - { - "keytime": 0.916667, - "rotation": [-0.045039, -0.001830, 0.205065, 0.977710], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.877846, -0.823425, 0.439367] - }, - { - "keytime": 0.944444, - "rotation": [-0.045070, 0.000627, 0.258039, 0.965082], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.877846, -0.823425, 0.439369] - }, - { - "keytime": 0.972222, - "rotation": [-0.044944, 0.003409, 0.317155, 0.947302], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.877846, -0.823425, 0.439369] - }, - { - "keytime": 1.000000, - "rotation": [-0.044664, 0.006068, 0.372772, 0.926827], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.877846, -0.823433, 0.439365] - } - ] - }, - { - "boneId": "Bip001 L Finger1Nub", - "keyframes": [ - { - "keytime": 0.000000, - "rotation": [ 0.000000, -0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.151039, -0.000000, 0.000004] - }, - { - "keytime": 0.027778, - "rotation": [-0.000000, 0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.151039, 0.000000, 0.000000] - }, - { - "keytime": 0.055556, - "rotation": [-0.000000, -0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.151035, -0.000004, -0.000000] - }, - { - "keytime": 0.083333, - "rotation": [ 0.000000, 0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.151043, -0.000002, -0.000000] - }, - { - "keytime": 0.166667, - "rotation": [-0.000000, -0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.151039, 0.000000, 0.000000] - }, - { - "keytime": 0.222222, - "rotation": [-0.000000, -0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.151035, -0.000004, -0.000000] - }, - { - "keytime": 0.250000, - "rotation": [-0.000000, 0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.151043, 0.000000, 0.000000] - }, - { - "keytime": 0.277778, - "rotation": [-0.000000, 0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.151039, 0.000000, -0.000000] - }, - { - "keytime": 0.305556, - "rotation": [ 0.000000, -0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.151035, -0.000002, 0.000004] - }, - { - "keytime": 0.333333, - "rotation": [ 0.000000, 0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.151039, 0.000002, -0.000000] - }, - { - "keytime": 0.361111, - "rotation": [ 0.000000, -0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.151031, 0.000002, -0.000000] - }, - { - "keytime": 0.388889, - "rotation": [ 0.000000, -0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.151039, 0.000000, 0.000000] - }, - { - "keytime": 0.444444, - "rotation": [ 0.000000, 0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.151039, 0.000000, -0.000000] - }, - { - "keytime": 0.472222, - "rotation": [-0.000000, 0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.151047, -0.000002, 0.000001] - }, - { - "keytime": 0.500000, - "rotation": [ 0.000000, -0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.151039, 0.000001, -0.000001] - }, - { - "keytime": 0.527778, - "rotation": [-0.000000, 0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.151039, 0.000000, -0.000000] - }, - { - "keytime": 0.555556, - "rotation": [-0.000000, -0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.151035, -0.000002, 0.000000] - }, - { - "keytime": 0.583333, - "rotation": [ 0.000000, 0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.151039, 0.000001, 0.000000] - }, - { - "keytime": 0.611111, - "rotation": [-0.000000, -0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.151035, -0.000000, 0.000000] - }, - { - "keytime": 0.638889, - "rotation": [-0.000000, -0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.151043, 0.000002, 0.000000] - }, - { - "keytime": 0.666667, - "rotation": [-0.000000, 0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.151039, 0.000000, -0.000000] - }, - { - "keytime": 0.694444, - "rotation": [-0.000000, 0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.151035, 0.000002, 0.000000] - }, - { - "keytime": 0.722222, - "rotation": [-0.000000, 0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.151039, 0.000002, 0.000000] - }, - { - "keytime": 0.777778, - "rotation": [ 0.000000, -0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.151039, -0.000000, 0.000000] - }, - { - "keytime": 0.805555, - "rotation": [-0.000000, -0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.151039, 0.000000, -0.000002] - }, - { - "keytime": 0.833333, - "rotation": [-0.000000, -0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.151047, -0.000003, -0.000000] - }, - { - "keytime": 0.861111, - "rotation": [ 0.000000, -0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.151039, 0.000001, 0.000000] - }, - { - "keytime": 0.888889, - "rotation": [-0.000000, 0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.151047, -0.000001, 0.000002] - }, - { - "keytime": 0.916667, - "rotation": [-0.000000, -0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.151047, 0.000000, 0.000000] - }, - { - "keytime": 0.944444, - "rotation": [ 0.000000, 0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.151039, -0.000002, -0.000000] - }, - { - "keytime": 0.972222, - "rotation": [ 0.000000, -0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.151039, -0.000004, 0.000004] - }, - { - "keytime": 1.000000, - "rotation": [ 0.000000, -0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.151031, -0.000002, 0.000000] - } - ] - }, - { - "boneId": "Bip001 L Finger21", - "keyframes": [ - { - "keytime": 0.000000, - "rotation": [ 0.000000, 0.000000, 0.275862, 0.961197], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.603943, -0.000002, -0.000000] - }, - { - "keytime": 0.027778, - "rotation": [ 0.000000, 0.000000, 0.268419, 0.963302], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.603943, 0.000002, -0.000004] - }, - { - "keytime": 0.055556, - "rotation": [-0.000000, 0.000000, 0.261063, 0.965322], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.603935, 0.000002, -0.000000] - }, - { - "keytime": 0.083333, - "rotation": [-0.000000, -0.000000, 0.242620, 0.970122], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.603943, -0.000001, -0.000000] - }, - { - "keytime": 0.111111, - "rotation": [ 0.000000, 0.000000, 0.211833, 0.977306], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.603947, 0.000000, -0.000004] - }, - { - "keytime": 0.138889, - "rotation": [ 0.000000, -0.000000, 0.174991, 0.984570], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.603943, -0.000002, -0.000000] - }, - { - "keytime": 0.166667, - "rotation": [-0.000000, -0.000000, 0.134913, 0.990857], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.603943, -0.000004, 0.000004] - }, - { - "keytime": 0.194444, - "rotation": [-0.000000, -0.000000, 0.093328, 0.995635], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.603943, -0.000002, 0.000008] - }, - { - "keytime": 0.222222, - "rotation": [-0.000000, -0.000000, 0.055712, 0.998447], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.603939, -0.000000, -0.000004] - }, - { - "keytime": 0.250000, - "rotation": [-0.000000, -0.000000, 0.023011, 0.999735], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.603935, -0.000000, -0.000000] - }, - { - "keytime": 0.277778, - "rotation": [-0.000000, 0.000000, 0.000180, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.603951, 0.000000, -0.000000] - }, - { - "keytime": 0.305556, - "rotation": [-0.000000, -0.000000, -0.012680, 0.999920], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.603928, 0.000000, 0.000004] - }, - { - "keytime": 0.333333, - "rotation": [-0.000000, 0.000000, -0.017861, 0.999840], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.603943, -0.000004, 0.000004] - }, - { - "keytime": 0.361111, - "rotation": [-0.000000, 0.000000, -0.017172, 0.999853], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.603935, -0.000000, -0.000002] - }, - { - "keytime": 0.388889, - "rotation": [ 0.000000, 0.000000, -0.012960, 0.999916], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.603943, 0.000001, -0.000002] - }, - { - "keytime": 0.416667, - "rotation": [ 0.000000, 0.000000, -0.007145, 0.999974], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.603943, -0.000002, 0.000002] - }, - { - "keytime": 0.444444, - "rotation": [-0.000000, -0.000000, -0.002179, 0.999998], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.603935, -0.000001, 0.000002] - }, - { - "keytime": 0.472222, - "rotation": [ 0.000000, -0.000000, -0.000022, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.603943, 0.000001, 0.000001] - }, - { - "keytime": 0.500000, - "rotation": [ 0.000000, -0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.603943, 0.000000, -0.000002] - }, - { - "keytime": 0.527778, - "rotation": [ 0.000000, -0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.603943, 0.000003, 0.000002] - }, - { - "keytime": 0.555556, - "rotation": [ 0.000000, -0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.603951, -0.000002, 0.000000] - }, - { - "keytime": 0.583333, - "rotation": [ 0.000000, 0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.603947, -0.000004, -0.000000] - }, - { - "keytime": 0.611111, - "rotation": [-0.000000, -0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.603943, 0.000004, -0.000000] - }, - { - "keytime": 0.638889, - "rotation": [-0.000000, 0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.603939, -0.000002, -0.000000] - }, - { - "keytime": 0.666667, - "rotation": [-0.000000, 0.000000, 0.000036, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.603943, -0.000000, -0.000000] - }, - { - "keytime": 0.694444, - "rotation": [-0.000000, -0.000000, -0.002504, 0.999997], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.603939, 0.000002, -0.000000] - }, - { - "keytime": 0.722222, - "rotation": [ 0.000000, -0.000000, -0.008595, 0.999963], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.603939, -0.000002, 0.000004] - }, - { - "keytime": 0.750000, - "rotation": [-0.000000, 0.000000, -0.016156, 0.999869], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.603935, -0.000002, 0.000000] - }, - { - "keytime": 0.777778, - "rotation": [-0.000000, 0.000000, -0.023234, 0.999730], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.603935, -0.000000, -0.000000] - }, - { - "keytime": 0.805555, - "rotation": [ 0.000000, 0.000000, -0.027260, 0.999628], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.603943, 0.000004, -0.000000] - }, - { - "keytime": 0.833333, - "rotation": [-0.000000, 0.000000, -0.026336, 0.999653], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.603943, -0.000002, 0.000001] - }, - { - "keytime": 0.861111, - "rotation": [-0.000000, 0.000000, -0.017961, 0.999839], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.603935, 0.000002, -0.000000] - }, - { - "keytime": 0.888889, - "rotation": [-0.000000, -0.000000, -0.000607, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.603943, 0.000000, -0.000000] - }, - { - "keytime": 0.916667, - "rotation": [ 0.000000, 0.000000, 0.041925, 0.999121], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.603935, 0.000000, -0.000000] - }, - { - "keytime": 0.944444, - "rotation": [ 0.000000, 0.000000, 0.115408, 0.993318], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.603943, -0.000006, 0.000002] - }, - { - "keytime": 0.972222, - "rotation": [-0.000000, 0.000000, 0.197930, 0.980216], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.603951, -0.000000, 0.000004] - }, - { - "keytime": 1.000000, - "rotation": [ 0.000000, 0.000000, 0.275862, 0.961197], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.603943, 0.000002, -0.000004] - } - ] - }, - { - "boneId": "Bip001 R Finger1", - "keyframes": [ - { - "keytime": 0.000000, - "rotation": [ 0.000392, -0.000071, 0.179470, 0.983763], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.252800, -1.936865, 3.420065] - }, - { - "keytime": 0.027778, - "rotation": [ 0.000392, -0.000071, 0.179470, 0.983763], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.252800, -1.936865, 3.420066] - }, - { - "keytime": 0.055556, - "rotation": [ 0.000392, -0.000071, 0.179470, 0.983763], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.252808, -1.936867, 3.420065] - }, - { - "keytime": 0.083333, - "rotation": [ 0.000392, -0.000071, 0.179470, 0.983763], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.252800, -1.936867, 3.420066] - }, - { - "keytime": 0.111111, - "rotation": [ 0.000392, -0.000071, 0.179470, 0.983763], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.252792, -1.936863, 3.420067] - }, - { - "keytime": 0.138889, - "rotation": [ 0.000392, -0.000071, 0.179470, 0.983763], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.252800, -1.936867, 3.420066] - }, - { - "keytime": 0.166667, - "rotation": [ 0.000392, -0.000071, 0.179470, 0.983763], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.252800, -1.936867, 3.420065] - }, - { - "keytime": 0.194444, - "rotation": [ 0.000392, -0.000071, 0.179470, 0.983763], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.252777, -1.936867, 3.420067] - }, - { - "keytime": 0.222222, - "rotation": [ 0.000392, -0.000071, 0.179470, 0.983763], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.252808, -1.936867, 3.420065] - }, - { - "keytime": 0.277778, - "rotation": [ 0.000392, -0.000071, 0.179470, 0.983763], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.252800, -1.936863, 3.420067] - }, - { - "keytime": 0.305556, - "rotation": [ 0.000392, -0.000071, 0.179470, 0.983763], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.252796, -1.936867, 3.420067] - }, - { - "keytime": 0.333333, - "rotation": [ 0.000392, -0.000071, 0.179470, 0.983763], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.252796, -1.936867, 3.420063] - }, - { - "keytime": 0.361111, - "rotation": [ 0.000392, -0.000071, 0.179470, 0.983763], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.252796, -1.936863, 3.420071] - }, - { - "keytime": 0.388889, - "rotation": [ 0.000392, -0.000071, 0.179470, 0.983763], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.252800, -1.936867, 3.420071] - }, - { - "keytime": 0.416667, - "rotation": [ 0.000392, -0.000071, 0.179470, 0.983763], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.252800, -1.936874, 3.420074] - }, - { - "keytime": 0.444444, - "rotation": [ 0.000392, -0.000071, 0.179470, 0.983763], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.252800, -1.936867, 3.420067] - }, - { - "keytime": 0.472222, - "rotation": [ 0.000392, -0.000071, 0.179470, 0.983763], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.252800, -1.936874, 3.420067] - }, - { - "keytime": 0.500000, - "rotation": [ 0.000392, -0.000071, 0.179470, 0.983763], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.252800, -1.936867, 3.420067] - }, - { - "keytime": 0.527778, - "rotation": [ 0.000392, -0.000071, 0.179470, 0.983763], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.252800, -1.936874, 3.420067] - }, - { - "keytime": 0.555556, - "rotation": [ 0.000392, -0.000071, 0.179470, 0.983763], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.252800, -1.936867, 3.420067] - }, - { - "keytime": 0.583333, - "rotation": [ 0.000392, -0.000071, 0.179470, 0.983763], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.252800, -1.936867, 3.420071] - }, - { - "keytime": 0.611111, - "rotation": [ 0.000392, -0.000071, 0.179470, 0.983763], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.252796, -1.936867, 3.420063] - }, - { - "keytime": 0.638889, - "rotation": [ 0.000392, -0.000071, 0.179470, 0.983763], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.252800, -1.936867, 3.420067] - }, - { - "keytime": 0.666667, - "rotation": [ 0.000392, -0.000071, 0.179470, 0.983763], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.252792, -1.936867, 3.420071] - }, - { - "keytime": 0.694444, - "rotation": [ 0.000392, -0.000071, 0.179470, 0.983763], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.252804, -1.936863, 3.420067] - }, - { - "keytime": 0.722222, - "rotation": [ 0.000392, -0.000071, 0.179470, 0.983763], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.252796, -1.936867, 3.420069] - }, - { - "keytime": 0.750000, - "rotation": [ 0.000392, -0.000071, 0.179470, 0.983763], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.252800, -1.936867, 3.420069] - }, - { - "keytime": 0.777778, - "rotation": [ 0.000392, -0.000071, 0.179470, 0.983763], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.252800, -1.936867, 3.420067] - }, - { - "keytime": 0.805555, - "rotation": [ 0.000392, -0.000071, 0.179470, 0.983763], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.252800, -1.936869, 3.420065] - }, - { - "keytime": 0.861111, - "rotation": [ 0.000392, -0.000071, 0.179470, 0.983763], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.252800, -1.936865, 3.420066] - }, - { - "keytime": 0.888889, - "rotation": [ 0.000392, -0.000071, 0.179470, 0.983763], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.252792, -1.936865, 3.420066] - }, - { - "keytime": 0.916667, - "rotation": [ 0.000392, -0.000071, 0.179470, 0.983763], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.252808, -1.936865, 3.420066] - }, - { - "keytime": 0.972222, - "rotation": [ 0.000392, -0.000071, 0.179470, 0.983763], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.252800, -1.936865, 3.420067] - }, - { - "keytime": 1.000000, - "rotation": [ 0.000392, -0.000071, 0.179470, 0.983763], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.252808, -1.936867, 3.420066] - } - ] - }, - { - "boneId": "Bip001 R Finger01", - "keyframes": [ - { - "keytime": 0.000000, - "rotation": [ 0.000000, 0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 3.872101, 0.000002, 0.000005] - }, - { - "keytime": 0.027778, - "rotation": [-0.000000, 0.000000, -0.001149, 0.999999], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 3.872093, -0.000001, 0.000001] - }, - { - "keytime": 0.055556, - "rotation": [-0.000000, -0.000000, -0.003685, 0.999993], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 3.872093, 0.000002, 0.000002] - }, - { - "keytime": 0.083333, - "rotation": [-0.000000, 0.000000, -0.006305, 0.999980], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 3.872093, -0.000000, 0.000000] - }, - { - "keytime": 0.111111, - "rotation": [ 0.000000, -0.000000, -0.007475, 0.999972], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 3.872093, -0.000002, -0.000000] - }, - { - "keytime": 0.138889, - "rotation": [ 0.000000, 0.000000, -0.005912, 0.999983], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 3.872086, -0.000000, 0.000000] - }, - { - "keytime": 0.166667, - "rotation": [ 0.000000, -0.000000, -0.000240, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 3.872093, 0.000002, -0.000002] - }, - { - "keytime": 0.194444, - "rotation": [-0.000000, -0.000000, 0.010158, 0.999948], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 3.872086, 0.000000, -0.000002] - }, - { - "keytime": 0.222222, - "rotation": [-0.000000, -0.000000, 0.023418, 0.999726], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 3.872093, -0.000000, 0.000002] - }, - { - "keytime": 0.250000, - "rotation": [-0.000000, -0.000000, 0.039422, 0.999223], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 3.872101, 0.000000, 0.000000] - }, - { - "keytime": 0.277778, - "rotation": [ 0.000000, -0.000000, 0.056365, 0.998410], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 3.872093, 0.000004, -0.000000] - }, - { - "keytime": 0.305556, - "rotation": [-0.000000, -0.000000, 0.073830, 0.997271], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 3.872093, 0.000000, 0.000004] - }, - { - "keytime": 0.333333, - "rotation": [ 0.000000, 0.000000, 0.091471, 0.995808], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 3.872086, 0.000000, 0.000004] - }, - { - "keytime": 0.361111, - "rotation": [ 0.000000, -0.000000, 0.107391, 0.994217], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 3.872093, 0.000004, 0.000004] - }, - { - "keytime": 0.388889, - "rotation": [-0.000000, 0.000000, 0.121276, 0.992619], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 3.872097, 0.000000, 0.000004] - }, - { - "keytime": 0.416667, - "rotation": [ 0.000000, 0.000000, 0.132573, 0.991173], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 3.872089, 0.000000, 0.000000] - }, - { - "keytime": 0.444444, - "rotation": [-0.000000, -0.000000, 0.139776, 0.990183], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 3.872093, 0.000000, -0.000000] - }, - { - "keytime": 0.472222, - "rotation": [-0.000000, -0.000000, 0.142436, 0.989804], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 3.872089, 0.000000, -0.000000] - }, - { - "keytime": 0.500000, - "rotation": [-0.000000, 0.000000, 0.139380, 0.990239], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 3.872093, 0.000000, 0.000008] - }, - { - "keytime": 0.527778, - "rotation": [-0.000000, 0.000000, 0.131050, 0.991376], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 3.872089, -0.000000, -0.000008] - }, - { - "keytime": 0.555556, - "rotation": [-0.000000, 0.000000, 0.118489, 0.992955], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 3.872093, 0.000004, -0.000000] - }, - { - "keytime": 0.583333, - "rotation": [ 0.000000, 0.000000, 0.102743, 0.994708], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 3.872093, 0.000004, 0.000008] - }, - { - "keytime": 0.611111, - "rotation": [ 0.000000, -0.000000, 0.084307, 0.996440], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 3.872089, -0.000004, -0.000004] - }, - { - "keytime": 0.638889, - "rotation": [-0.000000, -0.000000, 0.065345, 0.997863], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 3.872097, -0.000000, -0.000000] - }, - { - "keytime": 0.666667, - "rotation": [ 0.000000, 0.000000, 0.046417, 0.998922], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 3.872089, -0.000000, -0.000004] - }, - { - "keytime": 0.694444, - "rotation": [-0.000000, -0.000000, 0.028095, 0.999605], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 3.872105, 0.000008, -0.000000] - }, - { - "keytime": 0.722222, - "rotation": [-0.000000, -0.000000, 0.012550, 0.999921], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 3.872086, -0.000004, 0.000000] - }, - { - "keytime": 0.750000, - "rotation": [ 0.000000, 0.000000, 0.000275, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 3.872101, -0.000000, 0.000000] - }, - { - "keytime": 0.777778, - "rotation": [ 0.000000, -0.000000, -0.005716, 0.999984], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 3.872086, 0.000000, -0.000000] - }, - { - "keytime": 0.805555, - "rotation": [ 0.000000, 0.000000, -0.005143, 0.999987], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 3.872086, 0.000000, 0.000002] - }, - { - "keytime": 0.833333, - "rotation": [-0.000000, -0.000000, -0.001993, 0.999998], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 3.872093, -0.000000, 0.000002] - }, - { - "keytime": 0.861111, - "rotation": [-0.000000, -0.000000, -0.000010, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 3.872093, 0.000000, 0.000000] - }, - { - "keytime": 0.888889, - "rotation": [ 0.000000, 0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 3.872093, -0.000002, -0.000000] - }, - { - "keytime": 0.916667, - "rotation": [-0.000000, 0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 3.872086, -0.000001, 0.000000] - }, - { - "keytime": 0.944444, - "rotation": [ 0.000000, -0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 3.872101, -0.000000, -0.000001] - }, - { - "keytime": 0.972222, - "rotation": [ 0.000000, 0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 3.872093, 0.000001, -0.000002] - }, - { - "keytime": 1.000000, - "rotation": [-0.000000, -0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 3.872093, 0.000001, 0.000002] - } - ] - }, - { - "boneId": "Bip001 R Finger11", - "keyframes": [ - { - "keytime": 0.000000, - "rotation": [ 0.000000, -0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.013489, -0.000000, 0.000000] - }, - { - "keytime": 0.027778, - "rotation": [-0.000000, -0.000000, -0.001078, 0.999999], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.013489, -0.000000, 0.000000] - }, - { - "keytime": 0.055556, - "rotation": [-0.000000, 0.000000, -0.003456, 0.999994], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.013481, -0.000000, 0.000000] - }, - { - "keytime": 0.083333, - "rotation": [ 0.000000, 0.000000, -0.005914, 0.999983], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.013481, 0.000000, -0.000000] - }, - { - "keytime": 0.111111, - "rotation": [ 0.000000, -0.000000, -0.007011, 0.999975], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.013481, -0.000000, 0.000001] - }, - { - "keytime": 0.138889, - "rotation": [ 0.000000, 0.000000, -0.005545, 0.999985], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.013481, 0.000004, 0.000000] - }, - { - "keytime": 0.166667, - "rotation": [ 0.000000, 0.000000, -0.000225, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.013489, 0.000001, -0.000000] - }, - { - "keytime": 0.194444, - "rotation": [ 0.000000, -0.000000, 0.009527, 0.999955], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.013496, -0.000003, 0.000000] - }, - { - "keytime": 0.222222, - "rotation": [ 0.000000, 0.000000, 0.021964, 0.999759], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.013496, 0.000001, 0.000000] - }, - { - "keytime": 0.250000, - "rotation": [-0.000000, 0.000000, 0.036976, 0.999316], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.013489, 0.000000, 0.000000] - }, - { - "keytime": 0.277778, - "rotation": [ 0.000000, 0.000000, 0.052868, 0.998601], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.013481, 0.000004, 0.000000] - }, - { - "keytime": 0.305556, - "rotation": [ 0.000000, 0.000000, 0.069253, 0.997599], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.013489, 0.000000, -0.000004] - }, - { - "keytime": 0.333333, - "rotation": [ 0.000000, 0.000000, 0.085805, 0.996312], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.013489, -0.000000, 0.000000] - }, - { - "keytime": 0.361111, - "rotation": [-0.000000, -0.000000, 0.100746, 0.994912], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.013489, -0.000004, -0.000004] - }, - { - "keytime": 0.388889, - "rotation": [ 0.000000, -0.000000, 0.113780, 0.993506], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.013481, -0.000000, 0.000008] - }, - { - "keytime": 0.416667, - "rotation": [-0.000000, 0.000000, 0.124385, 0.992234], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.013481, 0.000000, 0.000004] - }, - { - "keytime": 0.444444, - "rotation": [-0.000000, -0.000000, 0.131148, 0.991363], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.013485, -0.000000, 0.000004] - }, - { - "keytime": 0.472222, - "rotation": [ 0.000000, 0.000000, 0.133646, 0.991029], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.013485, 0.000004, 0.000004] - }, - { - "keytime": 0.500000, - "rotation": [-0.000000, -0.000000, 0.130777, 0.991412], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.013485, -0.000004, 0.000004] - }, - { - "keytime": 0.527778, - "rotation": [-0.000000, -0.000000, 0.122956, 0.992412], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.013489, 0.000008, 0.000000] - }, - { - "keytime": 0.555556, - "rotation": [-0.000000, 0.000000, 0.111163, 0.993802], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.013489, 0.000004, -0.000000] - }, - { - "keytime": 0.583333, - "rotation": [-0.000000, 0.000000, 0.096384, 0.995344], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.013489, 0.000000, -0.000000] - }, - { - "keytime": 0.611111, - "rotation": [ 0.000000, 0.000000, 0.079083, 0.996868], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.013489, -0.000000, -0.000000] - }, - { - "keytime": 0.638889, - "rotation": [ 0.000000, 0.000000, 0.061292, 0.998120], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.013485, -0.000000, 0.000000] - }, - { - "keytime": 0.666667, - "rotation": [-0.000000, -0.000000, 0.043537, 0.999052], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.013489, 0.000004, -0.000004] - }, - { - "keytime": 0.694444, - "rotation": [ 0.000000, 0.000000, 0.026351, 0.999653], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.013496, -0.000002, -0.000000] - }, - { - "keytime": 0.722222, - "rotation": [-0.000000, 0.000000, 0.011771, 0.999931], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.013496, -0.000002, 0.000000] - }, - { - "keytime": 0.750000, - "rotation": [ 0.000000, 0.000000, 0.000257, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.013481, -0.000002, -0.000002] - }, - { - "keytime": 0.777778, - "rotation": [ 0.000000, -0.000000, -0.005361, 0.999986], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.013489, 0.000001, -0.000000] - }, - { - "keytime": 0.805555, - "rotation": [-0.000000, 0.000000, -0.004823, 0.999988], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.013489, 0.000000, 0.000000] - }, - { - "keytime": 0.833333, - "rotation": [ 0.000000, -0.000000, -0.001869, 0.999998], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.013489, -0.000002, 0.000000] - }, - { - "keytime": 0.861111, - "rotation": [ 0.000000, -0.000000, -0.000009, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.013489, 0.000002, -0.000000] - }, - { - "keytime": 0.888889, - "rotation": [-0.000000, -0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.013496, -0.000002, 0.000000] - }, - { - "keytime": 0.944444, - "rotation": [ 0.000000, -0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.013489, 0.000002, -0.000000] - }, - { - "keytime": 0.972222, - "rotation": [-0.000000, -0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.013496, -0.000002, 0.000001] - }, - { - "keytime": 1.000000, - "rotation": [ 0.000000, -0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.013489, -0.000002, -0.000000] - } - ] - }, - { - "boneId": "Bip001 R Finger0Nub", - "keyframes": [ - { - "keytime": 0.000000, - "rotation": [ 0.000000, -0.000000, 1.000000, -0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 2.278816, -0.000000, -0.000001] - }, - { - "keytime": 0.027778, - "rotation": [ 0.000000, 0.000000, 1.000000, -0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 2.278831, 0.000000, -0.000000] - }, - { - "keytime": 0.055556, - "rotation": [-0.000000, 0.000000, 1.000000, 0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 2.278831, -0.000001, -0.000001] - }, - { - "keytime": 0.083333, - "rotation": [-0.000000, -0.000000, 1.000000, -0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 2.278824, -0.000001, 0.000000] - }, - { - "keytime": 0.138889, - "rotation": [ 0.000000, -0.000000, 1.000000, -0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 2.278824, 0.000000, -0.000002] - }, - { - "keytime": 0.166667, - "rotation": [-0.000000, -0.000000, 1.000000, -0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 2.278831, -0.000002, -0.000000] - }, - { - "keytime": 0.194444, - "rotation": [-0.000000, 0.000000, 1.000000, -0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 2.278824, -0.000000, 0.000002] - }, - { - "keytime": 0.222222, - "rotation": [ 0.000000, -0.000000, 1.000000, 0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 2.278831, 0.000000, 0.000000] - }, - { - "keytime": 0.250000, - "rotation": [-0.000000, -0.000000, 1.000000, -0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 2.278828, -0.000004, -0.000000] - }, - { - "keytime": 0.277778, - "rotation": [ 0.000000, 0.000000, 1.000000, -0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 2.278824, -0.000000, 0.000000] - }, - { - "keytime": 0.305556, - "rotation": [-0.000000, 0.000000, 1.000000, -0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 2.278831, 0.000004, 0.000000] - }, - { - "keytime": 0.333333, - "rotation": [-0.000000, -0.000000, 1.000000, -0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 2.278824, -0.000000, -0.000008] - }, - { - "keytime": 0.361111, - "rotation": [ 0.000000, 0.000000, 1.000000, -0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 2.278831, 0.000000, -0.000000] - }, - { - "keytime": 0.388889, - "rotation": [ 0.000000, 0.000000, 1.000000, -0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 2.278824, -0.000004, -0.000000] - }, - { - "keytime": 0.416667, - "rotation": [ 0.000000, -0.000000, 1.000000, -0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 2.278824, -0.000000, 0.000008] - }, - { - "keytime": 0.444444, - "rotation": [-0.000000, -0.000000, 1.000000, -0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 2.278831, 0.000004, 0.000000] - }, - { - "keytime": 0.472222, - "rotation": [-0.000000, -0.000000, 1.000000, -0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 2.278828, 0.000004, -0.000000] - }, - { - "keytime": 0.500000, - "rotation": [ 0.000000, 0.000000, 1.000000, -0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 2.278831, 0.000000, -0.000000] - }, - { - "keytime": 0.527778, - "rotation": [ 0.000000, -0.000000, 1.000000, -0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 2.278835, 0.000000, 0.000000] - }, - { - "keytime": 0.555556, - "rotation": [ 0.000000, 0.000000, 1.000000, -0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 2.278828, -0.000004, 0.000000] - }, - { - "keytime": 0.583333, - "rotation": [ 0.000000, 0.000000, 1.000000, -0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 2.278824, 0.000004, -0.000004] - }, - { - "keytime": 0.611111, - "rotation": [-0.000000, 0.000000, 1.000000, -0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 2.278824, 0.000000, -0.000000] - }, - { - "keytime": 0.638889, - "rotation": [ 0.000000, 0.000000, 1.000000, -0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 2.278828, -0.000000, -0.000000] - }, - { - "keytime": 0.666667, - "rotation": [-0.000000, -0.000000, 1.000000, -0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 2.278831, 0.000000, 0.000004] - }, - { - "keytime": 0.694444, - "rotation": [-0.000000, 0.000000, 1.000000, -0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 2.278828, -0.000004, 0.000000] - }, - { - "keytime": 0.722222, - "rotation": [-0.000000, 0.000000, 1.000000, -0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 2.278828, 0.000004, -0.000000] - }, - { - "keytime": 0.750000, - "rotation": [ 0.000000, -0.000000, 1.000000, 0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 2.278824, 0.000000, -0.000000] - }, - { - "keytime": 0.777778, - "rotation": [-0.000000, 0.000000, 1.000000, 0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 2.278824, -0.000000, 0.000002] - }, - { - "keytime": 0.805555, - "rotation": [ 0.000000, 0.000000, 1.000000, -0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 2.278824, 0.000004, 0.000000] - }, - { - "keytime": 0.833333, - "rotation": [ 0.000000, 0.000000, 1.000000, -0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 2.278824, 0.000000, -0.000001] - }, - { - "keytime": 0.861111, - "rotation": [-0.000000, 0.000000, 1.000000, -0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 2.278824, -0.000000, 0.000001] - }, - { - "keytime": 0.888889, - "rotation": [ 0.000000, -0.000000, 1.000000, 0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 2.278824, 0.000004, -0.000000] - }, - { - "keytime": 0.916667, - "rotation": [ 0.000000, 0.000000, 1.000000, -0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 2.278824, 0.000001, 0.000002] - }, - { - "keytime": 0.944444, - "rotation": [-0.000000, -0.000000, 1.000000, -0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 2.278824, 0.000000, -0.000002] - }, - { - "keytime": 0.972222, - "rotation": [ 0.000000, -0.000000, 1.000000, -0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 2.278831, -0.000001, 0.000002] - }, - { - "keytime": 1.000000, - "rotation": [-0.000000, 0.000000, 1.000000, -0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 2.278824, -0.000001, -0.000001] - } - ] - }, - { - "boneId": "Bip001 R UpperArm", - "keyframes": [ - { - "keytime": 0.000000, - "rotation": [ 0.047436, -0.666097, 0.085716, 0.739403], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 6.200712, 0.000002, -0.000008] - }, - { - "keytime": 0.027778, - "rotation": [ 0.038818, -0.655320, 0.073578, 0.750757], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 6.200712, 0.000000, 0.000008] - }, - { - "keytime": 0.055556, - "rotation": [ 0.028905, -0.644076, 0.062691, 0.761840], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 6.200712, -0.000000, 0.000000] - }, - { - "keytime": 0.083333, - "rotation": [ 0.019302, -0.636907, 0.056587, 0.768619], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 6.200712, 0.000004, 0.000008] - }, - { - "keytime": 0.111111, - "rotation": [ 0.010397, -0.630217, 0.049806, 0.774750], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 6.200712, 0.000000, -0.000008] - }, - { - "keytime": 0.138889, - "rotation": [ 0.007143, -0.629239, 0.047792, 0.775708], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 6.200710, -0.000000, 0.000008] - }, - { - "keytime": 0.166667, - "rotation": [ 0.006099, -0.628556, 0.042848, 0.776559], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 6.200712, 0.000004, -0.000008] - }, - { - "keytime": 0.194444, - "rotation": [ 0.013457, -0.630250, 0.039098, 0.775290], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 6.200712, -0.000002, 0.000015] - }, - { - "keytime": 0.222222, - "rotation": [ 0.021144, -0.631160, 0.032298, 0.774691], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 6.200714, -0.000000, -0.000007] - }, - { - "keytime": 0.250000, - "rotation": [ 0.034396, -0.630945, 0.029909, 0.774487], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 6.200714, -0.000002, -0.000008] - }, - { - "keytime": 0.277778, - "rotation": [ 0.047173, -0.629976, 0.026881, 0.774714], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 6.200714, -0.000000, -0.000000] - }, - { - "keytime": 0.305556, - "rotation": [ 0.058608, -0.627169, 0.018204, 0.776462], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 6.200710, -0.000002, 0.000000] - }, - { - "keytime": 0.333333, - "rotation": [ 0.070343, -0.623827, 0.010758, 0.778316], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 6.200712, 0.000000, -0.000008] - }, - { - "keytime": 0.361111, - "rotation": [ 0.079019, -0.618931, -0.005894, 0.781438], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 6.200712, -0.000000, -0.000008] - }, - { - "keytime": 0.388889, - "rotation": [ 0.087342, -0.613362, -0.018887, 0.784730], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 6.200710, 0.000002, -0.000000] - }, - { - "keytime": 0.416667, - "rotation": [ 0.094704, -0.610689, -0.031940, 0.785538], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 6.200714, 0.000004, 0.000008] - }, - { - "keytime": 0.444444, - "rotation": [ 0.101661, -0.609201, -0.039421, 0.785484], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 6.200712, 0.000002, 0.000008] - }, - { - "keytime": 0.472222, - "rotation": [ 0.101579, -0.616107, -0.040481, 0.780035], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 6.200714, 0.000000, -0.000007] - }, - { - "keytime": 0.500000, - "rotation": [ 0.100240, -0.624784, -0.033838, 0.773597], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 6.200714, -0.000002, -0.000008] - }, - { - "keytime": 0.527778, - "rotation": [ 0.090401, -0.637334, -0.018268, 0.765049], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 6.200710, -0.000000, -0.000000] - }, - { - "keytime": 0.555556, - "rotation": [ 0.078306, -0.650529, -0.000369, 0.755434], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 6.200710, 0.000000, -0.000000] - }, - { - "keytime": 0.583333, - "rotation": [ 0.063263, -0.658135, 0.015685, 0.750074], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 6.200710, 0.000000, 0.000008] - }, - { - "keytime": 0.611111, - "rotation": [ 0.047296, -0.665765, 0.035590, 0.743810], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 6.200714, -0.000002, 0.000000] - }, - { - "keytime": 0.638889, - "rotation": [ 0.035738, -0.665309, 0.046509, 0.744260], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 6.200710, -0.000000, -0.000000] - }, - { - "keytime": 0.666667, - "rotation": [ 0.024082, -0.664319, 0.058116, 0.744797], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 6.200714, 0.000002, -0.000000] - }, - { - "keytime": 0.694444, - "rotation": [ 0.020944, -0.660137, 0.063801, 0.748138], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 6.200710, -0.000002, 0.000000] - }, - { - "keytime": 0.722222, - "rotation": [ 0.018358, -0.655816, 0.067431, 0.751679], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 6.200714, 0.000004, -0.000008] - }, - { - "keytime": 0.750000, - "rotation": [ 0.018527, -0.651005, 0.064541, 0.756098], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 6.200712, 0.000000, -0.000000] - }, - { - "keytime": 0.777778, - "rotation": [ 0.019383, -0.646487, 0.058305, 0.760446], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 6.200710, -0.000000, 0.000008] - }, - { - "keytime": 0.805555, - "rotation": [ 0.014787, -0.641392, 0.054208, 0.765153], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 6.200713, 0.000000, -0.000008] - }, - { - "keytime": 0.833333, - "rotation": [ 0.008574, -0.637232, 0.049311, 0.769045], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 6.200712, 0.000000, -0.000000] - }, - { - "keytime": 0.861111, - "rotation": [ 0.003625, -0.635649, 0.046199, 0.770586], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 6.200712, -0.000002, 0.000000] - }, - { - "keytime": 0.888889, - "rotation": [ 0.003667, -0.638225, 0.046908, 0.768411], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 6.200714, 0.000000, -0.000000] - }, - { - "keytime": 0.916667, - "rotation": [ 0.009474, -0.644791, 0.053578, 0.762420], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 6.200712, -0.000004, 0.000008] - }, - { - "keytime": 0.944444, - "rotation": [ 0.019195, -0.653979, 0.065563, 0.753422], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 6.200712, 0.000002, 0.000000] - }, - { - "keytime": 0.972222, - "rotation": [ 0.029666, -0.663412, 0.079633, 0.743413], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 6.200712, -0.000002, 0.000000] - }, - { - "keytime": 1.000000, - "rotation": [ 0.039218, -0.672003, 0.093577, 0.733565], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 6.200712, 0.000002, -0.000008] - } - ] - }, - { - "boneId": "Bip001 R Finger0", - "keyframes": [ - { - "keytime": 0.000000, - "rotation": [-0.752880, -0.138782, -0.000591, 0.643359], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.991684, 0.806471, 6.254313] - }, - { - "keytime": 0.027778, - "rotation": [-0.752880, -0.138782, -0.000591, 0.643359], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.991692, 0.806473, 6.254313] - }, - { - "keytime": 0.055556, - "rotation": [-0.752880, -0.138782, -0.000591, 0.643359], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.991684, 0.806471, 6.254311] - }, - { - "keytime": 0.111111, - "rotation": [-0.752880, -0.138782, -0.000591, 0.643359], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.991684, 0.806473, 6.254312] - }, - { - "keytime": 0.138889, - "rotation": [-0.752880, -0.138782, -0.000591, 0.643359], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.991684, 0.806477, 6.254310] - }, - { - "keytime": 0.166667, - "rotation": [-0.752880, -0.138782, -0.000591, 0.643359], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.991684, 0.806473, 6.254311] - }, - { - "keytime": 0.194444, - "rotation": [-0.752880, -0.138782, -0.000591, 0.643359], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.991676, 0.806473, 6.254311] - }, - { - "keytime": 0.222222, - "rotation": [-0.752880, -0.138782, -0.000591, 0.643359], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.991676, 0.806473, 6.254313] - }, - { - "keytime": 0.250000, - "rotation": [-0.752880, -0.138782, -0.000591, 0.643359], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.991669, 0.806473, 6.254314] - }, - { - "keytime": 0.277778, - "rotation": [-0.752880, -0.138782, -0.000591, 0.643359], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.991680, 0.806473, 6.254314] - }, - { - "keytime": 0.305556, - "rotation": [-0.752880, -0.138782, -0.000591, 0.643359], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.991680, 0.806473, 6.254311] - }, - { - "keytime": 0.333333, - "rotation": [-0.752880, -0.138782, -0.000591, 0.643359], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.991684, 0.806473, 6.254311] - }, - { - "keytime": 0.361111, - "rotation": [-0.752880, -0.138782, -0.000591, 0.643359], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.991688, 0.806477, 6.254307] - }, - { - "keytime": 0.388889, - "rotation": [-0.752880, -0.138782, -0.000591, 0.643359], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.991688, 0.806473, 6.254314] - }, - { - "keytime": 0.416667, - "rotation": [-0.752880, -0.138782, -0.000591, 0.643359], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.991684, 0.806473, 6.254311] - }, - { - "keytime": 0.444444, - "rotation": [-0.752880, -0.138782, -0.000591, 0.643359], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.991688, 0.806473, 6.254311] - }, - { - "keytime": 0.472222, - "rotation": [-0.752880, -0.138782, -0.000591, 0.643359], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.991684, 0.806473, 6.254311] - }, - { - "keytime": 0.500000, - "rotation": [-0.752880, -0.138782, -0.000591, 0.643359], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.991680, 0.806465, 6.254318] - }, - { - "keytime": 0.555556, - "rotation": [-0.752880, -0.138782, -0.000591, 0.643359], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.991684, 0.806473, 6.254311] - }, - { - "keytime": 0.583333, - "rotation": [-0.752880, -0.138782, -0.000591, 0.643359], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.991684, 0.806473, 6.254314] - }, - { - "keytime": 0.611111, - "rotation": [-0.752880, -0.138782, -0.000591, 0.643359], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.991684, 0.806477, 6.254311] - }, - { - "keytime": 0.666667, - "rotation": [-0.752880, -0.138782, -0.000591, 0.643359], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.991680, 0.806473, 6.254311] - }, - { - "keytime": 0.694444, - "rotation": [-0.752880, -0.138782, -0.000591, 0.643359], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.991692, 0.806473, 6.254311] - }, - { - "keytime": 0.722222, - "rotation": [-0.752880, -0.138782, -0.000591, 0.643359], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.991692, 0.806473, 6.254313] - }, - { - "keytime": 0.750000, - "rotation": [-0.752880, -0.138782, -0.000591, 0.643359], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.991684, 0.806473, 6.254313] - }, - { - "keytime": 0.777778, - "rotation": [-0.752880, -0.138782, -0.000591, 0.643359], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.991684, 0.806473, 6.254311] - }, - { - "keytime": 0.805555, - "rotation": [-0.752880, -0.138782, -0.000591, 0.643359], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.991692, 0.806471, 6.254311] - }, - { - "keytime": 0.833333, - "rotation": [-0.752880, -0.138782, -0.000591, 0.643359], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.991684, 0.806471, 6.254310] - }, - { - "keytime": 0.861111, - "rotation": [-0.752880, -0.138782, -0.000591, 0.643359], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.991692, 0.806471, 6.254310] - }, - { - "keytime": 0.888889, - "rotation": [-0.752880, -0.138782, -0.000591, 0.643359], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.991676, 0.806473, 6.254312] - }, - { - "keytime": 0.916667, - "rotation": [-0.752880, -0.138782, -0.000591, 0.643359], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.991684, 0.806475, 6.254310] - }, - { - "keytime": 0.944444, - "rotation": [-0.752880, -0.138782, -0.000591, 0.643359], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.991676, 0.806473, 6.254312] - }, - { - "keytime": 0.972222, - "rotation": [-0.752880, -0.138782, -0.000591, 0.643359], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.991676, 0.806473, 6.254310] - }, - { - "keytime": 1.000000, - "rotation": [-0.752880, -0.138782, -0.000591, 0.643359], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.991684, 0.806473, 6.254311] - } - ] - }, - { - "boneId": "Bip001 R Finger2", - "keyframes": [ - { - "keytime": 0.000000, - "rotation": [ 0.044958, 0.003226, 0.174651, 0.983598], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.877846, -0.823423, -0.439368] - }, - { - "keytime": 0.027778, - "rotation": [ 0.044953, 0.003295, 0.173149, 0.983864], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.877853, -0.823423, -0.439367] - }, - { - "keytime": 0.055556, - "rotation": [ 0.044942, 0.003446, 0.169832, 0.984442], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.877853, -0.823425, -0.439368] - }, - { - "keytime": 0.083333, - "rotation": [ 0.044930, 0.003603, 0.166402, 0.985027], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.877838, -0.823429, -0.439368] - }, - { - "keytime": 0.111111, - "rotation": [ 0.044924, 0.003672, 0.164871, 0.985285], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.877838, -0.823425, -0.439368] - }, - { - "keytime": 0.138889, - "rotation": [ 0.044932, 0.003579, 0.166917, 0.984940], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.877846, -0.823425, -0.439369] - }, - { - "keytime": 0.166667, - "rotation": [ 0.044957, 0.003240, 0.174338, 0.983654], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.877846, -0.823425, -0.439368] - }, - { - "keytime": 0.194444, - "rotation": [ 0.044998, 0.002619, 0.187915, 0.981151], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.877846, -0.823421, -0.439369] - }, - { - "keytime": 0.222222, - "rotation": [ 0.045037, 0.001825, 0.205179, 0.977686], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.877853, -0.823421, -0.439369] - }, - { - "keytime": 0.250000, - "rotation": [ 0.045066, 0.000866, 0.225939, 0.973098], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.877834, -0.823421, -0.439365] - }, - { - "keytime": 0.277778, - "rotation": [ 0.045074, -0.000150, 0.247818, 0.967758], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.877838, -0.823425, -0.439365] - }, - { - "keytime": 0.305556, - "rotation": [ 0.045058, -0.001198, 0.270262, 0.961731], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.877838, -0.823425, -0.439369] - }, - { - "keytime": 0.333333, - "rotation": [ 0.045017, -0.002258, 0.292812, 0.955107], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.877838, -0.823425, -0.439369] - }, - { - "keytime": 0.361111, - "rotation": [ 0.044959, -0.003215, 0.313055, 0.948665], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.877850, -0.823421, -0.439373] - }, - { - "keytime": 0.388889, - "rotation": [ 0.044892, -0.004049, 0.330624, 0.942686], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.877842, -0.823425, -0.439362] - }, - { - "keytime": 0.416667, - "rotation": [ 0.044825, -0.004728, 0.344854, 0.937573], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.877842, -0.823425, -0.439362] - }, - { - "keytime": 0.444444, - "rotation": [ 0.044777, -0.005161, 0.353898, 0.934197], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.877846, -0.823425, -0.439369] - }, - { - "keytime": 0.472222, - "rotation": [ 0.044759, -0.005321, 0.357232, 0.932927], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.877846, -0.823425, -0.439369] - }, - { - "keytime": 0.500000, - "rotation": [ 0.044780, -0.005137, 0.353403, 0.934385], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.877850, -0.823433, -0.439369] - }, - { - "keytime": 0.527778, - "rotation": [ 0.044835, -0.004637, 0.342940, 0.938275], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.877846, -0.823433, -0.439369] - }, - { - "keytime": 0.555556, - "rotation": [ 0.044907, -0.003882, 0.327104, 0.943913], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.877842, -0.823425, -0.439365] - }, - { - "keytime": 0.583333, - "rotation": [ 0.044978, -0.002935, 0.307156, 0.950591], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.877846, -0.823425, -0.439365] - }, - { - "keytime": 0.611111, - "rotation": [ 0.045037, -0.001827, 0.283669, 0.957862], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.877842, -0.823425, -0.439365] - }, - { - "keytime": 0.638889, - "rotation": [ 0.045069, -0.000689, 0.259372, 0.964725], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.877846, -0.823425, -0.439369] - }, - { - "keytime": 0.666667, - "rotation": [ 0.045072, 0.000447, 0.234984, 0.970953], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.877842, -0.823429, -0.439369] - }, - { - "keytime": 0.694444, - "rotation": [ 0.045047, 0.001545, 0.211255, 0.976391], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.877853, -0.823418, -0.439369] - }, - { - "keytime": 0.722222, - "rotation": [ 0.045006, 0.002476, 0.191034, 0.980548], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.877846, -0.823425, -0.439365] - }, - { - "keytime": 0.750000, - "rotation": [ 0.044959, 0.003210, 0.175010, 0.983534], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.877853, -0.823429, -0.439367] - }, - { - "keytime": 0.777778, - "rotation": [ 0.044932, 0.003568, 0.167173, 0.984897], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.877846, -0.823425, -0.439369] - }, - { - "keytime": 0.805555, - "rotation": [ 0.044935, 0.003533, 0.167924, 0.984769], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.877846, -0.823427, -0.439369] - }, - { - "keytime": 0.833333, - "rotation": [ 0.044950, 0.003345, 0.172045, 0.984057], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.877846, -0.823427, -0.439368] - }, - { - "keytime": 0.861111, - "rotation": [ 0.044958, 0.003227, 0.174639, 0.983600], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.877853, -0.823425, -0.439367] - }, - { - "keytime": 0.888889, - "rotation": [ 0.044958, 0.003226, 0.174652, 0.983598], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.877838, -0.823427, -0.439368] - }, - { - "keytime": 0.916667, - "rotation": [ 0.044958, 0.003226, 0.174651, 0.983598], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.877853, -0.823423, -0.439367] - }, - { - "keytime": 0.944444, - "rotation": [ 0.044958, 0.003226, 0.174651, 0.983598], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.877838, -0.823423, -0.439367] - }, - { - "keytime": 0.972222, - "rotation": [ 0.044958, 0.003226, 0.174651, 0.983598], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.877846, -0.823421, -0.439367] - }, - { - "keytime": 1.000000, - "rotation": [ 0.044958, 0.003226, 0.174651, 0.983598], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.877846, -0.823425, -0.439369] - } - ] - }, - { - "boneId": "Bip001 R Finger21", - "keyframes": [ - { - "keytime": 0.000000, - "rotation": [ 0.000000, 0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.603935, -0.000004, 0.000000] - }, - { - "keytime": 0.027778, - "rotation": [-0.000000, 0.000000, -0.002192, 0.999998], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.603935, -0.000000, -0.000001] - }, - { - "keytime": 0.055556, - "rotation": [-0.000000, -0.000000, -0.007029, 0.999975], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.603943, -0.000001, -0.000001] - }, - { - "keytime": 0.083333, - "rotation": [ 0.000000, -0.000000, -0.012027, 0.999928], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.603935, 0.000001, 0.000001] - }, - { - "keytime": 0.111111, - "rotation": [-0.000000, 0.000000, -0.014258, 0.999898], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.603943, -0.000000, -0.000001] - }, - { - "keytime": 0.138889, - "rotation": [ 0.000000, -0.000000, -0.011276, 0.999936], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.603935, 0.000003, 0.000000] - }, - { - "keytime": 0.166667, - "rotation": [ 0.000000, -0.000000, -0.000457, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.603935, 0.000001, -0.000000] - }, - { - "keytime": 0.194444, - "rotation": [ 0.000000, 0.000000, 0.019375, 0.999812], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.603935, 0.000000, 0.000002] - }, - { - "keytime": 0.222222, - "rotation": [-0.000000, 0.000000, 0.044658, 0.999002], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.603943, -0.000002, -0.000002] - }, - { - "keytime": 0.250000, - "rotation": [ 0.000000, 0.000000, 0.075146, 0.997173], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.603943, 0.000000, -0.000002] - }, - { - "keytime": 0.277778, - "rotation": [ 0.000000, -0.000000, 0.107364, 0.994220], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.603943, -0.000000, -0.000000] - }, - { - "keytime": 0.305556, - "rotation": [ 0.000000, 0.000000, 0.140491, 0.990082], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.603935, 0.000002, 0.000000] - }, - { - "keytime": 0.333333, - "rotation": [-0.000000, 0.000000, 0.173835, 0.984775], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.603943, 0.000002, -0.000000] - }, - { - "keytime": 0.361111, - "rotation": [-0.000000, -0.000000, 0.203803, 0.979012], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.603935, 0.000000, 0.000000] - }, - { - "keytime": 0.388889, - "rotation": [-0.000000, -0.000000, 0.229829, 0.973231], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.603935, 0.000000, -0.000004] - }, - { - "keytime": 0.416667, - "rotation": [-0.000000, -0.000000, 0.250915, 0.968009], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.603943, -0.000002, -0.000004] - }, - { - "keytime": 0.444444, - "rotation": [-0.000000, -0.000000, 0.264315, 0.964436], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.603928, 0.000004, 0.000004] - }, - { - "keytime": 0.472222, - "rotation": [ 0.000000, -0.000000, 0.269255, 0.963069], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.603935, -0.000002, -0.000004] - }, - { - "keytime": 0.500000, - "rotation": [-0.000000, 0.000000, 0.263581, 0.964637], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.603935, 0.000006, -0.000000] - }, - { - "keytime": 0.527778, - "rotation": [-0.000000, -0.000000, 0.248078, 0.968740], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.603935, 0.000000, 0.000000] - }, - { - "keytime": 0.555556, - "rotation": [ 0.000000, 0.000000, 0.224614, 0.974448], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.603943, 0.000004, -0.000000] - }, - { - "keytime": 0.583333, - "rotation": [-0.000000, -0.000000, 0.195068, 0.980790], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.603943, 0.000004, 0.000004] - }, - { - "keytime": 0.611111, - "rotation": [-0.000000, -0.000000, 0.160309, 0.987067], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.603943, 0.000000, 0.000000] - }, - { - "keytime": 0.638889, - "rotation": [-0.000000, 0.000000, 0.124409, 0.992231], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.603943, 0.000002, -0.000000] - }, - { - "keytime": 0.666667, - "rotation": [-0.000000, -0.000000, 0.088456, 0.996080], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.603935, -0.000000, -0.000000] - }, - { - "keytime": 0.694444, - "rotation": [ 0.000000, 0.000000, 0.053572, 0.998564], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.603928, 0.000003, 0.000008] - }, - { - "keytime": 0.722222, - "rotation": [-0.000000, 0.000000, 0.023938, 0.999713], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.603935, 0.000001, 0.000000] - }, - { - "keytime": 0.750000, - "rotation": [ 0.000000, 0.000000, 0.000524, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.603935, 0.000002, -0.000002] - }, - { - "keytime": 0.777778, - "rotation": [-0.000000, 0.000000, -0.010904, 0.999941], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.603951, -0.000004, -0.000000] - }, - { - "keytime": 0.805555, - "rotation": [ 0.000000, -0.000000, -0.009810, 0.999952], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.603943, -0.000000, -0.000002] - }, - { - "keytime": 0.833333, - "rotation": [ 0.000000, -0.000000, -0.003801, 0.999993], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.603943, 0.000002, -0.000000] - }, - { - "keytime": 0.861111, - "rotation": [ 0.000000, -0.000000, -0.000018, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.603935, 0.000000, 0.000000] - }, - { - "keytime": 0.888889, - "rotation": [ 0.000000, -0.000000, 0.000001, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.603935, 0.000002, 0.000000] - }, - { - "keytime": 0.916667, - "rotation": [-0.000000, 0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.603935, 0.000002, -0.000001] - }, - { - "keytime": 0.944444, - "rotation": [-0.000000, 0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.603951, 0.000000, 0.000001] - }, - { - "keytime": 0.972222, - "rotation": [ 0.000000, 0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.603943, -0.000000, 0.000000] - }, - { - "keytime": 1.000000, - "rotation": [ 0.000000, 0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.603935, 0.000000, 0.000000] - } - ] - }, - { - "boneId": "Bip001 R Finger2Nub", - "keyframes": [ - { - "keytime": 0.000000, - "rotation": [ 0.000000, -0.000000, 1.000000, -0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 4.418678, 0.000002, 0.000000] - }, - { - "keytime": 0.027778, - "rotation": [-0.000000, -0.000000, 1.000000, -0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 4.418678, 0.000001, 0.000002] - }, - { - "keytime": 0.055556, - "rotation": [-0.000000, 0.000000, 1.000000, -0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 4.418686, -0.000001, 0.000000] - }, - { - "keytime": 0.083333, - "rotation": [-0.000000, -0.000000, 1.000000, -0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 4.418678, -0.000001, -0.000000] - }, - { - "keytime": 0.111111, - "rotation": [ 0.000000, 0.000000, 1.000000, -0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 4.418678, 0.000001, -0.000000] - }, - { - "keytime": 0.166667, - "rotation": [-0.000000, -0.000000, 1.000000, -0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 4.418678, -0.000001, 0.000000] - }, - { - "keytime": 0.194444, - "rotation": [ 0.000000, -0.000000, 1.000000, -0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 4.418678, -0.000000, 0.000000] - }, - { - "keytime": 0.222222, - "rotation": [-0.000000, -0.000000, 1.000000, -0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 4.418678, 0.000000, -0.000002] - }, - { - "keytime": 0.250000, - "rotation": [-0.000000, -0.000000, 1.000000, -0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 4.418678, -0.000002, -0.000002] - }, - { - "keytime": 0.277778, - "rotation": [-0.000000, 0.000000, 1.000000, 0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 4.418674, -0.000000, 0.000000] - }, - { - "keytime": 0.305556, - "rotation": [-0.000000, 0.000000, 1.000000, -0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 4.418678, 0.000000, -0.000004] - }, - { - "keytime": 0.333333, - "rotation": [ 0.000000, -0.000000, 1.000000, -0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 4.418674, 0.000000, 0.000000] - }, - { - "keytime": 0.361111, - "rotation": [ 0.000000, -0.000000, 1.000000, -0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 4.418674, 0.000002, 0.000000] - }, - { - "keytime": 0.388889, - "rotation": [-0.000000, 0.000000, 1.000000, 0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 4.418682, 0.000002, -0.000000] - }, - { - "keytime": 0.416667, - "rotation": [-0.000000, 0.000000, 1.000000, -0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 4.418678, -0.000000, -0.000000] - }, - { - "keytime": 0.444444, - "rotation": [ 0.000000, -0.000000, 1.000000, 0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 4.418678, 0.000002, -0.000004] - }, - { - "keytime": 0.472222, - "rotation": [-0.000000, -0.000000, 1.000000, -0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 4.418671, 0.000000, -0.000000] - }, - { - "keytime": 0.500000, - "rotation": [-0.000000, 0.000000, 1.000000, 0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 4.418678, 0.000000, -0.000004] - }, - { - "keytime": 0.527778, - "rotation": [-0.000000, 0.000000, 1.000000, -0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 4.418678, 0.000000, -0.000000] - }, - { - "keytime": 0.555556, - "rotation": [ 0.000000, -0.000000, 1.000000, -0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 4.418671, -0.000002, 0.000000] - }, - { - "keytime": 0.583333, - "rotation": [ 0.000000, -0.000000, 1.000000, -0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 4.418678, -0.000000, -0.000004] - }, - { - "keytime": 0.611111, - "rotation": [ 0.000000, 0.000000, 1.000000, -0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 4.418671, -0.000000, 0.000004] - }, - { - "keytime": 0.638889, - "rotation": [-0.000000, 0.000000, 1.000000, -0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 4.418678, 0.000002, 0.000000] - }, - { - "keytime": 0.666667, - "rotation": [-0.000000, 0.000000, 1.000000, -0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 4.418686, -0.000002, -0.000004] - }, - { - "keytime": 0.694444, - "rotation": [ 0.000000, -0.000000, 1.000000, 0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 4.418678, -0.000000, -0.000004] - }, - { - "keytime": 0.750000, - "rotation": [-0.000000, -0.000000, 1.000000, -0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 4.418678, -0.000002, 0.000000] - }, - { - "keytime": 0.777778, - "rotation": [ 0.000000, 0.000000, 1.000000, -0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 4.418686, 0.000001, 0.000000] - }, - { - "keytime": 0.805555, - "rotation": [-0.000000, -0.000000, 1.000000, -0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 4.418671, 0.000001, 0.000000] - }, - { - "keytime": 0.833333, - "rotation": [-0.000000, -0.000000, 1.000000, -0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 4.418678, -0.000001, -0.000002] - }, - { - "keytime": 0.916667, - "rotation": [ 0.000000, 0.000000, 1.000000, -0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 4.418678, -0.000002, 0.000001] - }, - { - "keytime": 0.944444, - "rotation": [ 0.000000, 0.000000, 1.000000, -0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 4.418671, -0.000000, 0.000000] - }, - { - "keytime": 0.972222, - "rotation": [ 0.000000, -0.000000, 1.000000, -0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 4.418678, 0.000000, -0.000000] - }, - { - "keytime": 1.000000, - "rotation": [-0.000000, -0.000000, 1.000000, -0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 4.418678, -0.000002, 0.000000] - } - ] - }, - { - "boneId": "Bip001 Head", - "keyframes": [ - { - "keytime": 0.000000, - "rotation": [ 0.106724, 0.022307, 0.082046, 0.990647], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.469177, 0.000002, -0.000000] - }, - { - "keytime": 0.027778, - "rotation": [ 0.099632, 0.018833, 0.086116, 0.991112], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.469170, 0.000001, -0.000000] - }, - { - "keytime": 0.055556, - "rotation": [ 0.090861, 0.015518, 0.089891, 0.991677], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.469185, -0.000000, -0.000000] - }, - { - "keytime": 0.083333, - "rotation": [ 0.076154, 0.017802, 0.091871, 0.992695], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.469185, 0.000002, 0.000000] - }, - { - "keytime": 0.111111, - "rotation": [ 0.062692, 0.019852, 0.093835, 0.993414], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.469177, 0.000000, 0.000000] - }, - { - "keytime": 0.138889, - "rotation": [ 0.042666, 0.027061, 0.092967, 0.994386], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.469185, 0.000000, -0.000000] - }, - { - "keytime": 0.166667, - "rotation": [ 0.025979, 0.033527, 0.092618, 0.994798], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.469185, -0.000001, 0.000000] - }, - { - "keytime": 0.194444, - "rotation": [ 0.005315, 0.040665, 0.089268, 0.995163], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.469185, -0.000000, -0.000001] - }, - { - "keytime": 0.222222, - "rotation": [-0.010008, 0.046779, 0.086690, 0.995086], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.469185, -0.000000, -0.000000] - }, - { - "keytime": 0.250000, - "rotation": [-0.030504, 0.051443, 0.083953, 0.994673], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.469185, 0.000000, 0.000000] - }, - { - "keytime": 0.277778, - "rotation": [-0.047669, 0.055671, 0.081798, 0.993950], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.469177, 0.000000, -0.000000] - }, - { - "keytime": 0.305556, - "rotation": [-0.057031, 0.057695, 0.078875, 0.993578], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.469177, -0.000001, -0.000000] - }, - { - "keytime": 0.333333, - "rotation": [-0.065600, 0.059714, 0.076297, 0.993131], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.469193, -0.000001, 0.000000] - }, - { - "keytime": 0.361111, - "rotation": [-0.061920, 0.058994, 0.071887, 0.993739], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.469177, -0.000000, -0.000000] - }, - { - "keytime": 0.388889, - "rotation": [-0.058928, 0.057610, 0.068646, 0.994232], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.469177, 0.000002, -0.000000] - }, - { - "keytime": 0.416667, - "rotation": [-0.053019, 0.059342, 0.064067, 0.994768], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.469177, -0.000000, -0.000000] - }, - { - "keytime": 0.444444, - "rotation": [-0.049324, 0.061702, 0.059978, 0.995069], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.469177, -0.000001, 0.000000] - }, - { - "keytime": 0.472222, - "rotation": [-0.045136, 0.075413, 0.061172, 0.994250], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.469177, -0.000001, 0.000000] - }, - { - "keytime": 0.500000, - "rotation": [-0.042360, 0.091276, 0.065054, 0.992795], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.469185, -0.000001, 0.000000] - }, - { - "keytime": 0.527778, - "rotation": [-0.039446, 0.112070, 0.076043, 0.990001], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.469185, -0.000000, -0.000000] - }, - { - "keytime": 0.555556, - "rotation": [-0.033898, 0.131652, 0.085926, 0.986983], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.469177, -0.000001, 0.000001] - }, - { - "keytime": 0.583333, - "rotation": [-0.022787, 0.141234, 0.095356, 0.985110], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.469177, 0.000001, 0.000000] - }, - { - "keytime": 0.611111, - "rotation": [-0.011843, 0.146994, 0.100413, 0.983956], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.469185, -0.000001, 0.000000] - }, - { - "keytime": 0.638889, - "rotation": [ 0.005071, 0.137260, 0.098005, 0.985662], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.469177, -0.000000, -0.000002] - }, - { - "keytime": 0.666667, - "rotation": [ 0.019897, 0.127665, 0.095064, 0.987050], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.469185, 0.000000, -0.000000] - }, - { - "keytime": 0.694444, - "rotation": [ 0.032269, 0.113156, 0.086808, 0.989252], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.469185, 0.000000, 0.000001] - }, - { - "keytime": 0.722222, - "rotation": [ 0.039830, 0.102338, 0.081374, 0.990615], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.469177, 0.000000, 0.000001] - }, - { - "keytime": 0.750000, - "rotation": [ 0.045934, 0.090829, 0.073425, 0.992093], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.469177, -0.000000, 0.000000] - }, - { - "keytime": 0.777778, - "rotation": [ 0.050496, 0.080351, 0.065602, 0.993323], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.469177, 0.000001, -0.000000] - }, - { - "keytime": 0.805555, - "rotation": [ 0.055295, 0.072080, 0.065009, 0.993741], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.469177, 0.000000, -0.000000] - }, - { - "keytime": 0.833333, - "rotation": [ 0.062513, 0.063691, 0.065603, 0.993847], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.469177, -0.000000, 0.000000] - }, - { - "keytime": 0.861111, - "rotation": [ 0.070226, 0.055438, 0.067019, 0.993732], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.469193, -0.000000, 0.000000] - }, - { - "keytime": 0.888889, - "rotation": [ 0.075752, 0.048277, 0.068692, 0.993586], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.469193, 0.000000, -0.000000] - }, - { - "keytime": 0.916667, - "rotation": [ 0.081219, 0.041779, 0.071055, 0.993282], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.469185, 0.000000, -0.000000] - }, - { - "keytime": 0.944444, - "rotation": [ 0.089317, 0.035208, 0.074563, 0.992584], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.469185, 0.000000, -0.000000] - }, - { - "keytime": 0.972222, - "rotation": [ 0.098148, 0.028872, 0.078368, 0.991661], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.469185, -0.000000, -0.000000] - }, - { - "keytime": 1.000000, - "rotation": [ 0.106721, 0.022307, 0.082045, 0.990647], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 5.469177, 0.000001, -0.000000] - } - ] - }, - { - "boneId": "Bip001 Ponytail1", - "keyframes": [ - { - "keytime": 0.000000, - "rotation": [ 0.061363, 0.007911, 0.989784, -0.128448], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 22.808495, -13.210012, -0.000025] - }, - { - "keytime": 0.027778, - "rotation": [ 0.061363, 0.007911, 0.989784, -0.128448], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 22.808502, -13.210012, -0.000027] - }, - { - "keytime": 0.055556, - "rotation": [ 0.061363, 0.007911, 0.989784, -0.128448], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 22.808495, -13.210007, -0.000028] - }, - { - "keytime": 0.083333, - "rotation": [ 0.061363, 0.007911, 0.989784, -0.128448], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 22.808495, -13.210011, -0.000027] - }, - { - "keytime": 0.111111, - "rotation": [ 0.061363, 0.007911, 0.989784, -0.128448], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 22.808495, -13.210016, -0.000025] - }, - { - "keytime": 0.138889, - "rotation": [ 0.061363, 0.007911, 0.989784, -0.128448], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 22.808510, -13.210011, -0.000025] - }, - { - "keytime": 0.166667, - "rotation": [ 0.061363, 0.007911, 0.989784, -0.128448], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 22.808495, -13.210012, -0.000024] - }, - { - "keytime": 0.194444, - "rotation": [ 0.061363, 0.007911, 0.989784, -0.128448], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 22.808487, -13.210011, -0.000026] - }, - { - "keytime": 0.222222, - "rotation": [ 0.061363, 0.007911, 0.989784, -0.128448], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 22.808502, -13.210011, -0.000027] - }, - { - "keytime": 0.250000, - "rotation": [ 0.061363, 0.007911, 0.989784, -0.128448], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 22.808495, -13.210011, -0.000024] - }, - { - "keytime": 0.277778, - "rotation": [ 0.061363, 0.007911, 0.989784, -0.128448], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 22.808495, -13.210011, -0.000026] - }, - { - "keytime": 0.305556, - "rotation": [ 0.061363, 0.007911, 0.989784, -0.128448], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 22.808487, -13.210011, -0.000027] - }, - { - "keytime": 0.333333, - "rotation": [ 0.061363, 0.007911, 0.989784, -0.128448], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 22.808495, -13.210012, -0.000024] - }, - { - "keytime": 0.361111, - "rotation": [ 0.061363, 0.007911, 0.989784, -0.128448], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 22.808479, -13.210009, -0.000025] - }, - { - "keytime": 0.388889, - "rotation": [ 0.061363, 0.007911, 0.989784, -0.128448], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 22.808479, -13.210007, -0.000026] - }, - { - "keytime": 0.416667, - "rotation": [ 0.061363, 0.007911, 0.989784, -0.128448], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 22.808517, -13.210014, -0.000026] - }, - { - "keytime": 0.444444, - "rotation": [ 0.061363, 0.007911, 0.989784, -0.128448], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 22.808495, -13.210007, -0.000028] - }, - { - "keytime": 0.472222, - "rotation": [ 0.061363, 0.007911, 0.989784, -0.128448], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 22.808502, -13.210012, -0.000027] - }, - { - "keytime": 0.500000, - "rotation": [ 0.061363, 0.007911, 0.989784, -0.128448], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 22.808479, -13.210011, -0.000027] - }, - { - "keytime": 0.527778, - "rotation": [ 0.061363, 0.007911, 0.989784, -0.128448], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 22.808479, -13.210007, -0.000027] - }, - { - "keytime": 0.555556, - "rotation": [ 0.061363, 0.007911, 0.989784, -0.128448], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 22.808502, -13.210011, -0.000023] - }, - { - "keytime": 0.583333, - "rotation": [ 0.061363, 0.007911, 0.989784, -0.128448], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 22.808510, -13.210014, -0.000023] - }, - { - "keytime": 0.611111, - "rotation": [ 0.061363, 0.007911, 0.989784, -0.128448], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 22.808502, -13.210011, -0.000025] - }, - { - "keytime": 0.694444, - "rotation": [ 0.061363, 0.007911, 0.989784, -0.128448], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 22.808487, -13.210011, -0.000026] - }, - { - "keytime": 0.722222, - "rotation": [ 0.061363, 0.007911, 0.989784, -0.128448], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 22.808495, -13.210009, -0.000025] - }, - { - "keytime": 0.750000, - "rotation": [ 0.061363, 0.007911, 0.989784, -0.128448], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 22.808487, -13.210011, -0.000028] - }, - { - "keytime": 0.777778, - "rotation": [ 0.061363, 0.007911, 0.989784, -0.128448], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 22.808502, -13.210014, -0.000026] - }, - { - "keytime": 0.805555, - "rotation": [ 0.061363, 0.007911, 0.989784, -0.128448], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 22.808495, -13.210012, -0.000026] - }, - { - "keytime": 0.833333, - "rotation": [ 0.061363, 0.007911, 0.989784, -0.128448], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 22.808502, -13.210016, -0.000025] - }, - { - "keytime": 0.861111, - "rotation": [ 0.061363, 0.007911, 0.989784, -0.128448], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 22.808479, -13.210007, -0.000028] - }, - { - "keytime": 0.888889, - "rotation": [ 0.061363, 0.007911, 0.989784, -0.128448], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 22.808487, -13.210009, -0.000027] - }, - { - "keytime": 0.916667, - "rotation": [ 0.061363, 0.007911, 0.989784, -0.128448], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 22.808479, -13.210007, -0.000027] - }, - { - "keytime": 0.944444, - "rotation": [ 0.061363, 0.007911, 0.989784, -0.128448], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 22.808495, -13.210011, -0.000026] - }, - { - "keytime": 0.972222, - "rotation": [ 0.061363, 0.007911, 0.989784, -0.128448], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 22.808487, -13.210011, -0.000025] - }, - { - "keytime": 1.000000, - "rotation": [ 0.061363, 0.007911, 0.989784, -0.128448], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 22.808495, -13.210014, -0.000026] - } - ] - }, - { - "boneId": "Bip001 Ponytail11", - "keyframes": [ - { - "keytime": 0.000000, - "rotation": [ 0.001409, 0.040135, -0.034265, 0.998606], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.090149, -0.007874, -0.000004] - }, - { - "keytime": 0.027778, - "rotation": [ 0.001172, 0.033370, -0.034274, 0.998855], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.090134, -0.007866, -0.000000] - }, - { - "keytime": 0.055556, - "rotation": [ 0.000917, 0.026126, -0.034281, 0.999070], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.090141, -0.007866, 0.000004] - }, - { - "keytime": 0.083333, - "rotation": [ 0.000642, 0.018298, -0.034287, 0.999244], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.090149, -0.007866, 0.000002] - }, - { - "keytime": 0.111111, - "rotation": [ 0.000368, 0.010476, -0.034291, 0.999357], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.090157, -0.007881, -0.000002] - }, - { - "keytime": 0.138889, - "rotation": [ 0.000090, 0.002566, -0.034293, 0.999409], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.090164, -0.007881, -0.000002] - }, - { - "keytime": 0.166667, - "rotation": [-0.000186, -0.005304, -0.034292, 0.999398], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.090141, -0.007874, -0.000000] - }, - { - "keytime": 0.194444, - "rotation": [-0.000465, -0.013232, -0.034290, 0.999324], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.090141, -0.007873, 0.000000] - }, - { - "keytime": 0.222222, - "rotation": [-0.000724, -0.020622, -0.034286, 0.999199], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.090157, -0.007881, -0.000002] - }, - { - "keytime": 0.250000, - "rotation": [-0.000975, -0.027781, -0.034280, 0.999026], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.090157, -0.007866, 0.000002] - }, - { - "keytime": 0.277778, - "rotation": [-0.001199, -0.034159, -0.034273, 0.998828], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.090118, -0.007858, 0.000008] - }, - { - "keytime": 0.305556, - "rotation": [-0.001399, -0.039843, -0.034266, 0.998617], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.090157, -0.007873, 0.000002] - }, - { - "keytime": 0.333333, - "rotation": [-0.001574, -0.044838, -0.034258, 0.998405], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.090157, -0.007874, 0.000004] - }, - { - "keytime": 0.361111, - "rotation": [-0.001711, -0.048719, -0.034252, 0.998224], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.090134, -0.007874, 0.000000] - }, - { - "keytime": 0.388889, - "rotation": [-0.001810, -0.051538, -0.034247, 0.998082], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.090149, -0.007874, 0.000002] - }, - { - "keytime": 0.416667, - "rotation": [-0.001790, -0.050969, -0.034248, 0.998111], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.090149, -0.007874, -0.000002] - }, - { - "keytime": 0.444444, - "rotation": [-0.001606, -0.045733, -0.034257, 0.998365], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.090149, -0.007881, -0.000002] - }, - { - "keytime": 0.472222, - "rotation": [-0.001305, -0.037179, -0.034269, 0.998720], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.090134, -0.007874, 0.000006] - }, - { - "keytime": 0.500000, - "rotation": [-0.000923, -0.026279, -0.034281, 0.999066], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.090141, -0.007866, 0.000004] - }, - { - "keytime": 0.527778, - "rotation": [-0.000527, -0.014998, -0.034289, 0.999299], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.090149, -0.007866, 0.000004] - }, - { - "keytime": 0.555556, - "rotation": [-0.000154, -0.004374, -0.034293, 0.999402], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.090157, -0.007881, 0.000000] - }, - { - "keytime": 0.583333, - "rotation": [ 0.000220, 0.006264, -0.034292, 0.999392], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.090149, -0.007874, 0.000000] - }, - { - "keytime": 0.611111, - "rotation": [ 0.000651, 0.018548, -0.034287, 0.999240], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.090149, -0.007874, -0.000004] - }, - { - "keytime": 0.638889, - "rotation": [ 0.001098, 0.031278, -0.034276, 0.998922], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.090134, -0.007866, 0.000004] - }, - { - "keytime": 0.666667, - "rotation": [ 0.001556, 0.044309, -0.034259, 0.998429], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.090134, -0.007873, 0.000000] - }, - { - "keytime": 0.694444, - "rotation": [ 0.002020, 0.057534, -0.034236, 0.997754], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.090149, -0.007873, -0.000004] - }, - { - "keytime": 0.722222, - "rotation": [ 0.002447, 0.069681, -0.034209, 0.996980], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.090157, -0.007889, -0.000008] - }, - { - "keytime": 0.750000, - "rotation": [ 0.002832, 0.080657, -0.034181, 0.996152], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.090134, -0.007874, -0.000000] - }, - { - "keytime": 0.777778, - "rotation": [ 0.003168, 0.090232, -0.034153, 0.995330], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.090149, -0.007874, 0.000004] - }, - { - "keytime": 0.805555, - "rotation": [ 0.003419, 0.097388, -0.034130, 0.994655], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.090134, -0.007874, 0.000002] - }, - { - "keytime": 0.833333, - "rotation": [ 0.003460, 0.098542, -0.034126, 0.994542], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.090149, -0.007874, 0.000002] - }, - { - "keytime": 0.861111, - "rotation": [ 0.003239, 0.092254, -0.034146, 0.995145], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.090149, -0.007866, 0.000000] - }, - { - "keytime": 0.888889, - "rotation": [ 0.002898, 0.082550, -0.034176, 0.995997], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.090172, -0.007874, -0.000002] - }, - { - "keytime": 0.916667, - "rotation": [ 0.002566, 0.073072, -0.034201, 0.996737], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.090149, -0.007866, -0.000004] - }, - { - "keytime": 0.944444, - "rotation": [ 0.002219, 0.063206, -0.034224, 0.997411], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.090134, -0.007866, 0.000002] - }, - { - "keytime": 0.972222, - "rotation": [ 0.001820, 0.051851, -0.034247, 0.998066], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.090157, -0.007866, 0.000002] - }, - { - "keytime": 1.000000, - "rotation": [ 0.001409, 0.040135, -0.034265, 0.998606], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 8.090157, -0.007881, -0.000004] - } - ] - }, - { - "boneId": "Bip001 R Forearm", - "keyframes": [ - { - "keytime": 0.000000, - "rotation": [-0.000000, 0.000000, -0.178585, 0.983925], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.361748, -0.000002, -0.000004] - }, - { - "keytime": 0.027778, - "rotation": [-0.000000, 0.000000, -0.175637, 0.984455], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.361755, 0.000002, -0.000000] - }, - { - "keytime": 0.055556, - "rotation": [ 0.000000, 0.000000, -0.170939, 0.985282], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.361755, 0.000004, 0.000000] - }, - { - "keytime": 0.083333, - "rotation": [ 0.000000, 0.000000, -0.166084, 0.986112], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.361755, 0.000002, 0.000000] - }, - { - "keytime": 0.111111, - "rotation": [-0.000000, -0.000000, -0.163103, 0.986609], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.361763, -0.000002, 0.000000] - }, - { - "keytime": 0.138889, - "rotation": [ 0.000000, 0.000000, -0.163573, 0.986531], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.361755, 0.000004, -0.000000] - }, - { - "keytime": 0.166667, - "rotation": [-0.000000, 0.000000, -0.169234, 0.985576], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.361763, 0.000000, 0.000004] - }, - { - "keytime": 0.194444, - "rotation": [-0.000000, 0.000000, -0.180535, 0.983569], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.361748, -0.000000, 0.000000] - }, - { - "keytime": 0.222222, - "rotation": [ 0.000000, 0.000000, -0.195052, 0.980793], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.361763, 0.000002, 0.000000] - }, - { - "keytime": 0.250000, - "rotation": [-0.000000, -0.000000, -0.212639, 0.977131], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.361755, 0.000002, -0.000004] - }, - { - "keytime": 0.277778, - "rotation": [ 0.000000, -0.000000, -0.231309, 0.972880], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.361763, -0.000004, -0.000000] - }, - { - "keytime": 0.305556, - "rotation": [-0.000000, 0.000000, -0.250613, 0.968087], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.361755, -0.000001, -0.000004] - }, - { - "keytime": 0.333333, - "rotation": [-0.000000, 0.000000, -0.270195, 0.962806], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.361748, 0.000001, -0.000004] - }, - { - "keytime": 0.361111, - "rotation": [-0.000000, -0.000000, -0.287996, 0.957632], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.361755, 0.000001, -0.000004] - }, - { - "keytime": 0.388889, - "rotation": [ 0.000000, -0.000000, -0.303721, 0.952761], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.361763, -0.000001, -0.000000] - }, - { - "keytime": 0.416667, - "rotation": [-0.000000, 0.000000, -0.316845, 0.948478], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.361763, -0.000001, 0.000004] - }, - { - "keytime": 0.444444, - "rotation": [ 0.000000, -0.000000, -0.325737, 0.945461], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.361755, 0.000000, 0.000000] - }, - { - "keytime": 0.472222, - "rotation": [ 0.000000, -0.000000, -0.329985, 0.943986], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.361748, 0.000001, -0.000000] - }, - { - "keytime": 0.500000, - "rotation": [ 0.000000, 0.000000, -0.328654, 0.944450], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.361748, -0.000000, 0.000000] - }, - { - "keytime": 0.527778, - "rotation": [ 0.000000, 0.000000, -0.322224, 0.946664], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.361748, 0.000000, -0.000000] - }, - { - "keytime": 0.555556, - "rotation": [ 0.000000, 0.000000, -0.311690, 0.950184], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.361763, -0.000001, 0.000000] - }, - { - "keytime": 0.583333, - "rotation": [-0.000000, -0.000000, -0.297997, 0.954567], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.361748, -0.000000, 0.000000] - }, - { - "keytime": 0.611111, - "rotation": [ 0.000000, 0.000000, -0.281598, 0.959532], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.361755, 0.000001, -0.000008] - }, - { - "keytime": 0.638889, - "rotation": [-0.000000, 0.000000, -0.264445, 0.964401], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.361755, 0.000000, 0.000004] - }, - { - "keytime": 0.666667, - "rotation": [-0.000000, -0.000000, -0.247080, 0.968995], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.361763, -0.000000, 0.000000] - }, - { - "keytime": 0.694444, - "rotation": [-0.000000, -0.000000, -0.230040, 0.973181], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.361763, 0.000000, 0.000004] - }, - { - "keytime": 0.722222, - "rotation": [-0.000000, 0.000000, -0.215372, 0.976532], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.361748, 0.000000, 0.000004] - }, - { - "keytime": 0.750000, - "rotation": [-0.000000, -0.000000, -0.203577, 0.979059], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.361748, 0.000000, -0.000004] - }, - { - "keytime": 0.777778, - "rotation": [-0.000000, 0.000000, -0.197105, 0.980382], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.361755, -0.000002, -0.000000] - }, - { - "keytime": 0.805555, - "rotation": [-0.000000, 0.000000, -0.195770, 0.980650], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.361755, 0.000002, 0.000000] - }, - { - "keytime": 0.833333, - "rotation": [-0.000000, 0.000000, -0.195620, 0.980680], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.361755, 0.000004, -0.000004] - }, - { - "keytime": 0.861111, - "rotation": [-0.000000, 0.000000, -0.192782, 0.981242], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.361763, 0.000000, 0.000004] - }, - { - "keytime": 0.888889, - "rotation": [ 0.000000, 0.000000, -0.186625, 0.982431], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.361755, 0.000004, 0.000004] - }, - { - "keytime": 0.916667, - "rotation": [ 0.000000, 0.000000, -0.179211, 0.983811], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.361755, 0.000000, 0.000000] - }, - { - "keytime": 0.944444, - "rotation": [ 0.000000, -0.000000, -0.170817, 0.985303], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.361755, -0.000004, -0.000000] - }, - { - "keytime": 0.972222, - "rotation": [ 0.000000, 0.000000, -0.162465, 0.986714], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.361763, -0.000000, -0.000000] - }, - { - "keytime": 1.000000, - "rotation": [-0.000000, -0.000000, -0.154215, 0.988037], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.361755, 0.000000, 0.000004] - } - ] - }, - { - "boneId": "Bip001 Ponytail12", - "keyframes": [ - { - "keytime": 0.000000, - "rotation": [ 0.001041, 0.092020, -0.010467, 0.995702], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.909294, -0.012123, -0.000002] - }, - { - "keytime": 0.027778, - "rotation": [ 0.000936, 0.082776, -0.010476, 0.996513], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.909302, -0.012123, -0.000002] - }, - { - "keytime": 0.055556, - "rotation": [ 0.000830, 0.073348, -0.010484, 0.997251], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.909302, -0.012131, -0.000002] - }, - { - "keytime": 0.083333, - "rotation": [ 0.000718, 0.063493, -0.010491, 0.997927], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.909302, -0.012115, -0.000002] - }, - { - "keytime": 0.111111, - "rotation": [ 0.000609, 0.053840, -0.010497, 0.998494], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.909286, -0.012123, 0.000002] - }, - { - "keytime": 0.138889, - "rotation": [ 0.000499, 0.044149, -0.010502, 0.998970], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.909279, -0.012115, 0.000004] - }, - { - "keytime": 0.166667, - "rotation": [ 0.000390, 0.034469, -0.010506, 0.999350], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.909294, -0.012131, 0.000000] - }, - { - "keytime": 0.194444, - "rotation": [ 0.000278, 0.024559, -0.010509, 0.999643], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.909286, -0.012123, -0.000000] - }, - { - "keytime": 0.222222, - "rotation": [ 0.000170, 0.015051, -0.010511, 0.999831], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.909294, -0.012123, 0.000000] - }, - { - "keytime": 0.250000, - "rotation": [ 0.000061, 0.005421, -0.010512, 0.999930], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.909286, -0.012123, 0.000000] - }, - { - "keytime": 0.277778, - "rotation": [-0.000042, -0.003714, -0.010512, 0.999938], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.909309, -0.012131, -0.000008] - }, - { - "keytime": 0.305556, - "rotation": [-0.000142, -0.012592, -0.010511, 0.999865], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.909286, -0.012116, -0.000000] - }, - { - "keytime": 0.333333, - "rotation": [-0.000242, -0.021418, -0.010510, 0.999715], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.909286, -0.012123, 0.000004] - }, - { - "keytime": 0.361111, - "rotation": [-0.000335, -0.029626, -0.010508, 0.999506], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.909286, -0.012123, 0.000000] - }, - { - "keytime": 0.388889, - "rotation": [-0.000423, -0.037428, -0.010505, 0.999244], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.909279, -0.012123, -0.000000] - }, - { - "keytime": 0.416667, - "rotation": [-0.000511, -0.045153, -0.010502, 0.998925], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.909279, -0.012123, 0.000004] - }, - { - "keytime": 0.444444, - "rotation": [-0.000589, -0.052059, -0.010498, 0.998589], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.909279, -0.012123, 0.000004] - }, - { - "keytime": 0.472222, - "rotation": [-0.000653, -0.057745, -0.010495, 0.998276], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.909309, -0.012131, -0.000004] - }, - { - "keytime": 0.500000, - "rotation": [-0.000697, -0.061658, -0.010492, 0.998042], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.909286, -0.012123, -0.000000] - }, - { - "keytime": 0.527778, - "rotation": [-0.000712, -0.062927, -0.010491, 0.997963], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.909294, -0.012123, 0.000004] - }, - { - "keytime": 0.555556, - "rotation": [-0.000690, -0.061053, -0.010493, 0.998079], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.909294, -0.012123, 0.000000] - }, - { - "keytime": 0.583333, - "rotation": [-0.000641, -0.056652, -0.010495, 0.998339], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.909302, -0.012131, -0.000006] - }, - { - "keytime": 0.611111, - "rotation": [-0.000573, -0.050674, -0.010499, 0.998660], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.909286, -0.012123, 0.000004] - }, - { - "keytime": 0.638889, - "rotation": [-0.000493, -0.043609, -0.010502, 0.998993], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.909309, -0.012131, 0.000000] - }, - { - "keytime": 0.666667, - "rotation": [-0.000401, -0.035428, -0.010506, 0.999317], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.909302, -0.012123, -0.000002] - }, - { - "keytime": 0.694444, - "rotation": [-0.000294, -0.025963, -0.010509, 0.999608], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.909294, -0.012123, -0.000000] - }, - { - "keytime": 0.722222, - "rotation": [-0.000180, -0.015900, -0.010511, 0.999818], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.909286, -0.012115, 0.000002] - }, - { - "keytime": 0.750000, - "rotation": [-0.000058, -0.005102, -0.010512, 0.999932], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.909279, -0.012123, 0.000000] - }, - { - "keytime": 0.777778, - "rotation": [ 0.000075, 0.006657, -0.010512, 0.999923], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.909302, -0.012131, -0.000001] - }, - { - "keytime": 0.805555, - "rotation": [ 0.000209, 0.018510, -0.010510, 0.999773], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.909302, -0.012123, -0.000001] - }, - { - "keytime": 0.833333, - "rotation": [ 0.000401, 0.035465, -0.010505, 0.999316], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.909302, -0.012123, -0.000000] - }, - { - "keytime": 0.861111, - "rotation": [ 0.000667, 0.058969, -0.010494, 0.998204], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.909294, -0.012123, -0.000000] - }, - { - "keytime": 0.888889, - "rotation": [ 0.000921, 0.081473, -0.010477, 0.996620], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.909294, -0.012123, 0.000000] - }, - { - "keytime": 0.916667, - "rotation": [ 0.001102, 0.097460, -0.010462, 0.995184], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.909286, -0.012123, -0.000002] - }, - { - "keytime": 0.944444, - "rotation": [ 0.001146, 0.101336, -0.010458, 0.994797], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.909302, -0.012131, -0.000003] - }, - { - "keytime": 0.972222, - "rotation": [ 0.001094, 0.096771, -0.010462, 0.995251], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.909294, -0.012123, -0.000002] - }, - { - "keytime": 1.000000, - "rotation": [ 0.001041, 0.092020, -0.010467, 0.995702], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 9.909286, -0.012115, 0.000000] - } - ] - }, - { - "boneId": "Bip001 R Hand", - "keyframes": [ - { - "keytime": 0.000000, - "rotation": [ 0.688181, -0.026022, 0.160038, 0.707190], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.590919, -0.000000, -0.000000] - }, - { - "keytime": 0.027778, - "rotation": [ 0.707529, -0.029188, 0.141334, 0.691791], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.590912, 0.000000, 0.000004] - }, - { - "keytime": 0.055556, - "rotation": [ 0.729458, -0.031647, 0.121693, 0.672369], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.590897, -0.000001, 0.000000] - }, - { - "keytime": 0.083333, - "rotation": [ 0.751116, -0.034138, 0.101289, 0.651460], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.590912, -0.000001, 0.000000] - }, - { - "keytime": 0.111111, - "rotation": [ 0.768173, -0.037194, 0.082176, 0.633857], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.590897, 0.000001, -0.000004] - }, - { - "keytime": 0.138889, - "rotation": [ 0.778642, -0.041570, 0.064642, 0.622744], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.590919, -0.000001, -0.000000] - }, - { - "keytime": 0.166667, - "rotation": [ 0.779951, -0.047947, 0.049624, 0.622025], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.590912, -0.000000, 0.000000] - }, - { - "keytime": 0.194444, - "rotation": [ 0.772491, -0.056988, 0.035475, 0.631468], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.590904, -0.000000, -0.000008] - }, - { - "keytime": 0.222222, - "rotation": [ 0.759833, -0.067676, 0.021360, 0.646234], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.590912, -0.000000, 0.000008] - }, - { - "keytime": 0.250000, - "rotation": [ 0.742143, -0.080017, 0.006769, 0.665413], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.590912, -0.000000, 0.000004] - }, - { - "keytime": 0.277778, - "rotation": [ 0.721396, -0.092680, -0.007099, 0.686256], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.590919, -0.000002, 0.000000] - }, - { - "keytime": 0.305556, - "rotation": [ 0.698218, -0.105425, -0.020334, 0.707788], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.590912, -0.000002, -0.000000] - }, - { - "keytime": 0.333333, - "rotation": [ 0.673141, -0.118046, -0.032959, 0.729288], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.590916, 0.000000, 0.000004] - }, - { - "keytime": 0.361111, - "rotation": [ 0.649119, -0.129264, -0.043909, 0.748337], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.590919, 0.000000, 0.000000] - }, - { - "keytime": 0.388889, - "rotation": [ 0.627050, -0.138961, -0.053271, 0.764631], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.590919, 0.000000, -0.000000] - }, - { - "keytime": 0.416667, - "rotation": [ 0.608189, -0.146875, -0.060966, 0.777699], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.590912, 0.000000, -0.000000] - }, - { - "keytime": 0.444444, - "rotation": [ 0.595458, -0.152100, -0.066271, 0.786068], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.590912, 0.000000, 0.000000] - }, - { - "keytime": 0.472222, - "rotation": [ 0.590002, -0.154465, -0.069190, 0.789463], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.590904, -0.000004, -0.000004] - }, - { - "keytime": 0.500000, - "rotation": [ 0.592921, -0.153484, -0.069305, 0.787454], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.590912, 0.000004, 0.000008] - }, - { - "keytime": 0.527778, - "rotation": [ 0.602882, -0.149434, -0.066617, 0.780874], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.590904, 0.000000, 0.000000] - }, - { - "keytime": 0.555556, - "rotation": [ 0.618388, -0.142805, -0.061488, 0.770339], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.590904, -0.000000, -0.000008] - }, - { - "keytime": 0.583333, - "rotation": [ 0.637931, -0.134059, -0.054232, 0.756394], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.590916, 0.000004, -0.000000] - }, - { - "keytime": 0.611111, - "rotation": [ 0.660703, -0.123336, -0.044879, 0.739084], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.590916, 0.000004, 0.000000] - }, - { - "keytime": 0.638889, - "rotation": [ 0.683913, -0.111774, -0.034329, 0.720133], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.590912, 0.000000, -0.000004] - }, - { - "keytime": 0.666667, - "rotation": [ 0.706881, -0.099610, -0.022696, 0.699916], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.590904, -0.000002, -0.000004] - }, - { - "keytime": 0.694444, - "rotation": [ 0.729055, -0.087038, -0.009976, 0.678826], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.590912, 0.000002, 0.000004] - }, - { - "keytime": 0.722222, - "rotation": [ 0.748107, -0.075385, 0.002694, 0.659277], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.590927, 0.000003, -0.000000] - }, - { - "keytime": 0.750000, - "rotation": [ 0.763802, -0.064909, 0.015202, 0.641998], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.590912, 0.000002, 0.000008] - }, - { - "keytime": 0.777778, - "rotation": [ 0.779721, -0.053101, 0.033505, 0.622970], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.590919, 0.000001, 0.000000] - }, - { - "keytime": 0.805555, - "rotation": [ 0.794602, -0.039971, 0.058259, 0.603005], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.590904, -0.000001, -0.000000] - }, - { - "keytime": 0.833333, - "rotation": [ 0.803741, -0.028110, 0.084008, 0.588348], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.590919, -0.000000, 0.000000] - }, - { - "keytime": 0.861111, - "rotation": [ 0.802659, -0.020361, 0.105324, 0.586712], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.590904, -0.000000, 0.000000] - }, - { - "keytime": 0.888889, - "rotation": [ 0.790315, -0.018012, 0.119658, 0.600633], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.590927, -0.000002, 0.000000] - }, - { - "keytime": 0.916667, - "rotation": [ 0.770123, -0.018684, 0.131151, 0.623988], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.590912, -0.000001, 0.000000] - }, - { - "keytime": 0.944444, - "rotation": [ 0.743782, -0.021169, 0.141131, 0.653011], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.590919, 0.000001, 0.000000] - }, - { - "keytime": 0.972222, - "rotation": [ 0.715790, -0.024016, 0.150138, 0.681562], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.590912, 0.000000, 0.000000] - }, - { - "keytime": 1.000000, - "rotation": [ 0.688181, -0.026022, 0.160038, 0.707190], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 20.590912, -0.000000, 0.000000] - } - ] - }, - { - "boneId": "Bip001 R Finger1Nub", - "keyframes": [ - { - "keytime": 0.000000, - "rotation": [-0.000000, -0.000000, 1.000000, 0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 4.151039, 0.000000, 0.000000] - }, - { - "keytime": 0.027778, - "rotation": [-0.000000, -0.000000, 1.000000, -0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 4.151039, -0.000000, 0.000001] - }, - { - "keytime": 0.055556, - "rotation": [-0.000000, 0.000000, 1.000000, 0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 4.151039, 0.000003, 0.000001] - }, - { - "keytime": 0.083333, - "rotation": [ 0.000000, -0.000000, 1.000000, 0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 4.151031, 0.000001, 0.000001] - }, - { - "keytime": 0.111111, - "rotation": [ 0.000000, 0.000000, 1.000000, 0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 4.151039, -0.000001, 0.000001] - }, - { - "keytime": 0.138889, - "rotation": [ 0.000000, -0.000000, 1.000000, 0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 4.151039, 0.000002, 0.000001] - }, - { - "keytime": 0.166667, - "rotation": [ 0.000000, -0.000000, 1.000000, 0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 4.151039, -0.000000, 0.000000] - }, - { - "keytime": 0.194444, - "rotation": [ 0.000000, 0.000000, 1.000000, 0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 4.151031, 0.000003, -0.000000] - }, - { - "keytime": 0.250000, - "rotation": [ 0.000000, 0.000000, 1.000000, 0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 4.151039, 0.000000, -0.000000] - }, - { - "keytime": 0.277778, - "rotation": [ 0.000000, -0.000000, 1.000000, 0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 4.151047, -0.000001, -0.000000] - }, - { - "keytime": 0.305556, - "rotation": [ 0.000000, 0.000000, 1.000000, 0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 4.151035, -0.000002, 0.000000] - }, - { - "keytime": 0.333333, - "rotation": [-0.000000, 0.000000, 1.000000, 0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 4.151043, 0.000000, -0.000004] - }, - { - "keytime": 0.361111, - "rotation": [-0.000000, -0.000000, 1.000000, 0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 4.151043, 0.000002, -0.000004] - }, - { - "keytime": 0.388889, - "rotation": [ 0.000000, -0.000000, 1.000000, 0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 4.151039, 0.000000, -0.000000] - }, - { - "keytime": 0.416667, - "rotation": [ 0.000000, -0.000000, 1.000000, -0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 4.151043, -0.000004, -0.000004] - }, - { - "keytime": 0.444444, - "rotation": [-0.000000, 0.000000, 1.000000, 0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 4.151047, -0.000000, -0.000000] - }, - { - "keytime": 0.472222, - "rotation": [ 0.000000, -0.000000, 1.000000, 0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 4.151047, 0.000000, -0.000004] - }, - { - "keytime": 0.500000, - "rotation": [ 0.000000, 0.000000, 1.000000, 0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 4.151039, 0.000000, 0.000000] - }, - { - "keytime": 0.527778, - "rotation": [ 0.000000, 0.000000, 1.000000, 0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 4.151035, -0.000004, 0.000000] - }, - { - "keytime": 0.555556, - "rotation": [-0.000000, 0.000000, 1.000000, 0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 4.151039, 0.000004, 0.000000] - }, - { - "keytime": 0.583333, - "rotation": [ 0.000000, -0.000000, 1.000000, 0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 4.151035, -0.000004, -0.000000] - }, - { - "keytime": 0.611111, - "rotation": [ 0.000000, -0.000000, 1.000000, 0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 4.151035, 0.000002, -0.000000] - }, - { - "keytime": 0.638889, - "rotation": [ 0.000000, 0.000000, 1.000000, 0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 4.151031, 0.000002, 0.000004] - }, - { - "keytime": 0.666667, - "rotation": [-0.000000, -0.000000, 1.000000, 0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 4.151031, 0.000000, 0.000000] - }, - { - "keytime": 0.694444, - "rotation": [ 0.000000, -0.000000, 1.000000, 0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 4.151039, 0.000000, -0.000000] - }, - { - "keytime": 0.722222, - "rotation": [ 0.000000, 0.000000, 1.000000, -0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 4.151031, -0.000002, -0.000000] - }, - { - "keytime": 0.750000, - "rotation": [ 0.000000, -0.000000, 1.000000, 0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 4.151039, -0.000000, -0.000000] - }, - { - "keytime": 0.777778, - "rotation": [-0.000000, 0.000000, 1.000000, 0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 4.151039, 0.000001, 0.000002] - }, - { - "keytime": 0.805555, - "rotation": [-0.000000, 0.000000, 1.000000, 0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 4.151039, -0.000002, 0.000000] - }, - { - "keytime": 0.833333, - "rotation": [ 0.000000, 0.000000, 1.000000, -0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 4.151031, -0.000002, -0.000001] - }, - { - "keytime": 0.861111, - "rotation": [-0.000000, -0.000000, 1.000000, -0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 4.151047, -0.000001, 0.000001] - }, - { - "keytime": 0.888889, - "rotation": [-0.000000, 0.000000, 1.000000, 0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 4.151031, -0.000000, 0.000000] - }, - { - "keytime": 0.916667, - "rotation": [-0.000000, -0.000000, 1.000000, -0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 4.151039, 0.000000, -0.000000] - }, - { - "keytime": 0.944444, - "rotation": [-0.000000, -0.000000, 1.000000, 0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 4.151039, -0.000002, 0.000000] - }, - { - "keytime": 0.972222, - "rotation": [-0.000000, 0.000000, 1.000000, 0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 4.151031, 0.000002, -0.000002] - }, - { - "keytime": 1.000000, - "rotation": [-0.000000, -0.000000, 1.000000, -0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 4.151039, 0.000000, -0.000001] - } - ] - }, - { - "boneId": "Bip001 HeadNub", - "keyframes": [ - { - "keytime": 0.000000, - "rotation": [ 0.000000, 0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 22.780968, 0.000000, 0.000000] - }, - { - "keytime": 0.027778, - "rotation": [ 0.000000, 0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 22.780975, -0.000002, 0.000002] - }, - { - "keytime": 0.055556, - "rotation": [ 0.000000, 0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 22.780968, 0.000002, 0.000000] - }, - { - "keytime": 0.083333, - "rotation": [-0.000000, 0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 22.780983, -0.000002, 0.000001] - }, - { - "keytime": 0.111111, - "rotation": [-0.000000, 0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 22.780983, -0.000002, 0.000001] - }, - { - "keytime": 0.138889, - "rotation": [ 0.000000, 0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 22.780983, -0.000000, -0.000002] - }, - { - "keytime": 0.166667, - "rotation": [-0.000000, 0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 22.780983, 0.000000, -0.000000] - }, - { - "keytime": 0.194444, - "rotation": [ 0.000000, -0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 22.780975, -0.000004, 0.000000] - }, - { - "keytime": 0.222222, - "rotation": [-0.000000, -0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 22.780975, 0.000002, 0.000000] - }, - { - "keytime": 0.250000, - "rotation": [-0.000000, -0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 22.780952, 0.000004, -0.000001] - }, - { - "keytime": 0.277778, - "rotation": [ 0.000000, -0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 22.780983, 0.000000, -0.000000] - }, - { - "keytime": 0.305556, - "rotation": [-0.000000, -0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 22.780975, 0.000002, -0.000001] - }, - { - "keytime": 0.333333, - "rotation": [ 0.000000, 0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 22.780968, 0.000002, -0.000001] - }, - { - "keytime": 0.361111, - "rotation": [ 0.000000, -0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 22.780968, 0.000000, -0.000001] - }, - { - "keytime": 0.388889, - "rotation": [ 0.000000, 0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 22.780968, -0.000004, -0.000000] - }, - { - "keytime": 0.416667, - "rotation": [ 0.000000, -0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 22.780975, 0.000004, -0.000001] - }, - { - "keytime": 0.444444, - "rotation": [ 0.000000, 0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 22.780983, 0.000002, -0.000001] - }, - { - "keytime": 0.472222, - "rotation": [-0.000000, 0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 22.780975, 0.000002, -0.000000] - }, - { - "keytime": 0.500000, - "rotation": [ 0.000000, 0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 22.780983, -0.000004, 0.000000] - }, - { - "keytime": 0.527778, - "rotation": [ 0.000000, -0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 22.780983, -0.000000, 0.000000] - }, - { - "keytime": 0.555556, - "rotation": [-0.000000, 0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 22.780960, 0.000004, -0.000000] - }, - { - "keytime": 0.583333, - "rotation": [ 0.000000, 0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 22.780968, 0.000000, -0.000000] - }, - { - "keytime": 0.611111, - "rotation": [ 0.000000, -0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 22.780975, -0.000000, 0.000002] - }, - { - "keytime": 0.666667, - "rotation": [ 0.000000, -0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 22.780975, 0.000000, 0.000001] - }, - { - "keytime": 0.694444, - "rotation": [ 0.000000, -0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 22.780975, -0.000002, 0.000001] - }, - { - "keytime": 0.722222, - "rotation": [-0.000000, -0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 22.780968, 0.000002, 0.000001] - }, - { - "keytime": 0.750000, - "rotation": [-0.000000, -0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 22.780975, -0.000000, -0.000001] - }, - { - "keytime": 0.777778, - "rotation": [-0.000000, 0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 22.780975, 0.000004, -0.000001] - }, - { - "keytime": 0.805555, - "rotation": [ 0.000000, -0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 22.780968, 0.000002, -0.000001] - }, - { - "keytime": 0.833333, - "rotation": [ 0.000000, -0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 22.780960, 0.000002, -0.000002] - }, - { - "keytime": 0.861111, - "rotation": [ 0.000000, -0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 22.780968, 0.000002, -0.000001] - }, - { - "keytime": 0.888889, - "rotation": [-0.000000, 0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 22.780960, 0.000004, -0.000003] - }, - { - "keytime": 0.916667, - "rotation": [ 0.000000, 0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 22.780968, 0.000002, -0.000000] - }, - { - "keytime": 0.944444, - "rotation": [ 0.000000, -0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 22.780968, 0.000000, 0.000001] - }, - { - "keytime": 0.972222, - "rotation": [-0.000000, 0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 22.780960, -0.000004, 0.000000] - }, - { - "keytime": 1.000000, - "rotation": [ 0.000000, -0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 22.780968, -0.000000, -0.000000] - } - ] - }, - { - "boneId": "Bip001 Ponytail1Nub", - "keyframes": [ - { - "keytime": 0.000000, - "rotation": [ 0.707388, 0.706825, 0.000001, -0.000001], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 15.228790, 0.000000, 0.000000] - }, - { - "keytime": 0.027778, - "rotation": [ 0.707388, 0.706825, 0.000001, -0.000001], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 15.228798, -0.000000, -0.000000] - }, - { - "keytime": 0.055556, - "rotation": [ 0.707388, 0.706825, 0.000001, -0.000001], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 15.228783, 0.000008, -0.000000] - }, - { - "keytime": 0.083333, - "rotation": [ 0.707388, 0.706825, 0.000001, -0.000001], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 15.228783, 0.000008, 0.000000] - }, - { - "keytime": 0.111111, - "rotation": [ 0.707388, 0.706825, 0.000001, -0.000001], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 15.228783, 0.000000, 0.000000] - }, - { - "keytime": 0.138889, - "rotation": [ 0.707388, 0.706825, 0.000001, -0.000001], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 15.228790, -0.000000, -0.000002] - }, - { - "keytime": 0.166667, - "rotation": [ 0.707388, 0.706825, 0.000001, -0.000001], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 15.228783, -0.000000, 0.000002] - }, - { - "keytime": 0.194444, - "rotation": [ 0.707388, 0.706825, 0.000001, -0.000001], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 15.228798, 0.000000, 0.000002] - }, - { - "keytime": 0.222222, - "rotation": [ 0.707388, 0.706825, 0.000001, -0.000001], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 15.228783, 0.000000, 0.000000] - }, - { - "keytime": 0.250000, - "rotation": [ 0.707388, 0.706825, 0.000001, -0.000001], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 15.228798, 0.000000, 0.000000] - }, - { - "keytime": 0.277778, - "rotation": [ 0.707388, 0.706825, 0.000001, -0.000001], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 15.228798, 0.000008, -0.000004] - }, - { - "keytime": 0.333333, - "rotation": [ 0.707388, 0.706825, 0.000001, -0.000001], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 15.228790, 0.000000, 0.000000] - }, - { - "keytime": 0.361111, - "rotation": [ 0.707388, 0.706825, 0.000001, -0.000001], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 15.228790, -0.000008, -0.000000] - }, - { - "keytime": 0.416667, - "rotation": [ 0.707388, 0.706825, 0.000001, -0.000001], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 15.228798, -0.000000, 0.000000] - }, - { - "keytime": 0.444444, - "rotation": [ 0.707388, 0.706825, 0.000001, -0.000001], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 15.228790, 0.000000, -0.000000] - }, - { - "keytime": 0.472222, - "rotation": [ 0.707388, 0.706825, 0.000001, -0.000001], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 15.228783, 0.000000, 0.000004] - }, - { - "keytime": 0.500000, - "rotation": [ 0.707388, 0.706825, 0.000001, -0.000001], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 15.228790, 0.000000, -0.000004] - }, - { - "keytime": 0.527778, - "rotation": [ 0.707388, 0.706825, 0.000001, -0.000001], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 15.228798, -0.000008, -0.000000] - }, - { - "keytime": 0.555556, - "rotation": [ 0.707388, 0.706825, 0.000001, -0.000001], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 15.228798, -0.000000, 0.000000] - }, - { - "keytime": 0.583333, - "rotation": [ 0.707388, 0.706825, 0.000001, -0.000001], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 15.228783, 0.000008, 0.000000] - }, - { - "keytime": 0.611111, - "rotation": [ 0.707388, 0.706825, 0.000001, -0.000001], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 15.228790, 0.000000, 0.000000] - }, - { - "keytime": 0.638889, - "rotation": [ 0.707388, 0.706825, 0.000001, -0.000001], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 15.228783, -0.000000, -0.000004] - }, - { - "keytime": 0.666667, - "rotation": [ 0.707388, 0.706825, 0.000001, -0.000001], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 15.228790, 0.000008, -0.000000] - }, - { - "keytime": 0.694444, - "rotation": [ 0.707388, 0.706825, 0.000001, -0.000001], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 15.228783, 0.000000, 0.000002] - }, - { - "keytime": 0.722222, - "rotation": [ 0.707388, 0.706825, 0.000001, -0.000001], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 15.228790, -0.000000, 0.000000] - }, - { - "keytime": 0.750000, - "rotation": [ 0.707388, 0.706825, 0.000001, -0.000001], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 15.228798, 0.000000, -0.000000] - }, - { - "keytime": 0.777778, - "rotation": [ 0.707388, 0.706825, 0.000001, -0.000001], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 15.228783, 0.000000, 0.000000] - }, - { - "keytime": 0.805555, - "rotation": [ 0.707388, 0.706825, 0.000001, -0.000001], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 15.228798, -0.000000, 0.000000] - }, - { - "keytime": 0.833333, - "rotation": [ 0.707388, 0.706825, 0.000001, -0.000001], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 15.228790, -0.000000, -0.000000] - }, - { - "keytime": 0.861111, - "rotation": [ 0.707388, 0.706825, 0.000001, -0.000001], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 15.228783, 0.000008, 0.000000] - }, - { - "keytime": 0.916667, - "rotation": [ 0.707388, 0.706825, 0.000001, -0.000001], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 15.228790, -0.000000, -0.000000] - }, - { - "keytime": 0.944444, - "rotation": [ 0.707388, 0.706825, 0.000001, -0.000001], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 15.228798, 0.000000, -0.000001] - }, - { - "keytime": 0.972222, - "rotation": [ 0.707388, 0.706825, 0.000001, -0.000001], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 15.228783, -0.000008, -0.000001] - }, - { - "keytime": 1.000000, - "rotation": [ 0.707388, 0.706825, 0.000001, -0.000001], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 15.228790, 0.000000, 0.000000] - } - ] - }, - { - "boneId": "Bip001 L Thigh", - "keyframes": [ - { - "keytime": 0.000000, - "rotation": [-0.114788, 0.992651, 0.031106, -0.022351], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-8.427422, 1.410457, 8.766703] - }, - { - "keytime": 0.027778, - "rotation": [-0.073267, 0.996424, 0.017913, -0.038095], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-8.044332, 1.413706, 8.917484] - }, - { - "keytime": 0.055556, - "rotation": [-0.031937, 0.998022, 0.003923, -0.054001], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-7.657920, 1.413757, 9.052235] - }, - { - "keytime": 0.083333, - "rotation": [ 0.013517, 0.997759, -0.011987, -0.064421], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-7.371239, 1.418080, 9.143500] - }, - { - "keytime": 0.111111, - "rotation": [ 0.066039, 0.995180, -0.028844, -0.066503], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-7.091226, 1.420362, 9.223919] - }, - { - "keytime": 0.138889, - "rotation": [ 0.121475, 0.989900, -0.045820, -0.056940], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-7.109674, 1.440309, 9.219720] - }, - { - "keytime": 0.166667, - "rotation": [ 0.176520, 0.981515, -0.055429, -0.048954], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-7.126777, 1.459841, 9.215789] - }, - { - "keytime": 0.194444, - "rotation": [ 0.214534, 0.974871, -0.051738, -0.030417], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-7.414445, 1.495528, 9.130481] - }, - { - "keytime": 0.222222, - "rotation": [ 0.250912, 0.966756, -0.047712, -0.012197], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-7.698913, 1.524969, 9.037525] - }, - { - "keytime": 0.250000, - "rotation": [ 0.271594, 0.961780, -0.034247, 0.006496], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-8.022026, 1.556878, 8.919048] - }, - { - "keytime": 0.277778, - "rotation": [ 0.291659, 0.956034, -0.018676, 0.024206], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-8.333797, 1.583722, 8.793536] - }, - { - "keytime": 0.305556, - "rotation": [ 0.292671, 0.955503, -0.001856, 0.036799], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-8.510896, 1.606959, 8.716415] - }, - { - "keytime": 0.333333, - "rotation": [ 0.294841, 0.954058, 0.012041, 0.051930], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-8.694336, 1.630502, 8.632378] - }, - { - "keytime": 0.361111, - "rotation": [ 0.280794, 0.957774, 0.018021, 0.059155], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-8.644709, 1.652871, 8.653896] - }, - { - "keytime": 0.388889, - "rotation": [ 0.270825, 0.960090, 0.019804, 0.066998], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-8.633492, 1.672658, 8.657011] - }, - { - "keytime": 0.416667, - "rotation": [ 0.271741, 0.959780, 0.018580, 0.068080], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-8.575447, 1.691037, 8.684336] - }, - { - "keytime": 0.444444, - "rotation": [ 0.276398, 0.958384, 0.017168, 0.069356], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-8.517136, 1.709037, 8.711280] - }, - { - "keytime": 0.472222, - "rotation": [ 0.282023, 0.956033, 0.023945, 0.076755], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-8.832605, 1.697673, 8.576487] - }, - { - "keytime": 0.500000, - "rotation": [ 0.292700, 0.952028, 0.030280, 0.083981], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-9.193459, 1.678984, 8.405820] - }, - { - "keytime": 0.527778, - "rotation": [ 0.292640, 0.950669, 0.035952, 0.096420], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-9.775896, 1.650753, 8.087597] - }, - { - "keytime": 0.555556, - "rotation": [ 0.294397, 0.948358, 0.046104, 0.108731], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-10.345566, 1.555428, 7.742260] - }, - { - "keytime": 0.583333, - "rotation": [ 0.273776, 0.953523, 0.049748, 0.115611], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-10.673684, 1.493740, 7.519708] - }, - { - "keytime": 0.611111, - "rotation": [ 0.252179, 0.958291, 0.054321, 0.123019], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-11.001801, 1.427522, 7.279614] - }, - { - "keytime": 0.638889, - "rotation": [ 0.219644, 0.967024, 0.047897, 0.119697], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-10.930054, 1.407764, 7.337693] - }, - { - "keytime": 0.666667, - "rotation": [ 0.186911, 0.974560, 0.041684, 0.116447], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-10.861209, 1.381138, 7.393818] - }, - { - "keytime": 0.694444, - "rotation": [ 0.148668, 0.982874, 0.026958, 0.105498], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-10.573190, 1.397408, 7.603175] - }, - { - "keytime": 0.722222, - "rotation": [ 0.111474, 0.989159, 0.011825, 0.094860], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-10.283604, 1.407483, 7.800935] - }, - { - "keytime": 0.750000, - "rotation": [ 0.074823, 0.993594, -0.006777, 0.084421], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-10.006869, 1.418915, 7.976343] - }, - { - "keytime": 0.777778, - "rotation": [ 0.037592, 0.996266, -0.025523, 0.073417], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-9.710903, 1.430860, 8.151744] - }, - { - "keytime": 0.805555, - "rotation": [ 0.008040, 0.997298, -0.029342, 0.066862], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-9.542633, 1.277079, 8.260144] - }, - { - "keytime": 0.833333, - "rotation": [-0.020086, 0.997415, -0.030962, 0.061646], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-9.383662, 1.080532, 8.354553] - }, - { - "keytime": 0.861111, - "rotation": [-0.041650, 0.997303, -0.025534, 0.054765], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-9.256496, 0.904048, 8.437755] - }, - { - "keytime": 0.888889, - "rotation": [-0.063135, 0.996508, -0.026786, 0.047628], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-9.123127, 0.825766, 8.513539] - }, - { - "keytime": 0.916667, - "rotation": [-0.083049, 0.995362, -0.032915, 0.035695], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-8.990601, 0.882383, 8.587404] - }, - { - "keytime": 0.944444, - "rotation": [-0.104502, 0.993243, -0.045376, 0.022097], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-8.848624, 1.039586, 8.657586] - }, - { - "keytime": 0.972222, - "rotation": [-0.111603, 0.993670, -0.012825, 0.000865], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-8.646338, 1.231184, 8.715652] - }, - { - "keytime": 1.000000, - "rotation": [-0.114788, 0.992651, 0.031106, -0.022351], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-8.427422, 1.410457, 8.766703] - } - ] - }, - { - "boneId": "Bip001 L Calf", - "keyframes": [ - { - "keytime": 0.000000, - "rotation": [ 0.000000, -0.000000, -0.201292, 0.979531], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 29.675537, -0.000002, 0.000001] - }, - { - "keytime": 0.027778, - "rotation": [-0.000000, 0.000000, -0.283361, 0.959013], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 29.675552, 0.000002, 0.000000] - }, - { - "keytime": 0.055556, - "rotation": [ 0.000000, -0.000000, -0.363433, 0.931620], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 29.675552, 0.000000, -0.000001] - }, - { - "keytime": 0.083333, - "rotation": [ 0.000000, 0.000000, -0.439999, 0.897998], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 29.675552, 0.000000, 0.000001] - }, - { - "keytime": 0.111111, - "rotation": [ 0.000000, 0.000000, -0.504811, 0.863230], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 29.675549, 0.000000, -0.000001] - }, - { - "keytime": 0.138889, - "rotation": [ 0.000000, 0.000000, -0.561897, 0.827208], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 29.675549, 0.000000, 0.000001] - }, - { - "keytime": 0.166667, - "rotation": [ 0.000000, -0.000000, -0.608745, 0.793366], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 29.675560, -0.000002, 0.000000] - }, - { - "keytime": 0.194444, - "rotation": [-0.000000, -0.000000, -0.613558, 0.789650], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 29.675541, -0.000002, 0.000000] - }, - { - "keytime": 0.222222, - "rotation": [ 0.000000, -0.000000, -0.618025, 0.786159], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 29.675549, 0.000004, 0.000000] - }, - { - "keytime": 0.250000, - "rotation": [-0.000000, 0.000000, -0.579413, 0.815034], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 29.675545, 0.000000, 0.000000] - }, - { - "keytime": 0.277778, - "rotation": [-0.000000, 0.000000, -0.540408, 0.841403], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 29.675549, 0.000000, -0.000000] - }, - { - "keytime": 0.305556, - "rotation": [-0.000000, 0.000000, -0.459525, 0.888165], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 29.675552, -0.000004, -0.000000] - }, - { - "keytime": 0.333333, - "rotation": [-0.000000, 0.000000, -0.372324, 0.928103], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 29.675549, 0.000000, 0.000000] - }, - { - "keytime": 0.361111, - "rotation": [ 0.000000, -0.000000, -0.267723, 0.963496], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 29.675552, 0.000000, 0.000001] - }, - { - "keytime": 0.388889, - "rotation": [ 0.000000, 0.000000, -0.165422, 0.986223], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 29.675545, -0.000004, -0.000000] - }, - { - "keytime": 0.416667, - "rotation": [-0.000000, -0.000000, -0.129851, 0.991533], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 29.675556, -0.000004, -0.000002] - }, - { - "keytime": 0.444444, - "rotation": [ 0.000000, 0.000000, -0.102318, 0.994752], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 29.675549, -0.000000, -0.000000] - }, - { - "keytime": 0.472222, - "rotation": [-0.000000, 0.000000, -0.136311, 0.990666], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 29.675552, 0.000000, 0.000000] - }, - { - "keytime": 0.500000, - "rotation": [-0.000000, 0.000000, -0.180461, 0.983582], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 29.675545, 0.000000, 0.000000] - }, - { - "keytime": 0.527778, - "rotation": [-0.000000, -0.000000, -0.230918, 0.972973], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 29.675545, 0.000000, -0.000000] - }, - { - "keytime": 0.555556, - "rotation": [-0.000000, -0.000000, -0.282888, 0.959153], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 29.675552, 0.000000, -0.000001] - }, - { - "keytime": 0.583333, - "rotation": [-0.000000, -0.000000, -0.297041, 0.954865], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 29.675545, 0.000000, 0.000002] - }, - { - "keytime": 0.611111, - "rotation": [-0.000000, 0.000000, -0.311237, 0.950332], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 29.675541, -0.000004, -0.000000] - }, - { - "keytime": 0.638889, - "rotation": [-0.000000, 0.000000, -0.299632, 0.954055], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 29.675549, -0.000000, -0.000000] - }, - { - "keytime": 0.666667, - "rotation": [ 0.000000, 0.000000, -0.288017, 0.957625], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 29.675545, 0.000002, 0.000000] - }, - { - "keytime": 0.694444, - "rotation": [ 0.000000, 0.000000, -0.265641, 0.964072], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 29.675545, 0.000000, 0.000000] - }, - { - "keytime": 0.722222, - "rotation": [-0.000000, -0.000000, -0.244050, 0.969763], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 29.675552, -0.000002, -0.000000] - }, - { - "keytime": 0.750000, - "rotation": [-0.000000, 0.000000, -0.218675, 0.975798], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 29.675552, -0.000000, -0.000001] - }, - { - "keytime": 0.777778, - "rotation": [-0.000000, -0.000000, -0.193348, 0.981130], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 29.675549, 0.000001, -0.000000] - }, - { - "keytime": 0.805555, - "rotation": [ 0.000000, 0.000000, -0.171116, 0.985251], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 29.675556, 0.000000, -0.000000] - }, - { - "keytime": 0.833333, - "rotation": [-0.000000, -0.000000, -0.150479, 0.988613], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 29.675549, 0.000000, 0.000001] - }, - { - "keytime": 0.861111, - "rotation": [-0.000000, 0.000000, -0.139991, 0.990153], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 29.675545, 0.000000, -0.000000] - }, - { - "keytime": 0.888889, - "rotation": [ 0.000000, 0.000000, -0.130918, 0.991393], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 29.675552, -0.000001, -0.000001] - }, - { - "keytime": 0.916667, - "rotation": [-0.000000, 0.000000, -0.137679, 0.990477], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 29.675552, 0.000002, -0.000000] - }, - { - "keytime": 0.944444, - "rotation": [-0.000000, -0.000000, -0.145182, 0.989405], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 29.675549, 0.000002, 0.000000] - }, - { - "keytime": 0.972222, - "rotation": [ 0.000000, -0.000000, -0.171115, 0.985251], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 29.675552, 0.000002, 0.000001] - }, - { - "keytime": 1.000000, - "rotation": [ 0.000000, -0.000000, -0.201292, 0.979531], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 29.675537, -0.000002, 0.000001] - } - ] - }, - { - "boneId": "Bip001 L Finger2Nub", - "keyframes": [ - { - "keytime": 0.000000, - "rotation": [ 0.000000, -0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.418678, 0.000004, -0.000000] - }, - { - "keytime": 0.027778, - "rotation": [ 0.000000, 0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.418674, -0.000002, 0.000004] - }, - { - "keytime": 0.055556, - "rotation": [ 0.000000, 0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.418682, -0.000002, 0.000004] - }, - { - "keytime": 0.083333, - "rotation": [ 0.000000, 0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.418678, 0.000004, -0.000004] - }, - { - "keytime": 0.111111, - "rotation": [-0.000000, -0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.418678, -0.000002, -0.000000] - }, - { - "keytime": 0.138889, - "rotation": [ 0.000000, -0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.418678, 0.000002, -0.000004] - }, - { - "keytime": 0.166667, - "rotation": [ 0.000000, -0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.418682, 0.000002, 0.000004] - }, - { - "keytime": 0.194444, - "rotation": [ 0.000000, 0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.418671, -0.000001, 0.000000] - }, - { - "keytime": 0.222222, - "rotation": [-0.000000, 0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.418674, -0.000000, 0.000004] - }, - { - "keytime": 0.250000, - "rotation": [ 0.000000, -0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.418674, 0.000002, 0.000000] - }, - { - "keytime": 0.277778, - "rotation": [-0.000000, 0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.418674, 0.000000, 0.000000] - }, - { - "keytime": 0.305556, - "rotation": [-0.000000, 0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.418682, 0.000000, -0.000004] - }, - { - "keytime": 0.333333, - "rotation": [ 0.000000, -0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.418678, -0.000002, 0.000004] - }, - { - "keytime": 0.361111, - "rotation": [ 0.000000, -0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.418678, -0.000002, 0.000000] - }, - { - "keytime": 0.388889, - "rotation": [ 0.000000, -0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.418678, -0.000000, 0.000000] - }, - { - "keytime": 0.444444, - "rotation": [-0.000000, -0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.418671, -0.000000, -0.000003] - }, - { - "keytime": 0.472222, - "rotation": [ 0.000000, 0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.418678, -0.000000, -0.000000] - }, - { - "keytime": 0.500000, - "rotation": [ 0.000000, -0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.418678, 0.000002, -0.000000] - }, - { - "keytime": 0.527778, - "rotation": [ 0.000000, -0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.418671, 0.000001, -0.000002] - }, - { - "keytime": 0.555556, - "rotation": [ 0.000000, -0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.418674, 0.000002, -0.000000] - }, - { - "keytime": 0.583333, - "rotation": [ 0.000000, 0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.418678, 0.000000, 0.000000] - }, - { - "keytime": 0.611111, - "rotation": [-0.000000, -0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.418674, -0.000000, -0.000004] - }, - { - "keytime": 0.638889, - "rotation": [-0.000000, 0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.418682, -0.000000, -0.000004] - }, - { - "keytime": 0.666667, - "rotation": [-0.000000, 0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.418674, 0.000002, -0.000000] - }, - { - "keytime": 0.694444, - "rotation": [-0.000000, 0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.418678, -0.000002, 0.000000] - }, - { - "keytime": 0.750000, - "rotation": [-0.000000, 0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.418678, 0.000000, -0.000004] - }, - { - "keytime": 0.777778, - "rotation": [ 0.000000, 0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.418671, -0.000000, -0.000000] - }, - { - "keytime": 0.805555, - "rotation": [ 0.000000, 0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.418686, 0.000001, 0.000000] - }, - { - "keytime": 0.833333, - "rotation": [-0.000000, 0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.418671, -0.000003, -0.000000] - }, - { - "keytime": 0.861111, - "rotation": [-0.000000, -0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.418678, -0.000000, 0.000000] - }, - { - "keytime": 0.916667, - "rotation": [ 0.000000, 0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.418678, 0.000002, 0.000000] - }, - { - "keytime": 0.944444, - "rotation": [ 0.000000, 0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.418678, 0.000000, -0.000002] - }, - { - "keytime": 0.972222, - "rotation": [-0.000000, -0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.418678, 0.000002, -0.000000] - }, - { - "keytime": 1.000000, - "rotation": [ 0.000000, 0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 4.418671, 0.000004, 0.000000] - } - ] - }, - { - "boneId": "Bip001 L Foot", - "keyframes": [ - { - "keytime": 0.000000, - "rotation": [-0.001549, -0.021056, 0.149877, 0.988479], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 36.461250, 0.000000, 0.000001] - }, - { - "keytime": 0.027778, - "rotation": [-0.025038, -0.006978, 0.095331, 0.995106], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 36.461250, -0.000004, 0.000001] - }, - { - "keytime": 0.055556, - "rotation": [-0.046123, 0.002666, 0.039577, 0.998148], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 36.461250, -0.000000, 0.000001] - }, - { - "keytime": 0.083333, - "rotation": [-0.063622, 0.012390, -0.014442, 0.997793], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 36.461258, -0.000004, -0.000002] - }, - { - "keytime": 0.111111, - "rotation": [-0.077874, 0.027195, -0.058991, 0.994845], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 36.461254, -0.000000, 0.000001] - }, - { - "keytime": 0.138889, - "rotation": [-0.087901, 0.042205, -0.095544, 0.990638], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 36.461262, 0.000008, -0.000002] - }, - { - "keytime": 0.166667, - "rotation": [-0.085520, 0.052600, -0.112432, 0.988574], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 36.461258, 0.000004, 0.000000] - }, - { - "keytime": 0.194444, - "rotation": [-0.076062, 0.044518, -0.090023, 0.992033], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 36.461258, 0.000004, -0.000002] - }, - { - "keytime": 0.222222, - "rotation": [-0.066472, 0.036624, -0.067712, 0.994814], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 36.461258, -0.000008, 0.000001] - }, - { - "keytime": 0.250000, - "rotation": [-0.056801, 0.024633, -0.040733, 0.997250], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 36.461262, -0.000004, -0.000002] - }, - { - "keytime": 0.277778, - "rotation": [-0.044537, 0.014458, -0.014810, 0.998793], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 36.461250, 0.000004, -0.000000] - }, - { - "keytime": 0.305556, - "rotation": [-0.029885, 0.017690, 0.010185, 0.999345], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 36.461250, -0.000002, 0.000000] - }, - { - "keytime": 0.333333, - "rotation": [-0.016863, 0.018926, 0.034841, 0.999071], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 36.461250, -0.000001, -0.000000] - }, - { - "keytime": 0.361111, - "rotation": [-0.006946, 0.013928, 0.054937, 0.998369], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 36.461258, -0.000001, 0.000000] - }, - { - "keytime": 0.388889, - "rotation": [-0.000618, 0.007392, 0.077033, 0.997001], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 36.461258, -0.000000, 0.000000] - }, - { - "keytime": 0.416667, - "rotation": [-0.000664, 0.010997, 0.082364, 0.996541], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 36.461250, 0.000000, 0.000001] - }, - { - "keytime": 0.444444, - "rotation": [-0.001237, 0.014001, 0.090582, 0.995790], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 36.461254, 0.000000, -0.000001] - }, - { - "keytime": 0.472222, - "rotation": [-0.002550, 0.041245, 0.067027, 0.996895], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 36.461250, -0.000000, -0.000001] - }, - { - "keytime": 0.500000, - "rotation": [-0.004585, 0.069842, 0.046809, 0.996449], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 36.461258, 0.000002, 0.000000] - }, - { - "keytime": 0.527778, - "rotation": [-0.008777, 0.075788, 0.042430, 0.996182], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 36.461258, -0.000002, -0.000000] - }, - { - "keytime": 0.555556, - "rotation": [-0.011883, 0.081106, 0.038538, 0.995889], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 36.461250, -0.000000, -0.000001] - }, - { - "keytime": 0.583333, - "rotation": [-0.011761, 0.073060, 0.060146, 0.995443], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 36.461250, -0.000000, -0.000001] - }, - { - "keytime": 0.611111, - "rotation": [-0.011010, 0.064642, 0.082732, 0.994412], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 36.461250, 0.000001, -0.000001] - }, - { - "keytime": 0.638889, - "rotation": [-0.009271, 0.059984, 0.099503, 0.993184], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 36.461250, 0.000000, 0.000001] - }, - { - "keytime": 0.666667, - "rotation": [-0.007832, 0.055456, 0.116489, 0.991612], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 36.461250, -0.000000, 0.000001] - }, - { - "keytime": 0.694444, - "rotation": [-0.004896, 0.044547, 0.120909, 0.991651], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 36.461250, -0.000002, 0.000000] - }, - { - "keytime": 0.722222, - "rotation": [-0.002967, 0.034015, 0.125303, 0.991531], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 36.461243, -0.000000, 0.000001] - }, - { - "keytime": 0.750000, - "rotation": [-0.002761, 0.025595, 0.125164, 0.991802], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 36.461243, 0.000002, 0.000001] - }, - { - "keytime": 0.777778, - "rotation": [-0.001959, 0.016745, 0.125385, 0.991965], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 36.461250, 0.000000, 0.000000] - }, - { - "keytime": 0.805555, - "rotation": [-0.002490, 0.020765, 0.128552, 0.991482], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 36.461250, -0.000004, 0.000002] - }, - { - "keytime": 0.833333, - "rotation": [-0.003083, 0.024075, 0.132500, 0.990886], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 36.461258, 0.000002, 0.000000] - }, - { - "keytime": 0.861111, - "rotation": [-0.004373, 0.030933, 0.143286, 0.989188], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 36.461254, 0.000000, -0.000000] - }, - { - "keytime": 0.888889, - "rotation": [-0.005824, 0.037681, 0.154215, 0.987301], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 36.461250, 0.000002, 0.000000] - }, - { - "keytime": 0.916667, - "rotation": [-0.004459, 0.026750, 0.164615, 0.985985], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 36.461250, -0.000004, -0.000000] - }, - { - "keytime": 0.944444, - "rotation": [-0.002809, 0.015431, 0.175633, 0.984331], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 36.461250, -0.000000, 0.000001] - }, - { - "keytime": 0.972222, - "rotation": [-0.002605, -0.004096, 0.165908, 0.986129], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 36.461250, 0.000004, -0.000000] - }, - { - "keytime": 1.000000, - "rotation": [-0.001549, -0.021056, 0.149877, 0.988479], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 36.461250, 0.000000, 0.000001] - } - ] - }, - { - "boneId": "Bip001 R Clavicle", - "keyframes": [ - { - "keytime": 0.000000, - "rotation": [ 0.708668, -0.104189, -0.652070, 0.248473], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.761490, 0.885229, -2.699672] - }, - { - "keytime": 0.027778, - "rotation": [ 0.709956, -0.098108, -0.654650, 0.240354], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.761490, 0.885227, -2.699672] - }, - { - "keytime": 0.055556, - "rotation": [ 0.710989, -0.091693, -0.657596, 0.231635], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.761475, 0.885226, -2.699672] - }, - { - "keytime": 0.083333, - "rotation": [ 0.711954, -0.085058, -0.660548, 0.222628], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.761475, 0.885228, -2.699672] - }, - { - "keytime": 0.111111, - "rotation": [ 0.712982, -0.078916, -0.662907, 0.214437], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.761490, 0.885228, -2.699671] - }, - { - "keytime": 0.138889, - "rotation": [ 0.714312, -0.073411, -0.664358, 0.207357], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.761475, 0.885227, -2.699672] - }, - { - "keytime": 0.166667, - "rotation": [ 0.716169, -0.068895, -0.664505, 0.201964], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.761482, 0.885225, -2.699672] - }, - { - "keytime": 0.194444, - "rotation": [ 0.718817, -0.064862, -0.663351, 0.197638], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.761482, 0.885227, -2.699672] - }, - { - "keytime": 0.222222, - "rotation": [ 0.721998, -0.060970, -0.661415, 0.193731], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.761482, 0.885227, -2.699672] - }, - { - "keytime": 0.250000, - "rotation": [ 0.725704, -0.057064, -0.658785, 0.190001], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.761475, 0.885227, -2.699672] - }, - { - "keytime": 0.277778, - "rotation": [ 0.729524, -0.053452, -0.655811, 0.186678], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.761475, 0.885226, -2.699672] - }, - { - "keytime": 0.305556, - "rotation": [ 0.733377, -0.050091, -0.652622, 0.183666], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.761482, 0.885226, -2.699672] - }, - { - "keytime": 0.333333, - "rotation": [ 0.737188, -0.046965, -0.649323, 0.180910], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.761467, 0.885224, -2.699672] - }, - { - "keytime": 0.361111, - "rotation": [ 0.740550, -0.044322, -0.646316, 0.178599], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.761490, 0.885229, -2.699673] - }, - { - "keytime": 0.388889, - "rotation": [ 0.743402, -0.042128, -0.643712, 0.176674], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.761482, 0.885227, -2.699673] - }, - { - "keytime": 0.416667, - "rotation": [ 0.745624, -0.040402, -0.641673, 0.175125], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.761490, 0.885226, -2.699672] - }, - { - "keytime": 0.444444, - "rotation": [ 0.746909, -0.039308, -0.640531, 0.174073], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.761475, 0.885224, -2.699671] - }, - { - "keytime": 0.472222, - "rotation": [ 0.747156, -0.038850, -0.640429, 0.173492], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.761490, 0.885228, -2.699672] - }, - { - "keytime": 0.500000, - "rotation": [ 0.746387, -0.039051, -0.641328, 0.173435], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.761482, 0.885227, -2.699672] - }, - { - "keytime": 0.527778, - "rotation": [ 0.744857, -0.039849, -0.642924, 0.173922], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.761482, 0.885227, -2.699672] - }, - { - "keytime": 0.555556, - "rotation": [ 0.742594, -0.041222, -0.645178, 0.174927], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.761490, 0.885225, -2.699671] - }, - { - "keytime": 0.583333, - "rotation": [ 0.739635, -0.043159, -0.648036, 0.176428], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.761490, 0.885229, -2.699671] - }, - { - "keytime": 0.611111, - "rotation": [ 0.735894, -0.045733, -0.651550, 0.178469], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.761482, 0.885226, -2.699671] - }, - { - "keytime": 0.638889, - "rotation": [ 0.731625, -0.048781, -0.655453, 0.180905], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.761482, 0.885227, -2.699673] - }, - { - "keytime": 0.666667, - "rotation": [ 0.726760, -0.052365, -0.659780, 0.183761], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.761467, 0.885226, -2.699673] - }, - { - "keytime": 0.694444, - "rotation": [ 0.721159, -0.056609, -0.664616, 0.187113], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.761475, 0.885227, -2.699672] - }, - { - "keytime": 0.722222, - "rotation": [ 0.715183, -0.061258, -0.669613, 0.190734], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.761475, 0.885225, -2.699672] - }, - { - "keytime": 0.750000, - "rotation": [ 0.708782, -0.066357, -0.674788, 0.194643], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.761482, 0.885226, -2.699674] - }, - { - "keytime": 0.777778, - "rotation": [ 0.696047, -0.076350, -0.684820, 0.201769], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.761475, 0.885227, -2.699673] - }, - { - "keytime": 0.805555, - "rotation": [-0.677050, 0.091610, 0.698799, -0.211875], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.761497, 0.885227, -2.699672] - }, - { - "keytime": 0.833333, - "rotation": [-0.659263, 0.107156, 0.710399, -0.221860], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.761475, 0.885226, -2.699672] - }, - { - "keytime": 0.861111, - "rotation": [-0.651060, 0.117174, 0.713931, -0.229551], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.761482, 0.885227, -2.699672] - }, - { - "keytime": 0.888889, - "rotation": [-0.655272, 0.119291, 0.708097, -0.234491], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.761475, 0.885226, -2.699672] - }, - { - "keytime": 0.916667, - "rotation": [-0.665965, 0.117432, 0.697016, -0.238469], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.761474, 0.885226, -2.699672] - }, - { - "keytime": 0.944444, - "rotation": [-0.680627, 0.113094, 0.682224, -0.241924], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.761482, 0.885228, -2.699672] - }, - { - "keytime": 0.972222, - "rotation": [ 0.695512, -0.108197, -0.666724, 0.245021], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.761482, 0.885227, -2.699672] - }, - { - "keytime": 1.000000, - "rotation": [ 0.708668, -0.104189, -0.652070, 0.248473], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-0.761490, 0.885228, -2.699672] - } - ] - }, - { - "boneId": "L_side01", - "keyframes": [ - { - "keytime": 0.000000, - "rotation": [-0.008935, 0.749765, 0.626415, -0.213018], - "scale": [ 1.113894, 1.000000, 1.000000], - "translation": [ 3.723862, -4.382172, 14.430992] - }, - { - "keytime": 0.027778, - "rotation": [-0.008681, 0.749818, 0.626423, -0.212818], - "scale": [ 1.113894, 1.000000, 1.000000], - "translation": [ 3.723862, -4.382172, 14.430992] - }, - { - "keytime": 0.055556, - "rotation": [-0.007956, 0.749969, 0.626446, -0.212246], - "scale": [ 1.113894, 1.000000, 1.000000], - "translation": [ 3.723862, -4.382172, 14.430992] - }, - { - "keytime": 0.083333, - "rotation": [-0.006774, 0.750214, 0.626482, -0.211314], - "scale": [ 1.113894, 1.000000, 1.000000], - "translation": [ 3.723862, -4.382172, 14.430992] - }, - { - "keytime": 0.111111, - "rotation": [-0.005260, 0.750524, 0.626527, -0.210122], - "scale": [ 1.113894, 1.000000, 1.000000], - "translation": [ 3.723862, -4.382172, 14.430992] - }, - { - "keytime": 0.138889, - "rotation": [-0.003439, 0.750892, 0.626577, -0.208690], - "scale": [ 1.113894, 1.000000, 1.000000], - "translation": [ 3.723862, -4.382172, 14.430992] - }, - { - "keytime": 0.166667, - "rotation": [-0.001366, 0.751305, 0.626629, -0.207063], - "scale": [ 1.113894, 1.000000, 1.000000], - "translation": [ 3.723862, -4.382172, 14.430992] - }, - { - "keytime": 0.194444, - "rotation": [ 0.000977, 0.751764, 0.626683, -0.205227], - "scale": [ 1.113894, 1.000000, 1.000000], - "translation": [ 3.723862, -4.382172, 14.430992] - }, - { - "keytime": 0.222222, - "rotation": [ 0.003396, 0.752229, 0.626733, -0.203337], - "scale": [ 1.113894, 1.000000, 1.000000], - "translation": [ 3.723863, -4.382172, 14.430992] - }, - { - "keytime": 0.250000, - "rotation": [ 0.005979, 0.752716, 0.626779, -0.201322], - "scale": [ 1.113894, 1.000000, 1.000000], - "translation": [ 3.723863, -4.382172, 14.430992] - }, - { - "keytime": 0.277778, - "rotation": [ 0.008517, 0.753185, 0.626818, -0.199347], - "scale": [ 1.113894, 1.000000, 1.000000], - "translation": [ 3.723863, -4.382172, 14.430992] - }, - { - "keytime": 0.305556, - "rotation": [ 0.011032, 0.753640, 0.626850, -0.197394], - "scale": [ 1.113894, 1.000000, 1.000000], - "translation": [ 3.723864, -4.382172, 14.430992] - }, - { - "keytime": 0.333333, - "rotation": [ 0.013539, 0.754084, 0.626875, -0.195453], - "scale": [ 1.113894, 1.000000, 1.000000], - "translation": [ 3.723864, -4.382172, 14.430992] - }, - { - "keytime": 0.361111, - "rotation": [ 0.015833, 0.754482, 0.626893, -0.193679], - "scale": [ 1.113894, 1.000000, 1.000000], - "translation": [ 3.723864, -4.382172, 14.430992] - }, - { - "keytime": 0.388889, - "rotation": [ 0.017934, 0.754840, 0.626904, -0.192058], - "scale": [ 1.113894, 1.000000, 1.000000], - "translation": [ 3.723865, -4.382172, 14.430992] - }, - { - "keytime": 0.416667, - "rotation": [ 0.019838, 0.755158, 0.626911, -0.190592], - "scale": [ 1.113894, 1.000000, 1.000000], - "translation": [ 3.723865, -4.382172, 14.430992] - }, - { - "keytime": 0.444444, - "rotation": [ 0.021375, 0.755411, 0.626913, -0.189411], - "scale": [ 1.113894, 1.000000, 1.000000], - "translation": [ 3.723865, -4.382172, 14.430992] - }, - { - "keytime": 0.472222, - "rotation": [ 0.022548, 0.755602, 0.626914, -0.188509], - "scale": [ 1.113894, 1.000000, 1.000000], - "translation": [ 3.723865, -4.382172, 14.430992] - }, - { - "keytime": 0.500000, - "rotation": [ 0.023318, 0.755726, 0.626914, -0.187919], - "scale": [ 1.113894, 1.000000, 1.000000], - "translation": [ 3.723866, -4.382172, 14.430992] - }, - { - "keytime": 0.527778, - "rotation": [ 0.023580, 0.755768, 0.626913, -0.187717], - "scale": [ 1.113894, 1.000000, 1.000000], - "translation": [ 3.723866, -4.382172, 14.430992] - }, - { - "keytime": 0.555556, - "rotation": [ 0.023266, 0.755718, 0.626914, -0.187958], - "scale": [ 1.113894, 1.000000, 1.000000], - "translation": [ 3.723866, -4.382172, 14.430992] - }, - { - "keytime": 0.583333, - "rotation": [ 0.022362, 0.755572, 0.626914, -0.188652], - "scale": [ 1.113894, 1.000000, 1.000000], - "translation": [ 3.723866, -4.382172, 14.430992] - }, - { - "keytime": 0.611111, - "rotation": [ 0.020897, 0.755333, 0.626913, -0.189777], - "scale": [ 1.113894, 1.000000, 1.000000], - "translation": [ 3.723867, -4.382172, 14.430992] - }, - { - "keytime": 0.638889, - "rotation": [ 0.019038, 0.755025, 0.626908, -0.191208], - "scale": [ 1.113894, 1.000000, 1.000000], - "translation": [ 3.723867, -4.382172, 14.430992] - }, - { - "keytime": 0.666667, - "rotation": [ 0.016827, 0.754652, 0.626899, -0.192912], - "scale": [ 1.113894, 1.000000, 1.000000], - "translation": [ 3.723867, -4.382172, 14.430992] - }, - { - "keytime": 0.694444, - "rotation": [ 0.014264, 0.754210, 0.626882, -0.194892], - "scale": [ 1.113894, 1.000000, 1.000000], - "translation": [ 3.723868, -4.382172, 14.430992] - }, - { - "keytime": 0.722222, - "rotation": [ 0.011579, 0.753738, 0.626856, -0.196970], - "scale": [ 1.113894, 1.000000, 1.000000], - "translation": [ 3.723868, -4.382172, 14.430992] - }, - { - "keytime": 0.750000, - "rotation": [ 0.008780, 0.753233, 0.626821, -0.199143], - "scale": [ 1.113894, 1.000000, 1.000000], - "translation": [ 3.723868, -4.382172, 14.430992] - }, - { - "keytime": 0.777778, - "rotation": [ 0.005857, 0.752693, 0.626777, -0.201417], - "scale": [ 1.113894, 1.000000, 1.000000], - "translation": [ 3.723868, -4.382172, 14.430992] - }, - { - "keytime": 0.805555, - "rotation": [ 0.003062, 0.752166, 0.626726, -0.203597], - "scale": [ 1.113894, 1.000000, 1.000000], - "translation": [ 3.723869, -4.382172, 14.430992] - }, - { - "keytime": 0.833333, - "rotation": [ 0.000385, 0.751649, 0.626670, -0.205691], - "scale": [ 1.113894, 1.000000, 1.000000], - "translation": [ 3.723869, -4.382172, 14.430992] - }, - { - "keytime": 0.861111, - "rotation": [-0.002168, 0.751146, 0.626609, -0.207692], - "scale": [ 1.113894, 1.000000, 1.000000], - "translation": [ 3.723869, -4.382172, 14.430992] - }, - { - "keytime": 0.888889, - "rotation": [-0.004370, 0.750704, 0.626551, -0.209421], - "scale": [ 1.113894, 1.000000, 1.000000], - "translation": [ 3.723869, -4.382172, 14.430992] - }, - { - "keytime": 0.916667, - "rotation": [-0.006223, 0.750327, 0.626498, -0.210880], - "scale": [ 1.113894, 1.000000, 1.000000], - "translation": [ 3.723869, -4.382172, 14.430992] - }, - { - "keytime": 0.944444, - "rotation": [-0.007688, 0.750025, 0.626454, -0.212034], - "scale": [ 1.113894, 1.000000, 1.000000], - "translation": [ 3.723869, -4.382172, 14.430992] - }, - { - "keytime": 0.972222, - "rotation": [-0.008600, 0.749835, 0.626426, -0.212754], - "scale": [ 1.113894, 1.000000, 1.000000], - "translation": [ 3.723869, -4.382172, 14.430992] - }, - { - "keytime": 1.000000, - "rotation": [-0.008935, 0.749765, 0.626415, -0.213018], - "scale": [ 1.113894, 1.000000, 1.000000], - "translation": [ 3.723869, -4.382172, 14.430992] - } - ] - }, - { - "boneId": "L_side_end", - "keyframes": [ - { - "keytime": 0.000000, - "rotation": [-0.000000, -0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 10.000004, 0.000000, 0.000000] - }, - { - "keytime": 1.000000, - "rotation": [ 0.000000, -0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 10.000004, 0.000000, 0.000000] - } - ] - }, - { - "boneId": "R_side01", - "keyframes": [ - { - "keytime": 0.000000, - "rotation": [-0.144018, 0.768587, 0.616043, 0.095000], - "scale": [ 1.000000, 1.000002, 1.000001], - "translation": [ 3.723907, -4.382370, -13.298973] - }, - { - "keytime": 0.027778, - "rotation": [-0.145501, 0.768610, 0.615922, 0.093317], - "scale": [ 1.000000, 1.000002, 1.000001], - "translation": [ 3.723907, -4.382370, -13.298973] - }, - { - "keytime": 0.055556, - "rotation": [-0.149715, 0.768661, 0.615553, 0.088547], - "scale": [ 1.000000, 1.000002, 1.000001], - "translation": [ 3.723907, -4.382370, -13.298973] - }, - { - "keytime": 0.083333, - "rotation": [-0.156549, 0.768690, 0.614875, 0.080847], - "scale": [ 1.000000, 1.000002, 1.000001], - "translation": [ 3.723907, -4.382370, -13.298972] - }, - { - "keytime": 0.111111, - "rotation": [-0.165253, 0.768634, 0.613871, 0.071105], - "scale": [ 1.000000, 1.000002, 1.000001], - "translation": [ 3.723907, -4.382370, -13.298973] - }, - { - "keytime": 0.138889, - "rotation": [-0.175650, 0.768430, 0.612466, 0.059561], - "scale": [ 1.000000, 1.000002, 1.000001], - "translation": [ 3.723907, -4.382370, -13.298973] - }, - { - "keytime": 0.166667, - "rotation": [-0.187397, 0.768020, 0.610615, 0.046645], - "scale": [ 1.000000, 1.000002, 1.000001], - "translation": [ 3.723907, -4.382370, -13.298972] - }, - { - "keytime": 0.194444, - "rotation": [-0.200539, 0.767336, 0.608220, 0.032354], - "scale": [ 1.000000, 1.000002, 1.000001], - "translation": [ 3.723907, -4.382370, -13.298973] - }, - { - "keytime": 0.222222, - "rotation": [-0.213933, 0.766394, 0.605434, 0.017961], - "scale": [ 1.000000, 1.000002, 1.000001], - "translation": [ 3.723907, -4.382370, -13.298973] - }, - { - "keytime": 0.250000, - "rotation": [-0.227999, 0.765138, 0.602139, 0.003037], - "scale": [ 1.000000, 1.000002, 1.000001], - "translation": [ 3.723906, -4.382370, -13.298973] - }, - { - "keytime": 0.277778, - "rotation": [-0.241523, 0.763672, 0.598621, -0.011129], - "scale": [ 1.000000, 1.000002, 1.000001], - "translation": [ 3.723906, -4.382370, -13.298972] - }, - { - "keytime": 0.305556, - "rotation": [-0.254536, 0.762022, 0.594920, -0.024586], - "scale": [ 1.000000, 1.000002, 1.000001], - "translation": [ 3.723906, -4.382370, -13.298972] - }, - { - "keytime": 0.333333, - "rotation": [-0.267000, 0.760219, 0.591088, -0.037317], - "scale": [ 1.000000, 1.000002, 1.000001], - "translation": [ 3.723905, -4.382370, -13.298972] - }, - { - "keytime": 0.361111, - "rotation": [-0.277785, 0.758484, 0.587549, -0.048205], - "scale": [ 1.000000, 1.000002, 1.000001], - "translation": [ 3.723905, -4.382370, -13.298972] - }, - { - "keytime": 0.388889, - "rotation": [-0.286882, 0.756893, 0.584404, -0.057298], - "scale": [ 1.000000, 1.000001, 1.000001], - "translation": [ 3.723905, -4.382370, -13.298972] - }, - { - "keytime": 0.416667, - "rotation": [-0.294081, 0.755551, 0.581814, -0.064433], - "scale": [ 1.000000, 1.000001, 1.000001], - "translation": [ 3.723905, -4.382370, -13.298973] - }, - { - "keytime": 0.444444, - "rotation": [-0.298561, 0.754678, 0.580157, -0.068846], - "scale": [ 1.000000, 1.000001, 1.000001], - "translation": [ 3.723904, -4.382370, -13.298971] - }, - { - "keytime": 0.472222, - "rotation": [-0.300182, 0.754356, 0.579548, -0.070439], - "scale": [ 1.000000, 1.000001, 1.000000], - "translation": [ 3.723904, -4.382370, -13.298971] - }, - { - "keytime": 0.500000, - "rotation": [-0.298904, 0.754610, 0.580029, -0.069183], - "scale": [ 1.000000, 1.000001, 1.000001], - "translation": [ 3.723904, -4.382370, -13.298972] - }, - { - "keytime": 0.527778, - "rotation": [-0.295301, 0.755316, 0.581366, -0.065637], - "scale": [ 0.999999, 1.000001, 1.000000], - "translation": [ 3.723903, -4.382370, -13.298973] - }, - { - "keytime": 0.555556, - "rotation": [-0.289650, 0.756386, 0.583419, -0.060047], - "scale": [ 1.000000, 1.000001, 1.000001], - "translation": [ 3.723903, -4.382370, -13.298971] - }, - { - "keytime": 0.583333, - "rotation": [-0.282226, 0.757722, 0.586032, -0.052654], - "scale": [ 0.999999, 1.000001, 1.000000], - "translation": [ 3.723903, -4.382370, -13.298972] - }, - { - "keytime": 0.611111, - "rotation": [-0.273017, 0.759272, 0.589139, -0.043406], - "scale": [ 1.000000, 1.000001, 1.000000], - "translation": [ 3.723902, -4.382370, -13.298971] - }, - { - "keytime": 0.638889, - "rotation": [-0.262851, 0.760844, 0.592394, -0.033096], - "scale": [ 0.999999, 1.000001, 1.000000], - "translation": [ 3.723902, -4.382370, -13.298972] - }, - { - "keytime": 0.666667, - "rotation": [-0.251756, 0.762394, 0.595737, -0.021725], - "scale": [ 1.000000, 1.000001, 1.000000], - "translation": [ 3.723902, -4.382370, -13.298971] - }, - { - "keytime": 0.694444, - "rotation": [-0.239647, 0.763891, 0.599129, -0.009174], - "scale": [ 0.999999, 1.000001, 1.000000], - "translation": [ 3.723902, -4.382370, -13.298971] - }, - { - "keytime": 0.722222, - "rotation": [-0.227520, 0.765186, 0.602257, 0.003542], - "scale": [ 1.000000, 1.000001, 1.000000], - "translation": [ 3.723901, -4.382370, -13.298971] - }, - { - "keytime": 0.750000, - "rotation": [-0.215299, 0.766284, 0.605130, 0.016503], - "scale": [ 0.999999, 1.000001, 1.000000], - "translation": [ 3.723901, -4.382370, -13.298971] - }, - { - "keytime": 0.777778, - "rotation": [-0.202896, 0.767189, 0.607755, 0.029809], - "scale": [ 0.999999, 1.000001, 1.000000], - "translation": [ 3.723901, -4.382370, -13.298971] - }, - { - "keytime": 0.805555, - "rotation": [-0.191311, 0.767842, 0.609938, 0.042372], - "scale": [ 0.999999, 1.000001, 1.000000], - "translation": [ 3.723901, -4.382370, -13.298971] - }, - { - "keytime": 0.833333, - "rotation": [-0.180434, 0.768286, 0.611746, 0.054286], - "scale": [ 0.999999, 1.000001, 1.000000], - "translation": [ 3.723901, -4.382370, -13.298971] - }, - { - "keytime": 0.861111, - "rotation": [-0.170236, 0.768555, 0.613225, 0.065559], - "scale": [ 0.999999, 1.000001, 1.000000], - "translation": [ 3.723900, -4.382370, -13.298971] - }, - { - "keytime": 0.888889, - "rotation": [-0.161574, 0.768670, 0.614314, 0.075213], - "scale": [ 0.999999, 1.000001, 1.000000], - "translation": [ 3.723900, -4.382370, -13.298971] - }, - { - "keytime": 0.916667, - "rotation": [-0.154378, 0.768688, 0.615101, 0.083289], - "scale": [ 0.999999, 1.000001, 1.000000], - "translation": [ 3.723900, -4.382370, -13.298971] - }, - { - "keytime": 0.944444, - "rotation": [-0.148753, 0.768651, 0.615641, 0.089634], - "scale": [ 0.999999, 1.000001, 1.000000], - "translation": [ 3.723900, -4.382370, -13.298971] - }, - { - "keytime": 0.972222, - "rotation": [-0.145282, 0.768607, 0.615940, 0.093565], - "scale": [ 0.999999, 1.000001, 1.000000], - "translation": [ 3.723900, -4.382370, -13.298971] - }, - { - "keytime": 1.000000, - "rotation": [-0.144018, 0.768587, 0.616043, 0.095000], - "scale": [ 0.999999, 1.000001, 1.000000], - "translation": [ 3.723900, -4.382370, -13.298971] - } - ] - }, - { - "boneId": "R_side03", - "keyframes": [ - { - "keytime": 0.000000, - "rotation": [-0.025935, 0.074403, 0.063229, 0.994884], - "scale": [ 1.000000, 1.000000, 1.000001], - "translation": [ 11.134218, -0.000005, -0.000015] - }, - { - "keytime": 0.027778, - "rotation": [-0.025114, 0.060219, 0.063589, 0.995841], - "scale": [ 1.000000, 1.000000, 1.000001], - "translation": [ 11.134218, -0.000005, -0.000015] - }, - { - "keytime": 0.055556, - "rotation": [-0.023061, 0.026267, 0.064401, 0.997312], - "scale": [ 1.000000, 1.000000, 1.000001], - "translation": [ 11.134218, -0.000005, -0.000015] - }, - { - "keytime": 0.083333, - "rotation": [-0.020352, -0.015718, 0.065304, 0.997534], - "scale": [ 1.000000, 1.000000, 1.000001], - "translation": [ 11.134218, -0.000005, -0.000015] - }, - { - "keytime": 0.111111, - "rotation": [-0.018005, -0.049935, 0.065955, 0.996410], - "scale": [ 1.000000, 1.000000, 1.000001], - "translation": [ 11.134218, -0.000005, -0.000015] - }, - { - "keytime": 0.138889, - "rotation": [-0.016957, -0.064644, 0.066209, 0.995565], - "scale": [ 1.000000, 1.000000, 1.000001], - "translation": [ 11.134218, -0.000005, -0.000015] - }, - { - "keytime": 0.166667, - "rotation": [-0.017280, -0.060397, 0.066132, 0.995831], - "scale": [ 1.000000, 1.000000, 1.000001], - "translation": [ 11.134218, -0.000005, -0.000015] - }, - { - "keytime": 0.194444, - "rotation": [-0.018226, -0.047815, 0.065896, 0.996513], - "scale": [ 1.000000, 1.000000, 1.000001], - "translation": [ 11.134218, -0.000005, -0.000015] - }, - { - "keytime": 0.222222, - "rotation": [-0.019593, -0.029218, 0.065531, 0.997230], - "scale": [ 1.000000, 1.000000, 1.000001], - "translation": [ 11.134218, -0.000005, -0.000015] - }, - { - "keytime": 0.250000, - "rotation": [-0.021308, -0.005124, 0.065026, 0.997643], - "scale": [ 1.000000, 1.000000, 1.000001], - "translation": [ 11.134218, -0.000005, -0.000015] - }, - { - "keytime": 0.277778, - "rotation": [-0.023126, 0.021458, 0.064432, 0.997423], - "scale": [ 1.000000, 1.000000, 1.000001], - "translation": [ 11.134218, -0.000005, -0.000015] - }, - { - "keytime": 0.305556, - "rotation": [-0.024967, 0.049604, 0.063761, 0.996419], - "scale": [ 1.000000, 1.000000, 1.000001], - "translation": [ 11.134218, -0.000005, -0.000015] - }, - { - "keytime": 0.333333, - "rotation": [-0.026771, 0.078584, 0.063027, 0.994553], - "scale": [ 1.000000, 1.000000, 1.000001], - "translation": [ 11.134218, -0.000005, -0.000015] - }, - { - "keytime": 0.361111, - "rotation": [-0.028340, 0.105089, 0.062319, 0.992104], - "scale": [ 1.000000, 1.000000, 1.000001], - "translation": [ 11.134218, -0.000005, -0.000015] - }, - { - "keytime": 0.388889, - "rotation": [-0.029658, 0.128437, 0.061667, 0.989354], - "scale": [ 1.000000, 1.000000, 1.000001], - "translation": [ 11.134218, -0.000005, -0.000015] - }, - { - "keytime": 0.416667, - "rotation": [-0.030692, 0.147583, 0.061114, 0.986682], - "scale": [ 1.000000, 1.000000, 1.000001], - "translation": [ 11.134218, -0.000005, -0.000015] - }, - { - "keytime": 0.444444, - "rotation": [-0.031334, 0.159861, 0.060750, 0.984770], - "scale": [ 1.000000, 1.000000, 1.000001], - "translation": [ 11.134218, -0.000005, -0.000015] - }, - { - "keytime": 0.472222, - "rotation": [-0.031568, 0.164414, 0.060614, 0.984021], - "scale": [ 1.000000, 1.000000, 1.000001], - "translation": [ 11.134218, -0.000005, -0.000015] - }, - { - "keytime": 0.500000, - "rotation": [-0.031299, 0.159184, 0.060770, 0.984880], - "scale": [ 1.000000, 1.000000, 1.000001], - "translation": [ 11.134218, -0.000005, -0.000015] - }, - { - "keytime": 0.527778, - "rotation": [-0.030556, 0.145001, 0.061189, 0.987065], - "scale": [ 1.000000, 1.000000, 1.000001], - "translation": [ 11.134218, -0.000005, -0.000015] - }, - { - "keytime": 0.555556, - "rotation": [-0.029402, 0.123792, 0.061799, 0.989945], - "scale": [ 1.000000, 1.000000, 1.000001], - "translation": [ 11.134218, -0.000005, -0.000015] - }, - { - "keytime": 0.583333, - "rotation": [-0.027901, 0.097491, 0.062525, 0.992878], - "scale": [ 1.000000, 1.000000, 1.000001], - "translation": [ 11.134218, -0.000005, -0.000015] - }, - { - "keytime": 0.611111, - "rotation": [-0.026074, 0.067141, 0.063321, 0.995391], - "scale": [ 1.000000, 1.000000, 1.000001], - "translation": [ 11.134218, -0.000005, -0.000015] - }, - { - "keytime": 0.638889, - "rotation": [-0.024130, 0.036569, 0.064076, 0.996983], - "scale": [ 1.000000, 1.000000, 1.000001], - "translation": [ 11.134218, -0.000005, -0.000015] - }, - { - "keytime": 0.666667, - "rotation": [-0.022148, 0.006931, 0.064761, 0.997631], - "scale": [ 1.000000, 1.000000, 1.000001], - "translation": [ 11.134218, -0.000005, -0.000015] - }, - { - "keytime": 0.694444, - "rotation": [-0.020227, -0.020499, 0.065351, 0.997447], - "scale": [ 1.000000, 1.000000, 1.000001], - "translation": [ 11.134218, -0.000005, -0.000015] - }, - { - "keytime": 0.722222, - "rotation": [-0.018660, -0.042055, 0.065784, 0.996773], - "scale": [ 1.000000, 1.000000, 1.000001], - "translation": [ 11.134218, -0.000005, -0.000015] - }, - { - "keytime": 0.750000, - "rotation": [-0.017573, -0.056614, 0.066061, 0.996053], - "scale": [ 1.000000, 1.000000, 1.000001], - "translation": [ 11.134218, -0.000005, -0.000015] - }, - { - "keytime": 0.777778, - "rotation": [-0.017147, -0.062211, 0.066164, 0.995720], - "scale": [ 1.000000, 1.000000, 1.000001], - "translation": [ 11.134218, -0.000005, -0.000015] - }, - { - "keytime": 0.805555, - "rotation": [-0.017548, -0.056569, 0.066067, 0.996056], - "scale": [ 1.000000, 1.000000, 1.000001], - "translation": [ 11.134218, -0.000005, -0.000015] - }, - { - "keytime": 0.833333, - "rotation": [-0.018609, -0.041453, 0.065797, 0.996798], - "scale": [ 1.000000, 1.000000, 1.000001], - "translation": [ 11.134218, -0.000005, -0.000015] - }, - { - "keytime": 0.861111, - "rotation": [-0.020125, -0.019238, 0.065372, 0.997473], - "scale": [ 1.000000, 1.000000, 1.000001], - "translation": [ 11.134218, -0.000005, -0.000015] - }, - { - "keytime": 0.888889, - "rotation": [-0.021756, 0.005585, 0.064858, 0.997642], - "scale": [ 1.000000, 1.000000, 1.000001], - "translation": [ 11.134218, -0.000005, -0.000015] - }, - { - "keytime": 0.916667, - "rotation": [-0.023325, 0.030470, 0.064303, 0.997192], - "scale": [ 1.000000, 1.000000, 1.000001], - "translation": [ 11.134218, -0.000005, -0.000015] - }, - { - "keytime": 0.944444, - "rotation": [-0.024682, 0.052880, 0.063770, 0.996257], - "scale": [ 1.000000, 1.000000, 1.000001], - "translation": [ 11.134218, -0.000005, -0.000015] - }, - { - "keytime": 0.972222, - "rotation": [-0.025585, 0.068313, 0.063385, 0.995320], - "scale": [ 1.000000, 1.000000, 1.000001], - "translation": [ 11.134218, -0.000005, -0.000015] - }, - { - "keytime": 1.000000, - "rotation": [-0.025935, 0.074403, 0.063229, 0.994884], - "scale": [ 1.000000, 1.000000, 1.000001], - "translation": [ 11.134218, -0.000005, -0.000015] - } - ] - }, - { - "boneId": "Bip001 R Foot", - "keyframes": [ - { - "keytime": 0.000000, - "rotation": [ 0.003484, -0.035191, 0.011147, 0.999312], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 36.461250, -0.000002, 0.000002] - }, - { - "keytime": 0.027778, - "rotation": [ 0.013722, -0.033476, 0.035171, 0.998726], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 36.461258, -0.000000, 0.000000] - }, - { - "keytime": 0.055556, - "rotation": [ 0.026585, -0.030849, 0.025162, 0.998854], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 36.461239, 0.000000, -0.000001] - }, - { - "keytime": 0.083333, - "rotation": [ 0.034520, -0.026440, 0.048033, 0.997899], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 36.461266, 0.000000, 0.000001] - }, - { - "keytime": 0.111111, - "rotation": [ 0.042987, -0.021953, 0.070443, 0.996347], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 36.461250, -0.000001, 0.000000] - }, - { - "keytime": 0.138889, - "rotation": [ 0.040703, -0.024626, 0.097574, 0.994091], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 36.461258, 0.000002, -0.000001] - }, - { - "keytime": 0.166667, - "rotation": [ 0.038081, -0.027290, 0.124980, 0.991053], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 36.461266, 0.000001, -0.000001] - }, - { - "keytime": 0.194444, - "rotation": [ 0.033243, -0.028264, 0.133365, 0.990106], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 36.461258, 0.000000, 0.000001] - }, - { - "keytime": 0.222222, - "rotation": [ 0.028214, -0.028692, 0.141298, 0.989149], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 36.461254, 0.000001, 0.000001] - }, - { - "keytime": 0.250000, - "rotation": [ 0.022211, -0.030178, 0.134274, 0.990236], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 36.461250, 0.000003, 0.000000] - }, - { - "keytime": 0.277778, - "rotation": [ 0.016689, -0.031431, 0.127303, 0.991225], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 36.461250, -0.000001, -0.000000] - }, - { - "keytime": 0.305556, - "rotation": [ 0.011779, -0.034528, 0.123136, 0.991719], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 36.461250, -0.000003, 0.000001] - }, - { - "keytime": 0.333333, - "rotation": [ 0.007522, -0.037743, 0.118854, 0.992166], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 36.461258, 0.000000, -0.000000] - }, - { - "keytime": 0.361111, - "rotation": [ 0.005679, -0.037349, 0.122081, 0.991801], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 36.461250, 0.000000, -0.000001] - }, - { - "keytime": 0.388889, - "rotation": [ 0.004319, -0.037364, 0.125145, 0.991425], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 36.461258, -0.000002, -0.000000] - }, - { - "keytime": 0.416667, - "rotation": [ 0.004381, -0.030130, 0.133134, 0.990630], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 36.461258, -0.000002, -0.000000] - }, - { - "keytime": 0.444444, - "rotation": [ 0.004137, -0.023139, 0.141105, 0.989715], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 36.461254, -0.000002, 0.000001] - }, - { - "keytime": 0.472222, - "rotation": [ 0.005168, -0.005282, 0.136747, 0.990578], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 36.461258, 0.000000, 0.000001] - }, - { - "keytime": 0.500000, - "rotation": [ 0.007822, 0.013005, 0.132033, 0.991129], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 36.461250, -0.000004, -0.000001] - }, - { - "keytime": 0.527778, - "rotation": [ 0.021190, 0.025911, 0.085331, 0.995790], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 36.461250, -0.000000, -0.000004] - }, - { - "keytime": 0.555556, - "rotation": [ 0.038711, 0.040060, 0.038256, 0.997714], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 36.461262, 0.000004, -0.000002] - }, - { - "keytime": 0.583333, - "rotation": [ 0.059938, 0.037801, -0.017962, 0.997324], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 36.461254, 0.000000, -0.000000] - }, - { - "keytime": 0.611111, - "rotation": [ 0.081890, 0.037863, -0.077090, 0.992934], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 36.461250, -0.000008, -0.000002] - }, - { - "keytime": 0.638889, - "rotation": [ 0.095147, 0.029694, -0.090580, 0.990889], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 36.461258, 0.000004, 0.000003] - }, - { - "keytime": 0.666667, - "rotation": [ 0.106567, 0.021472, -0.105014, 0.988511], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 36.461258, 0.000004, -0.000002] - }, - { - "keytime": 0.694444, - "rotation": [ 0.101241, 0.015693, -0.089327, 0.990719], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 36.461254, 0.000004, -0.000001] - }, - { - "keytime": 0.722222, - "rotation": [ 0.095805, 0.009987, -0.073627, 0.992623], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 36.461250, 0.000000, 0.000003] - }, - { - "keytime": 0.750000, - "rotation": [ 0.086650, 0.012616, -0.051504, 0.994827], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 36.461250, 0.000002, 0.000003] - }, - { - "keytime": 0.777778, - "rotation": [ 0.074171, 0.013533, -0.028775, 0.996738], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 36.461250, 0.000000, -0.000002] - }, - { - "keytime": 0.805555, - "rotation": [ 0.064071, 0.005562, -0.002992, 0.997925], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 36.461250, -0.000001, 0.000001] - }, - { - "keytime": 0.833333, - "rotation": [ 0.052438, -0.001250, 0.022055, 0.998380], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 36.461250, -0.000001, 0.000001] - }, - { - "keytime": 0.861111, - "rotation": [ 0.035797, -0.009115, 0.048050, 0.998162], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 36.461254, 0.000003, 0.000000] - }, - { - "keytime": 0.888889, - "rotation": [ 0.017394, -0.012752, 0.072759, 0.997116], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 36.461254, 0.000002, 0.000001] - }, - { - "keytime": 0.916667, - "rotation": [ 0.004822, -0.006065, 0.081143, 0.996672], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 36.461254, -0.000002, -0.000001] - }, - { - "keytime": 0.944444, - "rotation": [ 0.003181, -0.013697, 0.061747, 0.997993], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 36.461250, -0.000000, -0.000001] - }, - { - "keytime": 0.972222, - "rotation": [ 0.003512, -0.024261, 0.037053, 0.999013], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 36.461254, 0.000000, -0.000001] - }, - { - "keytime": 1.000000, - "rotation": [ 0.003484, -0.035191, 0.011147, 0.999312], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 36.461250, -0.000002, 0.000002] - } - ] - }, - { - "boneId": "L_side02", - "keyframes": [ - { - "keytime": 0.000000, - "rotation": [-0.003643, 0.092683, -0.176223, 0.979970], - "scale": [ 1.277025, 1.000000, 1.000000], - "translation": [ 9.999771, 0.000000, -0.000000] - }, - { - "keytime": 0.027778, - "rotation": [-0.003990, 0.090853, -0.176215, 0.980142], - "scale": [ 1.277025, 1.000000, 1.000000], - "translation": [ 9.999771, 0.000000, -0.000000] - }, - { - "keytime": 0.055556, - "rotation": [-0.004980, 0.085626, -0.176188, 0.980613], - "scale": [ 1.277025, 1.000000, 1.000000], - "translation": [ 9.999771, 0.000000, -0.000000] - }, - { - "keytime": 0.083333, - "rotation": [-0.006589, 0.077099, -0.176135, 0.981320], - "scale": [ 1.277025, 1.000000, 1.000000], - "translation": [ 9.999771, -0.000000, -0.000000] - }, - { - "keytime": 0.111111, - "rotation": [-0.008639, 0.066175, -0.176046, 0.982117], - "scale": [ 1.277025, 1.000000, 1.000000], - "translation": [ 9.999771, 0.000000, -0.000000] - }, - { - "keytime": 0.138889, - "rotation": [-0.011087, 0.053035, -0.175911, 0.982914], - "scale": [ 1.277025, 1.000000, 1.000000], - "translation": [ 9.999771, 0.000000, -0.000000] - }, - { - "keytime": 0.166667, - "rotation": [-0.013853, 0.038074, -0.175719, 0.983606], - "scale": [ 1.277025, 1.000000, 1.000000], - "translation": [ 9.999771, 0.000000, -0.000000] - }, - { - "keytime": 0.194444, - "rotation": [-0.016948, 0.021172, -0.175454, 0.984114], - "scale": [ 1.277025, 1.000000, 1.000000], - "translation": [ 9.999771, 0.000000, -0.000000] - }, - { - "keytime": 0.222222, - "rotation": [-0.020110, 0.003731, -0.175127, 0.984333], - "scale": [ 1.277025, 1.000000, 1.000000], - "translation": [ 9.999771, 0.000000, -0.000000] - }, - { - "keytime": 0.250000, - "rotation": [-0.023447, -0.014878, -0.174720, 0.984226], - "scale": [ 1.277025, 1.000000, 1.000000], - "translation": [ 9.999771, 0.000000, -0.000000] - }, - { - "keytime": 0.277778, - "rotation": [-0.026688, -0.033147, -0.174262, 0.983779], - "scale": [ 1.277025, 1.000000, 1.000000], - "translation": [ 9.999771, 0.000000, -0.000000] - }, - { - "keytime": 0.305556, - "rotation": [-0.029858, -0.051212, -0.173752, 0.983004], - "scale": [ 1.277025, 1.000000, 1.000000], - "translation": [ 9.999771, 0.000000, -0.000000] - }, - { - "keytime": 0.333333, - "rotation": [-0.032977, -0.069189, -0.173189, 0.981902], - "scale": [ 1.277025, 1.000000, 1.000000], - "translation": [ 9.999771, -0.000000, -0.000000] - }, - { - "keytime": 0.361111, - "rotation": [-0.035796, -0.085608, -0.172627, 0.980607], - "scale": [ 1.277025, 1.000000, 1.000000], - "translation": [ 9.999771, 0.000000, -0.000000] - }, - { - "keytime": 0.388889, - "rotation": [-0.038346, -0.100613, -0.172074, 0.979182], - "scale": [ 1.277025, 1.000000, 1.000000], - "translation": [ 9.999771, 0.000000, -0.000000] - }, - { - "keytime": 0.416667, - "rotation": [-0.040631, -0.114179, -0.171540, 0.977694], - "scale": [ 1.277025, 1.000000, 1.000000], - "translation": [ 9.999771, 0.000000, -0.000000] - }, - { - "keytime": 0.444444, - "rotation": [-0.042457, -0.125106, -0.171089, 0.976358], - "scale": [ 1.277025, 1.000000, 1.000000], - "translation": [ 9.999771, 0.000000, -0.000000] - }, - { - "keytime": 0.472222, - "rotation": [-0.043840, -0.133436, -0.170731, 0.975256], - "scale": [ 1.277025, 1.000000, 1.000000], - "translation": [ 9.999771, -0.000000, -0.000000] - }, - { - "keytime": 0.500000, - "rotation": [-0.044742, -0.138891, -0.170490, 0.974495], - "scale": [ 1.277025, 1.000000, 1.000000], - "translation": [ 9.999771, -0.000000, -0.000000] - }, - { - "keytime": 0.527778, - "rotation": [-0.045049, -0.140753, -0.170406, 0.974228], - "scale": [ 1.277025, 1.000000, 1.000000], - "translation": [ 9.999771, 0.000000, -0.000000] - }, - { - "keytime": 0.555556, - "rotation": [-0.044682, -0.138527, -0.170506, 0.974547], - "scale": [ 1.277025, 1.000000, 1.000000], - "translation": [ 9.999771, 0.000000, -0.000000] - }, - { - "keytime": 0.583333, - "rotation": [-0.043622, -0.132119, -0.170788, 0.975435], - "scale": [ 1.277025, 1.000000, 1.000000], - "translation": [ 9.999771, -0.000000, -0.000000] - }, - { - "keytime": 0.611111, - "rotation": [-0.041892, -0.121714, -0.171231, 0.976786], - "scale": [ 1.277025, 1.000000, 1.000000], - "translation": [ 9.999771, 0.000000, -0.000000] - }, - { - "keytime": 0.638889, - "rotation": [-0.039674, -0.108481, -0.171768, 0.978342], - "scale": [ 1.277025, 1.000000, 1.000000], - "translation": [ 9.999771, 0.000000, -0.000000] - }, - { - "keytime": 0.666667, - "rotation": [-0.037006, -0.092708, -0.172370, 0.979961], - "scale": [ 1.277025, 1.000000, 1.000000], - "translation": [ 9.999771, 0.000000, -0.000000] - }, - { - "keytime": 0.694444, - "rotation": [-0.033871, -0.074379, -0.173016, 0.981522], - "scale": [ 1.277025, 1.000000, 1.000000], - "translation": [ 9.999771, 0.000000, -0.000000] - }, - { - "keytime": 0.722222, - "rotation": [-0.030542, -0.055138, -0.173634, 0.982791], - "scale": [ 1.277025, 1.000000, 1.000000], - "translation": [ 9.999771, 0.000000, -0.000000] - }, - { - "keytime": 0.750000, - "rotation": [-0.027020, -0.035031, -0.174211, 0.983714], - "scale": [ 1.277025, 1.000000, 1.000000], - "translation": [ 9.999771, 0.000000, -0.000000] - }, - { - "keytime": 0.777778, - "rotation": [-0.023291, -0.014001, -0.174741, 0.984239], - "scale": [ 1.277025, 1.000000, 1.000000], - "translation": [ 9.999771, 0.000000, -0.000000] - }, - { - "keytime": 0.805555, - "rotation": [-0.019675, 0.006138, -0.175176, 0.984321], - "scale": [ 1.277025, 1.000000, 1.000000], - "translation": [ 9.999771, 0.000000, -0.000000] - }, - { - "keytime": 0.833333, - "rotation": [-0.016169, 0.025441, -0.175526, 0.984013], - "scale": [ 1.277025, 1.000000, 1.000000], - "translation": [ 9.999771, 0.000000, -0.000000] - }, - { - "keytime": 0.861111, - "rotation": [-0.012785, 0.043863, -0.175798, 0.983365], - "scale": [ 1.277025, 1.000000, 1.000000], - "translation": [ 9.999771, -0.000000, -0.000000] - }, - { - "keytime": 0.888889, - "rotation": [-0.009838, 0.059752, -0.175984, 0.982529], - "scale": [ 1.277025, 1.000000, 1.000000], - "translation": [ 9.999771, -0.000000, -0.000000] - }, - { - "keytime": 0.916667, - "rotation": [-0.007337, 0.073123, -0.176105, 0.981624], - "scale": [ 1.277025, 1.000000, 1.000000], - "translation": [ 9.999771, 0.000000, -0.000000] - }, - { - "keytime": 0.944444, - "rotation": [-0.005347, 0.083689, -0.176177, 0.980780], - "scale": [ 1.277025, 1.000000, 1.000000], - "translation": [ 9.999771, 0.000000, -0.000000] - }, - { - "keytime": 0.972222, - "rotation": [-0.004101, 0.090270, -0.176212, 0.980196], - "scale": [ 1.277025, 1.000000, 1.000000], - "translation": [ 9.999771, 0.000000, -0.000000] - }, - { - "keytime": 1.000000, - "rotation": [-0.003643, 0.092683, -0.176223, 0.979970], - "scale": [ 1.277025, 1.000000, 1.000000], - "translation": [ 9.999771, 0.000000, -0.000000] - } - ] - }, - { - "boneId": "Bip001 TailNub", - "keyframes": [ - { - "keytime": 0.000000, - "rotation": [ 0.707388, 0.706825, 0.000001, -0.000001], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 18.755024, 0.000000, 0.000000] - }, - { - "keytime": 0.027778, - "rotation": [ 0.707388, 0.706825, 0.000001, -0.000001], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 18.755020, 0.000000, -0.000002] - }, - { - "keytime": 0.055556, - "rotation": [ 0.707388, 0.706825, 0.000001, -0.000001], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 18.755028, -0.000000, -0.000000] - }, - { - "keytime": 0.083333, - "rotation": [ 0.707388, 0.706825, 0.000001, -0.000001], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 18.755026, 0.000000, 0.000002] - }, - { - "keytime": 0.138889, - "rotation": [ 0.707388, 0.706825, 0.000001, -0.000001], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 18.755028, 0.000000, -0.000000] - }, - { - "keytime": 0.166667, - "rotation": [ 0.707388, 0.706825, 0.000001, -0.000001], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 18.755022, 0.000000, 0.000000] - }, - { - "keytime": 0.194444, - "rotation": [ 0.707388, 0.706825, 0.000001, -0.000001], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 18.755022, -0.000004, -0.000001] - }, - { - "keytime": 0.222222, - "rotation": [ 0.707388, 0.706825, 0.000001, -0.000001], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 18.755024, -0.000000, 0.000001] - }, - { - "keytime": 0.250000, - "rotation": [ 0.707388, 0.706825, 0.000001, -0.000001], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 18.755022, -0.000000, 0.000000] - }, - { - "keytime": 0.277778, - "rotation": [ 0.707388, 0.706825, 0.000001, -0.000001], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 18.755026, -0.000004, -0.000000] - }, - { - "keytime": 0.305556, - "rotation": [ 0.707388, 0.706825, 0.000001, -0.000001], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 18.755024, -0.000000, 0.000000] - }, - { - "keytime": 0.333333, - "rotation": [ 0.707388, 0.706825, 0.000001, -0.000001], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 18.755026, -0.000000, -0.000001] - }, - { - "keytime": 0.388889, - "rotation": [ 0.707388, 0.706825, 0.000001, -0.000001], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 18.755024, 0.000000, 0.000000] - }, - { - "keytime": 0.416667, - "rotation": [ 0.707388, 0.706825, 0.000001, -0.000001], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 18.755028, -0.000004, -0.000001] - }, - { - "keytime": 0.444444, - "rotation": [ 0.707388, 0.706825, 0.000001, -0.000001], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 18.755024, 0.000004, -0.000000] - }, - { - "keytime": 0.472222, - "rotation": [ 0.707388, 0.706825, 0.000001, -0.000001], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 18.755024, 0.000000, 0.000000] - }, - { - "keytime": 0.500000, - "rotation": [ 0.707388, 0.706825, 0.000001, -0.000001], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 18.755028, 0.000000, 0.000001] - }, - { - "keytime": 0.527778, - "rotation": [ 0.707388, 0.706825, 0.000001, -0.000001], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 18.755028, -0.000002, -0.000000] - }, - { - "keytime": 0.555556, - "rotation": [ 0.707388, 0.706825, 0.000001, -0.000001], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 18.755028, -0.000000, 0.000000] - }, - { - "keytime": 0.583333, - "rotation": [ 0.707388, 0.706825, 0.000001, -0.000001], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 18.755030, 0.000000, 0.000001] - }, - { - "keytime": 0.611111, - "rotation": [ 0.707388, 0.706825, 0.000001, -0.000001], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 18.755026, -0.000000, -0.000000] - }, - { - "keytime": 0.638889, - "rotation": [ 0.707388, 0.706825, 0.000001, -0.000001], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 18.755026, 0.000004, 0.000001] - }, - { - "keytime": 0.694444, - "rotation": [ 0.707388, 0.706825, 0.000001, -0.000001], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 18.755024, 0.000000, 0.000000] - }, - { - "keytime": 0.722222, - "rotation": [ 0.707388, 0.706825, 0.000001, -0.000001], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 18.755028, -0.000004, 0.000001] - }, - { - "keytime": 0.750000, - "rotation": [ 0.707388, 0.706825, 0.000001, -0.000001], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 18.755026, -0.000000, -0.000000] - }, - { - "keytime": 0.777778, - "rotation": [ 0.707388, 0.706825, 0.000001, -0.000001], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 18.755020, 0.000000, -0.000001] - }, - { - "keytime": 0.805555, - "rotation": [ 0.707388, 0.706825, 0.000001, -0.000001], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 18.755020, 0.000000, 0.000001] - }, - { - "keytime": 0.833333, - "rotation": [ 0.707388, 0.706825, 0.000001, -0.000001], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 18.755032, 0.000000, 0.000000] - }, - { - "keytime": 0.861111, - "rotation": [ 0.707388, 0.706825, 0.000001, -0.000001], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 18.755024, 0.000000, -0.000002] - }, - { - "keytime": 0.888889, - "rotation": [ 0.707388, 0.706825, 0.000001, -0.000001], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 18.755024, -0.000000, 0.000002] - }, - { - "keytime": 0.916667, - "rotation": [ 0.707388, 0.706825, 0.000001, -0.000001], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 18.755022, 0.000000, 0.000002] - }, - { - "keytime": 0.944444, - "rotation": [ 0.707388, 0.706825, 0.000001, -0.000001], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 18.755028, 0.000000, -0.000002] - }, - { - "keytime": 0.972222, - "rotation": [ 0.707388, 0.706825, 0.000001, -0.000001], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 18.755030, -0.000000, -0.000000] - }, - { - "keytime": 1.000000, - "rotation": [ 0.707388, 0.706825, 0.000001, -0.000001], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 18.755026, 0.000004, -0.000000] - } - ] - }, - { - "boneId": "Bip001 Tail", - "keyframes": [ - { - "keytime": 0.000000, - "rotation": [-0.026873, 0.092343, 0.991063, -0.092439], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-3.604134, -10.040682, 2.116385] - }, - { - "keytime": 0.027778, - "rotation": [-0.010875, 0.090910, 0.990970, -0.097959], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-3.592991, -10.032965, 2.171628] - }, - { - "keytime": 0.055556, - "rotation": [ 0.005102, 0.089254, 0.990507, -0.104422], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-3.580711, -10.025412, 2.226575] - }, - { - "keytime": 0.083333, - "rotation": [ 0.018823, 0.088292, 0.989627, -0.111756], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-3.568550, -10.018709, 2.276217] - }, - { - "keytime": 0.111111, - "rotation": [ 0.032162, 0.087200, 0.988572, -0.118686], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-3.555822, -10.012373, 2.323957] - }, - { - "keytime": 0.138889, - "rotation": [ 0.037965, 0.088519, 0.987417, -0.125422], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-3.552395, -10.008403, 2.346643] - }, - { - "keytime": 0.166667, - "rotation": [ 0.043850, 0.089891, 0.986347, -0.130831], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-3.548965, -10.004427, 2.369034] - }, - { - "keytime": 0.194444, - "rotation": [ 0.043032, 0.093708, 0.985495, -0.134782], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-3.557551, -10.001884, 2.367135] - }, - { - "keytime": 0.222222, - "rotation": [ 0.042147, 0.097490, 0.984974, -0.136179], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-3.565009, -10.000563, 2.361603] - }, - { - "keytime": 0.250000, - "rotation": [ 0.041347, 0.102055, 0.984861, -0.133877], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-3.573814, -9.998823, 2.355517] - }, - { - "keytime": 0.277778, - "rotation": [ 0.041833, 0.106628, 0.985133, -0.128041], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-3.581044, -9.997697, 2.348946] - }, - { - "keytime": 0.305556, - "rotation": [ 0.046238, 0.110026, 0.985646, -0.119410], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-3.588022, -9.994202, 2.352757] - }, - { - "keytime": 0.333333, - "rotation": [ 0.050465, 0.113522, 0.986211, -0.109329], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-3.594612, -9.990546, 2.357715] - }, - { - "keytime": 0.361111, - "rotation": [ 0.059562, 0.114833, 0.986649, -0.098947], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-3.601173, -9.982539, 2.381007] - }, - { - "keytime": 0.388889, - "rotation": [ 0.065887, 0.116160, 0.986948, -0.089991], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-3.608259, -9.975932, 2.397527] - }, - { - "keytime": 0.416667, - "rotation": [ 0.071277, 0.116803, 0.987080, -0.083370], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-3.614357, -9.968795, 2.417685] - }, - { - "keytime": 0.444444, - "rotation": [ 0.073422, 0.117119, 0.987099, -0.080799], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-3.620363, -9.961732, 2.437652] - }, - { - "keytime": 0.472222, - "rotation": [ 0.061795, 0.118554, 0.987426, -0.084359], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-3.621488, -9.970918, 2.398165] - }, - { - "keytime": 0.500000, - "rotation": [ 0.044900, 0.119910, 0.987463, -0.092319], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-3.621437, -9.982296, 2.350747] - }, - { - "keytime": 0.527778, - "rotation": [ 0.019557, 0.123751, 0.986660, -0.103949], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-3.608917, -9.999041, 2.298653] - }, - { - "keytime": 0.555556, - "rotation": [-0.007645, 0.124256, 0.985295, -0.117027], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-3.592842, -10.031738, 2.178625] - }, - { - "keytime": 0.583333, - "rotation": [-0.028914, 0.124704, 0.983277, -0.129533], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-3.574969, -10.051600, 2.116105] - }, - { - "keytime": 0.611111, - "rotation": [-0.050092, 0.125273, 0.980762, -0.141076], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-3.555324, -10.071560, 2.053880] - }, - { - "keytime": 0.638889, - "rotation": [-0.058237, 0.122598, 0.979630, -0.147999], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-3.551333, -10.077381, 2.032475] - }, - { - "keytime": 0.666667, - "rotation": [-0.063886, 0.119673, 0.979168, -0.151086], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-3.546156, -10.084959, 2.003871] - }, - { - "keytime": 0.694444, - "rotation": [-0.061317, 0.115662, 0.980089, -0.149292], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-3.560035, -10.078748, 2.010462] - }, - { - "keytime": 0.722222, - "rotation": [-0.057632, 0.111719, 0.981312, -0.145684], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-3.571820, -10.073282, 2.016762] - }, - { - "keytime": 0.750000, - "rotation": [-0.053601, 0.108036, 0.982736, -0.140302], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-3.589268, -10.066116, 2.021307] - }, - { - "keytime": 0.777778, - "rotation": [-0.048467, 0.104551, 0.984322, -0.133529], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-3.605975, -10.057735, 2.032958] - }, - { - "keytime": 0.805555, - "rotation": [-0.048104, 0.092157, 0.986661, -0.125273], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-3.636218, -10.087616, 1.819314] - }, - { - "keytime": 0.833333, - "rotation": [-0.048202, 0.077449, 0.989038, -0.116114], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-3.672755, -10.119070, 1.550655] - }, - { - "keytime": 0.861111, - "rotation": [-0.047780, 0.064364, 0.991045, -0.106792], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-3.705715, -10.140238, 1.315488] - }, - { - "keytime": 0.888889, - "rotation": [-0.046052, 0.058015, 0.992336, -0.098911], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-3.721559, -10.145896, 1.223298] - }, - { - "keytime": 0.916667, - "rotation": [-0.042854, 0.060611, 0.992895, -0.093003], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-3.712580, -10.136668, 1.322722] - }, - { - "keytime": 0.944444, - "rotation": [-0.039017, 0.069774, 0.992832, -0.088843], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-3.682728, -10.113330, 1.562500] - }, - { - "keytime": 0.972222, - "rotation": [-0.032941, 0.081516, 0.991988, -0.090719], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-3.643432, -10.079174, 1.849097] - }, - { - "keytime": 1.000000, - "rotation": [-0.026873, 0.092343, 0.991063, -0.092439], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-3.604134, -10.040684, 2.116384] - } - ] - }, - { - "boneId": "Bip001 L Toe0", - "keyframes": [ - { - "keytime": 0.000000, - "rotation": [-0.000000, -0.000000, 0.707107, 0.707107], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 17.426956, 10.792507, 0.000003] - }, - { - "keytime": 0.027778, - "rotation": [-0.000000, -0.000000, 0.707107, 0.707107], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 17.426956, 10.792511, -0.000003] - }, - { - "keytime": 0.055556, - "rotation": [-0.000000, -0.000000, 0.707107, 0.707107], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 17.426952, 10.792511, -0.000000] - }, - { - "keytime": 0.083333, - "rotation": [-0.000000, -0.000000, 0.707107, 0.707107], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 17.426960, 10.792511, 0.000002] - }, - { - "keytime": 0.111111, - "rotation": [-0.000000, -0.000000, 0.707107, 0.707107], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 17.426958, 10.792507, 0.000001] - }, - { - "keytime": 0.138889, - "rotation": [-0.000000, -0.000000, 0.707107, 0.707107], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 17.426956, 10.792511, 0.000002] - }, - { - "keytime": 0.166667, - "rotation": [-0.000000, -0.000000, 0.707107, 0.707107], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 17.426956, 10.792503, -0.000001] - }, - { - "keytime": 0.194444, - "rotation": [-0.000000, -0.000000, 0.707107, 0.707107], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 17.426956, 10.792507, 0.000001] - }, - { - "keytime": 0.222222, - "rotation": [-0.000000, -0.000000, 0.707107, 0.707107], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 17.426954, 10.792511, 0.000002] - }, - { - "keytime": 0.250000, - "rotation": [-0.000000, 0.000000, 0.707107, 0.707107], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 17.426956, 10.792509, -0.000001] - }, - { - "keytime": 0.277778, - "rotation": [ 0.000000, -0.000000, 0.707107, 0.707107], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 17.426952, 10.792508, -0.000000] - }, - { - "keytime": 0.305556, - "rotation": [-0.000000, -0.000000, 0.707107, 0.707107], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 17.426960, 10.792510, 0.000001] - }, - { - "keytime": 0.333333, - "rotation": [-0.000000, -0.000000, 0.707107, 0.707107], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 17.426958, 10.792510, -0.000000] - }, - { - "keytime": 0.361111, - "rotation": [-0.000000, -0.000000, 0.707107, 0.707107], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 17.426956, 10.792508, 0.000001] - }, - { - "keytime": 0.388889, - "rotation": [-0.000000, -0.000000, 0.707107, 0.707107], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 17.426954, 10.792511, -0.000003] - }, - { - "keytime": 0.416667, - "rotation": [-0.000000, 0.000000, 0.707107, 0.707107], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 17.426960, 10.792515, 0.000000] - }, - { - "keytime": 0.444444, - "rotation": [-0.000000, -0.000000, 0.707107, 0.707107], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 17.426956, 10.792511, -0.000002] - }, - { - "keytime": 0.472222, - "rotation": [-0.000000, -0.000000, 0.707107, 0.707107], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 17.426960, 10.792505, -0.000000] - }, - { - "keytime": 0.500000, - "rotation": [-0.000000, -0.000000, 0.707107, 0.707107], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 17.426954, 10.792509, -0.000000] - }, - { - "keytime": 0.527778, - "rotation": [-0.000000, -0.000000, 0.707107, 0.707107], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 17.426956, 10.792503, 0.000001] - }, - { - "keytime": 0.555556, - "rotation": [-0.000000, -0.000000, 0.707107, 0.707107], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 17.426956, 10.792509, 0.000000] - }, - { - "keytime": 0.583333, - "rotation": [-0.000000, -0.000000, 0.707107, 0.707107], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 17.426954, 10.792509, 0.000000] - }, - { - "keytime": 0.611111, - "rotation": [-0.000000, -0.000000, 0.707107, 0.707107], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 17.426956, 10.792510, 0.000000] - }, - { - "keytime": 0.638889, - "rotation": [-0.000000, -0.000000, 0.707107, 0.707107], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 17.426956, 10.792507, -0.000000] - }, - { - "keytime": 0.666667, - "rotation": [-0.000000, -0.000000, 0.707107, 0.707107], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 17.426956, 10.792511, 0.000001] - }, - { - "keytime": 0.694444, - "rotation": [-0.000000, -0.000000, 0.707107, 0.707107], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 17.426954, 10.792509, -0.000000] - }, - { - "keytime": 0.722222, - "rotation": [-0.000000, 0.000000, 0.707107, 0.707107], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 17.426956, 10.792509, -0.000000] - }, - { - "keytime": 0.750000, - "rotation": [-0.000000, -0.000000, 0.707107, 0.707107], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 17.426958, 10.792511, -0.000000] - }, - { - "keytime": 0.805555, - "rotation": [-0.000000, -0.000000, 0.707107, 0.707107], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 17.426956, 10.792509, 0.000000] - }, - { - "keytime": 0.833333, - "rotation": [-0.000000, -0.000000, 0.707107, 0.707107], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 17.426958, 10.792509, 0.000000] - }, - { - "keytime": 0.888889, - "rotation": [-0.000000, -0.000000, 0.707107, 0.707107], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 17.426954, 10.792509, 0.000000] - }, - { - "keytime": 0.916667, - "rotation": [-0.000000, -0.000000, 0.707107, 0.707107], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 17.426956, 10.792510, -0.000001] - }, - { - "keytime": 0.972222, - "rotation": [-0.000000, -0.000000, 0.707107, 0.707107], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 17.426956, 10.792511, 0.000001] - }, - { - "keytime": 1.000000, - "rotation": [-0.000000, -0.000000, 0.707107, 0.707107], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 17.426956, 10.792507, 0.000003] - } - ] - }, - { - "boneId": "Bip001 R Calf", - "keyframes": [ - { - "keytime": 0.000000, - "rotation": [ 0.000000, -0.000000, -0.096311, 0.995351], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 29.675545, -0.000004, -0.000001] - }, - { - "keytime": 0.027778, - "rotation": [-0.000000, -0.000000, -0.234852, 0.972031], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 29.675549, -0.000004, 0.000001] - }, - { - "keytime": 0.055556, - "rotation": [-0.000000, 0.000000, -0.294400, 0.955682], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 29.675545, -0.000000, 0.000000] - }, - { - "keytime": 0.083333, - "rotation": [-0.000000, -0.000000, -0.318273, 0.947999], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 29.675549, -0.000000, 0.000001] - }, - { - "keytime": 0.111111, - "rotation": [ 0.000000, 0.000000, -0.341126, 0.940018], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 29.675556, 0.000004, 0.000002] - }, - { - "keytime": 0.138889, - "rotation": [-0.000000, 0.000000, -0.330113, 0.943941], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 29.675541, 0.000004, 0.000001] - }, - { - "keytime": 0.166667, - "rotation": [-0.000000, -0.000000, -0.319147, 0.947705], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 29.675545, 0.000000, -0.000000] - }, - { - "keytime": 0.194444, - "rotation": [ 0.000000, -0.000000, -0.292860, 0.956155], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 29.675549, -0.000000, -0.000000] - }, - { - "keytime": 0.222222, - "rotation": [-0.000000, 0.000000, -0.266892, 0.963726], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 29.675545, 0.000000, -0.000001] - }, - { - "keytime": 0.250000, - "rotation": [ 0.000000, -0.000000, -0.240917, 0.970546], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 29.675552, 0.000000, 0.000001] - }, - { - "keytime": 0.277778, - "rotation": [ 0.000000, 0.000000, -0.215489, 0.976506], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 29.675545, 0.000001, 0.000000] - }, - { - "keytime": 0.305556, - "rotation": [-0.000000, 0.000000, -0.194480, 0.980906], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 29.675552, 0.000000, -0.000000] - }, - { - "keytime": 0.333333, - "rotation": [-0.000000, 0.000000, -0.172690, 0.984976], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 29.675556, 0.000000, -0.000000] - }, - { - "keytime": 0.361111, - "rotation": [ 0.000000, 0.000000, -0.160577, 0.987023], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 29.675541, -0.000000, 0.000001] - }, - { - "keytime": 0.388889, - "rotation": [ 0.000000, -0.000000, -0.148054, 0.988979], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 29.675560, -0.000000, 0.000001] - }, - { - "keytime": 0.416667, - "rotation": [-0.000000, -0.000000, -0.156474, 0.987682], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 29.675560, 0.000001, 0.000000] - }, - { - "keytime": 0.444444, - "rotation": [ 0.000000, 0.000000, -0.164760, 0.986334], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 29.675549, 0.000000, -0.000000] - }, - { - "keytime": 0.472222, - "rotation": [-0.000000, 0.000000, -0.201665, 0.979455], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 29.675552, -0.000000, 0.000000] - }, - { - "keytime": 0.500000, - "rotation": [-0.000000, -0.000000, -0.239430, 0.970914], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 29.675545, -0.000000, 0.000000] - }, - { - "keytime": 0.527778, - "rotation": [ 0.000000, -0.000000, -0.301960, 0.953321], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 29.675549, 0.000000, 0.000001] - }, - { - "keytime": 0.555556, - "rotation": [ 0.000000, 0.000000, -0.362861, 0.931843], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 29.675541, 0.000000, 0.000000] - }, - { - "keytime": 0.583333, - "rotation": [ 0.000000, 0.000000, -0.430909, 0.902396], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 29.675552, -0.000000, -0.000000] - }, - { - "keytime": 0.611111, - "rotation": [ 0.000000, -0.000000, -0.498634, 0.866813], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 29.675552, -0.000000, 0.000000] - }, - { - "keytime": 0.638889, - "rotation": [-0.000000, 0.000000, -0.544043, 0.839057], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 29.675545, 0.000001, 0.000000] - }, - { - "keytime": 0.666667, - "rotation": [-0.000000, 0.000000, -0.588316, 0.808631], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 29.675541, -0.000000, 0.000000] - }, - { - "keytime": 0.694444, - "rotation": [-0.000000, -0.000000, -0.598894, 0.800828], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 29.675545, 0.000002, 0.000000] - }, - { - "keytime": 0.722222, - "rotation": [-0.000000, 0.000000, -0.608950, 0.793208], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 29.675552, 0.000004, -0.000000] - }, - { - "keytime": 0.750000, - "rotation": [ 0.000000, 0.000000, -0.584591, 0.811328], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 29.675556, 0.000004, 0.000001] - }, - { - "keytime": 0.777778, - "rotation": [-0.000000, -0.000000, -0.558831, 0.829282], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 29.675552, -0.000004, 0.000002] - }, - { - "keytime": 0.805555, - "rotation": [-0.000000, 0.000000, -0.498343, 0.866980], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 29.675545, -0.000000, -0.000001] - }, - { - "keytime": 0.833333, - "rotation": [ 0.000000, -0.000000, -0.435675, 0.900104], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 29.675545, 0.000004, -0.000000] - }, - { - "keytime": 0.861111, - "rotation": [-0.000000, 0.000000, -0.338358, 0.941017], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 29.675552, 0.000000, -0.000001] - }, - { - "keytime": 0.888889, - "rotation": [ 0.000000, -0.000000, -0.240207, 0.970722], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 29.675545, -0.000000, -0.000001] - }, - { - "keytime": 0.916667, - "rotation": [ 0.000000, 0.000000, -0.179823, 0.983699], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 29.675545, 0.000004, -0.000001] - }, - { - "keytime": 0.944444, - "rotation": [-0.000000, -0.000000, -0.147736, 0.989027], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 29.675552, 0.000000, 0.000002] - }, - { - "keytime": 0.972222, - "rotation": [ 0.000000, -0.000000, -0.122434, 0.992477], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 29.675549, 0.000004, 0.000002] - }, - { - "keytime": 1.000000, - "rotation": [ 0.000000, -0.000000, -0.096311, 0.995351], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 29.675545, -0.000004, -0.000001] - } - ] - }, - { - "boneId": "R_side02", - "keyframes": [ - { - "keytime": 0.000000, - "rotation": [-0.039391, 0.111920, 0.113179, 0.986465], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 11.138689, 0.000000, 0.000008] - }, - { - "keytime": 0.027778, - "rotation": [-0.038123, 0.100303, 0.113622, 0.987713], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 11.138689, 0.000000, 0.000008] - }, - { - "keytime": 0.055556, - "rotation": [-0.035009, 0.072480, 0.114630, 0.990142], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 11.138689, 0.000000, 0.000008] - }, - { - "keytime": 0.083333, - "rotation": [-0.031007, 0.038035, 0.115772, 0.992063], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 11.138689, 0.000000, 0.000008] - }, - { - "keytime": 0.111111, - "rotation": [-0.027620, 0.009917, 0.116616, 0.992743], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 11.138689, -0.000000, 0.000008] - }, - { - "keytime": 0.138889, - "rotation": [-0.026129, -0.002185, 0.116954, 0.992791], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 11.138689, 0.000000, 0.000008] - }, - { - "keytime": 0.166667, - "rotation": [-0.026448, 0.000358, 0.116884, 0.992793], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 11.138689, 0.000000, 0.000008] - }, - { - "keytime": 0.194444, - "rotation": [-0.027386, 0.007894, 0.116670, 0.992762], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 11.138689, -0.000000, 0.000008] - }, - { - "keytime": 0.222222, - "rotation": [-0.028758, 0.019024, 0.116343, 0.992610], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 11.138689, 0.000000, 0.000008] - }, - { - "keytime": 0.250000, - "rotation": [-0.030508, 0.033433, 0.115902, 0.992229], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 11.138689, -0.000000, 0.000008] - }, - { - "keytime": 0.277778, - "rotation": [-0.032404, 0.049320, 0.115391, 0.991566], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 11.138689, 0.000000, 0.000008] - }, - { - "keytime": 0.305556, - "rotation": [-0.034375, 0.066139, 0.114824, 0.990585], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 11.138689, 0.000000, 0.000008] - }, - { - "keytime": 0.333333, - "rotation": [-0.036363, 0.083461, 0.114212, 0.989276], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 11.138689, 0.000000, 0.000008] - }, - { - "keytime": 0.361111, - "rotation": [-0.038146, 0.099318, 0.113627, 0.987811], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 11.138689, 0.000000, 0.000008] - }, - { - "keytime": 0.388889, - "rotation": [-0.039690, 0.113303, 0.113091, 0.986305], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 11.138689, 0.000000, 0.000008] - }, - { - "keytime": 0.416667, - "rotation": [-0.040937, 0.124786, 0.112638, 0.984919], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 11.138689, 0.000000, 0.000008] - }, - { - "keytime": 0.444444, - "rotation": [-0.041728, 0.132159, 0.112341, 0.983957], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 11.138689, 0.000000, 0.000008] - }, - { - "keytime": 0.472222, - "rotation": [-0.042020, 0.134894, 0.112229, 0.983586], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 11.138689, 0.000000, 0.000008] - }, - { - "keytime": 0.500000, - "rotation": [-0.041844, 0.133300, 0.112295, 0.983804], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 11.138689, 0.000000, 0.000008] - }, - { - "keytime": 0.527778, - "rotation": [-0.041367, 0.128981, 0.112473, 0.984379], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 11.138689, 0.000000, 0.000008] - }, - { - "keytime": 0.555556, - "rotation": [-0.040649, 0.122535, 0.112735, 0.985202], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 11.138689, 0.000000, 0.000008] - }, - { - "keytime": 0.583333, - "rotation": [-0.039753, 0.114557, 0.113055, 0.986162], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 11.138689, 0.000000, 0.000008] - }, - { - "keytime": 0.611111, - "rotation": [-0.038708, 0.105366, 0.113416, 0.987186], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 11.138689, 0.000000, 0.000008] - }, - { - "keytime": 0.638889, - "rotation": [-0.037646, 0.096117, 0.113773, 0.988130], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 11.138689, 0.000000, 0.000008] - }, - { - "keytime": 0.666667, - "rotation": [-0.036604, 0.087153, 0.114112, 0.988961], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 11.138689, 0.000000, 0.000008] - }, - { - "keytime": 0.694444, - "rotation": [-0.035629, 0.078851, 0.114419, 0.989657], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 11.138689, 0.000000, 0.000008] - }, - { - "keytime": 0.722222, - "rotation": [-0.034855, 0.072320, 0.114657, 0.990156], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 11.138689, 0.000000, 0.000008] - }, - { - "keytime": 0.750000, - "rotation": [-0.034329, 0.067904, 0.114816, 0.990469], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 11.138689, 0.000000, 0.000008] - }, - { - "keytime": 0.777778, - "rotation": [-0.034126, 0.066205, 0.114876, 0.990584], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 11.138689, 0.000000, 0.000008] - }, - { - "keytime": 0.805555, - "rotation": [-0.034349, 0.068098, 0.114810, 0.990455], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 11.138689, 0.000000, 0.000008] - }, - { - "keytime": 0.833333, - "rotation": [-0.034946, 0.073167, 0.114630, 0.990094], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 11.138689, 0.000000, 0.000008] - }, - { - "keytime": 0.861111, - "rotation": [-0.035816, 0.080607, 0.114362, 0.989516], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 11.138689, 0.000000, 0.000008] - }, - { - "keytime": 0.888889, - "rotation": [-0.036778, 0.088911, 0.114056, 0.988804], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 11.138689, 0.000000, 0.000008] - }, - { - "keytime": 0.916667, - "rotation": [-0.037731, 0.097231, 0.113744, 0.988021], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 11.138689, 0.000000, 0.000008] - }, - { - "keytime": 0.944444, - "rotation": [-0.038582, 0.104723, 0.113458, 0.987255], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 11.138689, -0.000000, 0.000008] - }, - { - "keytime": 0.972222, - "rotation": [-0.039163, 0.109883, 0.113258, 0.986694], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 11.138689, 0.000000, 0.000008] - }, - { - "keytime": 1.000000, - "rotation": [-0.039391, 0.111920, 0.113179, 0.986465], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 11.138689, 0.000000, 0.000008] - } - ] - }, - { - "boneId": "Bip001 R Toe0Nub", - "keyframes": [ - { - "keytime": 0.000000, - "rotation": [ 0.000000, 0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 11.620659, -0.000001, -0.000000] - }, - { - "keytime": 0.027778, - "rotation": [ 0.000000, 0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 11.620659, -0.000000, 0.000003] - }, - { - "keytime": 0.055556, - "rotation": [ 0.000000, -0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 11.620661, -0.000000, 0.000001] - }, - { - "keytime": 0.083333, - "rotation": [-0.000000, 0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 11.620657, -0.000000, -0.000001] - }, - { - "keytime": 0.111111, - "rotation": [-0.000000, -0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 11.620659, 0.000000, -0.000001] - }, - { - "keytime": 0.138889, - "rotation": [-0.000000, -0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 11.620663, -0.000000, 0.000001] - }, - { - "keytime": 0.166667, - "rotation": [ 0.000000, -0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 11.620661, -0.000000, 0.000000] - }, - { - "keytime": 0.194444, - "rotation": [-0.000000, 0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 11.620663, -0.000000, -0.000000] - }, - { - "keytime": 0.250000, - "rotation": [ 0.000000, -0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 11.620660, 0.000000, 0.000000] - }, - { - "keytime": 0.333333, - "rotation": [ 0.000000, -0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 11.620661, 0.000000, 0.000000] - }, - { - "keytime": 0.444444, - "rotation": [ 0.000000, -0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 11.620659, -0.000000, -0.000000] - }, - { - "keytime": 0.472222, - "rotation": [-0.000000, 0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 11.620661, 0.000000, -0.000001] - }, - { - "keytime": 0.500000, - "rotation": [ 0.000000, 0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 11.620661, 0.000001, 0.000002] - }, - { - "keytime": 0.527778, - "rotation": [-0.000000, 0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 11.620659, -0.000002, -0.000002] - }, - { - "keytime": 0.555556, - "rotation": [ 0.000000, -0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 11.620661, -0.000002, -0.000002] - }, - { - "keytime": 0.583333, - "rotation": [ 0.000000, -0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 11.620660, 0.000000, -0.000002] - }, - { - "keytime": 0.611111, - "rotation": [-0.000000, -0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 11.620661, -0.000004, -0.000000] - }, - { - "keytime": 0.638889, - "rotation": [-0.000000, 0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 11.620660, -0.000000, 0.000000] - }, - { - "keytime": 0.666667, - "rotation": [ 0.000000, -0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 11.620661, 0.000002, 0.000000] - }, - { - "keytime": 0.694444, - "rotation": [ 0.000000, 0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 11.620659, 0.000004, 0.000000] - }, - { - "keytime": 0.722222, - "rotation": [-0.000000, -0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 11.620661, -0.000001, -0.000002] - }, - { - "keytime": 0.805555, - "rotation": [ 0.000000, -0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 11.620660, 0.000000, 0.000001] - }, - { - "keytime": 0.833333, - "rotation": [ 0.000000, -0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 11.620657, 0.000000, 0.000001] - }, - { - "keytime": 0.861111, - "rotation": [ 0.000000, 0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 11.620657, -0.000000, -0.000000] - }, - { - "keytime": 0.916667, - "rotation": [ 0.000000, 0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 11.620659, 0.000000, -0.000001] - }, - { - "keytime": 0.944444, - "rotation": [ 0.000000, 0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 11.620655, -0.000001, -0.000001] - }, - { - "keytime": 0.972222, - "rotation": [-0.000000, -0.000000, -0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 11.620659, 0.000002, -0.000000] - }, - { - "keytime": 1.000000, - "rotation": [ 0.000000, 0.000000, 0.000000, 1.000000], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 11.620659, -0.000001, -0.000000] - } - ] - }, - { - "boneId": "Bip001 L Toe0Nub", - "keyframes": [ - { - "keytime": 0.000000, - "rotation": [-0.000000, 0.000000, 1.000000, 0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 11.620661, 0.000000, 0.000000] - }, - { - "keytime": 0.027778, - "rotation": [ 0.000000, -0.000000, 1.000000, -0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 11.620659, 0.000000, -0.000002] - }, - { - "keytime": 0.055556, - "rotation": [ 0.000000, 0.000000, 1.000000, -0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 11.620663, 0.000000, 0.000001] - }, - { - "keytime": 0.083333, - "rotation": [-0.000000, -0.000000, 1.000000, -0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 11.620661, 0.000000, 0.000000] - }, - { - "keytime": 0.111111, - "rotation": [ 0.000000, 0.000000, 1.000000, -0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 11.620663, 0.000000, -0.000000] - }, - { - "keytime": 0.138889, - "rotation": [-0.000000, 0.000000, 1.000000, 0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 11.620659, -0.000002, 0.000001] - }, - { - "keytime": 0.166667, - "rotation": [ 0.000000, -0.000000, 1.000000, 0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 11.620659, -0.000000, -0.000001] - }, - { - "keytime": 0.194444, - "rotation": [ 0.000000, -0.000000, 1.000000, -0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 11.620661, -0.000000, -0.000001] - }, - { - "keytime": 0.222222, - "rotation": [ 0.000000, 0.000000, 1.000000, -0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 11.620661, 0.000002, -0.000001] - }, - { - "keytime": 0.250000, - "rotation": [ 0.000000, -0.000000, 1.000000, 0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 11.620660, -0.000000, -0.000000] - }, - { - "keytime": 0.277778, - "rotation": [-0.000000, -0.000000, 1.000000, -0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 11.620657, -0.000000, 0.000001] - }, - { - "keytime": 0.333333, - "rotation": [ 0.000000, 0.000000, 1.000000, -0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 11.620661, -0.000000, -0.000000] - }, - { - "keytime": 0.361111, - "rotation": [ 0.000000, 0.000000, 1.000000, -0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 11.620659, -0.000000, 0.000000] - }, - { - "keytime": 0.388889, - "rotation": [ 0.000000, 0.000000, 1.000000, -0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 11.620655, 0.000000, -0.000000] - }, - { - "keytime": 0.416667, - "rotation": [ 0.000000, -0.000000, 1.000000, 0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 11.620655, 0.000000, 0.000001] - }, - { - "keytime": 0.444444, - "rotation": [-0.000000, 0.000000, 1.000000, 0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 11.620659, 0.000002, -0.000000] - }, - { - "keytime": 0.472222, - "rotation": [ 0.000000, 0.000000, 1.000000, -0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 11.620659, 0.000000, 0.000001] - }, - { - "keytime": 0.527778, - "rotation": [ 0.000000, -0.000000, 1.000000, -0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 11.620663, -0.000000, 0.000000] - }, - { - "keytime": 0.555556, - "rotation": [ 0.000000, 0.000000, 1.000000, -0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 11.620659, 0.000000, -0.000001] - }, - { - "keytime": 0.583333, - "rotation": [-0.000000, -0.000000, 1.000000, -0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 11.620663, 0.000000, -0.000000] - }, - { - "keytime": 0.611111, - "rotation": [-0.000000, 0.000000, 1.000000, -0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 11.620659, -0.000000, 0.000000] - }, - { - "keytime": 0.777778, - "rotation": [ 0.000000, 0.000000, 1.000000, -0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 11.620660, 0.000000, -0.000001] - }, - { - "keytime": 0.833333, - "rotation": [ 0.000000, -0.000000, 1.000000, -0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 11.620661, 0.000000, -0.000000] - }, - { - "keytime": 0.888889, - "rotation": [-0.000000, -0.000000, 1.000000, -0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 11.620659, -0.000000, 0.000001] - }, - { - "keytime": 1.000000, - "rotation": [-0.000000, 0.000000, 1.000000, 0.000000], - "scale": [-1.000000, -1.000000, -1.000000], - "translation": [ 11.620661, 0.000000, 0.000000] - } - ] - }, - { - "boneId": "Bip001 Tail2", - "keyframes": [ - { - "keytime": 0.000000, - "rotation": [-0.002820, 0.074378, 0.038576, 0.996480], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 15.671284, -0.014889, 0.000000] - }, - { - "keytime": 0.027778, - "rotation": [-0.002297, 0.071497, 0.042712, 0.996523], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 15.671410, -0.014881, -0.000021] - }, - { - "keytime": 0.055556, - "rotation": [-0.001723, 0.068693, 0.047776, 0.996492], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 15.671548, -0.014862, -0.000047] - }, - { - "keytime": 0.083333, - "rotation": [-0.001109, 0.065835, 0.053380, 0.996401], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 15.671722, -0.014854, -0.000069] - }, - { - "keytime": 0.111111, - "rotation": [-0.000523, 0.063043, 0.058639, 0.996287], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 15.671867, -0.014832, -0.000094] - }, - { - "keytime": 0.138889, - "rotation": [ 0.000022, 0.060187, 0.063164, 0.996187], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 15.672002, -0.014809, -0.000114] - }, - { - "keytime": 0.166667, - "rotation": [ 0.000496, 0.057223, 0.066405, 0.996150], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 15.672097, -0.014809, -0.000127] - }, - { - "keytime": 0.194444, - "rotation": [ 0.000877, 0.054009, 0.067824, 0.996234], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 15.672146, -0.014801, -0.000135] - }, - { - "keytime": 0.222222, - "rotation": [ 0.001110, 0.050685, 0.066775, 0.996479], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 15.672106, -0.014805, -0.000133] - }, - { - "keytime": 0.250000, - "rotation": [ 0.001244, 0.047340, 0.063009, 0.996889], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 15.671989, -0.014816, -0.000126] - }, - { - "keytime": 0.277778, - "rotation": [ 0.001323, 0.044388, 0.057265, 0.997371], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 15.671832, -0.014839, -0.000116] - }, - { - "keytime": 0.305556, - "rotation": [ 0.001354, 0.041587, 0.049939, 0.997885], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 15.671606, -0.014862, -0.000103] - }, - { - "keytime": 0.333333, - "rotation": [ 0.001336, 0.038707, 0.041239, 0.998398], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 15.671352, -0.014881, -0.000087] - }, - { - "keytime": 0.361111, - "rotation": [ 0.001272, 0.035775, 0.032156, 0.998842], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 15.671077, -0.014904, -0.000072] - }, - { - "keytime": 0.388889, - "rotation": [ 0.001164, 0.032567, 0.022922, 0.999206], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 15.670816, -0.014919, -0.000057] - }, - { - "keytime": 0.416667, - "rotation": [ 0.001007, 0.028824, 0.013755, 0.999489], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 15.670528, -0.014931, -0.000041] - }, - { - "keytime": 0.444444, - "rotation": [ 0.000811, 0.024626, 0.005675, 0.999680], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 15.670287, -0.014931, -0.000027] - }, - { - "keytime": 0.472222, - "rotation": [ 0.000576, 0.019731, -0.001121, 0.999805], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 15.670093, -0.014934, -0.000015] - }, - { - "keytime": 0.500000, - "rotation": [ 0.000292, 0.013811, -0.006275, 0.999885], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 15.669945, -0.014935, -0.000006] - }, - { - "keytime": 0.527778, - "rotation": [-0.000047, 0.006844, -0.008627, 0.999939], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 15.669880, -0.014935, 0.000003] - }, - { - "keytime": 0.555556, - "rotation": [-0.000740, -0.004002, -0.004058, 0.999983], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 15.670011, -0.014931, 0.000021] - }, - { - "keytime": 0.583333, - "rotation": [-0.001697, -0.017977, 0.005644, 0.999821], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 15.670291, -0.014931, 0.000054] - }, - { - "keytime": 0.611111, - "rotation": [-0.002736, -0.033696, 0.017172, 0.999281], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 15.670640, -0.014923, 0.000100] - }, - { - "keytime": 0.638889, - "rotation": [-0.003578, -0.048360, 0.026158, 0.998481], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 15.670911, -0.014919, 0.000146] - }, - { - "keytime": 0.666667, - "rotation": [-0.004052, -0.060533, 0.029432, 0.997724], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 15.670988, -0.014904, 0.000173] - }, - { - "keytime": 0.694444, - "rotation": [-0.003331, -0.072024, 0.013545, 0.997305], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 15.670515, -0.014927, 0.000127] - }, - { - "keytime": 0.722222, - "rotation": [-0.001924, -0.077901, -0.011407, 0.996894], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 15.669778, -0.014931, 0.000031] - }, - { - "keytime": 0.750000, - "rotation": [-0.001410, -0.069102, -0.018080, 0.997445], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 15.669586, -0.014923, 0.000006] - }, - { - "keytime": 0.777778, - "rotation": [-0.001409, -0.052648, -0.014406, 0.998508], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 15.669690, -0.014927, 0.000019] - }, - { - "keytime": 0.805555, - "rotation": [-0.001537, -0.033982, -0.008015, 0.999389], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 15.669886, -0.014938, 0.000038] - }, - { - "keytime": 0.833333, - "rotation": [-0.001753, -0.013440, 0.000312, 0.999908], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 15.670142, -0.014938, 0.000052] - }, - { - "keytime": 0.861111, - "rotation": [-0.002030, 0.008918, 0.010126, 0.999907], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 15.670430, -0.014931, 0.000057] - }, - { - "keytime": 0.888889, - "rotation": [-0.002318, 0.031038, 0.020088, 0.999314], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 15.670725, -0.014923, 0.000050] - }, - { - "keytime": 0.916667, - "rotation": [-0.002590, 0.052832, 0.029718, 0.998158], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 15.671027, -0.014905, 0.000031] - }, - { - "keytime": 0.944444, - "rotation": [-0.002818, 0.074271, 0.038532, 0.996489], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 15.671284, -0.014889, -0.000002] - }, - { - "keytime": 0.972222, - "rotation": [-0.002820, 0.074382, 0.038578, 0.996479], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 15.671276, -0.014893, -0.000000] - }, - { - "keytime": 1.000000, - "rotation": [-0.002820, 0.074378, 0.038576, 0.996480], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 15.671280, -0.014885, 0.000000] - } - ] - }, - { - "boneId": "Bip001 Tail1", - "keyframes": [ - { - "keytime": 0.000000, - "rotation": [-0.002196, 0.057926, 0.038618, 0.997571], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 14.068222, -0.012442, 0.000002] - }, - { - "keytime": 0.027778, - "rotation": [-0.001790, 0.054596, 0.041639, 0.997638], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 14.068283, -0.012436, -0.000011] - }, - { - "keytime": 0.055556, - "rotation": [-0.001351, 0.051323, 0.045572, 0.997641], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 14.068387, -0.012428, -0.000023] - }, - { - "keytime": 0.083333, - "rotation": [-0.000884, 0.047976, 0.050006, 0.997596], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 14.068497, -0.012417, -0.000037] - }, - { - "keytime": 0.111111, - "rotation": [-0.000438, 0.044713, 0.054132, 0.997532], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 14.068596, -0.012402, -0.000049] - }, - { - "keytime": 0.138889, - "rotation": [-0.000018, 0.041403, 0.057536, 0.997485], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 14.068691, -0.012398, -0.000057] - }, - { - "keytime": 0.166667, - "rotation": [ 0.000356, 0.038011, 0.059680, 0.997494], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 14.068726, -0.012387, -0.000065] - }, - { - "keytime": 0.194444, - "rotation": [ 0.000673, 0.034395, 0.060000, 0.997605], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 14.068741, -0.012386, -0.000068] - }, - { - "keytime": 0.222222, - "rotation": [ 0.000893, 0.030729, 0.057954, 0.997846], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 14.068683, -0.012397, -0.000066] - }, - { - "keytime": 0.250000, - "rotation": [ 0.000955, 0.027007, 0.050297, 0.998369], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 14.068497, -0.012413, -0.000057] - }, - { - "keytime": 0.277778, - "rotation": [ 0.000839, 0.023448, 0.036987, 0.999040], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 14.068164, -0.012443, -0.000042] - }, - { - "keytime": 0.305556, - "rotation": [ 0.000618, 0.019600, 0.021085, 0.999585], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 14.067765, -0.012470, -0.000025] - }, - { - "keytime": 0.333333, - "rotation": [ 0.000352, 0.014974, 0.005379, 0.999873], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 14.067390, -0.012482, -0.000012] - }, - { - "keytime": 0.361111, - "rotation": [ 0.000126, 0.009505, -0.005950, 0.999937], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 14.067103, -0.012482, -0.000002] - }, - { - "keytime": 0.388889, - "rotation": [-0.000024, 0.002712, -0.011944, 0.999925], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 14.066943, -0.012472, 0.000002] - }, - { - "keytime": 0.416667, - "rotation": [-0.000148, -0.005690, -0.016840, 0.999842], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 14.066833, -0.012470, 0.000000] - }, - { - "keytime": 0.444444, - "rotation": [-0.000254, -0.014726, -0.020625, 0.999679], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 14.066734, -0.012472, -0.000002] - }, - { - "keytime": 0.472222, - "rotation": [-0.000360, -0.024126, -0.023316, 0.999437], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 14.066658, -0.012467, -0.000007] - }, - { - "keytime": 0.500000, - "rotation": [-0.000481, -0.033665, -0.024797, 0.999125], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 14.066628, -0.012463, -0.000010] - }, - { - "keytime": 0.527778, - "rotation": [-0.000622, -0.042280, -0.024839, 0.998797], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 14.066612, -0.012459, -0.000012] - }, - { - "keytime": 0.555556, - "rotation": [-0.000797, -0.049756, -0.023367, 0.998488], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 14.066666, -0.012463, -0.000010] - }, - { - "keytime": 0.583333, - "rotation": [-0.001018, -0.055635, -0.020343, 0.998243], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 14.066740, -0.012470, -0.000005] - }, - { - "keytime": 0.611111, - "rotation": [-0.001496, -0.056991, -0.008196, 0.998340], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 14.067026, -0.012478, 0.000024] - }, - { - "keytime": 0.638889, - "rotation": [-0.002389, -0.048651, 0.021488, 0.998582], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 14.067779, -0.012463, 0.000083] - }, - { - "keytime": 0.666667, - "rotation": [-0.002859, -0.036686, 0.041455, 0.998462], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 14.068282, -0.012436, 0.000110] - }, - { - "keytime": 0.694444, - "rotation": [-0.002631, -0.023559, 0.042683, 0.998807], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 14.068306, -0.012432, 0.000091] - }, - { - "keytime": 0.722222, - "rotation": [-0.002147, -0.009142, 0.038112, 0.999229], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 14.068194, -0.012436, 0.000061] - }, - { - "keytime": 0.750000, - "rotation": [-0.001561, 0.005716, 0.030763, 0.999509], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 14.068022, -0.012451, 0.000032] - }, - { - "keytime": 0.777778, - "rotation": [-0.001005, 0.020188, 0.023151, 0.999528], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 14.067821, -0.012463, 0.000013] - }, - { - "keytime": 0.805555, - "rotation": [-0.000662, 0.032178, 0.018484, 0.999311], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 14.067703, -0.012466, 0.000000] - }, - { - "keytime": 0.833333, - "rotation": [-0.000638, 0.040961, 0.018564, 0.998988], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 14.067702, -0.012466, -0.000004] - }, - { - "keytime": 0.861111, - "rotation": [-0.000897, 0.046817, 0.022054, 0.998660], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 14.067802, -0.012465, -0.000002] - }, - { - "keytime": 0.888889, - "rotation": [-0.001311, 0.050625, 0.027349, 0.998342], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 14.067937, -0.012459, -0.000002] - }, - { - "keytime": 0.916667, - "rotation": [-0.001776, 0.053847, 0.033236, 0.997994], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 14.068067, -0.012448, 0.000001] - }, - { - "keytime": 0.944444, - "rotation": [-0.002194, 0.057905, 0.038592, 0.997573], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 14.068214, -0.012444, 0.000000] - }, - { - "keytime": 0.972222, - "rotation": [-0.002196, 0.057927, 0.038619, 0.997571], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 14.068214, -0.012442, -0.000002] - }, - { - "keytime": 1.000000, - "rotation": [-0.002196, 0.057926, 0.038618, 0.997571], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 14.068222, -0.012442, 0.000002] - } - ] - }, - { - "boneId": "Bip001 R Thigh", - "keyframes": [ - { - "keytime": 0.000000, - "rotation": [ 0.263406, 0.949148, -0.172428, 0.001728], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-9.605743, -0.913907, -8.329865] - }, - { - "keytime": 0.027778, - "rotation": [ 0.316793, 0.933155, -0.169885, 0.001576], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-9.974776, -0.861100, -8.117259] - }, - { - "keytime": 0.055556, - "rotation": [ 0.327585, 0.930516, -0.163684, -0.005974], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-10.339571, -0.805605, -7.887783] - }, - { - "keytime": 0.083333, - "rotation": [ 0.313249, 0.934349, -0.169088, -0.016650], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-10.605019, -0.771020, -7.703882] - }, - { - "keytime": 0.111111, - "rotation": [ 0.299147, 0.937877, -0.173695, -0.026965], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-10.860144, -0.735782, -7.516114] - }, - { - "keytime": 0.138889, - "rotation": [ 0.263868, 0.946483, -0.182781, -0.033695], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-10.842899, -0.760107, -7.522594] - }, - { - "keytime": 0.166667, - "rotation": [ 0.228196, 0.953627, -0.192089, -0.040285], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-10.826889, -0.783865, -7.528264] - }, - { - "keytime": 0.194444, - "rotation": [ 0.184724, 0.962360, -0.195138, -0.040769], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-10.563744, -0.859017, -7.710597] - }, - { - "keytime": 0.222222, - "rotation": [ 0.142125, 0.968990, -0.197943, -0.040948], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-10.299692, -0.931094, -7.882529] - }, - { - "keytime": 0.250000, - "rotation": [ 0.108246, 0.974782, -0.191267, -0.038729], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-9.995049, -1.012809, -8.068825] - }, - { - "keytime": 0.277778, - "rotation": [ 0.075324, 0.979326, -0.184141, -0.036584], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-9.696195, -1.091418, -8.237907] - }, - { - "keytime": 0.305556, - "rotation": [ 0.048680, 0.982286, -0.177433, -0.035530], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-9.524130, -1.138992, -8.328146] - }, - { - "keytime": 0.333333, - "rotation": [ 0.021163, 0.984691, -0.169505, -0.034702], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-9.344254, -1.189610, -8.417793] - }, - { - "keytime": 0.361111, - "rotation": [-0.003411, 0.985635, -0.164631, -0.037520], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-9.392586, -1.187352, -8.388922] - }, - { - "keytime": 0.388889, - "rotation": [-0.028042, 0.986006, -0.159232, -0.040636], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-9.403244, -1.190849, -8.380939] - }, - { - "keytime": 0.416667, - "rotation": [-0.046234, 0.986890, -0.149268, -0.040370], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-9.459518, -1.182721, -8.346334] - }, - { - "keytime": 0.444444, - "rotation": [-0.063778, 0.987293, -0.139808, -0.040483], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-9.515865, -1.174375, -8.311479] - }, - { - "keytime": 0.472222, - "rotation": [-0.068549, 0.988014, -0.135952, -0.025429], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-9.206250, -1.229988, -8.463870] - }, - { - "keytime": 0.500000, - "rotation": [-0.073244, 0.988712, -0.130311, -0.010178], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-8.846237, -1.291128, -8.627728] - }, - { - "keytime": 0.527778, - "rotation": [-0.054038, 0.989701, -0.131802, 0.014128], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-8.250989, -1.417202, -8.863682] - }, - { - "keytime": 0.555556, - "rotation": [-0.034799, 0.990756, -0.125794, 0.036989], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-7.650295, -1.473219, -9.069567] - }, - { - "keytime": 0.583333, - "rotation": [ 0.007617, 0.990580, -0.125077, 0.055219], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-7.295353, -1.513759, -9.172390] - }, - { - "keytime": 0.611111, - "rotation": [ 0.051853, 0.988387, -0.122836, 0.072893], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-6.933272, -1.551988, -9.262792] - }, - { - "keytime": 0.638889, - "rotation": [ 0.099887, 0.983953, -0.126461, 0.076597], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-7.012731, -1.518387, -9.250736] - }, - { - "keytime": 0.666667, - "rotation": [ 0.148463, 0.976950, -0.130280, 0.080956], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-7.088746, -1.479700, -9.239670] - }, - { - "keytime": 0.694444, - "rotation": [ 0.187739, 0.968890, -0.142176, 0.076109], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-7.403986, -1.406331, -9.165216] - }, - { - "keytime": 0.722222, - "rotation": [ 0.225613, 0.959442, -0.153292, 0.071210], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-7.715780, -1.331885, -9.080582] - }, - { - "keytime": 0.750000, - "rotation": [ 0.251304, 0.952556, -0.159140, 0.064485], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-8.008769, -1.253895, -8.992682] - }, - { - "keytime": 0.777778, - "rotation": [ 0.277570, 0.944103, -0.167948, 0.058466], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-8.317361, -1.175605, -8.887855] - }, - { - "keytime": 0.805555, - "rotation": [ 0.290427, 0.940516, -0.167410, 0.055284], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-8.489173, -0.927013, -8.860504] - }, - { - "keytime": 0.833333, - "rotation": [ 0.304767, 0.936685, -0.165030, 0.050037], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-8.649483, -0.631967, -8.838776] - }, - { - "keytime": 0.861111, - "rotation": [ 0.301336, 0.937500, -0.169403, 0.039915], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-8.777243, -0.370641, -8.802567] - }, - { - "keytime": 0.888889, - "rotation": [ 0.297998, 0.936847, -0.180960, 0.027728], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-8.911368, -0.244727, -8.746032] - }, - { - "keytime": 0.916667, - "rotation": [ 0.291337, 0.937392, -0.190202, 0.015538], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-9.045128, -0.298345, -8.666240] - }, - { - "keytime": 0.944444, - "rotation": [ 0.282235, 0.941151, -0.185682, 0.010077], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-9.187859, -0.482454, -8.566030] - }, - { - "keytime": 0.972222, - "rotation": [ 0.272826, 0.945092, -0.179799, 0.006241], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-9.389498, -0.708799, -8.453152] - }, - { - "keytime": 1.000000, - "rotation": [ 0.263406, 0.949148, -0.172428, 0.001728], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [-9.605743, -0.913907, -8.329865] - } - ] - }, - { - "boneId": "Bip001 R Toe0", - "keyframes": [ - { - "keytime": 0.000000, - "rotation": [ 0.000000, 0.000000, 0.707107, 0.707107], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 17.426958, 10.792509, -0.000003] - }, - { - "keytime": 0.027778, - "rotation": [-0.000000, 0.000000, 0.707107, 0.707107], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 17.426958, 10.792513, -0.000002] - }, - { - "keytime": 0.055556, - "rotation": [ 0.000000, -0.000000, 0.707107, 0.707107], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 17.426958, 10.792511, 0.000001] - }, - { - "keytime": 0.083333, - "rotation": [-0.000000, 0.000000, 0.707107, 0.707107], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 17.426956, 10.792509, 0.000000] - }, - { - "keytime": 0.111111, - "rotation": [-0.000000, 0.000000, 0.707107, 0.707107], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 17.426956, 10.792515, -0.000000] - }, - { - "keytime": 0.138889, - "rotation": [ 0.000000, 0.000000, 0.707107, 0.707107], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 17.426958, 10.792507, 0.000000] - }, - { - "keytime": 0.166667, - "rotation": [ 0.000000, 0.000000, 0.707107, 0.707107], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 17.426956, 10.792507, -0.000001] - }, - { - "keytime": 0.194444, - "rotation": [ 0.000000, 0.000000, 0.707107, 0.707107], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 17.426954, 10.792507, -0.000002] - }, - { - "keytime": 0.222222, - "rotation": [-0.000000, 0.000000, 0.707107, 0.707107], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 17.426956, 10.792509, -0.000000] - }, - { - "keytime": 0.277778, - "rotation": [-0.000000, 0.000000, 0.707107, 0.707107], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 17.426958, 10.792511, 0.000000] - }, - { - "keytime": 0.305556, - "rotation": [ 0.000000, 0.000000, 0.707107, 0.707107], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 17.426958, 10.792508, 0.000001] - }, - { - "keytime": 0.333333, - "rotation": [ 0.000000, 0.000000, 0.707107, 0.707107], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 17.426954, 10.792509, -0.000000] - }, - { - "keytime": 0.361111, - "rotation": [ 0.000000, -0.000000, 0.707107, 0.707107], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 17.426956, 10.792509, 0.000001] - }, - { - "keytime": 0.388889, - "rotation": [ 0.000000, 0.000000, 0.707107, 0.707107], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 17.426954, 10.792511, -0.000002] - }, - { - "keytime": 0.416667, - "rotation": [-0.000000, 0.000000, 0.707107, 0.707107], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 17.426956, 10.792509, 0.000000] - }, - { - "keytime": 0.444444, - "rotation": [ 0.000000, 0.000000, 0.707107, 0.707107], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 17.426954, 10.792510, -0.000002] - }, - { - "keytime": 0.472222, - "rotation": [-0.000000, 0.000000, 0.707107, 0.707107], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 17.426958, 10.792513, -0.000000] - }, - { - "keytime": 0.500000, - "rotation": [ 0.000000, 0.000000, 0.707107, 0.707107], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 17.426958, 10.792507, -0.000001] - }, - { - "keytime": 0.527778, - "rotation": [ 0.000000, 0.000000, 0.707107, 0.707107], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 17.426958, 10.792511, -0.000000] - }, - { - "keytime": 0.555556, - "rotation": [ 0.000000, 0.000000, 0.707107, 0.707107], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 17.426954, 10.792505, 0.000002] - }, - { - "keytime": 0.583333, - "rotation": [ 0.000000, 0.000000, 0.707107, 0.707107], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 17.426958, 10.792509, -0.000000] - }, - { - "keytime": 0.611111, - "rotation": [ 0.000000, 0.000000, 0.707107, 0.707107], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 17.426950, 10.792507, 0.000006] - }, - { - "keytime": 0.638889, - "rotation": [ 0.000000, 0.000000, 0.707107, 0.707107], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 17.426960, 10.792511, 0.000000] - }, - { - "keytime": 0.666667, - "rotation": [ 0.000000, 0.000000, 0.707107, 0.707107], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 17.426960, 10.792505, -0.000002] - }, - { - "keytime": 0.694444, - "rotation": [ 0.000000, 0.000000, 0.707107, 0.707107], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 17.426954, 10.792507, 0.000004] - }, - { - "keytime": 0.722222, - "rotation": [ 0.000000, 0.000000, 0.707107, 0.707107], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 17.426956, 10.792507, 0.000000] - }, - { - "keytime": 0.777778, - "rotation": [-0.000000, 0.000000, 0.707107, 0.707107], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 17.426956, 10.792510, 0.000001] - }, - { - "keytime": 0.805555, - "rotation": [ 0.000000, 0.000000, 0.707107, 0.707107], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 17.426952, 10.792508, -0.000001] - }, - { - "keytime": 0.833333, - "rotation": [ 0.000000, 0.000000, 0.707107, 0.707107], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 17.426956, 10.792509, 0.000001] - }, - { - "keytime": 0.861111, - "rotation": [ 0.000000, 0.000000, 0.707107, 0.707107], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 17.426958, 10.792511, 0.000001] - }, - { - "keytime": 0.888889, - "rotation": [ 0.000000, -0.000000, 0.707107, 0.707107], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 17.426956, 10.792509, 0.000001] - }, - { - "keytime": 0.916667, - "rotation": [ 0.000000, 0.000000, 0.707107, 0.707107], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 17.426960, 10.792507, -0.000000] - }, - { - "keytime": 0.944444, - "rotation": [ 0.000000, 0.000000, 0.707107, 0.707107], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 17.426956, 10.792511, -0.000001] - }, - { - "keytime": 0.972222, - "rotation": [ 0.000000, -0.000000, 0.707107, 0.707107], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 17.426956, 10.792511, 0.000000] - }, - { - "keytime": 1.000000, - "rotation": [ 0.000000, 0.000000, 0.707107, 0.707107], - "scale": [ 1.000000, 1.000000, 1.000000], - "translation": [ 17.426958, 10.792509, -0.000003] - } - ] - }, - { - "boneId": "L_side03", - "keyframes": [ - { - "keytime": 0.000000, - "rotation": [-0.058886, -0.114618, -0.097216, 0.986886], - "scale": [ 0.783070, 1.000000, 1.000000], - "translation": [ 7.830889, 0.000007, -0.000001] - }, - { - "keytime": 0.027778, - "rotation": [-0.058867, -0.114421, -0.097228, 0.986909], - "scale": [ 0.783070, 1.000000, 1.000000], - "translation": [ 7.830889, 0.000007, -0.000001] - }, - { - "keytime": 0.055556, - "rotation": [-0.058813, -0.113859, -0.097261, 0.986974], - "scale": [ 0.783070, 1.000000, 1.000000], - "translation": [ 7.830889, 0.000007, -0.000001] - }, - { - "keytime": 0.083333, - "rotation": [-0.058725, -0.112943, -0.097315, 0.987079], - "scale": [ 0.783070, 1.000000, 1.000000], - "translation": [ 7.830889, 0.000007, -0.000001] - }, - { - "keytime": 0.111111, - "rotation": [-0.058611, -0.111769, -0.097384, 0.987213], - "scale": [ 0.783070, 1.000000, 1.000000], - "translation": [ 7.830889, 0.000007, -0.000001] - }, - { - "keytime": 0.138889, - "rotation": [-0.058475, -0.110360, -0.097467, 0.987371], - "scale": [ 0.783070, 1.000000, 1.000000], - "translation": [ 7.830889, 0.000007, -0.000001] - }, - { - "keytime": 0.166667, - "rotation": [-0.058319, -0.108756, -0.097561, 0.987549], - "scale": [ 0.783070, 1.000000, 1.000000], - "translation": [ 7.830889, 0.000007, -0.000001] - }, - { - "keytime": 0.194444, - "rotation": [-0.058142, -0.106945, -0.097667, 0.987747], - "scale": [ 0.783070, 1.000000, 1.000000], - "translation": [ 7.830889, 0.000007, -0.000001] - }, - { - "keytime": 0.222222, - "rotation": [-0.057959, -0.105077, -0.097776, 0.987947], - "scale": [ 0.783070, 1.000000, 1.000000], - "translation": [ 7.830889, 0.000007, -0.000001] - }, - { - "keytime": 0.250000, - "rotation": [-0.057762, -0.103085, -0.097892, 0.988157], - "scale": [ 0.783070, 1.000000, 1.000000], - "translation": [ 7.830889, 0.000007, -0.000001] - }, - { - "keytime": 0.277778, - "rotation": [-0.057568, -0.101128, -0.098006, 0.988359], - "scale": [ 0.783070, 1.000000, 1.000000], - "translation": [ 7.830889, 0.000007, -0.000001] - }, - { - "keytime": 0.305556, - "rotation": [-0.057375, -0.099193, -0.098119, 0.988555], - "scale": [ 0.783070, 1.000000, 1.000000], - "translation": [ 7.830889, 0.000007, -0.000001] - }, - { - "keytime": 0.333333, - "rotation": [-0.057182, -0.097265, -0.098231, 0.988747], - "scale": [ 0.783070, 1.000000, 1.000000], - "translation": [ 7.830889, 0.000007, -0.000001] - }, - { - "keytime": 0.361111, - "rotation": [-0.057005, -0.095502, -0.098334, 0.988919], - "scale": [ 0.783070, 1.000000, 1.000000], - "translation": [ 7.830889, 0.000007, -0.000001] - }, - { - "keytime": 0.388889, - "rotation": [-0.056842, -0.093889, -0.098427, 0.989073], - "scale": [ 0.783070, 1.000000, 1.000000], - "translation": [ 7.830889, 0.000007, -0.000001] - }, - { - "keytime": 0.416667, - "rotation": [-0.056694, -0.092429, -0.098512, 0.989211], - "scale": [ 0.783070, 1.000000, 1.000000], - "translation": [ 7.830889, 0.000007, -0.000001] - }, - { - "keytime": 0.444444, - "rotation": [-0.056574, -0.091251, -0.098580, 0.989320], - "scale": [ 0.783070, 1.000000, 1.000000], - "translation": [ 7.830889, 0.000007, -0.000001] - }, - { - "keytime": 0.472222, - "rotation": [-0.056483, -0.090352, -0.098632, 0.989403], - "scale": [ 0.783070, 1.000000, 1.000000], - "translation": [ 7.830889, 0.000007, -0.000001] - }, - { - "keytime": 0.500000, - "rotation": [-0.056423, -0.089763, -0.098666, 0.989456], - "scale": [ 0.783070, 1.000000, 1.000000], - "translation": [ 7.830889, 0.000007, -0.000001] - }, - { - "keytime": 0.527778, - "rotation": [-0.056402, -0.089562, -0.098678, 0.989475], - "scale": [ 0.783070, 1.000000, 1.000000], - "translation": [ 7.830889, 0.000007, -0.000001] - }, - { - "keytime": 0.555556, - "rotation": [-0.056427, -0.089802, -0.098664, 0.989453], - "scale": [ 0.783070, 1.000000, 1.000000], - "translation": [ 7.830889, 0.000007, -0.000001] - }, - { - "keytime": 0.583333, - "rotation": [-0.056497, -0.090494, -0.098624, 0.989390], - "scale": [ 0.783070, 1.000000, 1.000000], - "translation": [ 7.830889, 0.000007, -0.000001] - }, - { - "keytime": 0.611111, - "rotation": [-0.056612, -0.091617, -0.098559, 0.989286], - "scale": [ 0.783070, 1.000000, 1.000000], - "translation": [ 7.830889, 0.000007, -0.000001] - }, - { - "keytime": 0.638889, - "rotation": [-0.056757, -0.093043, -0.098477, 0.989153], - "scale": [ 0.783070, 1.000000, 1.000000], - "translation": [ 7.830889, 0.000007, -0.000001] - }, - { - "keytime": 0.666667, - "rotation": [-0.056928, -0.094739, -0.098378, 0.988992], - "scale": [ 0.783070, 1.000000, 1.000000], - "translation": [ 7.830889, 0.000007, -0.000001] - }, - { - "keytime": 0.694444, - "rotation": [-0.057127, -0.096708, -0.098264, 0.988801], - "scale": [ 0.783070, 1.000000, 1.000000], - "translation": [ 7.830889, 0.000007, -0.000001] - }, - { - "keytime": 0.722222, - "rotation": [-0.057333, -0.098772, -0.098144, 0.988597], - "scale": [ 0.783070, 1.000000, 1.000000], - "translation": [ 7.830889, 0.000007, -0.000001] - }, - { - "keytime": 0.750000, - "rotation": [-0.057548, -0.100926, -0.098018, 0.988380], - "scale": [ 0.783070, 1.000000, 1.000000], - "translation": [ 7.830889, 0.000007, -0.000001] - }, - { - "keytime": 0.777778, - "rotation": [-0.057771, -0.103179, -0.097887, 0.988147], - "scale": [ 0.783070, 1.000000, 1.000000], - "translation": [ 7.830889, 0.000007, -0.000001] - }, - { - "keytime": 0.805555, - "rotation": [-0.057984, -0.105335, -0.097761, 0.987920], - "scale": [ 0.783070, 1.000000, 1.000000], - "translation": [ 7.830889, 0.000007, -0.000001] - }, - { - "keytime": 0.833333, - "rotation": [-0.058187, -0.107402, -0.097640, 0.987697], - "scale": [ 0.783070, 1.000000, 1.000000], - "translation": [ 7.830889, 0.000007, -0.000001] - }, - { - "keytime": 0.861111, - "rotation": [-0.058379, -0.109376, -0.097524, 0.987481], - "scale": [ 0.783070, 1.000000, 1.000000], - "translation": [ 7.830889, 0.000007, -0.000001] - }, - { - "keytime": 0.888889, - "rotation": [-0.058545, -0.111080, -0.097424, 0.987290], - "scale": [ 0.783070, 1.000000, 1.000000], - "translation": [ 7.830889, 0.000007, -0.000001] - }, - { - "keytime": 0.916667, - "rotation": [-0.058683, -0.112516, -0.097340, 0.987128], - "scale": [ 0.783070, 1.000000, 1.000000], - "translation": [ 7.830889, 0.000007, -0.000001] - }, - { - "keytime": 0.944444, - "rotation": [-0.058793, -0.113651, -0.097273, 0.986998], - "scale": [ 0.783070, 1.000000, 1.000000], - "translation": [ 7.830889, 0.000007, -0.000001] - }, - { - "keytime": 0.972222, - "rotation": [-0.058861, -0.114359, -0.097232, 0.986916], - "scale": [ 0.783070, 1.000000, 1.000000], - "translation": [ 7.830889, 0.000007, -0.000001] - }, - { - "keytime": 1.000000, - "rotation": [-0.058886, -0.114618, -0.097216, 0.986886], - "scale": [ 0.783070, 1.000000, 1.000000], - "translation": [ 7.830889, 0.000007, -0.000001] - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/tests/cpp-tests/Resources/Sprite3DTest/scene.c3t b/tests/cpp-tests/Resources/Sprite3DTest/scene.c3t deleted file mode 100644 index 4e52334dc1..0000000000 --- a/tests/cpp-tests/Resources/Sprite3DTest/scene.c3t +++ /dev/null @@ -1,1237 +0,0 @@ -{ - "version": "1.2", - "mesh": [ - { - "version": "1.2", - "attributes": [{ - "size": 3, - "type": "GL_FLOAT", - "attribute": "VERTEX_ATTRIB_POSITION" - }, { - "size": 3, - "type": "GL_FLOAT", - "attribute": "VERTEX_ATTRIB_NORMAL" - }, { - "size": 2, - "type": "GL_FLOAT", - "attribute": "VERTEX_ATTRIB_TEX_COORD" - }], - "body": [ - { - "vertices": [ - -68.757713, -79.837128, 36.087357, -0.660985, 0.728444, -0.180187, 0.709760, 0.072667, - -68.410866, -79.355782, 38.064819, -0.790920, 0.610065, 0.047606, 0.716883, 0.068968, - -66.876549, -78.493713, 36.498875, -0.139730, 0.962497, -0.232543, 0.717948, 0.076760, - -67.037865, -77.382591, 38.201736, -0.143395, 0.987713, -0.062136, 0.724358, 0.073400, - -66.876549, -78.493713, 36.498875, -0.139730, 0.962497, -0.232543, 0.862053, 0.119325, - -67.037865, -77.382591, 38.201736, -0.143395, 0.987713, -0.062136, 0.854978, 0.116339, - -65.160423, -78.883904, 38.064819, 0.584785, 0.809790, 0.047601, 0.862601, 0.111854, - -64.691010, -79.246758, 36.087357, 0.426557, 0.886331, -0.180184, 0.868856, 0.115061, - -66.951424, -77.977989, 39.614838, -0.119729, 0.824694, 0.552760, 0.853524, 0.112765, - -66.951424, -77.977989, 39.614838, -0.119729, 0.824694, 0.552760, 0.727228, 0.069455, - -66.951424, -77.977989, 39.614838, -0.119729, 0.824694, 0.552760, 0.836770, 0.066378, - -65.733253, -79.166634, 38.802193, 0.704984, 0.275777, 0.653410, 0.829919, 0.068183, - -65.160423, -78.883904, 38.064819, 0.584785, 0.809790, 0.047601, 0.827088, 0.066214, - -68.410866, -79.355782, 38.064819, -0.790920, 0.610065, 0.047606, 0.371972, 0.017816, - -67.781281, -79.463974, 38.802193, -0.754299, 0.063908, 0.653414, 0.369049, 0.019694, - -66.951424, -77.977989, 39.614838, -0.119729, 0.824694, 0.552760, 0.362290, 0.017672, - -66.845993, -78.704185, 33.447403, -0.134275, 0.924884, -0.355753, 0.869548, 0.125962, - -66.845993, -78.704185, 33.447403, -0.134275, 0.924884, -0.355753, 0.709335, 0.084138, - -63.677174, -80.696022, 34.531609, 0.659084, 0.684887, -0.310705, 0.878009, 0.115682, - -66.589546, -80.470558, 30.153715, -0.116750, 0.804152, -0.582845, 0.882118, 0.132014, - -63.061775, -83.355820, 30.366394, 0.691582, 0.625246, -0.361637, 0.895552, 0.122515, - -61.401218, -84.889893, 33.809864, 0.742618, 0.662529, -0.097851, 0.894802, 0.110535, - -66.589546, -80.470558, 30.153715, -0.116750, 0.804152, -0.582845, 0.697555, 0.090928, - -69.317558, -81.514893, 34.531609, -0.826634, 0.469186, -0.310709, 0.700938, 0.073650, - -69.151184, -84.239914, 30.366394, -0.840832, 0.402765, -0.361638, 0.684706, 0.081410, - -66.226952, -82.968010, 27.692072, -0.100324, 0.691015, -0.715844, 0.686851, 0.095104, - -66.226952, -82.968010, 27.692072, -0.100324, 0.691015, -0.715844, 0.894939, 0.135686, - -70.306946, -86.182831, 33.809864, -0.954166, 0.231555, -0.189604, 0.687511, 0.068592, - -61.401218, -84.889893, 33.809864, 0.742618, 0.662529, -0.097851, 0.767121, 0.457366, - -61.401218, -84.889893, 30.366394, 0.598177, 0.801364, 0.000000, 0.780621, 0.457366, - -63.061775, -83.355820, 30.366394, 0.547721, 0.831768, -0.090358, 0.780621, 0.464571, - -61.401218, -84.889893, 26.310617, 0.600667, 0.795339, -0.081462, 0.796521, 0.457366, - -66.226952, -82.968010, 27.692072, -0.137686, 0.948385, -0.285673, 0.791105, 0.472818, - -66.161095, -83.421677, 26.310617, -0.142133, 0.979001, -0.146135, 0.796521, 0.471683, - -70.306946, -86.182831, 26.310617, -0.799163, 0.596533, -0.074075, 0.795526, 0.406894, - -66.226952, -82.968010, 27.692072, -0.137686, 0.948385, -0.285673, 0.789611, 0.389631, - -66.161095, -83.421677, 26.310617, -0.142133, 0.979001, -0.146135, 0.795526, 0.390287, - -69.151184, -84.239914, 30.366394, -0.761634, 0.641678, -0.090355, 0.778443, 0.400096, - -70.306946, -86.182831, 30.366394, -0.801360, 0.598182, 0.000000, 0.779592, 0.406894, - -70.306946, -86.182831, 33.809864, -0.801360, 0.598182, 0.000000, 0.766064, 0.406894, - -66.234589, -82.915482, 14.083838, -0.143661, 0.989528, -0.013969, 0.844453, 0.472950, - -66.234589, -82.915482, 14.083838, -0.143661, 0.989528, -0.013969, 0.843016, 0.389555, - -61.401218, -84.889893, 14.083838, 0.598447, 0.801162, 0.000349, 0.844453, 0.457366, - -66.161095, -83.421677, 0.957523, -0.143669, 0.989585, -0.009008, 0.895911, 0.471683, - -66.161095, -83.421677, 0.957523, -0.143669, 0.989585, -0.009008, 0.895128, 0.390287, - -70.306946, -86.182831, 14.083838, -0.801292, 0.598123, -0.013386, 0.843560, 0.406894, - -70.306946, -86.182831, 0.957523, -0.801365, 0.598176, 0.000000, 0.895128, 0.406894, - -61.401218, -84.889893, 0.957523, 0.589509, 0.807638, -0.014137, 0.895911, 0.457366, - -58.133862, -88.962234, 14.083838, 0.989577, 0.143999, 0.001041, 0.844453, 0.440912, - -58.640072, -89.035721, 0.957523, 0.990831, 0.132947, -0.024052, 0.895911, 0.441938, - -58.133862, -88.962234, 14.083838, 0.989577, 0.143999, 0.001041, 0.537825, 0.472715, - -60.108265, -93.795593, 14.083838, 0.929478, -0.368650, -0.012924, 0.537825, 0.456441, - -58.640072, -89.035721, 0.957523, 0.990831, 0.132947, -0.024052, 0.588186, 0.471907, - -60.108265, -93.795593, 0.957523, 0.955575, -0.294749, 0.000000, 0.588129, 0.456441, - -60.108265, -93.795593, 26.310617, 0.924099, -0.375369, -0.071686, 0.490969, 0.456441, - -58.640072, -89.035721, 26.310617, 0.976994, 0.147497, -0.154034, 0.491025, 0.471907, - -58.640072, -89.035721, 26.310617, 0.976994, 0.147497, -0.154034, 0.796521, 0.441938, - -58.186417, -88.969856, 27.692072, 0.887659, 0.128876, -0.442101, 0.485680, 0.472631, - -58.186417, -88.969856, 27.692072, 0.887659, 0.128876, -0.442101, 0.791105, 0.441019, - -59.458290, -86.045639, 30.366394, 0.641673, 0.761637, -0.090357, 0.780621, 0.450319, - -58.574207, -92.135071, 30.366394, 0.831767, -0.547722, -0.090358, 0.475324, 0.463041, - -60.108265, -93.795593, 30.366394, 0.734524, -0.678583, 0.000000, 0.475425, 0.456441, - -60.108265, -93.795593, 33.809864, 0.910474, -0.392292, -0.130938, 0.462229, 0.456441, - -59.458290, -86.045639, 30.366394, 0.402768, 0.840831, -0.361638, 0.805536, 0.213884, - -55.688942, -88.607300, 30.153715, 0.804153, 0.116745, -0.582845, 0.791871, 0.204376, - -58.186417, -88.969856, 27.692072, 0.887659, 0.128876, -0.442101, 0.804951, 0.200554, - -56.733315, -85.879250, 34.531609, 0.469184, 0.826636, -0.310709, 0.788194, 0.220675, - -61.401218, -84.889893, 33.809864, 0.231551, 0.954167, -0.189602, 0.805858, 0.225480, - -53.922565, -88.350830, 33.447403, 0.924883, 0.134277, -0.355755, 0.779531, 0.210368, - -55.914433, -91.519653, 34.531609, 0.684884, -0.659087, -0.310706, 0.701893, 0.130558, - -55.688942, -88.607300, 30.153715, 0.804153, 0.116745, -0.582845, 0.699156, 0.114049, - -53.922565, -88.350830, 33.447403, 0.924883, 0.134277, -0.355755, 0.711157, 0.120790, - -58.574207, -92.135071, 30.366394, 0.625247, -0.691583, -0.361635, 0.685027, 0.122792, - -58.186417, -88.969856, 27.692072, 0.887659, 0.128876, -0.442101, 0.686794, 0.109846, - -60.108265, -93.795593, 33.809864, 0.635001, -0.761335, -0.130932, 0.684937, 0.135095, - -54.465122, -90.505836, 36.087357, 0.886333, -0.426552, -0.180187, 0.710952, 0.131709, - -53.712105, -88.320259, 36.498875, 0.962495, 0.139742, -0.232543, 0.718166, 0.128046, - -54.102283, -90.036400, 38.064819, 0.809793, -0.584782, 0.047602, 0.716986, 0.135422, - -52.600964, -88.158951, 38.201736, 0.987712, 0.143400, -0.062136, 0.724941, 0.131391, - -54.574188, -86.785942, 38.064819, 0.610064, 0.790921, 0.047606, 0.773410, 0.224226, - -52.600964, -88.158951, 38.201736, 0.987712, 0.143400, -0.062136, 0.765744, 0.219703, - -53.712105, -88.320259, 36.498875, 0.962495, 0.139742, -0.232543, 0.772772, 0.216715, - -55.055538, -86.439102, 36.087357, 0.728440, 0.660991, -0.180187, 0.779153, 0.221238, - -53.196369, -88.245415, 39.614838, 0.824698, 0.119720, 0.552757, 0.726191, 0.135242, - -52.600964, -88.158951, 38.201736, 0.987712, 0.143400, -0.062136, 0.355357, 0.415290, - -54.574188, -86.785942, 38.064819, 0.610064, 0.790921, 0.047606, 0.364613, 0.416892, - -53.196369, -88.245415, 39.614838, 0.824698, 0.119720, 0.552757, 0.355512, 0.420195, - -53.196369, -88.245415, 39.614838, 0.824698, 0.119720, 0.552757, 0.336856, 0.040471, - -54.385033, -89.463608, 38.802193, 0.275802, -0.704989, 0.653394, 0.330005, 0.042277, - -54.102283, -90.036400, 38.064819, 0.809793, -0.584782, 0.047602, 0.327174, 0.040308, - -54.682369, -87.415520, 38.802193, 0.063930, 0.754300, 0.653409, 0.362715, 0.419347, - -61.264030, -95.738510, 30.366394, 0.761633, -0.641679, -0.090355, 0.462787, 0.325651, - -60.108265, -93.795593, 30.366394, 0.859435, -0.511245, 0.000000, 0.462787, 0.332965, - -60.108265, -93.795593, 33.809864, 0.635001, -0.761335, -0.130932, 0.449082, 0.332965, - -60.108265, -93.795593, 26.310617, 0.613031, -0.785392, -0.085745, 0.478930, 0.332965, - -64.188255, -97.010406, 27.692072, 0.128874, -0.887653, -0.442113, 0.473432, 0.317278, - -64.254120, -96.556694, 26.310617, 0.147501, -0.976991, -0.154052, 0.478930, 0.318430, - -64.188255, -97.010406, 27.692072, 0.128874, -0.887653, -0.442113, 0.625859, 0.295774, - -69.013992, -95.088585, 26.310617, -0.375358, -0.924104, -0.071684, 0.631497, 0.279319, - -64.254120, -96.556694, 26.310617, 0.147501, -0.976991, -0.154052, 0.631497, 0.295149, - -67.353439, -96.622604, 30.366394, -0.547710, -0.831775, -0.090354, 0.615213, 0.285799, - -69.013992, -95.088585, 30.366394, -0.678567, -0.734538, 0.000000, 0.616309, 0.279319, - -64.180626, -97.062996, 14.083838, 0.144001, -0.989577, 0.001041, 0.676764, 0.295846, - -69.013992, -95.088585, 14.083838, -0.368649, -0.929479, -0.012926, 0.677283, 0.279319, - -64.254120, -96.556694, 0.957523, 0.132948, -0.990831, -0.024056, 0.726437, 0.295149, - -64.180626, -97.062996, 14.083838, 0.144001, -0.989577, 0.001041, 0.527595, 0.317144, - -64.254120, -96.556694, 0.957523, 0.132948, -0.990831, -0.024056, 0.579839, 0.318430, - -60.108265, -93.795593, 0.957523, 0.571739, -0.820000, -0.026736, 0.579839, 0.332965, - -60.108265, -93.795593, 14.083838, 0.617208, -0.786682, 0.013600, 0.527595, 0.332965, - -69.013992, -95.088585, 0.957523, -0.294734, -0.955579, 0.000000, 0.726437, 0.279319, - -69.013992, -95.088585, 33.809864, -0.392286, -0.910477, -0.130934, 0.603414, 0.279319, - -61.264030, -95.738510, 30.366394, 0.840833, -0.402765, -0.361636, 0.572518, 0.175396, - -63.825668, -99.507912, 30.153715, 0.116748, -0.804154, -0.582843, 0.558852, 0.165888, - -64.188255, -97.010406, 27.692072, 0.128874, -0.887653, -0.442113, 0.571933, 0.162066, - -61.097664, -98.463486, 34.531609, 0.826638, -0.469181, -0.310708, 0.555175, 0.182187, - -60.108265, -93.795593, 33.809864, 0.910474, -0.392292, -0.130938, 0.572839, 0.186992, - -63.569221, -101.274239, 33.447403, 0.134277, -0.924883, -0.355755, 0.546512, 0.171880, - -66.738045, -99.282349, 34.531609, -0.659089, -0.684882, -0.310707, 0.608477, 0.181974, - -63.825668, -99.507912, 30.153715, 0.116748, -0.804154, -0.582843, 0.605739, 0.165464, - -63.569221, -101.274239, 33.447403, 0.134277, -0.924883, -0.355755, 0.617740, 0.172205, - -67.353439, -96.622604, 30.366394, -0.691582, -0.625247, -0.361636, 0.591611, 0.174207, - -69.013992, -95.088585, 33.809864, -0.848922, -0.493339, -0.189602, 0.591521, 0.186510, - -64.188255, -97.010406, 27.692072, 0.128874, -0.887653, -0.442113, 0.593378, 0.161261, - -65.724197, -100.731720, 36.087357, -0.426553, -0.886332, -0.180190, 0.617536, 0.183124, - -63.538666, -101.484718, 36.498875, 0.139736, -0.962495, -0.232546, 0.624750, 0.179461, - -65.254791, -101.094528, 38.064819, -0.584788, -0.809788, 0.047610, 0.623569, 0.186838, - -63.377350, -102.595886, 38.201736, 0.143392, -0.987714, -0.062129, 0.631525, 0.182806, - -62.004349, -100.622650, 38.064819, 0.790923, -0.610060, 0.047608, 0.540391, 0.185738, - -63.377350, -102.595886, 38.201736, 0.143392, -0.987714, -0.062129, 0.532725, 0.181215, - -63.538666, -101.484718, 36.498875, 0.139736, -0.962495, -0.232546, 0.539753, 0.178227, - -61.657497, -100.141304, 36.087357, 0.660988, -0.728441, -0.180192, 0.546134, 0.182750, - -63.463791, -102.000435, 39.614838, 0.119729, -0.824680, 0.552782, 0.632774, 0.186658, - -63.377350, -102.595886, 38.201736, 0.143392, -0.987714, -0.062129, 0.715625, 0.089246, - -62.004349, -100.622650, 38.064819, 0.790923, -0.610060, 0.047608, 0.724881, 0.090848, - -63.463791, -102.000435, 39.614838, 0.119729, -0.824680, 0.552782, 0.715780, 0.094151, - -63.463791, -102.000435, 39.614838, 0.119729, -0.824680, 0.552782, 0.338790, 0.060275, - -64.681969, -100.811790, 38.802193, -0.704984, -0.275783, 0.653407, 0.331938, 0.062081, - -65.254791, -101.094528, 38.064819, -0.584788, -0.809788, 0.047610, 0.329108, 0.060111, - -62.633942, -100.514458, 38.802193, 0.754296, -0.063901, 0.653418, 0.722983, 0.093303, - -75.359680, -93.539322, 36.087357, -0.728441, -0.660989, -0.180187, 0.349492, 0.398711, - -75.841026, -93.192482, 38.064819, -0.610060, -0.790924, 0.047600, 0.356615, 0.395013, - -76.703110, -91.658157, 36.498875, -0.962495, -0.139737, -0.232545, 0.357680, 0.402804, - -77.814255, -91.819473, 38.201736, -0.987713, -0.143393, -0.062139, 0.364090, 0.399445, - -76.703110, -91.658157, 36.498875, -0.962495, -0.139737, -0.232545, 0.772187, 0.254588, - -77.814255, -91.819473, 38.201736, -0.987713, -0.143393, -0.062139, 0.765112, 0.251602, - -76.312935, -89.942024, 38.064819, -0.809791, 0.584785, 0.047605, 0.772735, 0.247117, - -75.950089, -89.472641, 36.087357, -0.886332, 0.426555, -0.180185, 0.778991, 0.250324, - -77.218849, -91.733063, 39.614838, -0.824691, -0.119745, 0.552761, 0.763658, 0.248028, - -77.218849, -91.733063, 39.614838, -0.824691, -0.119745, 0.552761, 0.366960, 0.395499, - -77.218849, -91.733063, 39.614838, -0.824691, -0.119745, 0.552761, 0.665910, 0.111764, - -76.030190, -90.514862, 38.802193, -0.275779, 0.704977, 0.653417, 0.659059, 0.113569, - -76.312935, -89.942024, 38.064819, -0.809791, 0.584785, 0.047605, 0.656228, 0.111600, - -75.841026, -93.192482, 38.064819, -0.610060, -0.790924, 0.047600, 0.895379, 0.365598, - -75.732849, -92.562904, 38.802193, -0.063906, -0.754304, 0.653408, 0.892455, 0.367475, - -77.218849, -91.733063, 39.614838, -0.824691, -0.119745, 0.552761, 0.885696, 0.365453, - -76.492645, -91.627594, 33.447403, -0.924884, -0.134272, -0.355753, 0.779682, 0.261225, - -76.492645, -91.627594, 33.447403, -0.924884, -0.134272, -0.355753, 0.349067, 0.410182, - -74.500778, -88.458778, 34.531609, -0.684885, 0.659086, -0.310704, 0.788143, 0.250945, - -74.726273, -91.371178, 30.153715, -0.804153, -0.116752, -0.582844, 0.792252, 0.267276, - -71.841003, -87.843353, 30.366394, -0.625250, 0.691580, -0.361634, 0.805686, 0.257778, - -70.306946, -86.182831, 33.809864, -0.493332, 0.848927, -0.189594, 0.804936, 0.245798, - -74.726273, -91.371178, 30.153715, -0.804153, -0.116752, -0.582844, 0.337287, 0.416972, - -73.681900, -94.099174, 34.531609, -0.469187, -0.826636, -0.310704, 0.340669, 0.399694, - -70.956924, -93.932831, 30.366394, -0.402770, -0.840831, -0.361636, 0.324438, 0.407455, - -72.228798, -91.008568, 27.692072, -0.691012, -0.100320, -0.715848, 0.326583, 0.421148, - -72.228798, -91.008568, 27.692072, -0.691012, -0.100320, -0.715848, 0.805073, 0.270948, - -69.013992, -95.088585, 33.809864, -0.392286, -0.910477, -0.130934, 0.327243, 0.394636, - 71.948723, 70.055832, 36.087357, 0.570090, 0.815381, -0.100751, 0.417338, 0.134921, - 70.078423, 71.414337, 36.498875, 0.147470, 0.961340, -0.232546, 0.413311, 0.141768, - 71.605759, 70.539963, 38.064819, 0.795798, 0.603689, 0.047603, 0.409130, 0.134954, - 70.248642, 72.524139, 38.201736, 0.151324, 0.986529, -0.062142, 0.405904, 0.141772, - 70.078423, 71.414337, 36.498875, 0.147470, 0.961340, -0.232546, 0.394112, 0.215958, - 68.359200, 71.037956, 38.064819, -0.578259, 0.814463, 0.047601, 0.390062, 0.222967, - 70.248642, 72.524139, 38.201736, 0.151324, 0.986529, -0.062142, 0.385866, 0.215825, - 67.886894, 70.678909, 36.087357, -0.299470, 0.948772, -0.100742, 0.397698, 0.222569, - 70.157425, 71.929474, 39.614838, 0.126351, 0.823708, 0.552758, 0.382369, 0.218488, - 70.157425, 71.929474, 39.614838, 0.126351, 0.823708, 0.552758, 0.401004, 0.139783, - 70.157425, 71.929474, 39.614838, 0.126351, 0.823708, 0.552758, 0.869513, 0.365453, - 68.359200, 71.037956, 38.064819, -0.578259, 0.814463, 0.047601, 0.879196, 0.365598, - 68.929764, 70.750633, 38.802193, -0.702745, 0.281406, 0.653422, 0.876272, 0.367475, - 71.605759, 70.539963, 38.064819, 0.795798, 0.603689, 0.047603, 0.657035, 0.070201, - 70.157425, 71.929474, 39.614838, 0.126351, 0.823708, 0.552758, 0.666717, 0.070365, - 70.975311, 70.436852, 38.802193, 0.754783, 0.057837, 0.653420, 0.659866, 0.072170, - 70.046165, 71.204102, 33.447403, 0.141703, 0.923775, -0.355753, 0.490770, 0.166764, - 67.886894, 70.678909, 36.087357, -0.471349, 0.855243, -0.215384, 0.476799, 0.169051, - 70.078423, 71.414337, 36.498875, 0.147470, 0.961340, -0.232546, 0.479869, 0.161574, - 66.861450, 69.237793, 34.531609, -0.653561, 0.690158, -0.310709, 0.479866, 0.175832, - 69.775543, 69.439880, 30.153715, 0.123205, 0.803190, -0.582844, 0.501471, 0.174560, - 66.224709, 66.583031, 30.366394, -0.686536, 0.630782, -0.361638, 0.492659, 0.186933, - 64.551872, 65.062386, 33.809864, -0.798795, 0.587716, -0.128518, 0.476337, 0.187580, - 69.775543, 69.439880, 30.153715, 0.123205, 0.803190, -0.582844, 0.553589, 0.120689, - 70.046165, 71.204102, 33.447403, 0.141703, 0.923775, -0.355753, 0.565542, 0.127403, - 72.495079, 68.373627, 34.531609, 0.830378, 0.462531, -0.310706, 0.556315, 0.137133, - 72.306816, 65.650070, 30.366394, 0.844040, 0.395998, -0.361638, 0.539517, 0.129397, - 69.392891, 66.945404, 27.692072, 0.105868, 0.690185, -0.715847, 0.541277, 0.116503, - 69.392891, 66.945404, 27.692072, 0.105868, 0.690185, -0.715847, 0.508655, 0.182066, - 73.446930, 63.697922, 33.809864, 0.913598, 0.384960, -0.130938, 0.539427, 0.141652, - 71.948723, 70.055832, 36.087357, 0.706028, 0.674638, -0.215379, 0.565338, 0.138279, - 70.078423, 71.414337, 36.498875, 0.147470, 0.961340, -0.232546, 0.572524, 0.134631, - 64.551872, 65.062386, 33.809864, -0.798795, 0.587716, -0.128518, 0.449083, 0.295985, - 66.224709, 66.583031, 30.366394, -0.541012, 0.836147, -0.090355, 0.462788, 0.288670, - 64.551872, 65.062386, 30.366394, -0.672645, 0.739965, 0.000000, 0.462788, 0.295985, - 64.551872, 65.062386, 26.310617, -0.367929, 0.927087, -0.071684, 0.478931, 0.295985, - 69.392891, 66.945404, 27.692072, 0.145302, 0.947247, -0.285675, 0.473432, 0.280297, - 69.323387, 66.492271, 26.310617, 0.149995, 0.977827, -0.146137, 0.478931, 0.281449, - 73.446930, 63.697922, 26.310617, 0.628895, 0.774178, -0.071685, 0.478353, 0.353345, - 69.323387, 66.492271, 26.310617, 0.149995, 0.977827, -0.146137, 0.478353, 0.369175, - 69.392891, 66.945404, 27.692072, 0.145302, 0.947247, -0.285675, 0.472715, 0.369800, - 72.306816, 65.650070, 30.366394, 0.766764, 0.635538, -0.090356, 0.462069, 0.359825, - 73.446930, 63.697922, 30.366394, 0.863517, 0.504320, 0.000000, 0.463165, 0.353345, - 73.446930, 63.697922, 33.809864, 0.863517, 0.504320, 0.000000, 0.450270, 0.353345, - 69.400948, 66.997887, 14.083838, 0.151607, 0.988342, -0.013970, 0.527595, 0.280163, - 69.400948, 66.997887, 14.083838, 0.151607, 0.988342, -0.013970, 0.523620, 0.369872, - 64.551872, 65.062386, 14.083838, -0.361169, 0.932411, -0.012924, 0.527595, 0.295985, - 69.323387, 66.492271, 0.957523, 0.151616, 0.988398, -0.009008, 0.579840, 0.281449, - 73.446930, 63.697922, 14.083838, 0.624042, 0.781284, -0.012924, 0.524139, 0.353345, - 69.323387, 66.492271, 0.957523, 0.151616, 0.988398, -0.009008, 0.573294, 0.369175, - 73.446930, 63.697922, 0.957523, 0.560983, 0.827827, 0.000000, 0.573294, 0.353345, - 64.551872, 65.062386, 0.957523, -0.287059, 0.957913, 0.000000, 0.579840, 0.295985, - 58.193966, 63.564144, 36.087357, -0.815381, 0.570088, -0.100763, 0.805777, 0.064031, - 56.835449, 61.693829, 36.498875, -0.961341, 0.147463, -0.232548, 0.801750, 0.070877, - 57.709831, 63.221214, 38.064819, -0.603691, 0.795796, 0.047600, 0.797569, 0.064064, - 55.725643, 61.864071, 38.201736, -0.986530, 0.151321, -0.062135, 0.794343, 0.070882, - 56.835449, 61.693829, 36.498875, -0.961341, 0.147463, -0.232548, 0.842768, 0.015542, - 57.211834, 59.974613, 38.064819, -0.814462, -0.578260, 0.047613, 0.838718, 0.022551, - 55.725643, 61.864071, 38.201736, -0.986530, 0.151321, -0.062135, 0.834522, 0.015409, - 57.570892, 59.502300, 36.087357, -0.948770, -0.299475, -0.100744, 0.846354, 0.022153, - 56.320343, 61.772869, 39.614838, -0.823699, 0.126355, 0.552770, 0.831025, 0.018072, - 56.320343, 61.772869, 39.614838, -0.823699, 0.126355, 0.552770, 0.789443, 0.068892, - 56.320343, 61.772869, 39.614838, -0.823699, 0.126355, 0.552770, 0.704565, 0.171870, - 57.211834, 59.974613, 38.064819, -0.814462, -0.578260, 0.047613, 0.704387, 0.179741, - 57.499191, 60.545162, 38.802193, -0.281424, -0.702738, 0.653422, 0.702077, 0.177364, - 57.709831, 63.221214, 38.064819, -0.603691, 0.795796, 0.047600, 0.448551, 0.157634, - 56.320343, 61.772869, 39.614838, -0.823699, 0.126355, 0.552770, 0.458233, 0.157798, - 57.812958, 62.590759, 38.802193, -0.057834, 0.754779, 0.653425, 0.451381, 0.159603, - 57.045670, 61.661602, 33.447403, -0.923775, 0.141703, -0.355754, 0.878511, 0.024181, - 57.570892, 59.502300, 36.087357, -0.855239, -0.471355, -0.215385, 0.864541, 0.026468, - 56.835449, 61.693829, 36.498875, -0.961341, 0.147463, -0.232548, 0.867611, 0.018991, - 59.012016, 58.476864, 34.531609, -0.690156, -0.653563, -0.310708, 0.867608, 0.033250, - 58.809929, 61.390976, 30.153715, -0.803189, 0.123205, -0.582845, 0.889213, 0.031978, - 61.666767, 57.840111, 30.366394, -0.630782, -0.686537, -0.361636, 0.880401, 0.044351, - 63.187431, 56.167328, 33.809864, -0.641095, -0.756210, -0.130933, 0.864079, 0.044997, - 58.809929, 61.390976, 30.153715, -0.803189, 0.123205, -0.582845, 0.707189, 0.032838, - 57.045670, 61.661602, 33.447403, -0.923775, 0.141703, -0.355754, 0.719143, 0.039552, - 59.876175, 64.110527, 34.531609, -0.462532, 0.830378, -0.310705, 0.709916, 0.049282, - 62.599728, 63.922264, 30.366394, -0.396001, 0.844038, -0.361638, 0.693117, 0.041546, - 61.304405, 61.008347, 27.692072, -0.690185, 0.105873, -0.715847, 0.694877, 0.028652, - 61.304405, 61.008347, 27.692072, -0.690185, 0.105873, -0.715847, 0.896397, 0.039483, - 64.551872, 65.062386, 33.809864, -0.223885, 0.955995, -0.189604, 0.693027, 0.053800, - 58.193966, 63.564144, 36.087357, -0.674639, 0.706030, -0.215370, 0.718938, 0.050427, - 56.835449, 61.693829, 36.498875, -0.961341, 0.147463, -0.232548, 0.726124, 0.046779, - 64.327545, 54.215179, 30.366394, -0.766764, -0.635538, -0.090357, 0.610559, 0.250497, - 63.187431, 56.167328, 33.809864, -0.641095, -0.756210, -0.130933, 0.596853, 0.243183, - 63.187431, 56.167328, 30.366394, -0.863517, -0.504320, 0.000000, 0.610559, 0.243183, - 63.187431, 56.167328, 26.310617, -0.619323, -0.780440, -0.085744, 0.626701, 0.243183, - 67.241470, 52.919849, 27.692072, -0.135997, -0.886593, -0.442106, 0.621203, 0.258871, - 67.310974, 53.372978, 26.310617, -0.155341, -0.975777, -0.154039, 0.626701, 0.257718, - 67.241470, 52.919849, 27.692072, -0.135997, -0.886593, -0.442106, 0.625858, 0.316372, - 67.310974, 53.372978, 26.310617, -0.155341, -0.975777, -0.154039, 0.631496, 0.316997, - 72.082489, 54.802868, 26.310617, 0.367930, -0.927086, -0.071683, 0.631496, 0.332827, - 70.409653, 53.282219, 30.366394, 0.541013, -0.836147, -0.090355, 0.615213, 0.326347, - 72.082489, 54.802868, 30.366394, 0.672646, -0.739965, 0.000000, 0.616309, 0.332827, - 67.233414, 52.867317, 14.083838, -0.151943, -0.988389, 0.001041, 0.676764, 0.316300, - 72.082489, 54.802868, 14.083838, 0.361176, -0.932408, -0.012925, 0.677283, 0.332827, - 67.310974, 53.372978, 0.957523, -0.140901, -0.989731, -0.024055, 0.726437, 0.316997, - 67.233414, 52.867317, 14.083838, -0.151943, -0.988389, 0.001041, 0.675366, 0.259004, - 63.187431, 56.167328, 0.957523, -0.578311, -0.815378, -0.026734, 0.727611, 0.243183, - 67.310974, 53.372978, 0.957523, -0.140901, -0.989731, -0.024055, 0.727611, 0.257718, - 63.187431, 56.167328, 14.083838, -0.623508, -0.781698, 0.013599, 0.675366, 0.243183, - 72.082489, 54.802868, 0.957523, 0.287060, -0.957913, 0.000000, 0.726437, 0.332827, - 72.082489, 54.802868, 33.809864, 0.384957, -0.913600, -0.130930, 0.603414, 0.332827, - 64.327545, 54.215179, 30.366394, -0.844041, -0.395997, -0.361637, 0.805752, 0.167007, - 67.241470, 52.919849, 27.692072, -0.135997, -0.886593, -0.442106, 0.805780, 0.180319, - 66.858818, 50.425323, 30.153715, -0.123203, -0.803189, -0.582845, 0.792559, 0.176904, - 64.139297, 51.491627, 34.531609, -0.830381, -0.462524, -0.310706, 0.788145, 0.160761, - 63.187431, 56.167328, 33.809864, -0.955995, -0.223886, -0.189601, 0.805541, 0.155434, - 66.588188, 48.661098, 33.447403, -0.141700, -0.923774, -0.355755, 0.779979, 0.171302, - 69.772911, 50.627502, 34.531609, 0.653569, -0.690152, -0.310706, 0.615549, 0.140769, - 66.588188, 48.661098, 33.447403, -0.141700, -0.923774, -0.355755, 0.606798, 0.130752, - 66.858818, 50.425323, 30.153715, -0.123203, -0.803189, -0.582845, 0.619066, 0.124425, - 70.409653, 53.282219, 30.366394, 0.686539, -0.630781, -0.361635, 0.632708, 0.133574, - 72.082489, 54.802868, 33.809864, 0.756201, -0.641105, -0.130938, 0.632206, 0.145822, - 67.241470, 52.919849, 27.692072, -0.135997, -0.886593, -0.442106, 0.631571, 0.120634, - 68.747482, 49.186340, 36.087357, 0.471367, -0.855231, -0.215389, 0.606478, 0.141626, - 66.555954, 48.450863, 36.498875, -0.147459, -0.961343, -0.232541, 0.599474, 0.137752, - 64.685638, 49.809368, 36.087357, -0.706032, -0.674632, -0.215383, 0.779103, 0.160474, - 66.555954, 48.450863, 36.498875, -0.147459, -0.961343, -0.232541, 0.772947, 0.165177, - 64.685638, 49.809368, 36.087357, -0.570092, -0.815383, -0.100727, 0.674198, 0.025234, - 66.555954, 48.450863, 36.498875, -0.147459, -0.961343, -0.232541, 0.670171, 0.032080, - 65.028610, 49.325291, 38.064819, -0.795802, -0.603682, 0.047618, 0.665990, 0.025267, - 66.385719, 47.341064, 38.201736, -0.151324, -0.986530, -0.062129, 0.662764, 0.032085, - 66.555954, 48.450863, 36.498875, -0.147459, -0.961343, -0.232541, 0.663510, 0.087580, - 68.275162, 48.827293, 38.064819, 0.578269, -0.814455, 0.047612, 0.659460, 0.094588, - 66.385719, 47.341064, 38.201736, -0.151324, -0.986530, -0.062129, 0.655264, 0.087447, - 68.747482, 49.186340, 36.087357, 0.299491, -0.948766, -0.100733, 0.667096, 0.094191, - 66.476936, 47.935780, 39.614838, -0.126354, -0.823697, 0.552772, 0.651768, 0.090110, - 66.476936, 47.935780, 39.614838, -0.126354, -0.823697, 0.552772, 0.657864, 0.030095, - 66.476936, 47.935780, 39.614838, -0.126354, -0.823697, 0.552772, 0.862230, 0.190558, - 68.275162, 48.827293, 38.064819, 0.578269, -0.814455, 0.047612, 0.871912, 0.190703, - 67.704620, 49.114616, 38.802193, 0.702746, -0.281430, 0.653410, 0.868989, 0.192580, - 65.028610, 49.325291, 38.064819, -0.795802, -0.603682, 0.047618, 0.369605, 0.158410, - 66.476936, 47.935780, 39.614838, -0.126354, -0.823697, 0.552772, 0.379287, 0.158574, - 65.659050, 49.428406, 38.802193, -0.754786, -0.057840, 0.653416, 0.372436, 0.160379, - 74.034630, 55.942936, 30.366394, 0.635530, -0.766770, -0.090359, 0.610559, 0.214499, - 72.082489, 54.802868, 33.809864, 0.756201, -0.641105, -0.130938, 0.596853, 0.207185, - 72.082489, 54.802868, 30.366394, 0.504306, -0.863525, 0.000000, 0.610559, 0.207185, - 72.082489, 54.802868, 26.310617, 0.780438, -0.619325, -0.085745, 0.626701, 0.207185, - 75.329956, 58.856903, 27.692072, 0.886596, -0.135995, -0.442102, 0.621203, 0.222873, - 74.876839, 58.926380, 26.310617, 0.975777, -0.155344, -0.154035, 0.626701, 0.221720, - 75.329956, 58.856903, 27.692072, 0.886596, -0.135995, -0.442102, 0.490693, 0.404079, - 74.876839, 58.926380, 26.310617, 0.975777, -0.155344, -0.154035, 0.496332, 0.404704, - 73.446930, 63.697922, 26.310617, 0.927085, 0.367932, -0.071685, 0.496332, 0.420534, - 74.967598, 62.025093, 30.366394, 0.836144, 0.541017, -0.090357, 0.480048, 0.414054, - 73.446930, 63.697922, 30.366394, 0.739959, 0.672652, 0.000000, 0.481144, 0.420534, - 75.382439, 58.848850, 14.083838, 0.988389, -0.151942, 0.001041, 0.541599, 0.404007, - 73.446930, 63.697922, 14.083838, 0.932410, 0.361170, -0.012924, 0.542118, 0.420534, - 74.876839, 58.926380, 0.957523, 0.989731, -0.140903, -0.024052, 0.591272, 0.404704, - 75.382439, 58.848850, 14.083838, 0.988389, -0.151942, 0.001041, 0.675366, 0.223006, - 72.082489, 54.802868, 0.957523, 0.815378, -0.578311, -0.026730, 0.727611, 0.207185, - 74.876839, 58.926380, 0.957523, 0.989731, -0.140903, -0.024052, 0.727611, 0.221720, - 72.082489, 54.802868, 14.083838, 0.781703, -0.623502, 0.013597, 0.675366, 0.207185, - 73.446930, 63.697922, 0.957523, 0.957912, 0.287062, 0.000000, 0.591272, 0.420534, - 73.446930, 63.697922, 33.809864, 0.913598, 0.384960, -0.130938, 0.468249, 0.420534, - 74.034630, 55.942936, 30.366394, 0.396005, -0.844038, -0.361633, 0.632917, 0.086882, - 75.329956, 58.856903, 27.692072, 0.886596, -0.135995, -0.442102, 0.632945, 0.100194, - 77.824432, 58.474274, 30.153715, 0.803190, -0.123200, -0.582845, 0.619725, 0.096779, - 76.758186, 55.754723, 34.531609, 0.462531, -0.830378, -0.310707, 0.615311, 0.080635, - 72.082489, 54.802868, 33.809864, 0.384957, -0.913600, -0.130930, 0.632706, 0.075309, - 79.588707, 58.203648, 33.447403, 0.923775, -0.141697, -0.355756, 0.607144, 0.091177, - 77.622345, 61.388340, 34.531609, 0.690154, 0.653566, -0.310706, 0.878249, 0.084959, - 79.588707, 58.203648, 33.447403, 0.923775, -0.141697, -0.355756, 0.869499, 0.074943, - 77.824432, 58.474274, 30.153715, 0.803190, -0.123200, -0.582845, 0.881767, 0.068615, - 74.967598, 62.025093, 30.366394, 0.630782, 0.686537, -0.361636, 0.895408, 0.077764, - 73.446930, 63.697922, 33.809864, 0.500139, 0.844934, -0.189601, 0.894907, 0.090012, - 75.329956, 58.856903, 27.692072, 0.886596, -0.135995, -0.442102, 0.894272, 0.064824, - 79.063469, 60.362904, 36.087357, 0.855239, 0.471360, -0.215376, 0.869178, 0.085816, - 79.798912, 58.171375, 36.498875, 0.961341, -0.147466, -0.232543, 0.862174, 0.081942, - 78.440399, 56.301052, 36.087357, 0.674635, -0.706030, -0.215383, 0.606268, 0.080348, - 79.798912, 58.171375, 36.498875, 0.961341, -0.147466, -0.232543, 0.600112, 0.085052, - 78.440399, 56.301052, 36.087357, 0.815383, -0.570089, -0.100746, 0.895643, 0.190467, - 79.798912, 58.171375, 36.498875, 0.961341, -0.147466, -0.232543, 0.891615, 0.197313, - 78.924530, 56.644035, 38.064819, 0.603689, -0.795798, 0.047605, 0.887434, 0.190500, - 80.908722, 58.001129, 38.201736, 0.986527, -0.151336, -0.062137, 0.884208, 0.197318, - 79.798912, 58.171375, 36.498875, 0.961341, -0.147466, -0.232543, 0.338702, 0.444129, - 79.422531, 59.890587, 38.064819, 0.814460, 0.578263, 0.047604, 0.334652, 0.451137, - 80.908722, 58.001129, 38.201736, 0.986527, -0.151336, -0.062137, 0.330456, 0.443996, - 79.063469, 60.362904, 36.087357, 0.948770, 0.299475, -0.100746, 0.342288, 0.450739, - 80.314034, 58.092381, 39.614838, 0.823706, -0.126340, 0.552762, 0.326960, 0.446659, - 80.314034, 58.092381, 39.614838, 0.823706, -0.126340, 0.552762, 0.879309, 0.195328, - 80.314034, 58.092381, 39.614838, 0.823706, -0.126340, 0.552762, 0.362289, 0.040254, - 79.422531, 59.890587, 38.064819, 0.814460, 0.578263, 0.047604, 0.371972, 0.040399, - 79.135185, 59.320042, 38.802193, 0.281411, 0.702748, 0.653416, 0.369049, 0.042276, - 78.924530, 56.644035, 38.064819, 0.603689, -0.795798, 0.047605, 0.428647, 0.040265, - 80.314034, 58.092381, 39.614838, 0.823706, -0.126340, 0.552762, 0.438329, 0.040429, - 78.821404, 57.274445, 38.802193, 0.057880, -0.754797, 0.653400, 0.431478, 0.042235, - -66.628456, -80.202515, 42.196247, 0.041371, -0.284956, 0.957647, 0.337223, 0.141288, - -67.781281, -79.463974, 38.802193, -0.936859, -0.222494, 0.269799, 0.323255, 0.141658, - -66.582718, -80.517632, 39.078041, 0.142928, -0.984506, 0.101588, 0.326312, 0.137288, - -67.781281, -79.463974, 38.802193, -0.936859, -0.222494, 0.269799, 0.476740, 0.056963, - -66.628456, -80.202515, 42.196247, 0.041371, -0.284956, 0.957647, 0.463904, 0.052470, - -66.951424, -77.977989, 39.614838, -0.108355, 0.746326, 0.656702, 0.476867, 0.051109, - -66.951424, -77.977989, 39.614838, -0.108355, 0.746326, 0.656702, 0.572461, 0.027034, - -66.628456, -80.202515, 42.196247, 0.041371, -0.284956, 0.957647, 0.559391, 0.026881, - -65.733253, -79.166634, 38.802193, 0.961452, 0.053106, 0.269797, 0.571516, 0.021230, - -66.628456, -80.202515, 42.196247, 0.041371, -0.284956, 0.957647, 0.362045, 0.105288, - -66.582718, -80.517632, 39.078041, 0.142928, -0.984506, 0.101588, 0.372765, 0.100959, - -65.733253, -79.166634, 38.802193, 0.961452, 0.053106, 0.269797, 0.376020, 0.105234, - -55.420914, -88.568382, 42.196247, -0.284962, -0.041374, 0.957645, 0.726052, 0.012799, - -54.682369, -87.415520, 38.802193, -0.222506, 0.936854, 0.269805, 0.712084, 0.013169, - -55.735981, -88.614136, 39.078041, -0.984505, -0.142944, 0.101573, 0.715141, 0.008799, - -54.682369, -87.415520, 38.802193, -0.222506, 0.936854, 0.269805, 0.414638, 0.164907, - -55.420914, -88.568382, 42.196247, -0.284962, -0.041374, 0.957645, 0.401802, 0.160414, - -53.196369, -88.245415, 39.614838, 0.746324, 0.108351, 0.656705, 0.414766, 0.159053, - -53.196369, -88.245415, 39.614838, 0.746324, 0.108351, 0.656705, 0.355991, 0.258775, - -55.420914, -88.568382, 42.196247, -0.284962, -0.041374, 0.957645, 0.342922, 0.258622, - -54.385033, -89.463608, 38.802193, 0.053100, -0.961451, 0.269801, 0.355046, 0.252971, - -55.420914, -88.568382, 42.196247, -0.284962, -0.041374, 0.957645, 0.391137, 0.042254, - -55.735981, -88.614136, 39.078041, -0.984505, -0.142944, 0.101573, 0.401857, 0.037925, - -54.385033, -89.463608, 38.802193, 0.053100, -0.961451, 0.269801, 0.405112, 0.042199, - -63.786758, -99.775909, 42.196247, -0.041371, 0.284961, 0.957646, 0.766901, 0.016089, - -62.633942, -100.514458, 38.802193, 0.936858, 0.222502, 0.269795, 0.752933, 0.016459, - -63.832497, -99.460846, 39.078041, -0.142928, 0.984508, 0.101571, 0.755990, 0.012089, - -62.633942, -100.514458, 38.802193, 0.936858, 0.222502, 0.269795, 0.438170, 0.083401, - -63.786758, -99.775909, 42.196247, -0.041371, 0.284961, 0.957646, 0.425333, 0.078908, - -63.463791, -102.000435, 39.614838, 0.108358, -0.746325, 0.656702, 0.438297, 0.077547, - -63.463791, -102.000435, 39.614838, 0.108358, -0.746325, 0.656702, 0.363592, 0.222777, - -63.786758, -99.775909, 42.196247, -0.041371, 0.284961, 0.957646, 0.350522, 0.222624, - -64.681969, -100.811790, 38.802193, -0.961452, -0.053098, 0.269797, 0.362647, 0.216973, - -63.786758, -99.775909, 42.196247, -0.041371, 0.284961, 0.957646, 0.357954, 0.062057, - -63.832497, -99.460846, 39.078041, -0.142928, 0.984508, 0.101571, 0.368674, 0.057729, - -64.681969, -100.811790, 38.802193, -0.961452, -0.053098, 0.269797, 0.371930, 0.062003, - -69.013992, -95.088585, 14.083838, -0.786688, -0.617201, 0.013598, 0.691012, 0.472716, - -72.281349, -91.016190, 14.083838, -0.989578, -0.143996, 0.001041, 0.691012, 0.456441, - -69.013992, -95.088585, 0.957523, -0.820000, -0.571739, -0.026731, 0.741348, 0.472716, - -71.775139, -90.942703, 0.957523, -0.990832, -0.132944, -0.024052, 0.741348, 0.457249, - -72.281349, -91.016190, 14.083838, -0.989578, -0.143996, 0.001041, 0.847009, 0.421305, - -71.775139, -90.942703, 0.957523, -0.990832, -0.132944, -0.024052, 0.898835, 0.419764, - -71.775139, -90.942703, 26.310617, -0.976995, -0.147494, -0.154036, 0.799233, 0.419764, - -71.775139, -90.942703, 26.310617, -0.976995, -0.147494, -0.154036, 0.644126, 0.457249, - -72.228798, -91.008568, 27.692072, -0.948385, -0.137687, -0.285673, 0.793574, 0.421145, - -69.013992, -95.088585, 26.310617, -0.785390, -0.613033, -0.085744, 0.644126, 0.472716, - -72.228798, -91.008568, 27.692072, -0.948385, -0.137687, -0.285673, 0.638829, 0.456525, - -70.956924, -93.932831, 30.366394, -0.641676, -0.761634, -0.090358, 0.628573, 0.466116, - -69.013992, -95.088585, 30.366394, -0.511238, -0.859439, 0.000000, 0.628573, 0.472716, - -71.841003, -87.843353, 30.366394, -0.831767, 0.547722, -0.090358, 0.780219, 0.414219, - -69.013992, -95.088585, 33.809864, -0.511238, -0.859439, 0.000000, 0.615369, 0.472716, - -74.994301, -91.410095, 42.196247, 0.284963, 0.041367, 0.957645, 0.409195, 0.104918, - -75.732849, -92.562904, 38.802193, 0.222504, -0.936859, 0.269792, 0.395227, 0.105288, - -74.679230, -91.364342, 39.078041, 0.984507, 0.142930, 0.101574, 0.398284, 0.100918, - -75.732849, -92.562904, 38.802193, 0.222504, -0.936859, 0.269792, 0.520174, 0.029749, - -74.994301, -91.410095, 42.196247, 0.284963, 0.041367, 0.957645, 0.507338, 0.025255, - -77.218849, -91.733063, 39.614838, -0.746321, -0.108362, 0.656705, 0.520302, 0.023895, - -77.218849, -91.733063, 39.614838, -0.746321, -0.108362, 0.656705, 0.520301, 0.056187, - -74.994301, -91.410095, 42.196247, 0.284963, 0.041367, 0.957645, 0.507231, 0.056034, - -76.030190, -90.514862, 38.802193, -0.053101, 0.961450, 0.269804, 0.519355, 0.050383, - -74.994301, -91.410095, 42.196247, 0.284963, 0.041367, 0.957645, 0.328862, 0.105288, - -74.679230, -91.364342, 39.078041, 0.984507, 0.142930, 0.101574, 0.339582, 0.100960, - -76.030190, -90.514862, 38.802193, -0.053101, 0.961450, 0.269804, 0.342838, 0.105234, - -56.708702, -96.333183, -4.999500, 0.801365, -0.598175, 0.000000, 0.442691, 0.401695, - -56.708702, -96.333183, 0.999900, 0.801365, -0.598176, 0.000000, 0.442691, 0.420318, - -71.551590, -98.488136, -4.999500, -0.598175, -0.801365, 0.000000, 0.385416, 0.401695, - -71.551590, -98.488136, 0.999900, -0.598176, -0.801365, 0.000000, 0.385416, 0.420318, - -71.551590, -98.488136, -4.999500, -0.598175, -0.801365, 0.000000, 0.894912, 0.151212, - -71.551590, -98.488136, 0.999900, -0.598176, -0.801365, 0.000000, 0.894912, 0.169835, - -73.706512, -83.645241, -4.999500, -0.989625, -0.143676, 0.000000, 0.837637, 0.151212, - -73.706512, -83.645241, 0.999900, -0.989625, -0.143676, 0.000000, 0.837637, 0.169835, - -58.863621, -81.490326, 0.999900, 0.989625, 0.143676, 0.000000, 0.572470, 0.222652, - -56.708702, -96.333183, 0.999900, 0.801365, -0.598176, 0.000000, 0.515194, 0.222652, - -56.708702, -96.333183, -4.999500, 0.801365, -0.598175, 0.000000, 0.515194, 0.204028, - -58.863621, -81.490326, -4.999500, 0.989625, 0.143676, 0.000000, 0.572470, 0.204028, - -56.708702, -96.333183, 0.999900, 0.000000, 0.000000, 1.000000, 0.891007, 0.297868, - -58.863621, -81.490326, 0.999900, 0.000000, 0.000000, 1.000000, 0.833862, 0.294724, - -71.551590, -98.488136, 0.999900, 0.000000, 0.000000, 1.000000, 0.894875, 0.251416, - -66.285065, -82.567787, 0.999900, 0.000000, 0.000000, 1.000000, 0.835797, 0.271498, - -73.706512, -83.645241, 0.999900, 0.000000, 0.000000, 1.000000, 0.837731, 0.248272, - -58.863621, -81.490326, 0.999900, -0.143676, 0.989625, 0.000000, 0.367423, 0.332611, - -66.285065, -82.567787, -4.999500, -0.143675, 0.989625, 0.000000, 0.396061, 0.313987, - -66.285065, -82.567787, 0.999900, -0.143675, 0.989625, 0.000000, 0.396061, 0.332611, - -58.863621, -81.490326, -4.999500, -0.143676, 0.989625, 0.000000, 0.367423, 0.313987, - -73.706512, -83.645241, -4.999500, -0.143675, 0.989625, 0.000000, 0.424698, 0.313987, - -73.706512, -83.645241, 0.999900, -0.143675, 0.989625, 0.000000, 0.424698, 0.332611, - 69.816605, 69.707573, 42.196247, -0.043659, -0.284622, 0.957645, 0.391137, 0.062057, - 69.768326, 69.392860, 39.078041, -0.150840, -0.983325, 0.101580, 0.401857, 0.057729, - 70.975311, 70.436852, 38.802193, 0.935043, -0.230013, 0.269794, 0.405112, 0.062003, - 70.975311, 70.436852, 38.802193, 0.935043, -0.230013, 0.269794, 0.374856, 0.135840, - 70.157425, 71.929474, 39.614838, 0.114340, 0.745426, 0.656708, 0.375802, 0.141644, - 69.816605, 69.707573, 42.196247, -0.043659, -0.284622, 0.957645, 0.362732, 0.141491, - 70.157425, 71.929474, 39.614838, 0.114340, 0.745426, 0.656708, 0.764241, 0.064899, - 68.929764, 70.750633, 38.802193, -0.960995, 0.060829, 0.269795, 0.764114, 0.070753, - 69.816605, 69.707573, 42.196247, -0.043659, -0.284622, 0.957645, 0.751278, 0.066260, - 69.816605, 69.707573, 42.196247, -0.043659, -0.284622, 0.957645, 0.805471, 0.016730, - 68.929764, 70.750633, 38.802193, -0.960995, 0.060829, 0.269795, 0.791503, 0.017100, - 69.768326, 69.392860, 39.078041, -0.150840, -0.983325, 0.101580, 0.794560, 0.012730, - 64.551872, 65.062386, 14.083838, -0.781703, 0.623502, 0.013598, 0.692879, 0.404101, - 64.551872, 65.062386, 0.957523, -0.815381, 0.578308, -0.026732, 0.743215, 0.404101, - 61.251923, 61.016407, 14.083838, -0.988389, 0.151943, 0.001042, 0.692879, 0.420376, - 61.757523, 60.938824, 0.957523, -0.989732, 0.140898, -0.024053, 0.743215, 0.419567, - 61.251923, 61.016407, 14.083838, -0.988389, 0.151943, 0.001042, 0.674857, 0.353439, - 61.757523, 60.938824, 0.957523, -0.989732, 0.140898, -0.024053, 0.725218, 0.354248, - 63.187431, 56.167328, 14.083838, -0.932410, -0.361170, -0.012924, 0.674857, 0.369713, - 63.187431, 56.167328, 0.957523, -0.957911, -0.287064, 0.000000, 0.725161, 0.369713, - 63.187431, 56.167328, 26.310617, -0.927085, -0.367933, -0.071687, 0.628000, 0.369713, - 61.757523, 60.938824, 26.310617, -0.975779, 0.155334, -0.154037, 0.628057, 0.354248, - 61.757523, 60.938824, 26.310617, -0.975779, 0.155334, -0.154037, 0.645993, 0.419567, - 61.304405, 61.008347, 27.692072, -0.947248, 0.145303, -0.285673, 0.622712, 0.353523, - 64.551872, 65.062386, 26.310617, -0.780441, 0.619322, -0.085744, 0.645993, 0.404101, - 61.304405, 61.008347, 27.692072, -0.947248, 0.145303, -0.285673, 0.640696, 0.420292, - 62.599728, 63.922264, 30.366394, -0.635540, 0.766762, -0.090356, 0.630440, 0.410701, - 64.551872, 65.062386, 30.366394, -0.504323, 0.863515, 0.000000, 0.630440, 0.404101, - 61.666767, 57.840111, 30.366394, -0.836139, -0.541024, -0.090358, 0.612356, 0.363114, - 63.187431, 56.167328, 30.366394, -0.739950, -0.672661, 0.000000, 0.612458, 0.369713, - 64.551872, 65.062386, 33.809864, -0.504323, 0.863515, 0.000000, 0.617236, 0.404101, - 63.187431, 56.167328, 33.809864, -0.739950, -0.672661, 0.000000, 0.599261, 0.369713, - 58.542213, 61.432037, 42.196247, 0.284617, -0.043658, 0.957647, 0.358986, 0.083416, - 58.856918, 61.383747, 39.078041, 0.983325, -0.150842, 0.101578, 0.369706, 0.079087, - 57.812958, 62.590759, 38.802193, 0.230026, 0.935039, 0.269796, 0.372962, 0.083362, - 57.812958, 62.590759, 38.802193, 0.230026, 0.935039, 0.269796, 0.804534, 0.037720, - 56.320343, 61.772869, 39.614838, -0.745429, 0.114352, 0.656704, 0.805480, 0.043524, - 58.542213, 61.432037, 42.196247, 0.284617, -0.043658, 0.957647, 0.792410, 0.043371, - 56.320343, 61.772869, 39.614838, -0.745429, 0.114352, 0.656704, 0.769387, 0.086735, - 57.499191, 60.545162, 38.802193, -0.060823, -0.960993, 0.269801, 0.769259, 0.092589, - 58.542213, 61.432037, 42.196247, 0.284617, -0.043658, 0.957647, 0.756423, 0.088095, - 58.542213, 61.432037, 42.196247, 0.284617, -0.043658, 0.957647, 0.406137, 0.083046, - 57.499191, 60.545162, 38.802193, -0.060823, -0.960993, 0.269801, 0.392168, 0.083416, - 58.856918, 61.383747, 39.078041, 0.983325, -0.150842, 0.101578, 0.395225, 0.079046, - 66.817757, 50.157673, 42.196247, 0.043658, 0.284625, 0.957644, 0.391137, 0.022450, - 66.866028, 50.472340, 39.078041, 0.150835, 0.983328, 0.101565, 0.401857, 0.018121, - 65.659050, 49.428406, 38.802193, -0.935041, 0.230023, 0.269792, 0.405112, 0.022395, - 65.659050, 49.428406, 38.802193, -0.935041, 0.230023, 0.269792, 0.475921, 0.077598, - 66.476936, 47.935780, 39.614838, -0.114345, -0.745427, 0.656707, 0.476866, 0.083402, - 66.817757, 50.157673, 42.196247, 0.043658, 0.284625, 0.957644, 0.463796, 0.083248, - 66.476936, 47.935780, 39.614838, -0.114345, -0.745427, 0.656707, 0.441356, 0.099419, - 67.704620, 49.114616, 38.802193, 0.960994, -0.060818, 0.269798, 0.441228, 0.105273, - 66.817757, 50.157673, 42.196247, 0.043658, 0.284625, 0.957644, 0.428392, 0.100780, - 66.817757, 50.157673, 42.196247, 0.043658, 0.284625, 0.957644, 0.340675, 0.165065, - 67.704620, 49.114616, 38.802193, 0.960994, -0.060818, 0.269798, 0.326706, 0.165435, - 66.866028, 50.472340, 39.078041, 0.150835, 0.983328, 0.101565, 0.329764, 0.161065, - 78.092148, 58.433212, 42.196247, -0.284620, 0.043668, 0.957645, 0.325803, 0.083416, - 77.777451, 58.481453, 39.078041, -0.983327, 0.150835, 0.101573, 0.336523, 0.079088, - 78.821404, 57.274445, 38.802193, -0.230016, -0.935037, 0.269810, 0.339779, 0.083362, - 78.821404, 57.274445, 38.802193, -0.230016, -0.935037, 0.269810, 0.378308, 0.180976, - 80.314034, 58.092381, 39.614838, 0.745430, -0.114333, 0.656706, 0.379254, 0.186780, - 78.092148, 58.433212, 42.196247, -0.284620, 0.043668, 0.957645, 0.366184, 0.186626, - 80.314034, 58.092381, 39.614838, 0.745430, -0.114333, 0.656706, 0.340685, 0.180926, - 79.135185, 59.320042, 38.802193, 0.060816, 0.960997, 0.269788, 0.340557, 0.186779, - 78.092148, 58.433212, 42.196247, -0.284620, 0.043668, 0.957645, 0.327721, 0.182286, - 78.092148, 58.433212, 42.196247, -0.284620, 0.043668, 0.957645, 0.438287, 0.061687, - 79.135185, 59.320042, 38.802193, 0.060816, 0.960997, 0.269788, 0.424319, 0.062057, - 77.777451, 58.481453, 39.078041, -0.983327, 0.150835, 0.101573, 0.427376, 0.057687, - 59.767586, 53.657131, -4.999500, -0.806144, -0.591719, 0.000000, 0.747771, 0.286475, - 74.592690, 51.383041, -4.999500, 0.591719, -0.806144, 0.000000, 0.805046, 0.286475, - 59.767586, 53.657131, 0.999900, -0.806144, -0.591719, 0.000000, 0.747771, 0.305098, - 74.592690, 51.383041, 0.999900, 0.591719, -0.806144, 0.000000, 0.805046, 0.305098, - 74.592690, 51.383041, -4.999500, 0.591719, -0.806144, 0.000000, 0.367424, 0.277007, - 76.866776, 66.208122, -4.999500, 0.988439, -0.151621, 0.000000, 0.424699, 0.277007, - 74.592690, 51.383041, 0.999900, 0.591719, -0.806144, 0.000000, 0.367424, 0.295630, - 76.866776, 66.208122, 0.999900, 0.988439, -0.151621, 0.000000, 0.424699, 0.295630, - 62.041676, 68.482208, 0.999900, -0.988439, 0.151621, 0.000000, 0.515194, 0.258650, - 59.767586, 53.657131, -4.999500, -0.806144, -0.591719, 0.000000, 0.572470, 0.240026, - 59.767586, 53.657131, 0.999900, -0.806144, -0.591719, 0.000000, 0.572470, 0.258650, - 62.041676, 68.482208, -4.999500, -0.988439, 0.151621, 0.000000, 0.515194, 0.240026, - 59.767586, 53.657131, 0.999900, 0.000000, 0.000000, 1.000000, 0.805026, 0.367671, - 74.592690, 51.383041, 0.999900, 0.000000, 0.000000, 1.000000, 0.747789, 0.369366, - 62.041676, 68.482208, 0.999900, 0.000000, 0.000000, 1.000000, 0.802941, 0.321144, - 69.454224, 67.345169, 0.999900, 0.000000, 0.000000, 1.000000, 0.774322, 0.321991, - 76.866776, 66.208122, 0.999900, 0.000000, 0.000000, 1.000000, 0.745704, 0.322839, - 69.454224, 67.345169, -4.999500, 0.151621, 0.988439, 0.000000, 0.396075, 0.351033, - 76.866776, 66.208122, 0.999900, 0.151621, 0.988439, 0.000000, 0.367437, 0.369656, - 76.866776, 66.208122, -4.999500, 0.151621, 0.988439, 0.000000, 0.367437, 0.351033, - 69.454224, 67.345169, 0.999900, 0.151621, 0.988439, 0.000000, 0.396075, 0.369656, - 62.041676, 68.482208, -4.999500, 0.151620, 0.988439, 0.000000, 0.424712, 0.351033, - 62.041676, 68.482208, 0.999900, 0.151620, 0.988439, 0.000000, 0.424712, 0.369656, - -66.208847, -83.092804, 36.180588, 0.096592, -0.590254, 0.801418, 0.554590, 0.100509, - -66.396866, -81.797722, 38.191212, 0.104685, -0.721071, 0.684908, 0.544867, 0.098939, - -67.905663, -82.552383, 35.716282, -0.600818, -0.381097, 0.702697, 0.555927, 0.094424, - -68.277649, -80.851288, 37.960449, -0.756396, -0.423921, 0.498152, 0.544643, 0.091843, - -67.905663, -82.552383, 35.716282, -0.600818, -0.381097, 0.702697, 0.632681, 0.027473, - -68.277649, -80.851288, 37.960449, -0.756396, -0.423921, 0.498152, 0.621400, 0.027777, - -68.757713, -79.837128, 36.087357, -0.924397, -0.263336, 0.275942, 0.624349, 0.021144, - -68.410866, -79.355782, 38.064819, -0.889838, -0.110166, 0.442777, 0.617304, 0.024395, - -66.208847, -83.092804, 36.180588, 0.096592, -0.590254, 0.801418, 0.790599, 0.122015, - -64.735748, -82.092178, 35.716282, 0.684384, -0.194511, 0.702698, 0.789295, 0.116018, - -66.396866, -81.797722, 38.191212, 0.104685, -0.721071, 0.684908, 0.800181, 0.120482, - -64.862862, -80.355530, 37.960449, 0.845717, -0.191323, 0.498155, 0.800417, 0.113492, - -64.735748, -82.092178, 35.716282, 0.684384, -0.194511, 0.702698, 0.436473, 0.141768, - -64.691010, -79.246758, 36.087357, 0.961118, 0.010406, 0.275943, 0.444509, 0.135189, - -64.862862, -80.355530, 37.960449, 0.845717, -0.191323, 0.498155, 0.447760, 0.141728, - -65.160423, -78.883904, 38.064819, 0.884426, 0.147428, 0.442781, 0.451698, 0.138224, - -67.781281, -79.463974, 38.802193, -0.616236, -0.235501, 0.751527, 0.615668, 0.026735, - -66.582718, -80.517632, 39.078041, 0.065677, -0.452404, 0.889392, 0.805735, 0.118597, - -67.781281, -79.463974, 38.802193, -0.616236, -0.235501, 0.751527, 0.538673, 0.091872, - -66.582718, -80.517632, 39.078041, 0.065677, -0.452404, 0.889392, 0.539233, 0.097017, - -65.733253, -79.166634, 38.802193, 0.657759, -0.050541, 0.751531, 0.806298, 0.113529, - -65.733253, -79.166634, 38.802193, 0.657759, -0.050541, 0.751531, 0.453440, 0.140513, - -70.306946, -86.182831, 33.809864, -0.090718, 0.014320, 0.995774, 0.570947, 0.091048, - -67.757271, -88.086029, 33.809864, -0.007864, -0.118281, 0.992949, 0.573596, 0.101361, - -67.757271, -88.086029, 33.809864, -0.007864, -0.118281, 0.992949, 0.774952, 0.135540, - -65.708221, -86.541023, 33.902142, 0.165860, -0.295247, 0.940914, 0.776031, 0.127130, - -67.905663, -82.552383, 35.716282, -0.600818, -0.381097, 0.702697, 0.889437, 0.211324, - -69.317558, -81.514893, 34.531609, -0.699716, -0.156188, 0.697139, 0.897616, 0.214038, - -70.306946, -86.182831, 33.809864, -0.090718, 0.014320, 0.995774, 0.885509, 0.227139, - -69.317558, -81.514893, 34.531609, -0.699716, -0.156188, 0.697139, 0.632947, 0.021339, - -63.677174, -80.696022, 34.531609, 0.715243, 0.049237, 0.697139, 0.435925, 0.135646, - -64.735748, -82.092178, 35.716282, 0.684384, -0.194511, 0.702698, 0.347767, 0.369775, - -61.401218, -84.889893, 33.809864, 0.014320, 0.090718, 0.995774, 0.329814, 0.367624, - -63.677174, -80.696022, 34.531609, 0.715243, 0.049237, 0.697139, 0.347427, 0.363215, - -61.401218, -84.889893, 33.809864, 0.014320, 0.090718, 0.995774, 0.774507, 0.112670, - -65.708221, -86.541023, 33.902142, 0.165860, -0.295247, 0.940914, 0.875120, 0.218204, - -63.304409, -87.439560, 33.809864, -0.118280, 0.007863, 0.992949, 0.867599, 0.215268, - -61.401218, -84.889893, 33.809864, 0.014320, 0.090718, 0.995774, 0.872193, 0.205943, - -58.311165, -88.987976, 36.180588, -0.573775, -0.083306, 0.814765, 0.848688, 0.204228, - -61.759380, -89.488602, 33.902142, -0.371441, -0.053926, 0.926889, 0.857694, 0.216233, - -57.770786, -87.291122, 35.716282, -0.381100, 0.600814, 0.702699, 0.853961, 0.200302, - -57.016094, -88.799950, 38.191212, -0.721068, -0.104688, 0.684909, 0.843354, 0.197794, - -56.069721, -86.919182, 37.960449, -0.423930, 0.756386, 0.498161, 0.848034, 0.192249, - -57.770786, -87.291122, 35.716282, -0.381100, 0.600814, 0.702699, 0.572497, 0.075718, - -56.069721, -86.919182, 37.960449, -0.423930, 0.756386, 0.498161, 0.561216, 0.076022, - -55.055538, -86.439102, 36.087357, -0.263332, 0.924398, 0.275944, 0.564165, 0.069389, - -54.574188, -86.785942, 38.064819, -0.110178, 0.889838, 0.442774, 0.557120, 0.072640, - -57.310574, -90.461060, 35.716282, -0.194516, -0.684380, 0.702700, 0.842681, 0.206034, - -55.573948, -90.333931, 37.960449, -0.191341, -0.845712, 0.498157, 0.835883, 0.198423, - -57.310574, -90.461060, 35.716282, -0.194516, -0.684380, 0.702700, 0.657239, 0.053916, - -54.465122, -90.505836, 36.087357, 0.010390, -0.961114, 0.275956, 0.665275, 0.047338, - -55.573948, -90.333931, 37.960449, -0.191341, -0.845712, 0.498157, 0.668526, 0.053877, - -54.102283, -90.036400, 38.064819, 0.147408, -0.884436, 0.442769, 0.672464, 0.050373, - -54.682369, -87.415520, 38.802193, -0.235513, 0.616227, 0.751530, 0.555484, 0.074980, - -55.735981, -88.614136, 39.078041, -0.452403, -0.065696, 0.889391, 0.839942, 0.193269, - -54.682369, -87.415520, 38.802193, -0.235513, 0.616227, 0.751530, 0.842254, 0.189015, - -54.385033, -89.463608, 38.802193, -0.050551, -0.657779, 0.751513, 0.834966, 0.192719, - -54.385033, -89.463608, 38.802193, -0.050551, -0.657779, 0.751513, 0.674206, 0.052662, - -56.733315, -85.879250, 34.531609, -0.156185, 0.699720, 0.697136, 0.572764, 0.069584, - -57.770786, -87.291122, 35.716282, -0.381100, 0.600814, 0.702699, 0.832226, 0.325432, - -56.733315, -85.879250, 34.531609, -0.156185, 0.699720, 0.697136, 0.831031, 0.318939, - -61.401218, -84.889893, 33.809864, 0.014320, 0.090718, 0.995774, 0.849352, 0.320557, - -62.657940, -91.892410, 33.809864, -0.105452, 0.078715, 0.991304, 0.851753, 0.223320, - -60.108265, -93.795593, 33.809864, 0.116245, -0.086773, 0.989423, 0.840502, 0.222047, - -57.310574, -90.461060, 35.716282, -0.194516, -0.684380, 0.702700, 0.347753, 0.332729, - -60.108265, -93.795593, 33.809864, 0.116245, -0.086773, 0.989423, 0.329800, 0.330579, - -55.914433, -91.519653, 34.531609, 0.049231, -0.715242, 0.697141, 0.347412, 0.326170, - -55.914433, -91.519653, 34.531609, 0.049231, -0.715242, 0.697141, 0.656691, 0.047794, - -62.657940, -91.892410, 33.809864, -0.105452, 0.078715, 0.991304, 0.845396, 0.337092, - -64.206367, -96.885666, 36.180588, -0.083301, 0.573775, 0.814766, 0.843412, 0.355624, - -60.108265, -93.795593, 33.809864, 0.116245, -0.086773, 0.989423, 0.833396, 0.338617, - -64.706993, -93.437447, 33.902142, -0.053928, 0.371440, 0.926890, 0.850578, 0.230674, - -64.206367, -96.885666, 36.180588, -0.083301, 0.573775, 0.814766, 0.834458, 0.233111, - -62.509548, -97.426041, 35.716282, 0.600813, 0.381100, 0.702700, 0.836685, 0.353973, - -64.018349, -98.180748, 38.191212, -0.104686, 0.721070, 0.684908, 0.839402, 0.362518, - -62.137577, -99.127090, 37.960449, 0.756386, 0.423932, 0.498159, 0.831288, 0.362086, - -62.509548, -97.426041, 35.716282, 0.600813, 0.381100, 0.702700, 0.433186, 0.222598, - -62.137577, -99.127090, 37.960449, 0.756386, 0.423932, 0.498159, 0.421904, 0.222901, - -61.657497, -100.141304, 36.087357, 0.924398, 0.263334, 0.275942, 0.424853, 0.216268, - -62.004349, -100.622650, 38.064819, 0.889836, 0.110169, 0.442780, 0.417808, 0.219519, - -65.679466, -97.886246, 35.716282, -0.684381, 0.194514, 0.702700, 0.848305, 0.358844, - -65.552353, -99.622841, 37.960449, -0.845712, 0.191338, 0.498158, 0.843807, 0.367334, - -65.679466, -97.886246, 35.716282, -0.684381, 0.194514, 0.702700, 0.325214, 0.472907, - -65.724197, -100.731720, 36.087357, -0.961118, -0.010410, 0.275942, 0.333250, 0.466329, - -65.552353, -99.622841, 37.960449, -0.845712, 0.191338, 0.498158, 0.336501, 0.472868, - -65.254791, -101.094528, 38.064819, -0.884430, -0.147423, 0.442775, 0.340439, 0.469364, - -62.633942, -100.514458, 38.802193, 0.616230, 0.235499, 0.751533, 0.416172, 0.221859, - -63.832497, -99.460846, 39.078041, -0.065677, 0.452398, 0.889395, 0.836411, 0.367133, - -62.633942, -100.514458, 38.802193, 0.616230, 0.235499, 0.751533, 0.830829, 0.367680, - -64.681969, -100.811790, 38.802193, -0.657760, 0.050542, 0.751530, 0.838337, 0.370827, - -64.681969, -100.811790, 38.802193, -0.657760, 0.050542, 0.751530, 0.342181, 0.471653, - -62.509548, -97.426041, 35.716282, 0.600813, 0.381100, 0.702700, 0.520254, 0.098701, - -61.097664, -98.463486, 34.531609, 0.699715, 0.156185, 0.697140, 0.520216, 0.105266, - -60.108265, -93.795593, 33.809864, 0.116245, -0.086773, 0.989423, 0.502413, 0.101395, - -61.097664, -98.463486, 34.531609, 0.699715, 0.156185, 0.697140, 0.433451, 0.216464, - -67.110802, -92.538910, 33.809864, 0.078714, 0.105452, 0.991304, 0.861720, 0.343934, - -64.706993, -93.437447, 33.902142, -0.053928, 0.371440, 0.926890, 0.851370, 0.343412, - -69.013992, -95.088585, 33.809864, -0.086773, -0.116245, 0.989423, 0.866045, 0.352302, - -65.679466, -97.886246, 35.716282, -0.684381, 0.194514, 0.702700, 0.632597, 0.054854, - -69.013992, -95.088585, 33.809864, -0.086773, -0.116245, 0.989423, 0.614645, 0.052704, - -66.738045, -99.282349, 34.531609, -0.715240, -0.049242, 0.697142, 0.632257, 0.048295, - -66.738045, -99.282349, 34.531609, -0.715240, -0.049242, 0.697142, 0.324666, 0.466786, - -67.110802, -92.538910, 33.809864, 0.078714, 0.105452, 0.991304, 0.496124, 0.222967, - -72.104050, -90.990456, 36.180588, 0.590258, 0.096596, 0.801414, 0.473264, 0.222916, - -69.013992, -95.088585, 33.809864, -0.086773, -0.116245, 0.989423, 0.492303, 0.213146, - -68.655830, -90.489845, 33.902142, 0.295248, 0.165861, 0.940914, 0.869955, 0.341049, - -72.104050, -90.990456, 36.180588, 0.590258, 0.096596, 0.801414, 0.880580, 0.350899, - -72.644432, -92.687263, 35.716282, 0.381099, -0.600812, 0.702701, 0.473999, 0.217013, - -73.399117, -91.178467, 38.191212, 0.721070, 0.104687, 0.684908, 0.465677, 0.221725, - -74.345505, -93.059242, 37.960449, 0.423932, -0.756389, 0.498155, 0.464821, 0.214905, - -72.644432, -92.687263, 35.716282, 0.381099, -0.600812, 0.702701, 0.652669, 0.135375, - -74.345505, -93.059242, 37.960449, 0.423932, -0.756389, 0.498155, 0.660273, 0.129025, - -75.359680, -93.539322, 36.087357, 0.263341, -0.924395, 0.275945, 0.663682, 0.135247, - -75.841026, -93.192482, 38.064819, 0.110178, -0.889838, 0.442774, 0.665909, 0.129151, - -73.104652, -89.517365, 35.716282, 0.194513, 0.684384, 0.702697, 0.886547, 0.347634, - -73.399117, -91.178467, 38.191212, 0.721070, 0.104687, 0.684908, 0.883550, 0.356906, - -74.841270, -89.644447, 37.960449, 0.191326, 0.845717, 0.498153, 0.891075, 0.354486, - -73.104652, -89.517365, 35.716282, 0.194513, 0.684384, 0.702697, 0.466817, 0.032336, - -75.950089, -89.472641, 36.087357, -0.010415, 0.961121, 0.275932, 0.476885, 0.028817, - -74.841270, -89.644447, 37.960449, 0.191326, 0.845717, 0.498153, 0.476896, 0.035595, - -75.950089, -89.472641, 36.087357, -0.010415, 0.961121, 0.275932, 0.897185, 0.351652, - -76.312935, -89.942024, 38.064819, -0.147433, 0.884427, 0.442777, 0.896280, 0.357157, - -75.732849, -92.562904, 38.802193, 0.235508, -0.616235, 0.751525, 0.458097, 0.215167, - -75.841026, -93.192482, 38.064819, 0.110178, -0.889838, 0.442774, 0.459619, 0.212843, - -74.679230, -91.364342, 39.078041, 0.452398, 0.065670, 0.889395, 0.887458, 0.360644, - -74.679230, -91.364342, 39.078041, 0.452398, 0.065670, 0.889395, 0.459989, 0.220081, - -76.030190, -90.514862, 38.802193, 0.050540, 0.657750, 0.751539, 0.893874, 0.359666, - -73.681900, -94.099174, 34.531609, 0.156187, -0.699710, 0.697145, 0.473890, 0.211092, - -75.359680, -93.539322, 36.087357, 0.263341, -0.924395, 0.275945, 0.464916, 0.211515, - -70.306946, -86.182831, 33.809864, -0.090718, 0.014320, 0.995774, 0.881393, 0.332516, - -74.500778, -88.458778, 34.531609, -0.049241, 0.715239, 0.697144, 0.894185, 0.344393, - -68.655830, -90.489845, 33.902142, 0.295248, 0.165861, 0.940914, 0.868005, 0.232646, - -67.757271, -88.086029, 33.809864, -0.007864, -0.118281, 0.992949, 0.874257, 0.225866, - -65.207603, -89.989235, 33.809864, 0.000000, 0.000000, 1.000000, 0.863005, 0.224593, - -67.110802, -92.538910, 33.809864, 0.078714, 0.105452, 0.991304, 0.858411, 0.233918, - 69.373787, 66.820801, 36.180588, -0.089240, -0.581769, 0.808444, 0.496193, 0.127770, - 71.074898, 67.347557, 35.716282, 0.597734, -0.385915, 0.702697, 0.494049, 0.133728, - 69.572205, 68.114326, 38.191212, -0.110478, -0.720209, 0.684904, 0.486586, 0.125649, - 71.460533, 69.045578, 37.960449, 0.752962, -0.429988, 0.498155, 0.482482, 0.131949, - 71.074898, 67.347557, 35.716282, 0.597734, -0.385915, 0.702697, 0.788818, 0.092713, - 71.948723, 70.055832, 36.087357, 0.922252, -0.270755, 0.275941, 0.796853, 0.086134, - 71.460533, 69.045578, 37.960449, 0.752962, -0.429988, 0.498155, 0.800105, 0.092674, - 71.605759, 70.539963, 38.064819, 0.888921, -0.117311, 0.442785, 0.804043, 0.089169, - 69.373787, 66.820801, 36.180588, -0.089240, -0.581769, 0.808444, 0.478117, 0.245222, - 69.572205, 68.114326, 38.191212, -0.110478, -0.720209, 0.684904, 0.487819, 0.243409, - 67.908791, 67.833206, 35.716282, -0.685923, -0.189009, 0.702698, 0.479972, 0.251243, - 68.049835, 69.568771, 37.960449, -0.847226, -0.184527, 0.498155, 0.491616, 0.249835, - 67.908791, 67.833206, 35.716282, -0.685923, -0.189009, 0.702698, 0.477182, 0.105150, - 68.049835, 69.568771, 37.960449, -0.847226, -0.184527, 0.498155, 0.465779, 0.105437, - 67.886894, 70.678909, 36.087357, -0.961003, 0.018121, 0.275942, 0.468753, 0.098742, - 68.359200, 71.037956, 38.064819, -0.883211, 0.154521, 0.442788, 0.461697, 0.101947, - 70.975311, 70.436852, 38.802193, 0.614316, -0.240441, 0.751534, 0.805785, 0.091458, - 69.768326, 69.392860, 39.078041, -0.069315, -0.451862, 0.889391, 0.493953, 0.243285, - 70.975311, 70.436852, 38.802193, 0.614316, -0.240441, 0.751534, 0.477130, 0.129753, - 69.768326, 69.392860, 39.078041, -0.069315, -0.451862, 0.889391, 0.480463, 0.125330, - 68.929764, 70.750633, 38.802193, -0.658138, -0.045255, 0.751536, 0.497070, 0.247811, - 68.929764, 70.750633, 38.802193, -0.658138, -0.045255, 0.751536, 0.460144, 0.104205, - 73.446930, 63.697922, 33.809864, 0.018802, 0.013800, 0.999728, 0.505699, 0.142222, - 68.845482, 63.376713, 34.412979, -0.055862, -0.364169, 0.929656, 0.510784, 0.127625, - 70.882057, 61.815277, 33.227615, -0.022110, -0.016230, 0.999624, 0.515537, 0.134851, - 71.074898, 67.347557, 35.716282, 0.597734, -0.385915, 0.702697, 0.347753, 0.295748, - 73.446930, 63.697922, 33.809864, 0.018802, 0.013800, 0.999728, 0.329801, 0.293598, - 72.495079, 68.373627, 34.531609, 0.698436, -0.161803, 0.697142, 0.347413, 0.289189, - 72.495079, 68.373627, 34.531609, 0.698436, -0.161803, 0.697142, 0.788270, 0.086591, - 66.861450, 69.237793, 34.531609, -0.714821, 0.054981, 0.697143, 0.477267, 0.099144, - 67.908791, 67.833206, 35.716282, -0.685923, -0.189009, 0.702698, 0.458153, 0.180207, - 66.861450, 69.237793, 34.531609, -0.714821, 0.054981, 0.697143, 0.458115, 0.186772, - 64.551872, 65.062386, 33.809864, -0.013801, 0.018803, 0.999728, 0.440312, 0.182901, - 64.551872, 65.062386, 33.809864, -0.013801, 0.018803, 0.999728, 0.467921, 0.259360, - 66.434525, 62.497505, 33.227615, 0.016229, -0.022110, 0.999624, 0.458446, 0.251681, - 68.845482, 63.376713, 34.412979, -0.055862, -0.364169, 0.929656, 0.463545, 0.244612, - 64.873093, 60.460918, 34.412979, 0.364169, -0.055863, 0.929656, 0.394433, 0.464200, - 66.434525, 62.497505, 33.227615, 0.016229, -0.022110, 0.999624, 0.392529, 0.473384, - 64.551872, 65.062386, 33.809864, -0.013801, 0.018803, 0.999728, 0.379420, 0.473471, - 61.429005, 60.989208, 36.180588, 0.581773, -0.089246, 0.808440, 0.383229, 0.455104, - 60.902271, 62.690357, 35.716282, 0.385913, 0.597731, 0.702701, 0.376887, 0.458008, - 60.135487, 61.187626, 38.191212, 0.720205, -0.110482, 0.684908, 0.378018, 0.449663, - 59.204258, 63.075966, 37.960449, 0.429993, 0.752958, 0.498157, 0.369941, 0.451706, - 60.902271, 62.690357, 35.716282, 0.385913, 0.597731, 0.702701, 0.870762, 0.325283, - 58.193966, 63.564144, 36.087357, 0.270745, 0.922256, 0.275937, 0.859749, 0.325139, - 59.204258, 63.075966, 37.960449, 0.429993, 0.752958, 0.498157, 0.863173, 0.318921, - 57.709831, 63.221214, 38.064819, 0.117321, 0.888923, 0.442778, 0.857536, 0.319039, - 61.429005, 60.989208, 36.180588, 0.581773, -0.089246, 0.808440, 0.766935, 0.043521, - 60.135487, 61.187626, 38.191212, 0.720205, -0.110482, 0.684908, 0.757767, 0.043493, - 60.416615, 59.524216, 35.716282, 0.189013, -0.685922, 0.702699, 0.766826, 0.037804, - 58.681068, 59.665272, 37.960449, 0.184540, -0.847221, 0.498157, 0.756020, 0.037083, - 60.416615, 59.524216, 35.716282, 0.189013, -0.685922, 0.702699, 0.520617, 0.077936, - 58.681068, 59.665272, 37.960449, 0.184540, -0.847221, 0.498157, 0.509213, 0.078223, - 57.570892, 59.502300, 36.087357, -0.018112, -0.961001, 0.275950, 0.512187, 0.071528, - 57.211834, 59.974613, 38.064819, -0.154504, -0.883217, 0.442782, 0.505132, 0.074733, - 57.812958, 62.590759, 38.802193, 0.240447, 0.614310, 0.751537, 0.367551, 0.446464, - 57.709831, 63.221214, 38.064819, 0.117321, 0.888923, 0.442778, 0.365841, 0.448590, - 58.856918, 61.383747, 39.078041, 0.451858, -0.069319, 0.889393, 0.373687, 0.445940, - 58.681068, 59.665272, 37.960449, 0.184540, -0.847221, 0.498157, 0.379589, 0.443853, - 57.499191, 60.545162, 38.802193, 0.045266, -0.658145, 0.751529, 0.373338, 0.441754, - 57.499191, 60.545162, 38.802193, 0.045266, -0.658145, 0.751529, 0.503578, 0.076991, - 59.876175, 64.110527, 34.531609, 0.161797, 0.698439, 0.697140, 0.370790, 0.460357, - 58.193966, 63.564144, 36.087357, 0.270745, 0.922256, 0.275937, 0.367371, 0.453289, - 65.752304, 58.049980, 33.227615, 0.022111, 0.016228, 0.999624, 0.405110, 0.463143, - 63.187431, 56.167328, 33.809864, -0.018801, -0.013802, 0.999728, 0.404583, 0.452990, - 60.416615, 59.524216, 35.716282, 0.189013, -0.685922, 0.702699, 0.385844, 0.450718, - 60.416615, 59.524216, 35.716282, 0.189013, -0.685922, 0.702699, 0.434890, 0.252202, - 59.012016, 58.476864, 34.531609, -0.054974, -0.714821, 0.697143, 0.434852, 0.258768, - 63.187431, 56.167328, 33.809864, -0.018801, -0.013802, 0.999728, 0.417049, 0.254897, - 59.012016, 58.476864, 34.531609, -0.054974, -0.714821, 0.697143, 0.520701, 0.071930, - 67.260582, 53.044449, 36.180588, 0.089239, 0.581770, 0.808443, 0.422490, 0.452123, - 67.788879, 56.488537, 34.412979, 0.055862, 0.364169, 0.929656, 0.414064, 0.462710, - 67.260582, 53.044449, 36.180588, 0.089239, 0.581770, 0.808443, 0.710700, 0.176898, - 63.187431, 56.167328, 33.809864, -0.018801, -0.013802, 0.999728, 0.718758, 0.159533, - 65.559479, 52.517696, 35.716282, -0.597735, 0.385913, 0.702698, 0.717801, 0.175113, - 67.062164, 51.750923, 38.191212, 0.110473, 0.720205, 0.684909, 0.713060, 0.182585, - 65.173843, 50.819672, 37.960449, -0.752960, 0.429991, 0.498155, 0.721542, 0.181878, - 65.559479, 52.517696, 35.716282, -0.597735, 0.385913, 0.702698, 0.572493, 0.054019, - 64.685638, 49.809368, 36.087357, -0.922252, 0.270755, 0.275942, 0.561480, 0.053875, - 65.173843, 50.819672, 37.960449, -0.752960, 0.429991, 0.498155, 0.564904, 0.047658, - 65.028610, 49.325291, 38.064819, -0.888923, 0.117315, 0.442779, 0.559267, 0.047775, - 67.062164, 51.750923, 38.191212, 0.110473, 0.720205, 0.684909, 0.424652, 0.446122, - 68.725586, 52.032047, 35.716282, 0.685924, 0.189010, 0.702697, 0.429558, 0.454008, - 68.584526, 50.296528, 37.960449, 0.847220, 0.184538, 0.498160, 0.433094, 0.446911, - 68.725586, 52.032047, 35.716282, 0.685924, 0.189010, 0.702697, 0.415081, 0.186656, - 68.584526, 50.296528, 37.960449, 0.847220, 0.184538, 0.498160, 0.403677, 0.186943, - 68.747482, 49.186340, 36.087357, 0.961003, -0.018121, 0.275945, 0.406652, 0.180248, - 68.275162, 48.827293, 38.064819, 0.883215, -0.154517, 0.442782, 0.399596, 0.183453, - 65.659050, 49.428406, 38.802193, -0.614315, 0.240449, 0.751533, 0.722509, 0.187335, - 65.028610, 49.325291, 38.064819, -0.888923, 0.117315, 0.442779, 0.725261, 0.185700, - 66.866028, 50.472340, 39.078041, 0.069308, 0.451855, 0.889395, 0.427609, 0.441845, - 66.866028, 50.472340, 39.078041, 0.069308, 0.451855, 0.889395, 0.716024, 0.186780, - 67.704620, 49.114616, 38.802193, 0.658143, 0.045260, 0.751532, 0.434148, 0.441407, - 67.704620, 49.114616, 38.802193, 0.658143, 0.045260, 0.751532, 0.398043, 0.185711, - 64.139297, 51.491627, 34.531609, -0.698436, 0.161802, 0.697142, 0.725478, 0.174122, - 64.685638, 49.809368, 36.087357, -0.922252, 0.270755, 0.275942, 0.726472, 0.181357, - 70.199837, 57.367744, 33.227615, -0.016230, 0.022110, 0.999624, 0.417879, 0.471459, - 72.082489, 54.802868, 33.809864, 0.013801, -0.018803, 0.999728, 0.430120, 0.469621, - 69.772911, 50.627502, 34.531609, 0.714825, -0.054984, 0.697139, 0.437420, 0.455298, - 69.772911, 50.627502, 34.531609, 0.714825, -0.054984, 0.697139, 0.415165, 0.180650, - 71.761269, 59.404308, 34.412979, -0.364169, 0.055860, 0.929656, 0.684021, 0.164883, - 70.199837, 57.367744, 33.227615, -0.016230, 0.022110, 0.999624, 0.694336, 0.166313, - 72.082489, 54.802868, 33.809864, 0.013801, -0.018803, 0.999728, 0.693385, 0.176545, - 75.205360, 58.875992, 36.180588, -0.581774, 0.089233, 0.808441, 0.672754, 0.173686, - 75.732086, 57.174942, 35.716282, -0.385917, -0.597730, 0.702700, 0.675000, 0.178297, - 75.205360, 58.875992, 36.180588, -0.581774, 0.089233, 0.808441, 0.825542, 0.089738, - 75.732086, 57.174942, 35.716282, -0.385917, -0.597730, 0.702700, 0.825927, 0.084030, - 76.498878, 58.677578, 38.191212, -0.720207, 0.110467, 0.684908, 0.834705, 0.090002, - 77.430130, 56.789288, 37.960449, -0.429996, -0.752958, 0.498154, 0.836759, 0.083653, - 75.732086, 57.174942, 35.716282, -0.385917, -0.597730, 0.702700, 0.829279, 0.044320, - 78.440399, 56.301052, 36.087357, -0.270770, -0.922245, 0.275950, 0.837315, 0.037742, - 77.430130, 56.789288, 37.960449, -0.429996, -0.752958, 0.498154, 0.840567, 0.044281, - 78.924530, 56.644035, 38.064819, -0.117325, -0.888925, 0.442771, 0.844505, 0.040777, - 76.498878, 58.677578, 38.191212, -0.720207, 0.110467, 0.684908, 0.667754, 0.178727, - 76.217758, 60.341034, 35.716282, -0.189011, 0.685922, 0.702699, 0.666451, 0.170796, - 77.953300, 60.199982, 37.960449, -0.184528, 0.847223, 0.498159, 0.659727, 0.176650, - 76.217758, 60.341034, 35.716282, -0.189011, 0.685922, 0.702699, 0.391818, 0.258652, - 77.953300, 60.199982, 37.960449, -0.184528, 0.847223, 0.498159, 0.380415, 0.258939, - 79.063469, 60.362904, 36.087357, 0.018134, 0.961005, 0.275937, 0.383389, 0.252244, - 79.422531, 59.890587, 38.064819, 0.154535, 0.883211, 0.442783, 0.376334, 0.255449, - 78.821404, 57.274445, 38.802193, -0.240457, -0.614328, 0.751520, 0.846247, 0.043066, - 77.777451, 58.481453, 39.078041, -0.451860, 0.069306, 0.889393, 0.663439, 0.182292, - 78.821404, 57.274445, 38.802193, -0.240457, -0.614328, 0.751520, 0.662781, 0.186635, - 77.430130, 56.789288, 37.960449, -0.429996, -0.752958, 0.498154, 0.668936, 0.184730, - 79.135185, 59.320042, 38.802193, -0.045251, 0.658136, 0.751538, 0.657258, 0.181789, - 79.135185, 59.320042, 38.802193, -0.045251, 0.658136, 0.751538, 0.374780, 0.257707, - 76.758186, 55.754723, 34.531609, -0.161812, -0.698431, 0.697145, 0.828732, 0.038199, - 75.732086, 57.174942, 35.716282, -0.385917, -0.597730, 0.702700, 0.895298, 0.325499, - 72.082489, 54.802868, 33.809864, 0.013801, -0.018803, 0.999728, 0.877345, 0.323348, - 76.758186, 55.754723, 34.531609, -0.161812, -0.698431, 0.697145, 0.894958, 0.318939, - 70.882057, 61.815277, 33.227615, -0.022110, -0.016230, 0.999624, 0.682328, 0.155776, - 73.446930, 63.697922, 33.809864, 0.018802, 0.013800, 0.999728, 0.669367, 0.155472, - 77.622345, 61.388340, 34.531609, 0.054986, 0.714828, 0.697135, 0.660175, 0.168651, - 77.622345, 61.388340, 34.531609, 0.054986, 0.714828, 0.697135, 0.391903, 0.252645, - 68.317184, 59.932625, 33.809864, -0.000000, 0.000000, 1.000000, 0.694624, 0.157580, - 68.317184, 59.932625, 33.809864, -0.000000, 0.000000, 1.000000, 0.404770, 0.471546, - 68.317184, 59.932625, 33.809864, -0.000000, 0.000000, 1.000000, 0.521807, 0.125600, - 68.317184, 59.932625, 33.809864, -0.000000, 0.000000, 1.000000, 0.452628, 0.242237, - 65.752304, 58.049980, 33.227615, 0.022111, 0.016228, 0.999624, 0.707585, 0.157884, - 67.788879, 56.488537, 34.412979, 0.055862, 0.364169, 0.929656, 0.703580, 0.166516, - 0.000000, -149.985046, -7.999199, 0.000000, 0.000000, 1.000000, 0.473883, 0.759710, - -149.985046, 0.000000, -7.999199, 0.000000, 0.000000, 1.000000, 0.253594, 0.980000, - -149.985046, -149.985046, -7.999199, 0.000000, 0.000000, 1.000000, 0.253594, 0.759710, - 0.000000, 0.000000, -7.999199, 0.000000, 0.000000, 1.000000, 0.473883, 0.980000, - -149.985046, 0.000000, -7.999199, 0.000000, 0.000000, 1.000000, 0.020000, 0.526117, - 0.000000, 149.985046, -7.999199, 0.000000, 0.000000, 1.000000, 0.240289, 0.746406, - -149.985046, 149.985046, -7.999199, 0.000000, 0.000000, 1.000000, 0.020000, 0.746406, - 0.000000, 0.000000, -7.999199, 0.000000, 0.000000, 1.000000, 0.240289, 0.526117, - 0.000000, 149.985046, -7.999199, 0.000000, 0.000000, 1.000000, 0.020000, 0.980000, - 149.985046, 0.000000, -7.999199, 0.000000, 0.000000, 1.000000, 0.240289, 0.759710, - 149.985046, 149.985046, -7.999199, 0.000000, 0.000000, 1.000000, 0.240289, 0.980000, - 0.000000, 0.000000, -7.999199, 0.000000, 0.000000, 1.000000, 0.020000, 0.759710, - 149.985046, 0.000000, -7.999199, 0.000000, 0.000000, 1.000000, 0.473883, 0.746406, - 0.000000, -149.985046, -7.999199, 0.000000, 0.000000, 1.000000, 0.253594, 0.526117, - 149.985046, -149.985046, -7.999199, 0.000000, 0.000000, 1.000000, 0.473883, 0.526117, - 0.000000, 0.000000, -7.999199, 0.000000, 0.000000, 1.000000, 0.253594, 0.746406, - -58.057190, -119.987991, -4.999512, 0.000000, 0.000000, 1.000000, 0.693757, 0.539122, - -29.996965, -121.916885, -4.999512, 0.000000, 0.000000, 1.000000, 0.696594, 0.580403, - -56.054863, -96.708878, -4.999512, 0.000000, 0.000000, 1.000000, 0.659509, 0.542068, - -51.171333, -89.990990, -4.999512, 0.000000, 0.000000, 1.000000, 0.649626, 0.549252, - -29.996965, -89.990990, -4.999512, 0.000000, 0.000000, 1.000000, 0.649626, 0.580403, - -29.996998, -149.985001, -4.999500, 0.000000, 0.000000, 1.000000, 0.737887, 0.580403, - -59.993996, -149.985001, -4.999500, 0.000000, 0.000000, 1.000000, 0.737887, 0.536273, - 0.000034, -119.987991, -4.999512, -0.000000, 0.000000, 1.000000, 0.693757, 0.624533, - 0.000034, -89.990990, -4.999512, 0.000000, 0.000000, 1.000000, 0.649626, 0.624533, - 0.000000, -149.985001, -4.999500, -0.000000, 0.000000, 1.000000, 0.737887, 0.624533, - -70.084290, -119.987991, -4.999512, -0.340501, -0.044662, 0.939183, 0.693757, 0.521428, - -68.249924, -149.985001, -4.999500, -0.468265, -0.028635, 0.883124, 0.737887, 0.524127, - -29.996965, -59.993988, -4.999512, -0.000000, -0.000000, 1.000000, 0.605496, 0.580403, - 0.000034, -59.993988, -4.999512, 0.000000, -0.000000, 1.000000, 0.605496, 0.624533, - -29.996977, -31.442408, -4.999487, -0.000000, -0.000001, 1.000000, 0.563492, 0.580403, - -59.993973, -29.996990, -4.999487, -0.000000, -0.000001, 1.000000, 0.561366, 0.536273, - -59.993961, -59.993988, -4.999512, 0.000000, -0.000000, 1.000000, 0.605496, 0.536273, - -59.993961, -66.530563, -4.999512, 0.000000, 0.000000, 1.000000, 0.615112, 0.536273, - 0.000021, -29.996994, -4.999487, 0.000000, -0.000001, 1.000000, 0.561366, 0.624533, - -61.620274, -63.043060, -4.999512, 0.000000, 0.000000, 1.000000, 0.609982, 0.533880, - -60.943657, -69.824913, -4.999512, -0.000000, -0.000000, 1.000000, 0.619959, 0.534876, - -56.777134, -89.990990, -4.999512, -0.000000, -0.000000, 1.000000, 0.649626, 0.541005, - -57.746151, -89.990990, -4.999512, -0.000000, -0.000000, 1.000000, 0.649626, 0.539580, - -68.494781, -59.993988, -4.999512, -0.250366, 0.013182, 0.968061, 0.605496, 0.523767, - -71.245056, -29.996990, -4.999487, -0.387025, -0.013633, 0.921968, 0.561366, 0.519721, - -29.997011, -0.000003, -4.999475, -0.000000, -0.000000, 1.000000, 0.517236, 0.580403, - -59.994007, -0.000003, -4.999475, 0.000000, -0.000000, 1.000000, 0.517236, 0.536273, - -0.000012, -0.000003, -4.999475, 0.000000, -0.000000, 1.000000, 0.517236, 0.624533, - -71.031471, -0.000003, -4.999475, -0.295423, 0.002103, 0.955364, 0.517236, 0.520035, - 29.996994, -28.556038, -4.999487, -0.000000, -0.000001, 1.000000, 0.559246, 0.668663, - 29.996986, -0.000003, -4.999475, 0.000000, -0.000000, 1.000000, 0.517236, 0.668663, - -73.316231, -59.993988, -7.999212, -0.548348, 0.038817, 0.835349, 0.605496, 0.516674, - -69.240883, -63.587269, -4.999512, -0.266185, 0.061976, 0.961927, 0.610782, 0.522669, - -74.241608, -83.800400, -4.999512, -0.453150, 0.057633, 0.889569, 0.640519, 0.515312, - -74.241608, -83.800400, -4.999512, -0.453150, 0.057633, 0.889569, 0.132667, 0.478310, - -73.316231, -59.993988, -7.999212, -0.548348, 0.038817, 0.835349, 0.168089, 0.481074, - -77.221649, -89.990990, -7.999212, -0.775742, -0.008564, 0.630992, 0.123461, 0.484498, - -74.723320, -89.990990, -4.999512, -0.445557, -0.010384, 0.895194, 0.123497, 0.478735, - -73.611053, -119.987991, -7.999212, -0.650708, -0.087683, 0.754248, 0.079772, 0.481396, - -73.611053, -119.987991, -7.999212, -0.650708, -0.087683, 0.754248, 0.693757, 0.516240, - -74.723320, -89.990990, -4.999512, -0.445557, -0.010384, 0.895194, 0.649626, 0.514604, - -71.924004, -99.021179, -4.999512, 0.000000, 0.000000, 1.000000, 0.662911, 0.518722, - -73.183510, -89.990990, -4.999512, 0.000000, 0.000000, 1.000000, 0.649626, 0.516869, - -70.140556, -149.985001, -7.999199, -0.829464, -0.054038, 0.555940, 0.737887, 0.521346, - -70.140556, -149.985001, -7.999199, -0.829464, -0.054038, 0.555940, 0.034738, 0.478362, - -68.249924, -149.985001, -4.999500, -0.468265, -0.028635, 0.883124, 0.034699, 0.473128, - -70.084290, -119.987991, -4.999512, -0.340501, -0.044662, 0.939183, 0.078602, 0.474688, - 59.993996, -29.996994, -4.999487, -0.000000, -0.000001, 1.000000, 0.561366, 0.712794, - 29.997007, -59.993988, -4.999512, -0.000000, -0.000000, 1.000000, 0.605496, 0.668663, - 61.670868, -59.993988, -4.999512, 0.000000, -0.000000, 1.000000, 0.605496, 0.715261, - 59.994007, -89.990990, -4.999512, 0.000000, 0.000000, 1.000000, 0.649626, 0.712794, - 29.997007, -89.990990, -4.999512, 0.000000, 0.000000, 1.000000, 0.649626, 0.668663, - 29.997007, -118.352676, -4.999512, -0.000000, 0.000000, 1.000000, 0.691351, 0.668663, - 61.425850, -119.987991, -4.999512, 0.000000, 0.000000, 1.000000, 0.693757, 0.714900, - 59.993996, -149.985001, -4.999500, 0.000000, 0.000000, 1.000000, 0.737887, 0.712794, - 29.996998, -149.985001, -4.999500, 0.000000, 0.000000, 1.000000, 0.737887, 0.668663, - 68.249924, -149.985001, -4.999500, 0.456661, -0.062147, 0.887468, 0.737887, 0.724939, - 72.332275, -119.987991, -4.999512, 0.450393, -0.039440, 0.891959, 0.693757, 0.730945, - 72.877228, -89.990990, -4.999512, 0.498927, 0.018002, 0.866457, 0.649626, 0.731747, - 69.770798, -59.993988, -4.999512, 0.380264, 0.009387, 0.924831, 0.605496, 0.727177, - 71.337601, -29.996994, -4.999487, 0.399999, -0.015291, 0.916388, 0.561366, 0.729482, - 59.993984, -0.000003, -4.999475, 0.000000, -0.000000, 1.000000, 0.517236, 0.712794, - 72.050331, -0.000003, -4.999475, 0.346373, -0.016996, 0.937943, 0.517236, 0.730530, - 72.332275, -119.987991, -4.999512, 0.450393, -0.039440, 0.891959, 0.069949, 0.446872, - 68.249924, -149.985001, -4.999500, 0.456661, -0.062147, 0.887468, 0.020000, 0.446872, - 70.066391, -149.985001, -7.999199, 0.844739, -0.116053, 0.522444, 0.020000, 0.441877, - 74.698090, -119.987991, -7.999212, 0.786418, -0.065211, 0.614243, 0.069949, 0.441877, - 72.877228, -89.990990, -4.999512, 0.498927, 0.018002, 0.866457, 0.119897, 0.446872, - 74.693695, -89.990990, -7.999212, 0.855014, 0.029691, 0.517754, 0.119897, 0.441877, - 72.588242, -59.993988, -7.999212, 0.733904, 0.018361, 0.679005, 0.169846, 0.441877, - 69.770798, -59.993988, -4.999512, 0.380264, 0.009387, 0.924831, 0.169846, 0.446872, - 71.337601, -29.996994, -4.999487, 0.399999, -0.015291, 0.916388, 0.219795, 0.446872, - 74.155037, -29.996994, -7.999187, 0.724164, -0.028230, 0.689050, 0.219795, 0.441877, - 72.050331, -0.000003, -4.999475, 0.346373, -0.016996, 0.937943, 0.269743, 0.446872, - 75.708969, -0.000003, -7.999176, 0.633689, -0.032827, 0.772891, 0.256744, 0.415261, - 72.050331, -0.000003, -4.999475, 0.346373, -0.016996, 0.937943, 0.256466, 0.422204, - 74.155037, -29.996994, -7.999187, 0.724164, -0.028230, 0.689050, 0.212627, 0.415261, - -59.994007, -0.000003, -4.999475, 0.000000, 0.000000, 1.000000, 0.539600, 0.761318, - -29.997011, -0.000003, -4.999475, 0.000000, 0.000000, 1.000000, 0.583688, 0.761318, - -59.191608, 29.997002, -4.999475, 0.000000, 0.000000, 1.000000, 0.540779, 0.805406, - -29.997011, 29.996998, -4.999475, 0.000000, 0.000000, 1.000000, 0.583688, 0.805406, - -0.000012, -0.000003, -4.999475, 0.000000, 0.000000, 1.000000, 0.627776, 0.761318, - -0.000012, 29.996998, -4.999475, 0.000000, 0.000000, 1.000000, 0.627776, 0.805406, - -71.031471, -0.000003, -4.999475, -0.266436, -0.045938, 0.962757, 0.523378, 0.761318, - -76.203415, 29.997002, -4.999475, -0.443218, -0.028094, 0.895974, 0.515776, 0.805406, - -29.997011, 61.915215, -4.999475, -0.000000, 0.000000, 1.000000, 0.583688, 0.852318, - -59.994007, 59.993996, -4.999475, -0.000000, 0.000000, 1.000000, 0.539600, 0.849494, - -29.996998, 89.990997, -4.999500, 0.000000, 0.000000, 1.000000, 0.583688, 0.893582, - -0.000012, 59.993996, -4.999475, 0.000000, 0.000000, 1.000000, 0.627776, 0.849494, - 0.000000, 89.990997, -4.999500, 0.000000, 0.000000, 1.000000, 0.627776, 0.893582, - -76.583069, 59.993996, -4.999475, -0.490225, 0.017770, 0.871414, 0.515218, 0.849494, - -73.812851, 89.990997, -4.999500, -0.404470, 0.025678, 0.914191, 0.519290, 0.893582, - -59.993996, 89.990997, -4.999500, 0.000000, 0.000000, 1.000000, 0.539600, 0.893582, - -29.996998, 119.987991, -4.999500, 0.000000, 0.000000, 1.000000, 0.583688, 0.937670, - -58.654697, 119.987991, -4.999500, 0.000000, 0.000000, 1.000000, 0.541569, 0.937670, - 0.000000, 119.987991, -4.999500, 0.000000, 0.000000, 1.000000, 0.627776, 0.937670, - -29.996998, 149.985001, -4.999500, 0.000000, 0.000000, 1.000000, 0.583688, 0.981758, - -59.993996, 149.985001, -4.999500, 0.000000, 0.000000, 1.000000, 0.539600, 0.981758, - 0.000000, 149.985001, -4.999500, 0.000000, 0.000000, 1.000000, 0.627776, 0.981758, - -73.425537, 119.987991, -4.999500, -0.499956, 0.047357, 0.864755, 0.519859, 0.937670, - -68.249924, 149.985001, -4.999500, -0.439579, 0.075844, 0.894996, 0.527466, 0.981758, - 29.996998, 89.990997, -4.999500, -0.000000, 0.000000, 1.000000, 0.671865, 0.893582, - 29.996986, 58.568493, -4.999475, -0.000000, 0.000000, 1.000000, 0.671864, 0.847399, - 52.348866, 59.993996, -4.999475, -0.000000, 0.000000, 1.000000, 0.704716, 0.849494, - 59.993996, 89.990997, -4.999500, 0.000000, 0.000000, 1.000000, 0.715953, 0.893582, - 29.996986, 29.996998, -4.999475, 0.000000, 0.000000, 1.000000, 0.671864, 0.805406, - 59.993984, 29.997002, -4.999475, 0.000000, 0.000000, 1.000000, 0.715953, 0.805406, - 29.996986, -0.000003, -4.999475, 0.000000, 0.000000, 1.000000, 0.671864, 0.761318, - 59.993984, -0.000003, -4.999475, 0.000000, 0.000000, 1.000000, 0.715953, 0.761318, - -73.425537, 119.987991, -4.999500, -0.499956, 0.047357, 0.864755, 0.072477, 0.202447, - -68.249924, 149.985001, -4.999500, -0.439579, 0.075844, 0.894996, 0.023380, 0.202447, - -70.140556, 149.985001, -7.999199, -0.837116, 0.144434, 0.527613, 0.023380, 0.197537, - -75.316162, 119.987991, -7.999199, -0.839777, 0.076203, 0.537557, 0.072477, 0.197537, - -73.812851, 89.990997, -4.999500, -0.404470, 0.025678, 0.914191, 0.121574, 0.202447, - -76.466728, 89.990997, -7.999199, -0.752028, 0.048879, 0.657317, 0.121574, 0.197537, - -76.583069, 59.993996, -4.999475, -0.490225, 0.017770, 0.871414, 0.170671, 0.202447, - -78.473694, 59.993996, -7.999176, -0.845614, 0.029750, 0.532966, 0.170671, 0.197537, - -78.601768, 29.997002, -7.999176, -0.782913, -0.045315, 0.620478, 0.219768, 0.197537, - -76.203415, 29.997002, -4.999475, -0.443218, -0.028094, 0.895974, 0.219768, 0.202447, - -75.393929, -0.000003, -7.999176, -0.582087, -0.096447, 0.807386, 0.268865, 0.197537, - -75.393929, -0.000003, -7.999176, -0.582087, -0.096447, 0.807386, 0.516966, 0.761318, - 72.050331, -0.000003, -4.999475, 0.307883, -0.045540, 0.950334, 0.733672, 0.761318, - 76.487267, 29.997002, -4.999475, 0.415464, -0.039611, 0.908747, 0.740194, 0.805406, - 75.708969, -0.000003, -7.999176, 0.641187, -0.092811, 0.761751, 0.739050, 0.761318, - 79.127716, 29.997002, -7.999176, 0.747186, -0.069299, 0.660992, 0.212889, 0.235864, - 76.487267, 29.997002, -4.999475, 0.415464, -0.039611, 0.908747, 0.212657, 0.229940, - 75.708969, -0.000003, -7.999176, 0.641187, -0.092811, 0.761751, 0.257393, 0.230771, - 78.656815, 59.993996, -4.999475, 0.412895, 0.020378, 0.910551, 0.168224, 0.233805, - 81.606857, 59.993996, -7.999176, 0.712618, 0.032019, 0.700821, 0.168438, 0.240034, - 76.231400, 89.990997, -7.999199, 0.847223, 0.083818, 0.524584, 0.124432, 0.236480, - 77.582886, 67.588478, -4.999500, 0.487976, 0.069006, 0.870125, 0.157066, 0.233187, - 74.414940, 89.990997, -4.999500, 0.478904, 0.045368, 0.876694, 0.124154, 0.231365, - 74.694786, 119.987991, -7.999199, 0.852229, 0.085906, 0.516067, 0.080208, 0.236700, - 73.978279, 98.515289, -4.999500, 0.490537, 0.025128, 0.871058, 0.111586, 0.231428, - 72.878319, 119.987991, -4.999500, 0.501160, 0.052254, 0.863775, 0.079930, 0.231586, - 70.066391, 149.985001, -7.999199, 0.848037, 0.130848, 0.513529, 0.036159, 0.233881, - 68.249924, 149.985001, -4.999500, 0.451853, 0.069719, 0.889364, 0.035881, 0.228766, - 58.880199, 119.987991, -4.999500, 0.000000, 0.000000, 1.000000, 0.714316, 0.937670, - 72.878319, 119.987991, -4.999500, 0.501160, 0.052254, 0.863775, 0.734889, 0.937670, - 68.249924, 149.985001, -4.999500, 0.451853, 0.069719, 0.889364, 0.728087, 0.981758, - 59.993996, 149.985001, -4.999500, 0.000000, 0.000000, 1.000000, 0.715953, 0.981758, - 29.996998, 149.985001, -4.999500, 0.000000, 0.000000, 1.000000, 0.671865, 0.981758, - 29.996998, 119.987991, -4.999500, 0.000000, 0.000000, 1.000000, 0.671865, 0.937670, - 59.611111, 100.302933, -4.999500, -0.000000, 0.000000, 1.000000, 0.715390, 0.908738, - 64.360870, 98.443123, -4.999499, -0.000000, 0.000000, 1.000000, 0.722371, 0.906005, - 62.292465, 89.990997, -4.999500, 0.000000, -0.000000, 1.000000, 0.719331, 0.893582, - 73.416153, 89.990997, -4.999500, 0.000000, -0.000000, 1.000000, 0.735680, 0.893582, - 72.125191, 98.501381, -4.999500, 0.000000, 0.000000, 1.000000, 0.733782, 0.906090, - 63.527645, 79.230560, -4.999500, 0.000001, 0.000001, 1.000000, 0.721146, 0.877767, - 59.993984, 59.993996, -4.999475, 0.000000, 0.000001, 1.000000, 0.715953, 0.849494, - 61.216274, 59.993996, -4.999475, 0.000000, 0.000001, 1.000000, 0.717749, 0.849494, - 59.993984, 56.469688, -4.999475, 0.000000, 0.000000, 1.000000, 0.715953, 0.844314, - 61.181782, 56.376266, -4.999475, 0.000000, 0.000000, 1.000000, 0.717698, 0.844177, - 73.978279, 98.515289, -4.999500, 0.490537, 0.025128, 0.871058, 0.736506, 0.906111, - 61.062778, 53.733334, -4.999475, 0.000000, 0.000000, 1.000000, 0.717523, 0.840292, - 74.630280, 51.395844, -4.999475, 0.000000, 0.000000, 1.000000, 0.737464, 0.836857, - 76.442787, 59.993996, -4.999475, 0.000000, 0.000001, 1.000000, 0.740128, 0.849494, - 76.903969, 66.889465, -4.999500, -0.000000, 0.000003, 1.000000, 0.740806, 0.859629, - 74.414940, 89.990997, -4.999500, 0.478904, 0.045368, 0.876694, 0.737148, 0.893582, - 77.582886, 67.588478, -4.999500, 0.487976, 0.069006, 0.870125, 0.741804, 0.860656, - 78.656815, 59.993996, -4.999475, 0.412895, 0.020378, 0.910551, 0.743382, 0.849494, - -74.171883, -29.996990, -7.999187, -0.715526, -0.024847, 0.698144, 0.212121, 0.481784, - -71.245056, -29.996990, -4.999487, -0.387025, -0.013633, 0.921968, 0.212211, 0.475649, - -75.393929, -0.000003, -7.999176, -0.580868, 0.001060, 0.813997, 0.256108, 0.482813, - -75.393929, -0.000003, -7.999176, -0.580868, 0.001060, 0.813997, 0.517236, 0.513617, - -56.405537, -96.759964, -4.999512, 0.000000, 0.000000, 1.000000, 0.659585, 0.541552, - -57.057632, -96.261375, -4.999512, -0.000000, 0.000000, 1.000000, 0.658851, 0.540593, - -71.917862, -83.608429, -4.999512, 0.000000, 0.000000, 1.000000, 0.640237, 0.518731, - -71.027245, -76.978149, -4.999512, 0.000000, -0.000000, 1.000000, 0.630482, 0.520041, - -67.477661, -63.461353, -4.999512, -0.000000, -0.000000, 1.000000, 0.610597, 0.525263 - ], - "vertexsize": 7944, - "indices": [ - 0, 1, 2, 1, 3, 2, 4, 5, 6, 7, 4, 6, - 5, 8, 6, 3, 1, 9, 10, 11, 12, 13, 14, 15, - 16, 4, 7, 0, 2, 17, 18, 16, 7, 18, 19, 16, - 20, 19, 18, 21, 20, 18, 22, 23, 17, 23, 0, 17, - 24, 23, 22, 24, 22, 25, 26, 19, 20, 27, 23, 24, - 28, 29, 30, 29, 31, 30, 30, 31, 32, 32, 31, 33, - 34, 35, 36, 37, 35, 34, 38, 37, 34, 37, 38, 39, - 33, 31, 40, 36, 41, 34, 31, 42, 40, 40, 42, 43, - 41, 44, 45, 41, 45, 34, 44, 46, 45, 42, 47, 43, - 42, 48, 47, 48, 49, 47, 50, 51, 52, 51, 53, 52, - 54, 51, 50, 55, 54, 50, 56, 48, 42, 57, 54, 55, - 31, 58, 56, 31, 56, 42, 59, 58, 31, 29, 59, 31, - 60, 54, 57, 61, 54, 60, 59, 29, 28, 62, 61, 60, - 63, 64, 65, 63, 66, 64, 67, 66, 63, 64, 66, 68, - 69, 70, 71, 72, 70, 69, 73, 70, 72, 74, 72, 69, - 69, 71, 75, 71, 76, 75, 75, 76, 77, 76, 78, 77, - 79, 80, 81, 82, 79, 81, 66, 82, 68, 82, 81, 68, - 78, 83, 77, 84, 85, 86, 87, 88, 89, 85, 90, 86, - 91, 92, 93, 92, 91, 94, 91, 95, 94, 94, 95, 96, - 97, 98, 99, 100, 98, 97, 101, 98, 100, 99, 98, 102, - 98, 103, 102, 102, 103, 104, 105, 106, 107, 108, 105, 107, - 94, 96, 108, 96, 105, 108, 103, 109, 104, 110, 101, 100, - 111, 112, 113, 111, 114, 112, 115, 114, 111, 112, 114, 116, - 117, 118, 119, 120, 118, 117, 121, 120, 117, 122, 118, 120, - 117, 119, 123, 119, 124, 123, 123, 124, 125, 124, 126, 125, - 127, 128, 129, 130, 127, 129, 114, 130, 116, 130, 129, 116, - 126, 131, 125, 132, 133, 134, 135, 136, 137, 133, 138, 134, - 139, 140, 141, 140, 142, 141, 143, 144, 145, 146, 143, 145, - 144, 147, 145, 142, 140, 148, 149, 150, 151, 152, 153, 154, - 155, 143, 146, 139, 141, 156, 157, 155, 146, 157, 158, 155, - 159, 158, 157, 160, 159, 157, 161, 162, 156, 162, 139, 156, - 163, 162, 161, 163, 161, 164, 165, 158, 159, 166, 162, 163, - 167, 168, 169, 169, 168, 170, 171, 172, 173, 174, 172, 171, - 173, 172, 175, 170, 176, 169, 177, 178, 179, 180, 181, 182, - 183, 184, 185, 186, 184, 183, 186, 183, 187, 188, 186, 187, - 189, 186, 188, 190, 191, 192, 193, 190, 192, 193, 194, 190, - 195, 188, 187, 196, 193, 192, 192, 191, 197, 197, 191, 198, - 199, 200, 201, 201, 200, 202, 200, 203, 202, 203, 204, 202, - 205, 206, 207, 208, 205, 207, 209, 205, 208, 208, 210, 209, - 204, 211, 202, 206, 205, 212, 202, 211, 213, 211, 214, 213, - 212, 215, 216, 212, 205, 215, 216, 215, 217, 213, 214, 218, - 219, 220, 221, 221, 220, 222, 223, 224, 225, 226, 224, 223, - 225, 224, 227, 222, 228, 221, 229, 230, 231, 232, 233, 234, - 235, 236, 237, 238, 236, 235, 238, 235, 239, 240, 238, 239, - 241, 238, 240, 242, 243, 244, 245, 242, 244, 245, 246, 242, - 247, 240, 239, 248, 245, 244, 244, 243, 249, 249, 243, 250, - 251, 252, 253, 253, 254, 251, 251, 254, 255, 254, 256, 255, - 257, 258, 259, 260, 257, 259, 261, 260, 259, 258, 262, 259, - 259, 262, 263, 262, 264, 263, 265, 266, 267, 268, 266, 265, - 254, 268, 256, 256, 268, 265, 263, 264, 269, 270, 260, 261, - 271, 272, 273, 271, 273, 274, 275, 271, 274, 273, 276, 274, - 277, 278, 279, 280, 277, 279, 281, 277, 280, 282, 280, 279, - 277, 283, 278, 278, 283, 284, 274, 276, 285, 285, 276, 286, - 287, 288, 289, 289, 288, 290, 291, 292, 293, 294, 292, 291, - 293, 292, 295, 290, 296, 289, 297, 298, 299, 300, 301, 302, - 303, 304, 305, 305, 306, 303, 303, 306, 307, 306, 308, 307, - 309, 310, 311, 312, 309, 311, 313, 312, 311, 310, 314, 311, - 311, 314, 315, 314, 316, 315, 317, 318, 319, 320, 318, 317, - 306, 320, 308, 308, 320, 317, 315, 316, 321, 322, 312, 313, - 323, 324, 325, 323, 325, 326, 327, 323, 326, 325, 328, 326, - 329, 330, 331, 332, 329, 331, 333, 329, 332, 334, 332, 331, - 329, 335, 330, 330, 335, 336, 326, 328, 337, 337, 328, 338, - 339, 340, 341, 341, 340, 342, 343, 344, 345, 346, 344, 343, - 345, 344, 347, 342, 348, 341, 349, 350, 351, 352, 353, 354, - 355, 356, 357, 358, 359, 360, 361, 362, 363, 364, 365, 366, - 367, 368, 369, 370, 371, 372, 373, 374, 375, 376, 377, 378, - 379, 380, 381, 382, 383, 384, 385, 386, 387, 388, 389, 390, - 391, 392, 393, 392, 394, 393, 395, 45, 396, 45, 46, 396, - 34, 45, 395, 397, 34, 395, 398, 392, 391, 399, 34, 397, - 400, 401, 398, 400, 398, 391, 402, 401, 400, 403, 402, 400, - 404, 34, 399, 38, 34, 404, 402, 403, 405, 39, 38, 404, - 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, - 418, 419, 420, 419, 421, 420, 422, 423, 424, 423, 425, 424, - 426, 427, 428, 429, 426, 428, 430, 431, 432, 431, 433, 432, - 432, 433, 434, 435, 436, 437, 435, 438, 436, 437, 436, 439, - 437, 439, 440, 441, 442, 443, 444, 445, 446, 447, 448, 449, - 450, 451, 452, 453, 454, 455, 455, 454, 456, 457, 458, 459, - 459, 458, 460, 461, 457, 459, 462, 457, 461, 463, 453, 455, - 464, 462, 461, 465, 463, 466, 465, 453, 463, 467, 465, 466, - 468, 465, 467, 469, 464, 461, 470, 469, 461, 467, 471, 468, - 472, 469, 470, 473, 474, 475, 476, 477, 478, 479, 480, 481, - 482, 483, 484, 485, 486, 487, 488, 489, 490, 491, 492, 493, - 494, 495, 496, 497, 498, 499, 500, 501, 502, 503, 504, 505, - 506, 507, 508, 509, 510, 511, 511, 510, 512, 513, 514, 515, - 515, 514, 516, 517, 518, 519, 520, 518, 517, 521, 522, 523, - 523, 522, 524, 524, 522, 525, 526, 527, 528, 526, 529, 527, - 530, 529, 526, 530, 531, 529, 532, 533, 534, 533, 535, 534, - 536, 537, 538, 537, 539, 538, 540, 541, 542, 541, 543, 542, - 544, 545, 546, 545, 547, 546, 548, 539, 537, 549, 542, 543, - 550, 535, 551, 535, 533, 551, 552, 549, 543, 546, 547, 553, - 532, 534, 554, 555, 532, 554, 556, 557, 540, 558, 559, 560, - 536, 538, 561, 562, 545, 544, 563, 564, 565, 557, 566, 540, - 540, 566, 541, 567, 568, 569, 568, 570, 569, 568, 571, 570, - 570, 572, 569, 570, 573, 572, 573, 574, 572, 575, 576, 577, - 576, 578, 577, 570, 579, 573, 579, 580, 573, 581, 582, 583, - 582, 584, 583, 585, 578, 576, 586, 573, 580, 587, 574, 586, - 574, 573, 586, 588, 586, 580, 583, 584, 589, 575, 577, 590, - 591, 592, 593, 594, 570, 571, 594, 595, 570, 570, 595, 579, - 596, 597, 598, 599, 582, 581, 600, 601, 602, 594, 603, 604, - 601, 605, 602, 601, 606, 605, 606, 607, 605, 608, 609, 610, - 609, 611, 610, 601, 612, 606, 612, 613, 606, 614, 615, 616, - 615, 617, 616, 618, 611, 609, 619, 606, 613, 620, 607, 619, - 607, 606, 619, 621, 619, 613, 616, 617, 622, 623, 624, 625, - 608, 610, 626, 627, 601, 628, 627, 629, 601, 601, 629, 612, - 630, 631, 632, 633, 615, 614, 634, 635, 636, 627, 637, 638, - 635, 639, 636, 635, 640, 639, 640, 641, 639, 642, 643, 644, - 643, 645, 644, 638, 646, 647, 646, 648, 647, 649, 650, 651, - 652, 653, 648, 654, 655, 641, 656, 647, 648, 654, 641, 657, - 641, 640, 657, 658, 656, 648, 648, 653, 658, 639, 659, 636, - 639, 660, 659, 637, 661, 638, 638, 661, 646, 646, 661, 662, - 662, 652, 646, 663, 664, 560, 665, 664, 663, 665, 567, 664, - 665, 568, 567, 665, 571, 568, 665, 663, 666, 665, 666, 603, - 665, 603, 594, 665, 594, 571, 667, 668, 669, 669, 668, 670, - 671, 672, 673, 673, 672, 674, 675, 676, 677, 677, 676, 678, - 679, 680, 681, 681, 680, 682, 683, 673, 674, 684, 678, 676, - 685, 686, 670, 670, 686, 669, 687, 678, 684, 680, 688, 682, - 667, 689, 668, 690, 689, 667, 690, 691, 689, 692, 693, 694, - 671, 695, 672, 696, 679, 681, 697, 698, 699, 675, 677, 700, - 701, 675, 700, 701, 702, 675, 703, 704, 705, 703, 705, 706, - 706, 705, 707, 706, 707, 708, 708, 707, 709, 710, 711, 712, - 712, 711, 713, 714, 715, 716, 716, 715, 717, 718, 719, 720, - 720, 719, 721, 722, 709, 723, 724, 725, 708, 722, 724, 709, - 709, 724, 708, 726, 725, 724, 719, 727, 721, 707, 728, 729, - 707, 705, 728, 730, 703, 706, 730, 706, 731, 706, 732, 731, - 733, 734, 735, 736, 718, 720, 730, 731, 737, 730, 737, 738, - 739, 740, 741, 739, 741, 742, 742, 741, 743, 744, 745, 746, - 746, 745, 747, 737, 748, 749, 749, 748, 750, 751, 752, 753, - 753, 752, 754, 755, 743, 756, 757, 750, 748, 755, 758, 743, - 743, 758, 742, 759, 750, 757, 752, 760, 754, 741, 740, 761, - 741, 761, 762, 763, 738, 737, 763, 737, 764, 737, 749, 764, - 749, 765, 764, 766, 751, 753, 767, 768, 769, 767, 769, 770, - 770, 769, 771, 772, 773, 774, 774, 773, 775, 776, 777, 778, - 778, 777, 779, 770, 780, 781, 781, 780, 782, 783, 784, 785, - 785, 784, 786, 787, 778, 779, 788, 782, 780, 789, 788, 790, - 790, 788, 780, 791, 782, 788, 784, 792, 786, 776, 793, 777, - 794, 795, 796, 797, 767, 770, 797, 770, 798, 770, 781, 798, - 781, 799, 798, 800, 783, 785, 801, 767, 797, 801, 768, 767, - 802, 738, 763, 803, 691, 690, 804, 702, 701, 802, 704, 703, - 802, 703, 730, 801, 805, 806, 807, 808, 809, 807, 810, 808, - 811, 812, 813, 811, 814, 812, 815, 816, 817, 815, 818, 816, - 819, 820, 821, 819, 822, 820, 823, 824, 825, 825, 824, 826, - 827, 826, 824, 824, 823, 828, 823, 829, 828, 824, 830, 827, - 830, 831, 827, 828, 832, 824, 832, 830, 824, 823, 833, 829, - 825, 833, 823, 833, 834, 829, 827, 831, 835, 835, 826, 827, - 831, 836, 835, 835, 836, 837, 835, 837, 838, 839, 835, 838, - 840, 835, 839, 826, 835, 840, 836, 841, 837, 840, 839, 842, - 842, 843, 840, 840, 843, 844, 844, 843, 845, 839, 846, 842, - 839, 838, 846, 838, 847, 846, 838, 837, 848, 837, 841, 848, - 849, 838, 848, 841, 850, 848, 849, 851, 838, 851, 847, 838, - 841, 836, 852, 850, 841, 853, 841, 852, 853, 854, 846, 847, - 854, 855, 846, 855, 854, 856, 857, 858, 859, 860, 857, 859, - 859, 861, 860, 862, 833, 863, 863, 833, 864, 865, 863, 864, - 865, 856, 863, 862, 866, 833, 867, 868, 869, 853, 852, 870, - 870, 852, 871, 872, 870, 871, 872, 871, 873, 871, 874, 873, - 873, 874, 875, 876, 873, 875, 876, 875, 877, 875, 878, 877, - 830, 875, 874, 831, 830, 874, 831, 874, 871, 830, 832, 875, - 832, 878, 875, 877, 879, 876, 879, 880, 876, 873, 876, 881, - 876, 880, 881, 836, 831, 871, 836, 871, 852, 872, 873, 882, - 873, 881, 882, 872, 882, 870, 882, 883, 870, 870, 883, 884, - 884, 853, 870, 883, 885, 884, 886, 887, 888, 889, 886, 888, - 890, 886, 889, 891, 890, 889, 891, 892, 890, 892, 893, 890, - 894, 893, 892, 895, 894, 892, 896, 894, 895, 897, 898, 899, - 900, 901, 902, 901, 903, 902, 901, 904, 903, 904, 905, 903, - 900, 902, 906, 902, 907, 906, 902, 903, 908, 903, 905, 908, - 909, 902, 908, 902, 909, 907, 909, 908, 910, 908, 911, 910, - 905, 911, 908, 911, 912, 910, 909, 913, 907, 914, 913, 909, - 915, 914, 909, 909, 910, 915, 910, 912, 916, 917, 910, 916, - 917, 915, 910, 912, 918, 916, 916, 918, 919, 916, 919, 920, - 917, 916, 920, 918, 921, 919, 922, 914, 915, 922, 915, 917, - 920, 923, 917, 923, 922, 917, 912, 911, 924, 911, 925, 924, - 924, 925, 926, 927, 924, 926, 925, 928, 926, 928, 929, 926, - 905, 928, 925, 905, 904, 928, 904, 930, 928, 929, 928, 930, - 931, 929, 930, 911, 905, 925, 932, 933, 934, 935, 932, 934, - 936, 932, 935, 937, 936, 935, 938, 936, 937, 939, 938, 937, - 939, 940, 938, 940, 941, 938, 940, 942, 941, 943, 906, 907, - 931, 944, 929, 944, 945, 929, 945, 944, 946, 947, 948, 949, - 950, 948, 947, 951, 950, 947, 951, 952, 950, 950, 952, 953, - 952, 954, 953, 952, 955, 954, 954, 955, 956, 955, 957, 956, - 955, 958, 957, 958, 959, 957, 960, 961, 962, 963, 960, 962, - 960, 963, 964, 965, 960, 964, 960, 965, 966, 960, 966, 961, - 965, 924, 966, 918, 965, 964, 921, 918, 964, 918, 912, 965, - 912, 924, 965, 966, 967, 961, 966, 927, 967, 924, 927, 966, - 927, 968, 967, 967, 968, 969, 970, 967, 969, 971, 968, 927, - 971, 969, 968, 972, 971, 927, 972, 973, 971, 973, 972, 974, - 975, 973, 974, 961, 967, 970, 976, 961, 970, 970, 969, 976, - 975, 974, 977, 974, 929, 977, 929, 978, 977, 977, 978, 975, - 945, 978, 929, 978, 979, 975, 979, 973, 975, 973, 979, 971, - 979, 980, 971, 980, 969, 971, 969, 981, 976, 982, 981, 969, - 979, 982, 980, 980, 982, 969, 979, 983, 982, 945, 983, 978, - 983, 979, 978, 972, 926, 974, 929, 974, 926, 927, 926, 972, - 984, 858, 985, 984, 985, 986, 847, 851, 987, 825, 826, 844, - 840, 844, 826, 825, 844, 988, 825, 988, 833, 833, 988, 864, - 988, 844, 989, 988, 989, 864, 989, 845, 864, 845, 989, 844, - 845, 865, 864, 865, 845, 990, 990, 856, 865, 991, 856, 990, - 856, 991, 855, 991, 992, 855, 846, 855, 992, 842, 846, 992, - 845, 843, 990, 990, 843, 991, 991, 843, 992, 992, 843, 842 - ], - "indexnum": 2352 - } - ] - } - ], - "material": [ - { - "version": "1.2", - "base": [ - { - "filename": "CompleteMap.png" - } - ] - } - ], - "skin": [ - { - "id": "obj", - "tansform": [ 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, -1.000000, 0.000000, 0.000000, 1.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 1.000000] - } - ], - "animation": [] -} \ No newline at end of file diff --git a/tests/cpp-tests/Resources/configs/config-test-ok.plist b/tests/cpp-tests/Resources/configs/config-test-ok.plist index a4d08007cc..0b4c9e5a26 100755 --- a/tests/cpp-tests/Resources/configs/config-test-ok.plist +++ b/tests/cpp-tests/Resources/configs/config-test-ok.plist @@ -4,6 +4,10 @@ data + Japanese + ご静聴ありがとうございました！！ご静聴ありがとうございました！！ + Chinese + 中国中国中国中国中国中国中国中国中国中国 test.1 test1 test.2 diff --git a/tests/cpp-tests/Resources/fonts/Schwarzwald Regular.ttf b/tests/cpp-tests/Resources/fonts/Schwarzwald.ttf similarity index 100% rename from tests/cpp-tests/Resources/fonts/Schwarzwald Regular.ttf rename to tests/cpp-tests/Resources/fonts/Schwarzwald.ttf diff --git a/tests/cpp-tests/proj.android/jni/Android.mk b/tests/cpp-tests/proj.android/jni/Android.mk index 75950d8494..bb2c8fb025 100644 --- a/tests/cpp-tests/proj.android/jni/Android.mk +++ b/tests/cpp-tests/proj.android/jni/Android.mk @@ -10,7 +10,7 @@ LOCAL_SRC_FILES := main.cpp LOCAL_C_INCLUDES := ../../Classes -LOCAL_WHOLE_STATIC_LIBRARIES := cocos_cpp_tests_common +LOCAL_STATIC_LIBRARIES := cocos_cpp_tests_common include $(BUILD_SHARED_LIBRARY) diff --git a/tests/cpp-tests/proj.ios/Classes/testsAppDelegate.mm b/tests/cpp-tests/proj.ios/Classes/testsAppDelegate.mm index 963ac7f9e1..2e725af131 100644 --- a/tests/cpp-tests/proj.ios/Classes/testsAppDelegate.mm +++ b/tests/cpp-tests/proj.ios/Classes/testsAppDelegate.mm @@ -81,7 +81,7 @@ static AppDelegate s_sharedApplication; [[UIApplication sharedApplication] setStatusBarHidden:true]; // IMPORTANT: Setting the GLView should be done after creating the RootViewController - cocos2d::GLView *glview = cocos2d::GLView::createWithEAGLView(eaglView); + cocos2d::GLView *glview = cocos2d::GLViewImpl::createWithEAGLView(eaglView); cocos2d::Director::getInstance()->setOpenGLView(glview); app->run(); diff --git a/tests/cpp-tests/proj.ios/Info.plist b/tests/cpp-tests/proj.ios/Info.plist index 467758a542..0d0aff0b3b 100644 --- a/tests/cpp-tests/proj.ios/Info.plist +++ b/tests/cpp-tests/proj.ios/Info.plist @@ -65,7 +65,7 @@ fonts/Abberancy.ttf fonts/Abduction.ttf fonts/Paint Boy.ttf - fonts/Schwarzwald Regular.ttf + fonts/Schwarzwald.ttf fonts/Scissor Cuts.ttf UIPrerenderedIcon diff --git a/tests/cpp-tests/proj.mac/Info.plist b/tests/cpp-tests/proj.mac/Info.plist index 4709c4705e..c6a169726f 100644 --- a/tests/cpp-tests/proj.mac/Info.plist +++ b/tests/cpp-tests/proj.mac/Info.plist @@ -36,7 +36,7 @@ fonts/Abberancy.ttf fonts/Abduction.ttf fonts/Paint Boy.ttf - fonts/Schwarzwald Regular.ttf + fonts/Schwarzwald.ttf fonts/Scissor Cuts.ttf ATSApplicationFontsPath diff --git a/tests/cpp-tests/proj.win32/cpp-tests.vcxproj b/tests/cpp-tests/proj.win32/cpp-tests.vcxproj index b842c9b028..cd2cbd3f0a 100644 --- a/tests/cpp-tests/proj.win32/cpp-tests.vcxproj +++ b/tests/cpp-tests/proj.win32/cpp-tests.vcxproj @@ -74,7 +74,7 @@ Disabled ..\Classes;$(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\network;$(EngineRoot)external;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\curl\include\win32;$(EngineRoot)external\websockets\win32\include;$(EngineRoot)extensions;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USE_MATH_DEFINES;GL_GLEXT_PROTOTYPES;CC_ENABLE_CHIPMUNK_INTEGRATION=1;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;_USE_MATH_DEFINES;GL_GLEXT_PROTOTYPES;CC_ENABLE_CHIPMUNK_INTEGRATION=1;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;COCOS2DXWIN32_EXPORTS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -90,7 +90,7 @@ true Windows MachineX86 - libcurl_imp.lib;websockets.lib;%(AdditionalDependencies) + libcurl_imp.lib;websockets.lib;opengl32.lib;glew32.lib;%(AdditionalDependencies) @@ -118,7 +118,7 @@ false - libcurl_imp.lib;websockets.lib;%(AdditionalDependencies) + libcurl_imp.lib;websockets.lib;opengl32.lib;glew32.lib;%(AdditionalDependencies) $(OutDir)$(ProjectName).exe $(OutDir);%(AdditionalLibraryDirectories) false @@ -140,6 +140,7 @@ + @@ -182,6 +183,7 @@ + @@ -214,6 +216,7 @@ + @@ -322,6 +325,7 @@ + @@ -367,6 +371,7 @@ + @@ -399,6 +404,7 @@ + @@ -558,39 +564,35 @@ - + {98a51ba8-fc3a-415b-ac8f-8c7bd464e93e} - false - + + {e24950fa-5bc1-4aee-a900-4f0259354bf0} + + {f8edd7fa-9a51-4e80-baeb-860825d2eac6} - false - + {811c0dab-7b96-4bd3-a154-b7572b58e4ab} - + {b57cf53f-2e49-4031-9822-047cc0e6bde2} - + {b7c2a162-dec9-4418-972e-240ab3cbfcae} - - {7e06e92c-537a-442b-9e4a-4761c84f8a1a} - {df2638c0-8128-4847-867c-6eafe3dee7b5} - - {632a8f38-d0f0-4d22-86b3-d69f5e6bf63a} + + {7e06e92c-537a-442b-9e4a-4761c84f8a1a} - + {21b2c324-891f-48ea-ad1a-5ae13de12e28} - false - + {929480e7-23c0-4df6-8456-096d71547116} - false {207bc7a9-ccf1-4f2f-a04d-45f72242ae25} diff --git a/tests/cpp-tests/proj.win32/cpp-tests.vcxproj.filters b/tests/cpp-tests/proj.win32/cpp-tests.vcxproj.filters index 3404238b21..e815660d53 100644 --- a/tests/cpp-tests/proj.win32/cpp-tests.vcxproj.filters +++ b/tests/cpp-tests/proj.win32/cpp-tests.vcxproj.filters @@ -328,6 +328,9 @@ {fa88df83-76d7-4f41-ad48-801dafd44889} + + {7f85be1c-98c5-4412-afc5-6f39ae1452a7} + @@ -738,21 +741,6 @@ Classes\UITest\CocostudioGUISceneTest\CustomTest\CustomParticleWidgetTest - - Classes\UITest\CocostudioGUISceneTest\CustomWidget - - - Classes\UITest\CocostudioGUISceneTest\CustomWidget - - - Classes\UITest\CocostudioGUISceneTest\CustomWidget - - - Classes\UITest\CocostudioGUISceneTest\CustomWidget - - - Classes\UITest\CocostudioGUISceneTest\CustomWidget - Classes\UITest\CocostudioGUISceneTest\UIButtonTest @@ -855,6 +843,30 @@ Classes\UITest\CocostudioGUISceneTest + + Classes\UITest\CocostudioGUISceneTest\CustomWidget + + + Classes\UITest\CocostudioGUISceneTest\CustomWidget + + + Classes\UITest\CocostudioGUISceneTest\CustomWidget + + + Classes\UITest\CocostudioGUISceneTest\CustomWidget + + + Classes\UITest\CocostudioGUISceneTest\CustomWidget + + + Classes\UITest\CocostudioGUISceneTest + + + Classes\Camera3DTest + + + Classes\Sprite3DTest + @@ -1463,21 +1475,6 @@ Classes\UITest\CocostudioGUISceneTest\CustomTest\CustomParticleWidgetTest - - Classes\UITest\CocostudioGUISceneTest\CustomWidget - - - Classes\UITest\CocostudioGUISceneTest\CustomWidget - - - Classes\UITest\CocostudioGUISceneTest\CustomWidget - - - Classes\UITest\CocostudioGUISceneTest\CustomWidget - - - Classes\UITest\CocostudioGUISceneTest\CustomWidget - Classes\UITest\CocostudioGUISceneTest\UIButtonTest @@ -1580,5 +1577,29 @@ Classes\UITest\CocostudioGUISceneTest + + Classes\UITest\CocostudioGUISceneTest\CustomWidget + + + Classes\UITest\CocostudioGUISceneTest\CustomWidget + + + Classes\UITest\CocostudioGUISceneTest\CustomWidget + + + Classes\UITest\CocostudioGUISceneTest\CustomWidget + + + Classes\UITest\CocostudioGUISceneTest\CustomWidget + + + Classes\UITest\CocostudioGUISceneTest + + + Classes\Camera3DTest + + + Classes\Sprite3DTest + \ No newline at end of file diff --git a/tests/cpp-tests/proj.wp8-xaml/cpp-testsComponent/cpp-testsComponent.vcxproj b/tests/cpp-tests/proj.wp8-xaml/cpp-testsComponent/cpp-testsComponent.vcxproj index f360d9d55e..16806e1f8c 100644 --- a/tests/cpp-tests/proj.wp8-xaml/cpp-testsComponent/cpp-testsComponent.vcxproj +++ b/tests/cpp-tests/proj.wp8-xaml/cpp-testsComponent/cpp-testsComponent.vcxproj @@ -185,6 +185,7 @@ + @@ -228,6 +229,7 @@ + @@ -260,6 +262,7 @@ + @@ -382,6 +385,7 @@ + @@ -428,6 +432,7 @@ + @@ -460,6 +465,7 @@ + diff --git a/tests/cpp-tests/proj.wp8-xaml/cpp-testsComponent/cpp-testsComponent.vcxproj.filters b/tests/cpp-tests/proj.wp8-xaml/cpp-testsComponent/cpp-testsComponent.vcxproj.filters index 7cc4e29a0a..44d9ce5bea 100644 --- a/tests/cpp-tests/proj.wp8-xaml/cpp-testsComponent/cpp-testsComponent.vcxproj.filters +++ b/tests/cpp-tests/proj.wp8-xaml/cpp-testsComponent/cpp-testsComponent.vcxproj.filters @@ -325,6 +325,9 @@ {dff38415-43e7-4aff-98ec-c6094899d142} + + {d17dc00f-2b4d-46af-a1ff-c3f4d937d621} + @@ -855,6 +858,15 @@ Classes\UITest\CocosStudioGUITest + + Classes\UITest\CocosStudioGUITest + + + Classes\Sprite3DTest + + + Classes\Camera3DTest + @@ -1584,6 +1596,15 @@ Classes\UITest\CocosStudioGUITest + + Classes\UITest\CocosStudioGUITest + + + Classes\Sprite3DTest + + + Classes\Camera3DTest + diff --git a/tests/game-controller-test/Classes/AppDelegate.cpp b/tests/game-controller-test/Classes/AppDelegate.cpp index 6bd1bb104f..682d42b140 100644 --- a/tests/game-controller-test/Classes/AppDelegate.cpp +++ b/tests/game-controller-test/Classes/AppDelegate.cpp @@ -21,7 +21,7 @@ bool AppDelegate::applicationDidFinishLaunching() { auto director = Director::getInstance(); auto glview = director->getOpenGLView(); if(!glview) { - glview = GLView::create("Game Controller Test"); + glview = GLViewImpl::create("Game Controller Test"); director->setOpenGLView(glview); } diff --git a/tests/game-controller-test/proj.android/jni/Android.mk b/tests/game-controller-test/proj.android/jni/Android.mk index 9aff92cd27..fbb8613e91 100644 --- a/tests/game-controller-test/proj.android/jni/Android.mk +++ b/tests/game-controller-test/proj.android/jni/Android.mk @@ -13,7 +13,7 @@ LOCAL_SRC_FILES := main.cpp \ LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../Classes \ $(LOCAL_PATH)/../../../../external -LOCAL_WHOLE_STATIC_LIBRARIES := cocos2dx_static cocosdenshion_static +LOCAL_STATIC_LIBRARIES := cocos2dx_static cocosdenshion_static include $(BUILD_SHARED_LIBRARY) diff --git a/tests/game-controller-test/proj.ios/AppController.mm b/tests/game-controller-test/proj.ios/AppController.mm index c91d512703..b32bf90a76 100644 --- a/tests/game-controller-test/proj.ios/AppController.mm +++ b/tests/game-controller-test/proj.ios/AppController.mm @@ -72,7 +72,7 @@ static AppDelegate s_sharedApplication; [[UIApplication sharedApplication] setStatusBarHidden: YES]; // IMPORTANT: Setting the GLView should be done after creating the RootViewController - cocos2d::GLView *glview = cocos2d::GLView::createWithEAGLView(eaglView); + cocos2d::GLView *glview = cocos2d::GLViewImpl::createWithEAGLView(eaglView); cocos2d::Director::getInstance()->setOpenGLView(glview); cocos2d::Application *app = cocos2d::Application::getInstance(); diff --git a/tests/lua-empty-test/project/CMakeLists.txt b/tests/lua-empty-test/project/CMakeLists.txt index df91025c64..2b2db4e968 100644 --- a/tests/lua-empty-test/project/CMakeLists.txt +++ b/tests/lua-empty-test/project/CMakeLists.txt @@ -7,7 +7,7 @@ set(SAMPLE_SRC include_directories( Classes - ../../../cocos/scripting/lua/bindings + ../../../cocos/scripting/lua-bindings ../../../external/lua/lua ../../../external/lua/tolua ) @@ -18,12 +18,12 @@ add_executable(${APP_NAME} ) target_link_libraries(${APP_NAME} - luabinding - cocostudio - cocosbuilder - extensions + luacocos2d + luacocosdenshion + luanetwork audio cocos2d + network ) set(APP_BIN_DIR "${CMAKE_BINARY_DIR}/bin/${APP_NAME}") @@ -35,5 +35,7 @@ pre_build(${APP_NAME} COMMAND ${CMAKE_COMMAND} -E remove_directory ${APP_BIN_DIR}/Resources COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/../res ${APP_BIN_DIR}/Resources/res COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/../src ${APP_BIN_DIR}/Resources/src - COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/cocos/scripting/lua-bindings/script ${APP_BIN_DIR}/Resources + COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/cocos/scripting/lua-bindings/script/cocos2d ${APP_BIN_DIR}/Resources + COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/cocos/scripting/lua-bindings/script/cocosdenshion ${APP_BIN_DIR}/Resources + COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/cocos/scripting/lua-bindings/script/network ${APP_BIN_DIR}/Resources ) diff --git a/tests/lua-empty-test/project/Classes/AppDelegate.cpp b/tests/lua-empty-test/project/Classes/AppDelegate.cpp index 8b650561ab..295ebc76a1 100644 --- a/tests/lua-empty-test/project/Classes/AppDelegate.cpp +++ b/tests/lua-empty-test/project/Classes/AppDelegate.cpp @@ -3,6 +3,7 @@ #include "audio/include/SimpleAudioEngine.h" #include "base/CCScriptSupport.h" #include "CCLuaEngine.h" +#include "lua_module_register.h" USING_NS_CC; using namespace CocosDenshion; @@ -25,7 +26,8 @@ bool AppDelegate::applicationDidFinishLaunching() // register lua engine LuaEngine* engine = LuaEngine::getInstance(); ScriptEngineManager::getInstance()->setScriptEngine(engine); - + lua_State* L = engine->getLuaStack()->getLuaState(); + lua_module_register(L); //The call was commented because it will lead to ZeroBrane Studio can't find correct context when debugging //engine->executeScriptFile("src/hello.lua"); engine->executeString("require 'src/hello.lua'"); diff --git a/tests/lua-empty-test/project/Classes/lua_module_register.h b/tests/lua-empty-test/project/Classes/lua_module_register.h new file mode 100644 index 0000000000..04b44661af --- /dev/null +++ b/tests/lua-empty-test/project/Classes/lua_module_register.h @@ -0,0 +1,16 @@ +#ifndef __TEST_LUA_TESTS_PROJECT_CLASSES_LUA_MODULE_REGISTER_H__ +#define __TEST_LUA_TESTS_PROJECT_CLASSES_LUA_MODULE_REGISTER_H__ + +#include "network/lua_cocos2dx_network_manual.h" +#include "cocosdenshion/lua_cocos2dx_cocosdenshion_manual.h" + + +int lua_module_register(lua_State* L) +{ + register_network_module(L); + register_cocosdenshion_module(L); + return 1; +} + +#endif // __TEST_LUA_TESTS_PROJECT_CLASSES_LUA_MODULE_REGISTER_H__ + diff --git a/tests/lua-empty-test/project/proj.android/build-cfg.json b/tests/lua-empty-test/project/proj.android/build-cfg.json index b83dd6533d..4ecffa65f0 100644 --- a/tests/lua-empty-test/project/proj.android/build-cfg.json +++ b/tests/lua-empty-test/project/proj.android/build-cfg.json @@ -14,7 +14,15 @@ "to": "res" }, { - "from": "../../../../cocos/scripting/lua-bindings/script", + "from": "../../../../cocos/scripting/lua-bindings/script/cocos2d", + "to": "" + }, + { + "from": "../../../../cocos/scripting/lua-bindings/script/network", + "to": "" + }, + { + "from": "../../../../cocos/scripting/lua-bindings/script/cocosdenshion", "to": "" }, { diff --git a/tests/lua-empty-test/project/proj.android/jni/Android.mk b/tests/lua-empty-test/project/proj.android/jni/Android.mk index 90ed50ee5c..98cbf8f9c4 100644 --- a/tests/lua-empty-test/project/proj.android/jni/Android.mk +++ b/tests/lua-empty-test/project/proj.android/jni/Android.mk @@ -12,9 +12,11 @@ LOCAL_SRC_FILES := main.cpp \ LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../Classes \ $(LOCAL_PATH)/../../../../../external/lua/tolua \ -LOCAL_WHOLE_STATIC_LIBRARIES := cocos_lua_static +LOCAL_STATIC_LIBRARIES := cocos2d_lua_static +LOCAL_STATIC_LIBRARIES += cocosdenshion_lua_static +LOCAL_STATIC_LIBRARIES += network_lua_static include $(BUILD_SHARED_LIBRARY) -$(call import-module,scripting/lua-bindings) +$(call import-module,scripting/lua-bindings/proj.android) diff --git a/tests/lua-empty-test/project/proj.ios/AppController.mm b/tests/lua-empty-test/project/proj.ios/AppController.mm index 9f38038aed..a4a76d5cc1 100644 --- a/tests/lua-empty-test/project/proj.ios/AppController.mm +++ b/tests/lua-empty-test/project/proj.ios/AppController.mm @@ -73,7 +73,7 @@ static AppDelegate s_sharedApplication; [[UIApplication sharedApplication] setStatusBarHidden: YES]; // IMPORTANT: Setting the GLView should be done after creating the RootViewController - cocos2d::GLView *glview = cocos2d::GLView::createWithEAGLView(eaglView); + cocos2d::GLView *glview = cocos2d::GLViewImpl::createWithEAGLView(eaglView); cocos2d::Director::getInstance()->setOpenGLView(glview); cocos2d::Application *app = cocos2d::Application::getInstance(); diff --git a/tests/lua-empty-test/project/proj.win32/lua-empty-test.vcxproj b/tests/lua-empty-test/project/proj.win32/lua-empty-test.vcxproj index c54bd5bfc6..6c6ff97247 100644 --- a/tests/lua-empty-test/project/proj.win32/lua-empty-test.vcxproj +++ b/tests/lua-empty-test/project/proj.win32/lua-empty-test.vcxproj @@ -21,8 +21,8 @@ v100 v110 v110_xp - v120 - v120_xp + v120 + v120_xp Application @@ -30,8 +30,8 @@ v100 v110 v110_xp - v120 - v120_xp + v120 + v120_xp @@ -83,7 +83,7 @@ Disabled - $(ProjectDir)..\Classes;$(EngineRoot)cocos\scripting\lua-bindings\auto;$(EngineRoot)cocos\scripting\lua-bindings\manual;$(EngineRoot)cocos\audio\include;$(EngineRoot)external\lua\lua;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;%(AdditionalIncludeDirectories) + $(ProjectDir)..\Classes;$(EngineRoot)cocos\scripting\lua-bindings\auto;$(EngineRoot)cocos\scripting\lua-bindings\manual;$(EngineRoot)cocos\audio\include;$(EngineRoot)external\lua\lua;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\chipmunk\include\chipmunk;%(AdditionalIncludeDirectories) WIN32;_WINDOWS;STRICT;_DEBUG;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) false EnableFastChecks @@ -108,13 +108,14 @@ MachineX86 - xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script" "$(ProjectDir)..\..\" /e /Y + xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script\cocos2d" "$(ProjectDir)..\..\" /e /Y +xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script\cocosdenshion" "$(ProjectDir)..\..\" /e /Y +xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script\network" "$(ProjectDir)..\..\" /e /Y xcopy "$(ProjectDir)..\..\..\..\external\lua\luasocket\*.lua" "$(ProjectDir)..\..\" /e /Y - if not exist "$(OutDir)" mkdir "$(OutDir)" -xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\websockets\prebuilt\win32\*.*" "$(OutDir)" - + + @@ -131,7 +132,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\websockets\prebuilt\win32\*.*" "$ lua-empty-test_p.c - $(ProjectDir)..\Classes;$(EngineRoot)cocos\scripting\lua-bindings\auto;$(EngineRoot)cocos\scripting\lua-bindings\manual;$(EngineRoot)cocos\audio\include;$(EngineRoot)external\lua\lua;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;%(AdditionalIncludeDirectories) + $(ProjectDir)..\Classes;$(EngineRoot)cocos\scripting\lua-bindings\auto;$(EngineRoot)cocos\scripting\lua-bindings\manual;$(EngineRoot)cocos\audio\include;$(EngineRoot)external\lua\lua;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\chipmunk\include\chipmunk;%(AdditionalIncludeDirectories) WIN32;_WINDOWS;STRICT;NDEBUG;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) @@ -157,12 +158,13 @@ xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\websockets\prebuilt\win32\*.*" "$ true - if not exist "$(OutDir)" mkdir "$(OutDir)" -xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\websockets\prebuilt\win32\*.*" "$(OutDir)" - + + - xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script" "$(ProjectDir)..\..\" /e /Y + xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script\cocos2d" "$(ProjectDir)..\..\" /e /Y +xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script\cocosdenshion" "$(ProjectDir)..\..\" /e /Y +xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script\network" "$(ProjectDir)..\..\" /e /Y xcopy "$(ProjectDir)..\..\..\..\external\lua\luasocket\*.lua" "$(ProjectDir)..\..\" /e /Y @@ -172,41 +174,18 @@ xcopy "$(ProjectDir)..\..\..\..\external\lua\luasocket\*.lua" "$(ProjectDir)..\. + - - {98a51ba8-fc3a-415b-ac8f-8c7bd464e93e} + + {9f2d6ce6-c893-4400-b50c-6db70cc2562f} - - {f8edd7fa-9a51-4e80-baeb-860825d2eac6} + + {46a7d57a-7f25-4f52-823b-ffac4ff3a624} - - {811c0dab-7b96-4bd3-a154-b7572b58e4ab} - - - {b57cf53f-2e49-4031-9822-047cc0e6bde2} - - - {b7c2a162-dec9-4418-972e-240ab3cbfcae} - - - {ddc3e27f-004d-4dd4-9dd3-931a013d2159} - - - {7e06e92c-537a-442b-9e4a-4761c84f8a1a} - - - {df2638c0-8128-4847-867c-6eafe3dee7b5} - - - {632a8f38-d0f0-4d22-86b3-d69f5e6bf63a} - - - {21b2c324-891f-48ea-ad1a-5ae13de12e28} - - - {207bc7a9-ccf1-4f2f-a04d-45f72242ae25} + + {65e52f4b-703f-419e-ad67-926241a10042} diff --git a/tests/lua-empty-test/project/proj.win32/lua-empty-test.vcxproj.filters b/tests/lua-empty-test/project/proj.win32/lua-empty-test.vcxproj.filters index 5de7838f8f..2b19b414cc 100644 --- a/tests/lua-empty-test/project/proj.win32/lua-empty-test.vcxproj.filters +++ b/tests/lua-empty-test/project/proj.win32/lua-empty-test.vcxproj.filters @@ -23,5 +23,8 @@ win32 + + Classes + \ No newline at end of file diff --git a/tests/lua-empty-test/src/hello.lua b/tests/lua-empty-test/src/hello.lua index d9ab1b2a8d..fd6bfb17c3 100644 --- a/tests/lua-empty-test/src/hello.lua +++ b/tests/lua-empty-test/src/hello.lua @@ -18,7 +18,7 @@ local function initGLView() local director = cc.Director:getInstance() local glView = director:getOpenGLView() if nil == glView then - glView = cc.GLView:create("Lua Empty Test") + glView = cc.GLViewImpl:create("Lua Empty Test") director:setOpenGLView(glView) end diff --git a/tests/lua-game-controller-test/project/Classes/AppDelegate.cpp b/tests/lua-game-controller-test/project/Classes/AppDelegate.cpp index ca92bd541c..c9fbd7cdfa 100644 --- a/tests/lua-game-controller-test/project/Classes/AppDelegate.cpp +++ b/tests/lua-game-controller-test/project/Classes/AppDelegate.cpp @@ -4,7 +4,7 @@ #include "base/CCScriptSupport.h" #include "CCLuaEngine.h" #include "scripting/lua-bindings/auto/lua_cocos2dx_controller_auto.hpp" -#include "scripting/lua-bindings/manual/lua_cocos2dx_controller_manual.hpp" +#include "scripting/lua-bindings/manual/controller/lua_cocos2dx_controller_manual.hpp" USING_NS_CC; using namespace CocosDenshion; @@ -38,7 +38,6 @@ bool AppDelegate::applicationDidFinishLaunching() } lua_pop(L, 1);//statck:... #endif - engine->executeString("require 'src/main.lua'"); return true; diff --git a/tests/lua-game-controller-test/project/proj.android/build-cfg.json b/tests/lua-game-controller-test/project/proj.android/build-cfg.json index 3c8431066f..e379d249eb 100644 --- a/tests/lua-game-controller-test/project/proj.android/build-cfg.json +++ b/tests/lua-game-controller-test/project/proj.android/build-cfg.json @@ -14,15 +14,12 @@ "to": "res" }, { - "from": "../../../../cocos/scripting/lua-bindings/script", + "from": "../../../../cocos/scripting/lua-bindings/script/cocos2d", "to": "" }, { - "from": "../../../../external/lua/luasocket", - "to": "", - "include": [ - "*.lua" - ] + "from": "../../../../cocos/scripting/lua-bindings/script/controller", + "to": "" }, { "from": "../../../game-controller-test/Resources", diff --git a/tests/lua-game-controller-test/project/proj.android/jni/Android.mk b/tests/lua-game-controller-test/project/proj.android/jni/Android.mk index 005ca87198..9b9640e484 100644 --- a/tests/lua-game-controller-test/project/proj.android/jni/Android.mk +++ b/tests/lua-game-controller-test/project/proj.android/jni/Android.mk @@ -9,17 +9,18 @@ LOCAL_MODULE_FILENAME := liblua_game_controller LOCAL_SRC_FILES := main.cpp \ ../../Classes/AppDelegate.cpp \ ../../../../../cocos/scripting/lua-bindings/auto/lua_cocos2dx_controller_auto.cpp \ - ../../../../../cocos/scripting/lua-bindings/manual/lua_cocos2dx_controller_manual.cpp \ + ../../../../../cocos/scripting/lua-bindings/manual/controller/lua_cocos2dx_controller_manual.cpp \ LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../Classes \ $(LOCAL_PATH)/../../../../../external/lua/tolua \ $(LOCAL_PATH)/../../../../../cocos/scripting/lua-bindings/auto \ - $(LOCAL_PATH)/../../../../../cocos/scripting/lua-bindings/manual \ + $(LOCAL_PATH)/../../../../../cocos/scripting/lua-bindings/manual\controller \ $(LOCAL_PATH)/../../../../../cocos/base -LOCAL_WHOLE_STATIC_LIBRARIES := cocos_lua_static +LOCAL_STATIC_LIBRARIES := cocos2d_lua_static +LOCAL_STATIC_LIBRARIES += cocosdenshion_static include $(BUILD_SHARED_LIBRARY) -$(call import-module,scripting/lua-bindings) +$(call import-module,scripting/lua-bindings/proj.android) diff --git a/tests/lua-game-controller-test/project/proj.ios/AppController.mm b/tests/lua-game-controller-test/project/proj.ios/AppController.mm index 9f38038aed..a4a76d5cc1 100644 --- a/tests/lua-game-controller-test/project/proj.ios/AppController.mm +++ b/tests/lua-game-controller-test/project/proj.ios/AppController.mm @@ -73,7 +73,7 @@ static AppDelegate s_sharedApplication; [[UIApplication sharedApplication] setStatusBarHidden: YES]; // IMPORTANT: Setting the GLView should be done after creating the RootViewController - cocos2d::GLView *glview = cocos2d::GLView::createWithEAGLView(eaglView); + cocos2d::GLView *glview = cocos2d::GLViewImpl::createWithEAGLView(eaglView); cocos2d::Director::getInstance()->setOpenGLView(glview); cocos2d::Application *app = cocos2d::Application::getInstance(); diff --git a/tests/lua-game-controller-test/src/GameControllerTest.lua b/tests/lua-game-controller-test/src/GameControllerTest.lua index 9b186fb84b..a822d85981 100644 --- a/tests/lua-game-controller-test/src/GameControllerTest.lua +++ b/tests/lua-game-controller-test/src/GameControllerTest.lua @@ -1,3 +1,5 @@ +require("extern") +require("ControllerConstants") local ControllerHolder = class("ControllerHolder") diff --git a/tests/lua-tests/project/CMakeLists.txt b/tests/lua-tests/project/CMakeLists.txt index 73bf301fce..0130a24fd8 100644 --- a/tests/lua-tests/project/CMakeLists.txt +++ b/tests/lua-tests/project/CMakeLists.txt @@ -19,12 +19,24 @@ add_executable(${APP_NAME} ) target_link_libraries(${APP_NAME} - luabinding + luacocos2d + luacocosdenshion + luanetwork + luacocosbuilder + luacocostudio + luaspine + luaextension + luaui + luacocos3d + cocos2d + cocos3d + audio cocostudio + spine cocosbuilder extensions - audio - cocos2d + ui + network ) set(APP_BIN_DIR "${CMAKE_BINARY_DIR}/bin/${APP_NAME}") @@ -36,7 +48,13 @@ pre_build(${APP_NAME} COMMAND ${CMAKE_COMMAND} -E remove_directory ${APP_BIN_DIR}/Resources COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/../res ${APP_BIN_DIR}/Resources/res COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/../src ${APP_BIN_DIR}/Resources/src - COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/cocos/scripting/lua-bindings/script ${APP_BIN_DIR}/Resources + COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/cocos/scripting/lua-bindings/script/cocos2d ${APP_BIN_DIR}/Resources + COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/cocos/scripting/lua-bindings/script/cocosdenshion ${APP_BIN_DIR}/Resources + COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/cocos/scripting/lua-bindings/script/network ${APP_BIN_DIR}/Resources + COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/cocos/scripting/lua-bindings/script/cocosbuilder ${APP_BIN_DIR}/Resources + COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/cocos/scripting/lua-bindings/script/cocostudio ${APP_BIN_DIR}/Resources + COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/cocos/scripting/lua-bindings/script/extension ${APP_BIN_DIR}/Resources + COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/cocos/scripting/lua-bindings/script/ui ${APP_BIN_DIR}/Resources COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/tests/cpp-tests/Resources ${APP_BIN_DIR}/Resources/res ) diff --git a/tests/lua-tests/project/Classes/AppDelegate.cpp b/tests/lua-tests/project/Classes/AppDelegate.cpp index ce312026d4..c38a9a1949 100644 --- a/tests/lua-tests/project/Classes/AppDelegate.cpp +++ b/tests/lua-tests/project/Classes/AppDelegate.cpp @@ -3,6 +3,7 @@ #include "CCLuaEngine.h" #include "audio/include/SimpleAudioEngine.h" #include "lua_assetsmanager_test_sample.h" +#include "lua_module_register.h" using namespace CocosDenshion; @@ -22,13 +23,22 @@ bool AppDelegate::applicationDidFinishLaunching() // register lua engine LuaEngine* pEngine = LuaEngine::getInstance(); ScriptEngineManager::getInstance()->setScriptEngine(pEngine); + LuaStack* stack = pEngine->getLuaStack(); stack->setXXTEAKeyAndSign("2dxLua", strlen("2dxLua"), "XXTEA", strlen("XXTEA")); - -#if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32 || CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID ||CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_MAC) - register_assetsmanager_test_sample(stack->getLuaState()); -#endif + + lua_State* L = stack->getLuaState(); + + lua_module_register(L); + #if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32 || CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID ||CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_MAC) + lua_getglobal(L, "_G"); + if (lua_istable(L,-1))//stack:...,_G, + { + register_assetsmanager_test_sample(L); + } + lua_pop(L, 1); + #endif pEngine->executeScriptFile("src/controller.lua"); diff --git a/tests/lua-tests/project/Classes/lua_module_register.h b/tests/lua-tests/project/Classes/lua_module_register.h new file mode 100644 index 0000000000..36ce8dff3c --- /dev/null +++ b/tests/lua-tests/project/Classes/lua_module_register.h @@ -0,0 +1,29 @@ +#ifndef __TEST_LUA_TESTS_PROJECT_CLASSES_LUA_MODULE_REGISTER_H__ +#define __TEST_LUA_TESTS_PROJECT_CLASSES_LUA_MODULE_REGISTER_H__ + +#include "extension/lua_cocos2dx_extension_manual.h" +#include "cocosbuilder/lua_cocos2dx_cocosbuilder_manual.h" +#include "cocostudio/lua_cocos2dx_coco_studio_manual.hpp" +#include "ui/lua_cocos2dx_ui_manual.hpp" +#include "spine/lua_cocos2dx_spine_manual.hpp" +#include "network/lua_cocos2dx_network_manual.h" +#include "cocosdenshion/lua_cocos2dx_cocosdenshion_manual.h" +#include "3d/lua_cocos2dx_3d_manual.h" + + + +int lua_module_register(lua_State* L) +{ + register_extension_module(L); + register_cocostudio_module(L); + register_cocosbuilder_module(L); + register_ui_moudle(L); + register_spine_module(L); + register_network_module(L); + register_cocosdenshion_module(L); + register_cocos3d_module(L); + return 1; +} + +#endif // __TEST_LUA_TESTS_PROJECT_CLASSES_LUA_MODULE_REGISTER_H__ + diff --git a/tests/lua-tests/project/proj.android/build-cfg.json b/tests/lua-tests/project/proj.android/build-cfg.json index 59638fbd1e..797d851ebc 100644 --- a/tests/lua-tests/project/proj.android/build-cfg.json +++ b/tests/lua-tests/project/proj.android/build-cfg.json @@ -21,7 +21,31 @@ ] }, { - "from": "../../../../cocos/scripting/lua-bindings/script", + "from": "../../../../cocos/scripting/lua-bindings/script/cocos2d", + "to": "" + }, + { + "from": "../../../../cocos/scripting/lua-bindings/script/cocosbuilder", + "to": "" + }, + { + "from": "../../../../cocos/scripting/lua-bindings/script/cocosdenshion", + "to": "" + }, + { + "from": "../../../../cocos/scripting/lua-bindings/script/cocostudio", + "to": "" + }, + { + "from": "../../../../cocos/scripting/lua-bindings/script/extension", + "to": "" + }, + { + "from": "../../../../cocos/scripting/lua-bindings/script/network", + "to": "" + }, + { + "from": "../../../../cocos/scripting/lua-bindings/script/ui", "to": "" }, { diff --git a/tests/lua-tests/project/proj.android/jni/Android.mk b/tests/lua-tests/project/proj.android/jni/Android.mk index 37abd43abb..77cb96921f 100644 --- a/tests/lua-tests/project/proj.android/jni/Android.mk +++ b/tests/lua-tests/project/proj.android/jni/Android.mk @@ -13,10 +13,17 @@ LOCAL_SRC_FILES += main.cpp \ LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../Classes -LOCAL_STATIC_LIBRARIES := curl_static_prebuilt +LOCAL_STATIC_LIBRARIES := cocos2d_lua_static +LOCAL_STATIC_LIBRARIES += cocosdenshion_lua_static +LOCAL_STATIC_LIBRARIES += network_lua_static +LOCAL_STATIC_LIBRARIES += cocosbuilder_lua_static +LOCAL_STATIC_LIBRARIES += cocostudio_lua_static +LOCAL_STATIC_LIBRARIES += spine_lua_static +LOCAL_STATIC_LIBRARIES += extension_lua_static +LOCAL_STATIC_LIBRARIES += ui_lua_static +LOCAL_STATIC_LIBRARIES += cocos3d_lua_static -LOCAL_WHOLE_STATIC_LIBRARIES := cocos_lua_static include $(BUILD_SHARED_LIBRARY) -$(call import-module,scripting/lua-bindings) +$(call import-module,scripting/lua-bindings/proj.android) diff --git a/tests/lua-tests/project/proj.ios_mac/ios/AppController.mm b/tests/lua-tests/project/proj.ios_mac/ios/AppController.mm index c7d5d8312f..3305eb9259 100644 --- a/tests/lua-tests/project/proj.ios_mac/ios/AppController.mm +++ b/tests/lua-tests/project/proj.ios_mac/ios/AppController.mm @@ -76,7 +76,7 @@ static AppDelegate s_sharedApplication; // IMPORTANT: Setting the GLView should be done after creating the RootViewController - cocos2d::GLView *glview = cocos2d::GLView::createWithEAGLView(eaglView); + cocos2d::GLView *glview = cocos2d::GLViewImpl::createWithEAGLView(eaglView); cocos2d::Director::getInstance()->setOpenGLView(glview); cocos2d::Application::getInstance()->run(); diff --git a/tests/lua-tests/project/proj.ios_mac/ios/Info.plist b/tests/lua-tests/project/proj.ios_mac/ios/Info.plist index 9926484e84..dbfaaa0b95 100644 --- a/tests/lua-tests/project/proj.ios_mac/ios/Info.plist +++ b/tests/lua-tests/project/proj.ios_mac/ios/Info.plist @@ -52,7 +52,7 @@ fonts/Abberancy.ttf fonts/Abduction.ttf fonts/Paint Boy.ttf - fonts/Schwarzwald Regular.ttf + fonts/Schwarzwald.ttf fonts/Scissor Cuts.ttf UIPrerenderedIcon diff --git a/tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj b/tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj index 7d5ab0cb3a..a502ffc812 100644 --- a/tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj +++ b/tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj @@ -22,8 +22,8 @@ v100 v110 v110_xp - v120 - v120_xp + v120 + v120_xp Application @@ -32,8 +32,8 @@ v100 v110 v110_xp - v120 - v120_xp + v120 + v120_xp @@ -108,14 +108,20 @@ - xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script" "$(ProjectDir)..\.." /e /Y + xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script\cocos2d" "$(ProjectDir)..\..\" /e /Y +xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script\cocosdenshion" "$(ProjectDir)..\..\" /e /Y +xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script\network" "$(ProjectDir)..\..\" /e /Y +xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script\cocosbuilder" "$(ProjectDir)..\..\" /e /Y +xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script\cocostudio" "$(ProjectDir)..\..\" /e /Y +xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script\extension" "$(ProjectDir)..\..\" /e /Y +xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script\ui" "$(ProjectDir)..\..\" /e /Y xcopy "$(ProjectDir)..\..\..\..\external\lua\luasocket\*.lua" "$(ProjectDir)..\..\" /e /Y xcopy "$(ProjectDir)..\..\..\cpp-tests\Resources" "$(ProjectDir)..\..\res" /e /Y copy files - if not exist "$(OutDir)" mkdir "$(OutDir)" -xcopy /Y /Q "$(EngineRoot)external\websockets\prebuilt\win32\*.*" "$(OutDir)" + + @@ -157,19 +163,26 @@ xcopy /Y /Q "$(EngineRoot)external\websockets\prebuilt\win32\*.*" "$(OutDir)" - xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script" "$(ProjectDir)..\.." /e /Y + xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script\cocos2d" "$(ProjectDir)..\..\" /e /Y +xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script\cocosdenshion" "$(ProjectDir)..\..\" /e /Y +xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script\network" "$(ProjectDir)..\..\" /e /Y +xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script\cocosbuilder" "$(ProjectDir)..\..\" /e /Y +xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script\cocostudio" "$(ProjectDir)..\..\" /e /Y +xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script\extension" "$(ProjectDir)..\..\" /e /Y +xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua-bindings\script\ui" "$(ProjectDir)..\..\" /e /Y xcopy "$(ProjectDir)..\..\..\..\external\lua\luasocket\*.lua" "$(ProjectDir)..\..\" /e /Y xcopy "$(ProjectDir)..\..\..\cpp-tests\Resources" "$(ProjectDir)..\..\res" /e /Y copy files - if not exist "$(OutDir)" mkdir "$(OutDir)" -xcopy /Y /Q "$(EngineRoot)external\websockets\prebuilt\win32\*.*" "$(OutDir)" + + + @@ -178,38 +191,32 @@ xcopy /Y /Q "$(EngineRoot)external\websockets\prebuilt\win32\*.*" "$(OutDir)" - - {ddc3e27f-004d-4dd4-9dd3-931a013d2159} + + {9f2d6ce6-c893-4400-b50c-6db70cc2562f} - - {98a51ba8-fc3a-415b-ac8f-8c7bd464e93e} + + {06840490-14a4-43d6-88bc-aafa44d043eb} - - {f8edd7fa-9a51-4e80-baeb-860825d2eac6} + + {f8198014-f4f3-49f0-88ab-c1969a5829af} - - {811c0dab-7b96-4bd3-a154-b7572b58e4ab} + + {46a7d57a-7f25-4f52-823b-ffac4ff3a624} - - {b57cf53f-2e49-4031-9822-047cc0e6bde2} + + {9640951e-c5d0-47b5-9c42-0bcada261c50} - - {b7c2a162-dec9-4418-972e-240ab3cbfcae} + + {7068296e-38a4-4bca-85db-3a09bd014847} - - {7e06e92c-537a-442b-9e4a-4761c84f8a1a} + + {65e52f4b-703f-419e-ad67-926241a10042} - - {df2638c0-8128-4847-867c-6eafe3dee7b5} + + {31ef6ab1-0d9a-4bc6-99b8-2c482ea373c4} - - {632a8f38-d0f0-4d22-86b3-d69f5e6bf63a} - - - {21b2c324-891f-48ea-ad1a-5ae13de12e28} - - - {207bc7a9-ccf1-4f2f-a04d-45f72242ae25} + + {fe78eebb-3dbb-4713-8cbf-63d742c5bd82} diff --git a/tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj.filters b/tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj.filters index 12f4b9ee7c..e6cf7a3008 100644 --- a/tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj.filters +++ b/tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj.filters @@ -18,6 +18,9 @@ Classes + + Classes + diff --git a/tests/lua-tests/src/CocoStudioTest/CocoStudioActionTimelineTest/CocoStudioActionTimelineTest.lua b/tests/lua-tests/src/CocoStudioTest/CocoStudioActionTimelineTest/CocoStudioActionTimelineTest.lua index e3a3d63916..d2319daf07 100644 --- a/tests/lua-tests/src/CocoStudioTest/CocoStudioActionTimelineTest/CocoStudioActionTimelineTest.lua +++ b/tests/lua-tests/src/CocoStudioTest/CocoStudioActionTimelineTest/CocoStudioActionTimelineTest.lua @@ -96,8 +96,8 @@ function TimelineTestLayer.create() end function TimelineTestLayer.backCallback() - local newScene = TimelineTestScene.create() - newScene:addChild(backimelineTest()) + local newScene = TimelineTestScene.create() + newScene:addChild(backTimelineTest()) cc.Director:getInstance():replaceScene(newScene) end diff --git a/tests/lua-tests/src/ExtensionTest/ExtensionTest.lua b/tests/lua-tests/src/ExtensionTest/ExtensionTest.lua index d0b5b72def..602aa260d3 100644 --- a/tests/lua-tests/src/ExtensionTest/ExtensionTest.lua +++ b/tests/lua-tests/src/ExtensionTest/ExtensionTest.lua @@ -1,3 +1,4 @@ +require "ExtensionConstants" require "src/ExtensionTest/CocosBuilderTest" require "src/ExtensionTest/WebProxyTest" diff --git a/tests/lua-tests/src/ExtensionTest/WebProxyTest.lua b/tests/lua-tests/src/ExtensionTest/WebProxyTest.lua index 9545978279..c14ffeab8c 100644 --- a/tests/lua-tests/src/ExtensionTest/WebProxyTest.lua +++ b/tests/lua-tests/src/ExtensionTest/WebProxyTest.lua @@ -1,4 +1,4 @@ - + require "NetworkConstants" local function WebSocketTestLayer() local layer = cc.Layer:create() local winSize = cc.Director:getInstance():getWinSize() diff --git a/tests/lua-tests/src/FontTest/FontTest.lua b/tests/lua-tests/src/FontTest/FontTest.lua index 1e19a714ae..461df655f5 100644 --- a/tests/lua-tests/src/FontTest/FontTest.lua +++ b/tests/lua-tests/src/FontTest/FontTest.lua @@ -8,7 +8,7 @@ local fontList = { "fonts/Abberancy.ttf", "fonts/Abduction.ttf", "fonts/Paint Boy.ttf", - "fonts/Schwarzwald Regular.ttf", + "fonts/Schwarzwald.ttf", "fonts/Scissor Cuts.ttf" } diff --git a/tests/lua-tests/src/LabelTestNew/LabelTestNew.lua b/tests/lua-tests/src/LabelTestNew/LabelTestNew.lua index 74ccbb576f..9e9b2b5f9f 100644 --- a/tests/lua-tests/src/LabelTestNew/LabelTestNew.lua +++ b/tests/lua-tests/src/LabelTestNew/LabelTestNew.lua @@ -1085,7 +1085,7 @@ function LabelTTFFontsTestNew.create() "fonts/Abduction.ttf", "fonts/American Typewriter.ttf", "fonts/Paint Boy.ttf", - "fonts/Schwarzwald Regular.ttf", + "fonts/Schwarzwald.ttf", "fonts/Scissor Cuts.ttf", } local ttfConfig = {} diff --git a/tests/lua-tests/src/VideoPlayerTest/VideoPlayerTest.lua b/tests/lua-tests/src/VideoPlayerTest/VideoPlayerTest.lua index 41ec6834eb..ad082ce774 100644 --- a/tests/lua-tests/src/VideoPlayerTest/VideoPlayerTest.lua +++ b/tests/lua-tests/src/VideoPlayerTest/VideoPlayerTest.lua @@ -1,4 +1,4 @@ -require("experimentalConstants") +require("experimentalUIConstants") local visibleRect = cc.Director:getInstance():getOpenGLView():getVisibleRect() diff --git a/tests/lua-tests/src/controller.lua b/tests/lua-tests/src/controller.lua index 1e89841d68..df010e4491 100644 --- a/tests/lua-tests/src/controller.lua +++ b/tests/lua-tests/src/controller.lua @@ -2,14 +2,13 @@ -- avoid memory leak collectgarbage("setpause", 100) collectgarbage("setstepmul", 5000) - ---------------- -- run local director = cc.Director:getInstance() local glView = director:getOpenGLView() if nil == glView then - glView = cc.GLView:createWithRect("Lua Tests", cc.rect(0,0,900,640)) + glView = cc.GLViewImpl:createWithRect("Lua Tests", cc.rect(0,0,900,640)) director:setOpenGLView(glView) end @@ -72,7 +71,6 @@ end addSearchPath("res/", screenSize.height) addSearchPath("", screenSize.height) - require "src/mainMenu" local scene = cc.Scene:create() diff --git a/tools/bindings-generator b/tools/bindings-generator index 6fcfc80c68..ee16f69272 160000 --- a/tools/bindings-generator +++ b/tools/bindings-generator @@ -1 +1 @@ -Subproject commit 6fcfc80c68b22de00342cc3fa8e0f3168bcf5e06 +Subproject commit ee16f692722f6bbb7d485032751f9b826ec9e926 diff --git a/tools/cocos2d-console b/tools/cocos2d-console index 751afb6fb1..fb44ec8cf7 160000 --- a/tools/cocos2d-console +++ b/tools/cocos2d-console @@ -1 +1 @@ -Subproject commit 751afb6fb1cc20665990157530890a6f3200e0d7 +Subproject commit fb44ec8cf77f6f51503987c3a1a0964580b5d88f diff --git a/tools/gen-prebuilt/.gitignore b/tools/gen-prebuilt/.gitignore new file mode 100644 index 0000000000..71c422c076 --- /dev/null +++ b/tools/gen-prebuilt/.gitignore @@ -0,0 +1,4 @@ +.idea/* +build/* +prebuilt* +cocos2d-x/* diff --git a/tools/gen-prebuilt/README.md b/tools/gen-prebuilt/README.md new file mode 100644 index 0000000000..e762a37e06 --- /dev/null +++ b/tools/gen-prebuilt/README.md @@ -0,0 +1,41 @@ + +# Generate prebuilt engine + +## Purpose + +The tools in `gen-prebuilt` are used for generating prebuilt engine. + +## Steps + +1. Generate prebuilt libs + * First, build libs for `Mac, iOS & android`: Run `python gen_prebuilt_libs.py` on Mac. + * Second, build libs for `Windows`: Run `python gen_prebuilt_libs.py -n` on Windows. +2. Organize the prebuilt libs with modules + Run command `python module_organize.py` on Windows or Mac. + +## Script Details + +1. gen_prebuilt_libs.py + + ``` + Usage: gen_prebuilt_libs.py [options] + + Options: + -c Remove the "prebuilt" directory first. + -n, --no-android Not build android libs. + -s, --strip Enable strip when generating iOS, Mac & Android libs. + -i, --incredibuild Use incredibuild to build win32 projects. Only available on windows. + ``` + + The result of the script is : A folder named `prebuilt` which contains prebuilt libs will generated. + +2. module_organize.py + + ``` + Usage: module_organize.py [options] + + Options: + -d, --dst-root Specify a path where to place the engine organized by modules. Default value is the same path with `module_organize.py`. + ``` + + The result of the script is : A folder named `cocos2d-x` will generated in the `dst-root`. \ No newline at end of file diff --git a/tools/gen-prebuilt/build_config.json b/tools/gen-prebuilt/build_config.json new file mode 100644 index 0000000000..0c250ef587 --- /dev/null +++ b/tools/gen-prebuilt/build_config.json @@ -0,0 +1,25 @@ +{ + "xcode_proj_info" : { + "build/cocos2d_libs.xcodeproj" : { + "outputdir" : "prebuilt", + "targets" :[ "build all libs" ] + }, + "cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj" : { + "outputdir" : "prebuilt", + "targets" : [ "build all lualibs" ] + } + }, + "win32_proj_info" : { + "build/cocos2d-win32.vc2012.sln" : { + "outputdir" : "prebuilt/win32", + "targets" : [ + "libcocosdenshion", "libbox2d", "libchipmunk", + "libcocos2d", "libcocosbuilder", "libcocostudio", + "libextension", "libui", "libnetwork", "libspine", + "libluacocos2d", "libluacocosbuilder", "libluacocosdenshion", + "libluacocostudio", "libluaextension", "libluanetwork", + "libluaspine", "libluaui" + ] + } + } +} diff --git a/tools/gen-prebuilt/excopy.py b/tools/gen-prebuilt/excopy.py new file mode 100644 index 0000000000..4b4877d726 --- /dev/null +++ b/tools/gen-prebuilt/excopy.py @@ -0,0 +1,100 @@ +#!/usr/bin/python +# ---------------------------------------------------------------------------- +# extend methods for copy files/dirs +# +# Copyright 2014 (C) zhangbin +# +# License: MIT +# ---------------------------------------------------------------------------- + +import os +import shutil + +def copy_files_in_dir(src, dst): + + for item in os.listdir(src): + path = os.path.join(src, item) + if os.path.isfile(path): + shutil.copy(path, dst) + if os.path.isdir(path): + new_dst = os.path.join(dst, item) + if not os.path.isdir(new_dst): + os.makedirs(new_dst) + copy_files_in_dir(path, new_dst) + +def copy_files_with_config(config, src_root, dst_root): + src_dir = config["from"] + dst_dir = config["to"] + + src_dir = os.path.join(src_root, src_dir) + dst_dir = os.path.join(dst_root, dst_dir) + + include_rules = None + if config.has_key("include"): + include_rules = config["include"] + include_rules = convert_rules(include_rules) + + exclude_rules = None + if config.has_key("exclude"): + exclude_rules = config["exclude"] + exclude_rules = convert_rules(exclude_rules) + + copy_files_with_rules(src_dir, src_dir, dst_dir, include_rules, exclude_rules) + +def copy_files_with_rules(src_rootDir, src, dst, include = None, exclude = None): + if os.path.isfile(src): + if not os.path.exists(dst): + os.makedirs(dst) + shutil.copy(src, dst) + return + + if (include is None) and (exclude is None): + if not os.path.exists(dst): + os.makedirs(dst) + copy_files_in_dir(src, dst) + elif (include is not None): + # have include + for name in os.listdir(src): + abs_path = os.path.join(src, name) + rel_path = os.path.relpath(abs_path, src_rootDir) + if os.path.isdir(abs_path): + sub_dst = os.path.join(dst, name) + copy_files_with_rules(src_rootDir, abs_path, sub_dst, include = include) + elif os.path.isfile(abs_path): + if _in_rules(rel_path, include): + if not os.path.exists(dst): + os.makedirs(dst) + shutil.copy(abs_path, dst) + elif (exclude is not None): + # have exclude + for name in os.listdir(src): + abs_path = os.path.join(src, name) + rel_path = os.path.relpath(abs_path, src_rootDir) + if os.path.isdir(abs_path): + sub_dst = os.path.join(dst, name) + copy_files_with_rules(src_rootDir, abs_path, sub_dst, exclude = exclude) + elif os.path.isfile(abs_path): + if not _in_rules(rel_path, exclude): + if not os.path.exists(dst): + os.makedirs(dst) + shutil.copy(abs_path, dst) + +def _in_rules(rel_path, rules): + import re + ret = False + path_str = rel_path.replace("\\", "/") + for rule in rules: + if re.match(rule, path_str): + ret = True + + return ret + +def convert_rules(rules): + ret_rules = [] + for rule in rules: + ret = rule.replace('.', '\\.') + ret = ret.replace('*', '.*') + ret = "%s" % ret + ret_rules.append(ret) + + return ret_rules diff --git a/tools/gen-prebuilt/gen_prebuilt_libs.py b/tools/gen-prebuilt/gen_prebuilt_libs.py new file mode 100644 index 0000000000..14d7f4ef4b --- /dev/null +++ b/tools/gen-prebuilt/gen_prebuilt_libs.py @@ -0,0 +1,358 @@ +#!/usr/bin/python +# ---------------------------------------------------------------------------- +# generate the prebuilt libs of engine +# +# Copyright 2014 (C) zhangbin +# +# License: MIT +# ---------------------------------------------------------------------------- +''' +Generate the prebuilt libs of engine +''' + +import os +import subprocess +import shutil +import sys +import excopy +import json + +from argparse import ArgumentParser + +if sys.platform == 'win32': + import _winreg + +TESTS_PROJ_PATH = "tests/lua-tests" +ANDROID_SO_PATH = "project/proj.android/libs" +ANDROID_A_PATH = "project/proj.android/obj/local" +MK_PATH = "project/proj.android/jni/Application.mk" +CONSOLE_PATH = "tools/cocos2d-console/bin" + +def os_is_win32(): + return sys.platform == 'win32' + +def os_is_mac(): + return sys.platform == 'darwin' + +def run_shell(cmd, cwd=None): + p = subprocess.Popen(cmd, shell=True, cwd=cwd) + p.wait() + + if p.returncode: + raise subprocess.CalledProcessError(returncode=p.returncode, cmd=cmd) + + return p.returncode + +class Generator(object): + + XCODE_CMD_FMT = "xcodebuild -project \"%s\" -configuration Release -target \"%s\" %s CONFIGURATION_BUILD_DIR=%s" + + CONFIG_FILE = "build_config.json" + KEY_XCODE_PROJ_INFO = "xcode_proj_info" + KEY_WIN32_PROJ_INFO = "win32_proj_info" + + KEY_OUTPUT_DIR = "outputdir" + KEY_TARGETS = "targets" + + def __init__(self, args): + self.need_clean = args.need_clean + self.disable_strip = args.disable_strip + self.use_incredibuild = args.use_incredibuild + self.tool_dir = os.path.realpath(os.path.dirname(__file__)) + self.no_android = args.no_android + + self.engine_dir = os.path.join(self.tool_dir, os.path.pardir, os.path.pardir) + + self.load_config() + + def load_config(self): + cfg_json = os.path.join(self.tool_dir, Generator.CONFIG_FILE) + f = open(cfg_json) + cfg_info = json.load(f) + f.close() + + self.xcode_proj_info = cfg_info[Generator.KEY_XCODE_PROJ_INFO] + self.win32_proj_info = cfg_info[Generator.KEY_WIN32_PROJ_INFO] + + def modify_mk(self, mk_file): + if os.path.isfile(mk_file): + file_obj = open(mk_file, "a") + file_obj.write("\nAPP_ABI :=armeabi armeabi-v7a\n") + file_obj.close() + + def build_android(self): + # build .a for android + console_dir = os.path.join(self.engine_dir, CONSOLE_PATH) + cmd_path = os.path.join(console_dir, "cocos") + proj_path = os.path.join(self.engine_dir, TESTS_PROJ_PATH) + + # Add multi ABI in Application.mk + mk_file = os.path.join(proj_path, MK_PATH) + f = open(mk_file) + file_content = f.read() + f.close() + + self.modify_mk(mk_file) + + # build it + build_cmd = "%s compile -s %s -p android --ndk-mode release -j 4" % (cmd_path, proj_path) + run_shell(build_cmd) + + f = open(mk_file, "w") + f.write(file_content) + f.close() + + # copy .a to prebuilt dir + obj_dir = os.path.join(proj_path, ANDROID_A_PATH) + prebuilt_dir = os.path.join(self.tool_dir, "prebuilt", "android") + copy_cfg = { + "from": obj_dir, + "to": prebuilt_dir, + "include": [ + "*.a$" + ] + } + excopy.copy_files_with_config(copy_cfg, obj_dir, prebuilt_dir) + + if not self.disable_strip: + # strip the android libs + ndk_root = os.environ["NDK_ROOT"] + if os_is_win32(): + if self.is_32bit_windows(): + bit_str = "" + else: + bit_str = "-x86_64" + + sys_folder_name = "windows%s" % bit_str + elif os_is_mac(): + sys_folder_name = "darwin-x86_64" + + strip_cmd_path = os.path.join(ndk_root, "toolchains/arm-linux-androideabi-4.8/prebuilt/%s/arm-linux-androideabi/bin/strip" % sys_folder_name) + if os.path.exists(strip_cmd_path): + strip_cmd = "%s -S %s/armeabi*/*.a" % (strip_cmd_path, prebuilt_dir) + run_shell(strip_cmd) + + def get_required_vs_version(self, proj_file): + # get the VS version required by the project + import re + file_obj = open(proj_file) + pattern = re.compile(r"^# Visual Studio.+(\d{4})") + num = None + for line in file_obj: + match = pattern.match(line) + if match is not None: + num = match.group(1) + break + + if num is not None: + if num == "2012": + ret = "11.0" + elif num == "2013": + ret = "12.0" + else: + ret = None + else: + ret = None + + return ret + + def get_vs_cmd_path(self, require_version): + # find the VS in register, if system is 64bit, should find vs in both 32bit & 64bit register + if self.is_32bit_windows(): + reg_flag_list = [ _winreg.KEY_WOW64_32KEY ] + else: + reg_flag_list = [ _winreg.KEY_WOW64_64KEY, _winreg.KEY_WOW64_32KEY ] + + needUpgrade = False + vsPath = None + + try: + for reg_flag in reg_flag_list: + print("find vs in reg : %s" % ("32bit" if reg_flag == _winreg.KEY_WOW64_32KEY else "64bit")) + vs = _winreg.OpenKey( + _winreg.HKEY_LOCAL_MACHINE, + r"SOFTWARE\Microsoft\VisualStudio", + 0, + _winreg.KEY_READ | reg_flag + ) + + try: + i = 0 + while True: + try: + # enum the keys in vs reg + version = _winreg.EnumKey(vs, i) + find_ver = float(version) + + # find the vs which version >= required version + if find_ver >= float(require_version): + key = _winreg.OpenKey(vs, r"SxS\VS7") + vsPath, type = _winreg.QueryValueEx(key, version) + + if os.path.exists(vsPath): + if float(version) > float(require_version): + needUpgrade = True + break + else: + vsPath = None + except: + continue + finally: + i += 1 + except: + pass + + # if find one right vs, break + if vsPath is not None: + break + except WindowsError as e: + message = "Visual Studio wasn't installed" + print(e) + raise Exception(message) + + commandPath = os.path.join(vsPath, "Common7", "IDE", "devenv") + return (needUpgrade, commandPath) + + def is_32bit_windows(self): + arch = os.environ['PROCESSOR_ARCHITECTURE'].lower() + archw = os.environ.has_key("PROCESSOR_ARCHITEW6432") + return (arch == "x86" and not archw) + + def build_win32_proj(self, cmd_path, sln_path, proj_name, mode): + build_cmd = " ".join([ + "\"%s\"" % cmd_path, + "\"%s\"" % sln_path, + "/%s \"Release|Win32\"" % mode, + "/Project \"%s\"" % proj_name + ]) + run_shell(build_cmd) + + def build_win32(self): + print("Building Win32") + + for key in self.win32_proj_info.keys(): + output_dir = self.win32_proj_info[key][Generator.KEY_OUTPUT_DIR] + proj_path = os.path.join(self.engine_dir, key) + require_vs_version = self.get_required_vs_version(proj_path) + needUpgrade, vs_command = self.get_vs_cmd_path(require_vs_version) + + # get the build folder & win32 output folder + build_folder_path = os.path.join(os.path.dirname(proj_path), "Release.win32") + if os.path.exists(build_folder_path): + shutil.rmtree(build_folder_path) + os.makedirs(build_folder_path) + + win32_output_dir = os.path.join(self.tool_dir, output_dir) + if os.path.exists(win32_output_dir): + shutil.rmtree(win32_output_dir) + os.makedirs(win32_output_dir) + + # upgrade projects + if needUpgrade: + commandUpgrade = ' '.join([ + "\"%s\"" % vs_command, + "\"%s\"" % proj_path, + "/Upgrade" + ]) + run_shell(commandUpgrade) + + if self.use_incredibuild: + # use incredibuild, build whole sln + build_cmd = " ".join([ + "BuildConsole", + "%s" % proj_path, + "/build", + "/cfg=\"Release|Win32\"" + ]) + run_shell(build_cmd) + + if not self.use_incredibuild: + # build the projects + for proj_name in self.win32_proj_info[key][Generator.KEY_TARGETS]: + self.build_win32_proj(vs_command, proj_path, proj_name, "build") + + lib_file_path = os.path.join(build_folder_path, "%s.lib" % proj_name) + if not os.path.exists(lib_file_path): + # if the lib is not generated, rebuild the project + self.build_win32_proj(vs_command, proj_path, proj_name, "rebuild") + + if not os.path.exists(lib_file_path): + raise Exception("Library %s not generated as expected!" % lib_file_path) + + # copy the libs into prebuilt dir + for file_name in os.listdir(build_folder_path): + file_path = os.path.join(build_folder_path, file_name) + shutil.copy(file_path, win32_output_dir) + + print("Win32 build succeeded.") + + def build_ios_mac(self): + for key in self.xcode_proj_info.keys(): + output_dir = self.xcode_proj_info[key][Generator.KEY_OUTPUT_DIR] + proj_path = os.path.join(self.engine_dir, key) + ios_out_dir = os.path.join(self.tool_dir, output_dir, "ios") + mac_out_dir = os.path.join(self.tool_dir, output_dir, "mac") + + ios_sim_libs_dir = os.path.join(ios_out_dir, "simulator") + ios_dev_libs_dir = os.path.join(ios_out_dir, "device") + for target in self.xcode_proj_info[key][Generator.KEY_TARGETS]: + build_cmd = Generator.XCODE_CMD_FMT % (proj_path, "%s iOS" % target, "-sdk iphonesimulator", ios_sim_libs_dir) + run_shell(build_cmd, self.tool_dir) + + build_cmd = Generator.XCODE_CMD_FMT % (proj_path, "%s iOS" % target, "-sdk iphoneos", ios_dev_libs_dir) + run_shell(build_cmd, self.tool_dir) + + build_cmd = Generator.XCODE_CMD_FMT % (proj_path, "%s Mac" % target, "", mac_out_dir) + run_shell(build_cmd, self.tool_dir) + + # generate fat libs for iOS + for lib in os.listdir(ios_sim_libs_dir): + sim_lib = os.path.join(ios_sim_libs_dir, lib) + dev_lib = os.path.join(ios_dev_libs_dir, lib) + output_lib = os.path.join(ios_out_dir, lib) + lipo_cmd = "lipo -create -output \"%s\" \"%s\" \"%s\"" % (output_lib, sim_lib, dev_lib) + + run_shell(lipo_cmd) + + # remove the simulator & device libs in iOS + shutil.rmtree(ios_sim_libs_dir) + shutil.rmtree(ios_dev_libs_dir) + + if not self.disable_strip: + # strip the libs + ios_strip_cmd = "xcrun -sdk iphoneos strip -S %s/*.a" % ios_out_dir + run_shell(ios_strip_cmd) + mac_strip_cmd = "xcrun strip -S %s/*.a" % mac_out_dir + run_shell(mac_strip_cmd) + + def build_all_libs(self): + if os_is_mac(): + # build for iOS & Mac + self.build_ios_mac() + + if os_is_win32(): + # build for win32 + self.build_win32() + + if not self.no_android: + self.build_android() + + def do_generate(self): + output_dir = os.path.join(self.tool_dir, "prebuilt") + if self.need_clean and os.path.exists(output_dir): + shutil.rmtree(output_dir) + self.build_all_libs() + +if __name__ == "__main__": + parser = ArgumentParser(description="Generate prebuilt engine for Cocos Engine.") + parser.add_argument('-c', dest='need_clean', action="store_true", help='Remove the \"prebuilt\" directory first.') + parser.add_argument('-n', "--no-android", dest='no_android', action="store_true", help='Not build android libs.') + parser.add_argument('-d', "--disable-strip", dest='disable_strip', action="store_true", help='Disable the strip of the generated libs.') + parser.add_argument('-i', "--incredibuild", dest='use_incredibuild', action="store_true", help='Use incredibuild to build win32 projects. Only available on windows.') + (args, unknown) = parser.parse_known_args() + + if len(unknown) > 0: + print("unknown arguments: %s" % unknown) + + gen_obj = Generator(args) + gen_obj.do_generate() diff --git a/tools/gen-prebuilt/module_config.json b/tools/gen-prebuilt/module_config.json new file mode 100644 index 0000000000..d9d7988c6a --- /dev/null +++ b/tools/gen-prebuilt/module_config.json @@ -0,0 +1,708 @@ +{ + "cocos2d" : { + "is_compiled" : true, + "target_dir" : "cocos", + "win32_lib_file_name" : "libcocos2d", + "ios_lib_file_name" : "libcocos2d iOS.a", + "mac_lib_file_name" : "libcocos2d Mac.a", + "android_lib_name" : "cocos2dx_static", + "android_lib_file_name" : "libcocos2d", + "include" : [ + { + "from": "cocos", + "to": "cocos/include", + "include" : [ + "2d/*.h", "3d/*.h", "3d/*.inl", "base/*.h", + "deprecated/*.h", "math/*.h", "math/*.inl", + "physics/*.h", "platform/*.h", "renderer/*.h", + "storage/*.h", "cocos2d.h", "2d/cocos2d_headers.props", + "2d/cocos2dx.props" + ] + }, + { + "from": "cocos/platform/android/java", + "to": "cocos/include/platform/android/java", + "exclude": [ + "bin/*", "gen/*", "libs/*" + ] + }, + { + "from": "external", + "to": "external", + "include": [ + "tinyxml2/*.h", + "unzip/*.h", + "xxhash/*.h", + "json/*.h", + "win32-specific/*" + ] + }, + { + "from": "external/lua/tolua", + "to": "cocos/lua-bindings/include", + "include": [ + "*.h" + ] + }, + { + "from": "cocos/scripting/lua-bindings/script/cocos2d", + "to": "cocos/lua-bindings/script", + "include": [ + "*.lua" + ] + }, + { + "from": "cocos/scripting/lua-bindings/auto", + "to": "cocos/lua-bindings/include", + "include": [ + "lua_cocos2dx_auto.hpp", + "lua_cocos2dx_experimental_auto.hpp", + "lua_cocos2dx_physics_auto.hpp" + ] + }, + { + "from": "cocos/scripting/lua-bindings/manual", + "to": "cocos/lua-bindings/include", + "include": [ + "CCLuaBridge.h", + "CCLuaStack.h", + "Cocos2dxLuaLoader.h", + "lua_debugger.h", + "CCLuaEngine.h", + "CCLuaValue.h", + "LuaBasicConversions.h", + "tolua_fix.h", + "cocos2d/*.h", + "cocos2d/*.hpp" + ] + } + ], + "export_include" : [ + "../../include", + "../../../modules", + "../../../external/tinyxml2", + "../../../external/unzip", + "../../../external/chipmunk/include/chipmunk", + "../../../external/edtaa3func", + "../../../external/xxhash", + "../../../external/ConvertUTF", + "../../../external" + ], + "depend_modules" : [ + "chipmunk", "freetype", "jpeg", + "png", "webp", "tiff", + "cocos_android", "curl", "websockets" + ], + "export_ldlibs" : [ + "GLESv2", "log", "z", "android" + ], + "export_cflags" : [ + "-Wno-psabi", "-DUSE_FILE32API" + ], + "export_cppflags" : [ + "-Wno-literal-suffix", "-Wno-deprecated-declarations" + ], + "is_optional" : false, + "lua_bindings" : { + "lua_lib_name" : "libluacocos2d", + "android_lib_name" : "cocos2d_lua_static", + "depend_modules" : [ + "luajit" + ] + } + }, + "freetype" : { + "is_compiled" : false, + "from_dir" : "external/freetype2", + "target_dir" : "external/freetype2", + "android_lib_name" : "cocos_freetype2_static", + "is_optional" : false, + "exclude" : [ + "include/ios/*", + "include/linux/*", + "include/wp8/*", + "include/winrt/*", + "include/mac/*", + "prebuilt/ios/*", + "prebuilt/linux/*", + "prebuilt/wp8/*", + "prebuilt/winrt/*", + "prebuilt/mac/*" + ] + }, + "jpeg" : { + "is_compiled" : false, + "from_dir" : "external/jpeg", + "target_dir" : "external/jpeg", + "android_lib_name" : "cocos_jpeg_static", + "is_optional" : false, + "exclude" : [ + "include/ios/*", + "include/linux/*", + "include/wp8/*", + "include/winrt/*", + "include/mac/*", + "prebuilt/ios/*", + "prebuilt/linux/*", + "prebuilt/wp8/*", + "prebuilt/winrt/*", + "prebuilt/mac/*" + ] + }, + "png" : { + "is_compiled" : false, + "from_dir" : "external/png", + "target_dir" : "external/png", + "android_lib_name" : "cocos_png_static", + "is_optional" : false, + "exclude" : [ + "include/ios/*", + "include/wp8/*", + "include/winrt/*", + "include/mac/*", + "prebuilt/ios/*", + "prebuilt/wp8/*", + "prebuilt/winrt/*", + "prebuilt/mac/*" + ] + }, + "webp" : { + "is_compiled" : false, + "from_dir" : "external/webp", + "target_dir" : "external/webp", + "android_lib_name" : "cocos_webp_static", + "is_optional" : false, + "exclude" : [ + "include/ios/*", + "include/linux/*", + "include/mac/*", + "prebuilt/ios/*", + "prebuilt/linux/*", + "prebuilt/mac/*" + ] + }, + "tiff" : { + "is_compiled" : false, + "from_dir" : "external/tiff", + "target_dir" : "external/tiff", + "android_lib_name" : "cocos_tiff_static", + "is_optional" : false, + "exclude" : [ + "include/ios/*", + "include/linux/*", + "include/wp8/*", + "include/winrt/*", + "include/mac/*", + "prebuilt/ios/*", + "prebuilt/linux/*", + "prebuilt/wp8/*", + "prebuilt/winrt/*", + "prebuilt/mac/*" + ] + }, + "curl" : { + "is_compiled" : false, + "from_dir" : "external/curl", + "target_dir" : "external/curl", + "win32_lib_file_name" : "libcurl_imp", + "android_lib_name" : "cocos_curl_static", + "is_optional" : false, + "exclude" : [ + "include/ios/*", + "include/wp8/*", + "prebuilt/ios/*", + "prebuilt/wp8/*" + ], + "additional_link" : { + "mac": { + "libcurl.dylib": "usr/lib" + } + } + }, + "websockets" : { + "is_compiled" : false, + "from_dir" : "external/websockets", + "target_dir" : "external/websockets", + "win32_lib_file_name" : "websockets", + "android_lib_name" : "websockets_static", + "is_optional" : false, + "exclude" : [ + "include/ios/*", + "include/linux/*", + "include/wp8/*", + "include/mac/*", + "prebuilt/ios/*", + "prebuilt/linux/*", + "prebuilt/wp8/*", + "prebuilt/mac/*" + ] + }, + "glfw3": { + "is_compiled" : false, + "from_dir" : "external/glfw3", + "target_dir" : "external/glfw3", + "is_optional" : false + }, + "luajit": { + "is_compiled" : false, + "from_dir" : "external/lua/luajit", + "target_dir" : "external/lua/luajit", + "android_lib_name" : "luajit_static", + "is_optional" : false, + "include" : [ + "include/*", + "prebuilt/android/*", + "prebuilt/win32/*" + ] + }, + "lua": { + "is_compiled" : false, + "from_dir" : "external/lua/lua", + "target_dir" : "external/lua/lua", + "is_optional" : false, + "include" : [ + "*.h", + "prebuilt/ios/*" + ] + }, + "cocos_android" : { + "is_compiled" : true, + "target_dir" : "cocos/include/platform/android", + "android_lib_name" : "cocos2dxandroid_static", + "android_lib_file_name" : "libcocos2dandroid", + "export_include" : [ + "../../" + ], + "export_ldlibs" : [ + "GLESv1_CM", "GLESv2", "EGL", "log", "z", "android" + ], + "is_optional" : false + }, + "chipmunk" : { + "is_compiled" : true, + "target_dir" : "modules/chipmunk", + "win32_lib_file_name" : "libchipmunk", + "ios_lib_file_name" : "libchipmunk iOS.a", + "mac_lib_file_name" : "libchipmunk Mac.a", + "android_lib_name" : "chipmunk_static", + "android_lib_file_name" : "libchipmunk", + "include" : [ + { + "from": "external/chipmunk", + "to": "modules/chipmunk", + "include" : [ + "include/*.h" + ] + } + ], + "export_include" : [ + "../../include/chipmunk" + ], + "is_optional" : true + }, + "box2d" : { + "is_compiled" : true, + "target_dir" : "modules/Box2D", + "win32_lib_file_name" : "libbox2d", + "ios_lib_file_name" : "libbox2d iOS.a", + "mac_lib_file_name" : "libbox2d Mac.a", + "android_lib_name" : "box2d_static", + "android_lib_file_name" : "libbox2d", + "include" : [ + { + "from": "external/Box2D", + "to": "modules/Box2D/include/Box2D", + "include" : [ + "*.h" + ] + } + ], + "export_include" : [ + "../../include" + ], + "is_optional" : true + }, + "audio" : { + "is_compiled" : true, + "target_dir" : "modules/audio", + "win32_lib_file_name" : "libcocosdenshion", + "ios_lib_file_name" : "libcocosdenshion iOS.a", + "mac_lib_file_name" : "libcocosdenshion Mac.a", + "android_lib_name" : "cocosdenshion_static", + "android_lib_file_name" : "libcocosdenshion", + "include" : [ + { + "from": "cocos/audio", + "to": "modules/audio", + "include" : [ + "include/*.h" + ] + }, + { + "from": "cocos/scripting/lua-bindings/script/cocosdenshion", + "to": "modules/audio/lua-bindings/script", + "include": [ + "*.lua" + ] + }, + { + "from": "cocos/scripting/lua-bindings/auto", + "to": "modules/audio/lua-bindings/include", + "include": [ + "lua_cocos2dx_cocosdenshion_auto.hpp" + ] + }, + { + "from": "cocos/scripting/lua-bindings/manual/cocosdenshion", + "to": "modules/audio/lua-bindings/include", + "include": [ + "*.hpp", "*.h" + ] + } + ], + "export_include" : [ + "../../include" + ], + "is_optional" : true, + "lua_bindings" : { + "lua_lib_name" : "libluacocosdenshion", + "android_lib_name" : "cocosdenshion_lua_static", + "headers" : [ + "lua_cocos2dx_cocosdenshion_manual.h" + ], + "registers" : [ + "register_cocosdenshion_module" + ] + } + }, + "network" : { + "is_compiled" : true, + "target_dir" : "modules/network", + "win32_lib_file_name" : "libnetwork", + "ios_lib_file_name" : "libnetwork iOS.a", + "mac_lib_file_name" : "libnetwork Mac.a", + "android_lib_name" : "cocos_network_static", + "android_lib_file_name" : "libnetwork", + "include" : [ + { + "from": "cocos/network", + "to": "modules/network/include/network", + "include" : [ + "*.h" + ] + }, + { + "from": "external/lua/luasocket", + "to": "modules/network/lua-bindings/script", + "include": [ + "*.lua" + ] + }, + { + "from": "cocos/scripting/lua-bindings/script/network", + "to": "modules/network/lua-bindings/script", + "include": [ + "*.lua" + ] + }, + { + "from": "cocos/scripting/lua-bindings/manual/network", + "to": "modules/network/lua-bindings/include", + "include": [ + "*.hpp", "*.h" + ] + } + ], + "export_include" : [ + "../../include" + ], + "depend_modules" : [ + "cocos2d", "curl", "websockets" + ], + "is_optional" : true, + "lua_bindings" : { + "lua_lib_name" : "libluanetwork", + "android_lib_name" : "network_lua_static", + "headers" : [ + "lua_cocos2dx_network_manual.h" + ], + "registers" : [ + "register_network_module" + ] + } + }, + "ui" : { + "is_compiled" : true, + "target_dir" : "modules/ui", + "win32_lib_file_name" : "libui", + "ios_lib_file_name" : "libui iOS.a", + "mac_lib_file_name" : "libui Mac.a", + "android_lib_name" : "cocos_ui_static", + "android_lib_file_name" : "libui", + "include" : [ + { + "from": "cocos/ui", + "to": "modules/ui/include/ui", + "include" : [ + "*.h" + ] + }, + { + "from": "cocos/scripting/lua-bindings/script/ui", + "to": "modules/ui/lua-bindings/script", + "include": [ + "*.lua" + ] + }, + { + "from": "cocos/scripting/lua-bindings/auto", + "to": "modules/ui/lua-bindings/include", + "include": [ + "lua_cocos2dx_ui_auto.hpp", + "lua_cocos2dx_experimental_video_auto.hpp" + ] + }, + { + "from": "cocos/scripting/lua-bindings/manual/ui", + "to": "modules/ui/lua-bindings/include", + "include": [ + "*.hpp", "*.h" + ] + } + ], + "export_include" : [ + "../../include" + ], + "depend_modules" : [ + "cocos2d", "extensions" + ], + "is_optional" : true, + "lua_bindings" : { + "lua_lib_name" : "libluaui", + "android_lib_name" : "ui_lua_static", + "headers" : [ + "lua_cocos2dx_ui_manual.hpp" + ], + "registers" : [ + "register_ui_moudle" + ] + } + }, + "extensions" : { + "is_compiled" : true, + "target_dir" : "modules/extensions", + "win32_lib_file_name" : "libextension", + "ios_lib_file_name" : "libextension iOS.a", + "mac_lib_file_name" : "libextension Mac.a", + "android_lib_name" : "cocos_extension_static", + "android_lib_file_name" : "libextension", + "include" : [ + { + "from": "extensions", + "to": "modules/extensions/include/extensions", + "include" : [ + "*.h" + ] + }, + { + "from": "cocos/scripting/lua-bindings/script/extension", + "to": "modules/extensions/lua-bindings/script", + "include": [ + "*.lua" + ] + }, + { + "from": "cocos/scripting/lua-bindings/auto", + "to": "modules/extensions/lua-bindings/include", + "include": [ + "lua_cocos2dx_extension_auto.hpp" + ] + }, + { + "from": "cocos/scripting/lua-bindings/manual/extension", + "to": "modules/extensions/lua-bindings/include", + "include": [ + "*.hpp", "*.h" + ] + } + ], + "export_include" : [ + "../../include" + ], + "depend_modules" : [ + "cocos2d", "curl", "box2d" + ], + "is_optional" : true, + "lua_bindings" : { + "lua_lib_name" : "libluaextension", + "android_lib_name" : "extension_lua_static", + "headers" : [ + "lua_cocos2dx_extension_manual.h" + ], + "registers" : [ + "register_extension_module" + ] + } + }, + "cocostudio" : { + "is_compiled" : true, + "target_dir" : "modules/cocostudio", + "win32_lib_file_name" : "libcocostudio", + "ios_lib_file_name" : "libcocostudio iOS.a", + "mac_lib_file_name" : "libcocostudio Mac.a", + "android_lib_name" : "cocostudio_static", + "android_lib_file_name" : "libcocostudio", + "include" : [ + { + "from": "cocos/editor-support/cocostudio", + "to": "modules/cocostudio/include/cocostudio", + "include" : [ + "*.h" + ] + }, + { + "from": "cocos/scripting/lua-bindings/script/cocostudio", + "to": "modules/cocostudio/lua-bindings/script", + "include": [ + "*.lua" + ] + }, + { + "from": "cocos/scripting/lua-bindings/auto", + "to": "modules/cocostudio/lua-bindings/include", + "include": [ + "lua_cocos2dx_studio_auto.hpp" + ] + }, + { + "from": "cocos/scripting/lua-bindings/manual/cocostudio", + "to": "modules/cocostudio/lua-bindings/include", + "include": [ + "*.hpp", "*.h" + ] + } + ], + "export_include" : [ + "../../include" + ], + "depend_modules" : [ + "ui", "audio" + ], + "is_optional" : true, + "lua_bindings" : { + "lua_lib_name" : "libluacocostudio", + "android_lib_name" : "cocostudio_lua_static", + "headers" : [ + "lua_cocos2dx_coco_studio_manual.hpp" + ], + "registers" : [ + "register_cocostudio_module" + ] + } + }, + "spine" : { + "is_compiled" : true, + "target_dir" : "modules/spine", + "win32_lib_file_name" : "libspine", + "ios_lib_file_name" : "libspine iOS.a", + "mac_lib_file_name" : "libspine Mac.a", + "android_lib_name" : "spine_static", + "android_lib_file_name" : "libspine", + "include" : [ + { + "from": "cocos/editor-support/spine", + "to": "modules/spine/include/spine", + "include" : [ + "*.h" + ] + }, + { + "from": "cocos/scripting/lua-bindings/auto", + "to": "modules/spine/lua-bindings/include", + "include": [ + "lua_cocos2dx_spine_auto.hpp" + ] + }, + { + "from": "cocos/scripting/lua-bindings/manual/spine", + "to": "modules/spine/lua-bindings/include", + "include": [ + "*.hpp", "*.h" + ] + } + ], + "export_include" : [ + "../../include" + ], + "depend_modules" : [ + "cocos2d" + ], + "is_optional" : true, + "lua_bindings" : { + "lua_lib_name" : "libluaspine", + "android_lib_name" : "spine_lua_static", + "headers" : [ + "lua_cocos2dx_spine_manual.hpp" + ], + "registers" : [ + "register_spine_module" + ] + } + }, + "cocosbuilder" : { + "is_compiled" : true, + "target_dir" : "modules/cocosbuilder", + "win32_lib_file_name" : "libcocosbuilder", + "ios_lib_file_name" : "libcocosbuilder iOS.a", + "mac_lib_file_name" : "libcocosbuilder Mac.a", + "android_lib_name" : "cocosbuilder_static", + "android_lib_file_name" : "libcocosbuilder", + "include" : [ + { + "from": "cocos/editor-support/cocosbuilder", + "to": "modules/cocosbuilder/include/cocosbuilder", + "include" : [ + "*.h" + ] + }, + { + "from": "cocos/scripting/lua-bindings/script/cocosbuilder", + "to": "modules/cocosbuilder/lua-bindings/script", + "include": [ + "*.lua" + ] + }, + { + "from": "cocos/scripting/lua-bindings/auto", + "to": "modules/cocosbuilder/lua-bindings/include", + "include": [ + "lua_cocos2dx_cocosbuilder_auto.hpp" + ] + }, + { + "from": "cocos/scripting/lua-bindings/manual/cocosbuilder", + "to": "modules/cocosbuilder/lua-bindings/include", + "include": [ + "*.hpp", "*.h" + ] + } + ], + "export_include" : [ + "../../include" + ], + "depend_modules" : [ + "extensions" + ], + "is_optional" : true, + "lua_bindings" : { + "lua_lib_name" : "libluacocosbuilder", + "android_lib_name" : "cocosbuilder_lua_static", + "headers" : [ + "lua_cocos2dx_cocosbuilder_manual.h" + ], + "registers" : [ + "register_cocosbuilder_module" + ] + } + } +} diff --git a/tools/gen-prebuilt/module_organize.py b/tools/gen-prebuilt/module_organize.py new file mode 100644 index 0000000000..c6d5572f5b --- /dev/null +++ b/tools/gen-prebuilt/module_organize.py @@ -0,0 +1,381 @@ +import os +import shutil +import json +import excopy + +from argparse import ArgumentParser + +class ModuleOrganizer(object): + + CFG_FILE = "module_config.json" + + KEY_MODULE_IS_COMPILED = "is_compiled" + KEY_MODULE_FROM_DIR = "from_dir" + KEY_MODULE_TARGET_DIR = "target_dir" + KEY_MODULE_INCLUDE = "include" + KEY_MODULE_ANDROID_LIB_NAME = "android_lib_name" + KEY_MODULE_ANDROID_LIB_FILE_NAME = "android_lib_file_name" + KEY_MODULE_EXPORT_INCLUDE = "export_include" + KEY_MODULE_DEPEND_MODULES = "depend_modules" + KEY_MODULE_EXPORT_LDLIBS = "export_ldlibs" + KEY_MODULE_EXPORT_CFLAGS = "export_cflags" + KEY_MODULE_EXPORT_CPPFLAGS = "export_cppflags" + KEY_MODULE_WIN32_LIB_FILE_NAME = "win32_lib_file_name" + KEY_MODULE_IOS_LIB_FILE_NAME = "ios_lib_file_name" + KEY_MODULE_MAC_LIB_FILE_NAME = "mac_lib_file_name" + KEY_MODULE_IS_OPTIONAL = "is_optional" + KEY_MODULE_LUA_BINDINGS = "lua_bindings" + KEY_MODULE_LUA_LIB_NAME = "lua_lib_name" + KEY_MODULE_EXCLUDE = "exclude" + KEY_MODULE_ADDITIONAL_LINK = "additional_link" + + EXPORT_KEYS = [ + KEY_MODULE_IS_COMPILED, + KEY_MODULE_TARGET_DIR, + KEY_MODULE_ANDROID_LIB_NAME, + KEY_MODULE_ANDROID_LIB_FILE_NAME, + KEY_MODULE_DEPEND_MODULES, + KEY_MODULE_WIN32_LIB_FILE_NAME, + KEY_MODULE_IOS_LIB_FILE_NAME, + KEY_MODULE_MAC_LIB_FILE_NAME, + KEY_MODULE_IS_OPTIONAL, + KEY_MODULE_LUA_BINDINGS, + KEY_MODULE_ADDITIONAL_LINK + ] + + EXPORT_MODULE_INFO_FILE_NAME = "modules-info.json" + + # Parameter 5--9 means: + # 5. LOCAL_EXPORT_LDLIBS + # 6. LOCAL_EXPORT_CFLAGS + # 7. LOCAL_EXPORT_CPPFLAGS + # 8. LOCAL_WHOLE_STATIC_LIBRARIES + # 9. $(call import-module, xxx) + MK_FORMAT = "LOCAL_PATH := $(call my-dir)\n\n" \ + "include $(CLEAR_VARS)\n\n" \ + "LOCAL_MODULE := %s\n" \ + "LOCAL_MODULE_FILENAME := %s\n\n" \ + "LOCAL_SRC_FILES := %s\n\n" \ + "LOCAL_EXPORT_C_INCLUDES := %s\n\n" \ + "%s" \ + "%s" \ + "%s" \ + "%s" \ + "include $(PREBUILT_STATIC_LIBRARY)\n\n" \ + "%s\n" + + PROPS_FILE_PATH = "cocos/include/2d/cocos2d_headers.props" + VERSION_SRC_FILE = "cocos/cocos2d.cpp" + VERSION_DST_FILE = "version" + + def __init__(self, dst_root): + self.local_path = os.path.realpath(os.path.dirname(__file__)) + self.modules_info = self._parse_modules() + + self.src_root = os.path.join(self.local_path, os.path.pardir, os.path.pardir) + self.prebuilt_dir = os.path.join(self.local_path, "prebuilt") + + if not os.path.exists(self.prebuilt_dir): + raise Exception("Prebuilt directory is not existed. PLZ run script 'gen_prebuilt_libs.py' first.") + + if dst_root is None: + dst = self.local_path + else: + if os.path.isabs(dst_root): + dst = dst_root + else: + dst = os.path.abspath(dst_root) + self.dst_root = os.path.join(dst, "cocos2d-x") + + def _parse_modules(self): + cfg_path = os.path.join(self.local_path, ModuleOrganizer.CFG_FILE) + f = open(cfg_path) + cfg_info = json.load(f) + f.close() + + return cfg_info + + def gen_android_depend_str(self, depends): + whole_libs_str = "" + call_import_str = "" + i = 0 + for module in depends: + depend_info = self.modules_info[module] + if i == 0: + flag = ":" + else: + flag = "+" + whole_libs_str += ("LOCAL_WHOLE_STATIC_LIBRARIES %s= %s\n" % (flag, depend_info[ModuleOrganizer.KEY_MODULE_ANDROID_LIB_NAME])) + call_import_str += ("$(call import-module,%s/prebuilt/android)\n" % depend_info[ModuleOrganizer.KEY_MODULE_TARGET_DIR]) + i += 1 + + whole_libs_str += "\n" + return (whole_libs_str, call_import_str) + + def handle_for_android(self, module_info): + # copy libs file + android_lib_file_name = module_info[ModuleOrganizer.KEY_MODULE_ANDROID_LIB_FILE_NAME] + copy_android_lib_cfg = {} + copy_android_lib_cfg["from"] = "android" + copy_android_lib_cfg["to"] = "%s/prebuilt/android" % module_info[ModuleOrganizer.KEY_MODULE_TARGET_DIR] + copy_android_lib_cfg["include"] = [ + "*/%s.a" % android_lib_file_name + ] + excopy.copy_files_with_config(copy_android_lib_cfg, self.prebuilt_dir, self.dst_root) + + # generate the prebuilt Android.mk for the module + android_lib_name = module_info[ModuleOrganizer.KEY_MODULE_ANDROID_LIB_NAME] + local_src_file = "./$(TARGET_ARCH_ABI)/%s.a" % android_lib_file_name + export_include_paths = [] + for include_path in module_info[ModuleOrganizer.KEY_MODULE_EXPORT_INCLUDE]: + temp_path = "${LOCAL_PATH}/%s" % include_path + export_include_paths.append(temp_path) + export_include_str = " \\\n".join(export_include_paths) + + export_ldlibs_str = "" + if module_info.has_key(ModuleOrganizer.KEY_MODULE_EXPORT_LDLIBS): + export_ldlibs_str = "LOCAL_EXPORT_LDLIBS := " + for ldlib in module_info[ModuleOrganizer.KEY_MODULE_EXPORT_LDLIBS]: + export_ldlibs_str += ("-l%s " % ldlib) + export_ldlibs_str += "\n\n" + + export_cflags_str = "" + if module_info.has_key(ModuleOrganizer.KEY_MODULE_EXPORT_CFLAGS): + export_cflags_str = "LOCAL_EXPORT_CFLAGS := " + export_cflags_str += " ".join(module_info[ModuleOrganizer.KEY_MODULE_EXPORT_CFLAGS]) + export_cflags_str += "\n\n" + + export_cppflags_str = "" + if module_info.has_key(ModuleOrganizer.KEY_MODULE_EXPORT_CPPFLAGS): + export_cppflags_str = "LOCAL_EXPORT_CPPFLAGS := " + export_cppflags_str += " ".join(module_info[ModuleOrganizer.KEY_MODULE_EXPORT_CPPFLAGS]) + export_cppflags_str += "\n\n" + + whole_libs = "" + call_libs = "" + if module_info.has_key(ModuleOrganizer.KEY_MODULE_DEPEND_MODULES): + whole_libs, call_libs = self.gen_android_depend_str(module_info[ModuleOrganizer.KEY_MODULE_DEPEND_MODULES]) + + mk_content = ModuleOrganizer.MK_FORMAT % \ + (android_lib_name, + android_lib_file_name, + local_src_file, + export_include_str, + export_ldlibs_str, + export_cflags_str, + export_cppflags_str, + whole_libs, + call_libs + ) + + mk_file_path = os.path.join(self.dst_root, module_info[ModuleOrganizer.KEY_MODULE_TARGET_DIR], "prebuilt/android/Android.mk") + mk_dir = os.path.dirname(mk_file_path) + if not os.path.exists(mk_dir): + os.makedirs(mk_dir) + mk_obj = open(mk_file_path, "w") + mk_obj.write(mk_content) + mk_obj.close() + + def handle_for_win32(self, module_info): + if module_info.has_key(ModuleOrganizer.KEY_MODULE_WIN32_LIB_FILE_NAME): + dst_dir = os.path.join(self.dst_root, module_info[ModuleOrganizer.KEY_MODULE_TARGET_DIR], "prebuilt", "win32") + src_lib_file = os.path.join(self.prebuilt_dir, "win32", "%s.lib" % module_info[ModuleOrganizer.KEY_MODULE_WIN32_LIB_FILE_NAME]) + src_dll_file = os.path.join(self.prebuilt_dir, "win32", "%s.dll" % module_info[ModuleOrganizer.KEY_MODULE_WIN32_LIB_FILE_NAME]) + if not os.path.exists(dst_dir): + os.makedirs(dst_dir) + + if os.path.exists(src_lib_file): + shutil.copy(src_lib_file, dst_dir) + else: + print("\t%s is not existed" % src_lib_file) + + if os.path.exists(src_dll_file): + shutil.copy(src_dll_file, dst_dir) + + def handle_for_ios_mac(self, module_info): + if module_info.has_key(ModuleOrganizer.KEY_MODULE_IOS_LIB_FILE_NAME): + dst_dir = os.path.join(self.dst_root, module_info[ModuleOrganizer.KEY_MODULE_TARGET_DIR], "prebuilt", "ios") + src_lib_file = os.path.join(self.prebuilt_dir, "ios", module_info[ModuleOrganizer.KEY_MODULE_IOS_LIB_FILE_NAME]) + if not os.path.exists(dst_dir): + os.makedirs(dst_dir) + + if os.path.exists(src_lib_file): + shutil.copy(src_lib_file, dst_dir) + else: + print("\t%s is not existed" % src_lib_file) + + if module_info.has_key(ModuleOrganizer.KEY_MODULE_MAC_LIB_FILE_NAME): + dst_dir = os.path.join(self.dst_root, module_info[ModuleOrganizer.KEY_MODULE_TARGET_DIR], "prebuilt", "mac") + src_lib_file = os.path.join(self.prebuilt_dir, "mac", module_info[ModuleOrganizer.KEY_MODULE_MAC_LIB_FILE_NAME]) + if not os.path.exists(dst_dir): + os.makedirs(dst_dir) + + if os.path.exists(src_lib_file): + shutil.copy(src_lib_file, dst_dir) + else: + print("\t%s is not existed" % src_lib_file) + + def handle_for_lua_bindings(self, module_name): + module_info = self.modules_info[module_name] + lua_binding_info = module_info[ModuleOrganizer.KEY_MODULE_LUA_BINDINGS] + lua_lib_name = lua_binding_info[ModuleOrganizer.KEY_MODULE_LUA_LIB_NAME] + platforms = { + "android" : "*/%s.a" % lua_lib_name, + "ios" : "%s iOS.a" % lua_lib_name, + "mac" : "%s Mac.a" % lua_lib_name, + "win32" : "%s.lib" % lua_lib_name + } + + target_dir = os.path.join(self.dst_root, module_info[ModuleOrganizer.KEY_MODULE_TARGET_DIR], "lua-bindings", "prebuilt") + for p in platforms.keys(): + cpy_info = { + "from" : p, + "to" : p, + "include" : [ + platforms[p] + ] + } + excopy.copy_files_with_config(cpy_info, self.prebuilt_dir, target_dir) + + # write the Android.mk for lua-bindings lib + android_lib_name = lua_binding_info[ModuleOrganizer.KEY_MODULE_ANDROID_LIB_NAME] + mk_file_path = os.path.join(target_dir, "android", "Android.mk") + + depends = [ module_name ] + if lua_binding_info.has_key(ModuleOrganizer.KEY_MODULE_DEPEND_MODULES): + depends += lua_binding_info[ModuleOrganizer.KEY_MODULE_DEPEND_MODULES] + whole_libs, call_libs = self.gen_android_depend_str(depends) + file_content = ModuleOrganizer.MK_FORMAT % \ + (android_lib_name, + lua_lib_name, + "./$(TARGET_ARCH_ABI)/%s.a" % lua_lib_name, + "${LOCAL_PATH}/../../include", + "", "", "", whole_libs, call_libs ) + f = open(mk_file_path, "w") + f.write(file_content) + f.close() + + def gen_compiled_module(self, module_name): + print("generate compiled module : %s" % module_name) + module_info = self.modules_info[module_name] + # copy the include files + if module_info.has_key(ModuleOrganizer.KEY_MODULE_INCLUDE): + for include_cfg in module_info[ModuleOrganizer.KEY_MODULE_INCLUDE]: + excopy.copy_files_with_config(include_cfg, self.src_root, self.dst_root) + + # handle the process for android + self.handle_for_android(module_info) + + # handle the process for win32 + self.handle_for_win32(module_info) + + # handle the process for ios and mac + self.handle_for_ios_mac(module_info) + + # handle the lua-bindings + if module_info.has_key(ModuleOrganizer.KEY_MODULE_LUA_BINDINGS): + self.handle_for_lua_bindings(module_name) + + def gen_prebuilt_module(self, module_name): + print("generate prebuilt module : %s" % module_name) + module_info = self.modules_info[module_name] + if module_info.has_key(ModuleOrganizer.KEY_MODULE_EXCLUDE): + exclude = module_info[ModuleOrganizer.KEY_MODULE_EXCLUDE] + else: + exclude = [] + + if module_info.has_key(ModuleOrganizer.KEY_MODULE_INCLUDE): + include = module_info[ModuleOrganizer.KEY_MODULE_INCLUDE] + else: + include = [] + + copy_cfg = { + "from" : module_info[ModuleOrganizer.KEY_MODULE_FROM_DIR], + "to": module_info[ModuleOrganizer.KEY_MODULE_TARGET_DIR] + } + + if len(include) > 0: + copy_cfg["include"] = include + elif len(exclude) > 0: + copy_cfg["exclude"] = exclude + + excopy.copy_files_with_config(copy_cfg, self.src_root, self.dst_root) + + def export_modules_info(self): + export_file_path = os.path.join(self.dst_root, ModuleOrganizer.EXPORT_MODULE_INFO_FILE_NAME) + export_info = {} + for module_name in self.modules_info.keys(): + module_info = self.modules_info[module_name] + dst_info = {} + for key in ModuleOrganizer.EXPORT_KEYS: + if module_info.has_key(key): + dst_info[key] = module_info[key] + + export_info[module_name] = dst_info + + outfile = open(export_file_path, "w") + json.dump(export_info, outfile, sort_keys = True, indent = 4) + outfile.close() + + def gen_modules(self): + if os.path.exists(self.dst_root): + shutil.rmtree(self.dst_root) + + for module in self.modules_info.keys(): + module_info = self.modules_info[module] + if module_info[ModuleOrganizer.KEY_MODULE_IS_COMPILED]: + self.gen_compiled_module(module) + else: + self.gen_prebuilt_module(module) + + # copy the module config file to dst root + self.export_modules_info() + + # restore the version of engine + src_file = os.path.join(self.src_root, ModuleOrganizer.VERSION_SRC_FILE) + ver = "" + f = open(src_file) + import re + for line in f.readlines(): + match = re.match(r".*return[ \t]*\"(.*)\";", line) + if match: + ver = match.group(1) + break + f.close() + + if len(ver) <= 0: + raise Exception("Can't find version in %s" % src_file) + else: + dst_file = os.path.join(self.dst_root, ModuleOrganizer.VERSION_DST_FILE) + f = open(dst_file, "w") + f.write(ver) + f.close() + + # modify the cocos2dx.props + props_file = os.path.join(self.dst_root, ModuleOrganizer.PROPS_FILE_PATH) + if os.path.exists(props_file): + f = open(props_file) + file_content = f.read() + f.close() + + replace_str = { + "$(MSBuildThisFileDirectory)..\\..\\" : "$(MSBuildThisFileDirectory)..\\..\\..\\", + "$(EngineRoot)cocos" : "$(EngineRoot)cocos\\include" + } + for key in replace_str.keys(): + file_content = file_content.replace(key, replace_str[key]) + + f = open(props_file, "w") + f.write(file_content) + f.close() + +if __name__ == '__main__': + parser = ArgumentParser(description="Organize the modules of engine from prebuilt engine.") + parser.add_argument('-d', "--dst-root", dest='dst_root', help='The path where to place the engine organized by modules.') + (args, unknown) = parser.parse_known_args() + + if len(unknown) > 0: + print("unknown arguments: %s" % unknown) + + organizer = ModuleOrganizer(args.dst_root) + organizer.gen_modules() diff --git a/tools/jenkins-scripts/ci-dailybuild-android.py b/tools/jenkins-scripts/ci-dailybuild-android.py new file mode 100644 index 0000000000..3a48db9b9e --- /dev/null +++ b/tools/jenkins-scripts/ci-dailybuild-android.py @@ -0,0 +1,169 @@ +import os +import platform +import json +from shutil import copy +import sys +import traceback +import MySQLdb +from email.mime.text import MIMEText +import smtplib +import datetime +def check_current_3rd_libs(): + #get current_libs config + backup_files = range(2) + current_files = range(2) + config_file_paths = ['external/config.json','templates/lua-template-runtime/runtime/config.json'] + for i, config_file_path in enumerate(config_file_paths): + if not os.path.isfile(config_file_path): + raise Exception("Could not find 'external/config.json'") + + with open(config_file_path) as data_file: + data = json.load(data_file) + + current_3rd_libs_version = data["version"] + filename = current_3rd_libs_version + '.zip' + node_name = os.environ['NODE_NAME'] + backup_file = '../cocos-2dx-external/node/' + node_name + '/' + filename + backup_files[i] = backup_file + current_file = filename + current_files[i] = current_file + if os.path.isfile(backup_file): + copy(backup_file, current_file) + #run download-deps.py + os.system('python download-deps.py -r no') + #backup file + for i, backup_file in enumerate(backup_files): + current_file = current_files[i] + copy(current_file, backup_file) + +def strip_android_libs(): + strip_cmd = os.environ['ndk_strip'] + print strip_cmd + _cmd = strip_cmd + ' ./tests/cpp-tests/proj.android/obj/local/armeabi/*.a' + os.system(_cmd) + +def connect_db(): + db_host = os.environ['db_host'] + db_user = os.environ['db_user'] + db_pw = os.environ['db_pw'] + db = MySQLdb.connect(db_host, db_user, db_pw, "dailybuild" ) + return db + +def close_db(db): + db.close() + +def save_build_stats(db, filename, size): + cursor = db.cursor() + sql = "INSERT INTO %s (size, createdTime) VALUES(%d, now())" % (filename, size) + print sql + cursor.execute(sql) + db.commit() + +def scan_all_libs(db): + stats = {} + _path = 'tests/cpp-empty-test/proj.android/libs/armeabi/libcpp_empty_test.so' + filesize = os.path.getsize(_path)/1024 + stats['libcpp_empty_test'] = filesize + save_build_stats(db, 'libcpp_empty_test', filesize) + _path = 'tests/lua-empty-test/project/proj.android/libs/armeabi/liblua_empty_test.so' + filesize = os.path.getsize(_path)/1024 + stats['liblua_empty_test'] = filesize + save_build_stats(db, 'liblua_empty_test', filesize) + lib_path = './tests/cpp-tests/proj.android/obj/local/armeabi' + for root, dirs, files in os.walk(lib_path): + for _file in files: + if not _file.endswith(".a"): + continue + print _file + libfile = lib_path + '/' + _file + _filename = _file.split('.')[0] + filesize = os.path.getsize(libfile)/1024 + stats[_filename]=filesize + save_build_stats(db, _filename, filesize) + return stats + +def send_mail(sub,title,content): + #to_list = os.environ['EMAIL_LIST'].split(' ') + mail_user = os.environ['EMAIL_USER'] + mail_pass = os.environ['EMAIL_PWD'] + to_list = os.environ['EMAIL_LIST'].split(' ') + mail_postfix = 'gmail.com' + me = mail_user + "<" + mail_user + "@" + mail_postfix + ">" + msg = MIMEText(content, _subtype='plain', _charset='gb2312') + msg['Subject'] = sub + msg['From'] = me + msg['To'] = " ".join(to_list) + print 'to users:', msg['To'] + msg['Content'] = 'test' + try: + s = smtplib.SMTP('smtp.gmail.com', 587) + s.ehlo() + s.starttls() + s.login(mail_user,mail_pass) + s.sendmail(me, to_list, str(msg)) + print 'info:', me, to_list, str(msg) + s.close() + return True + except Exception, e: + print str(e) + return False + +def sendEmail(stats): + now = datetime.datetime.now() + sub = "Cocos2d-x Android dailybuild stats of " + now.strftime("%Y-%m-%d") + title = "Dailybuild stats" + content = "The following list tracks the sizes of Cocos2d-x Android built libraries:\n" + + for key in stats: + content += key + content += " : " + content += str(stats[key]) + "KB" + content += "\n" + + send_mail(sub, title, content) + +def main(): + print 'Build Config:' + print ' Branch:v3' + print ' Target:Android' + print ' build script:python build/android-build.py -b release all' + if(os.path.exists('build/android-build.py') == False): + node_name = os.environ['NODE_NAME'] + source_dir = '../cocos-2dx-develop-base-repo/node/' + node_name + "/." + os.system("cp -r " + source_dir + " .") + + os.system('git pull origin v3') + os.system('git submodule update --init --force') + check_current_3rd_libs() + + ret = os.system("python tools/jenkins-scripts/gen_jsb.py") + if(ret != 0): + return(1) + + ret = os.system('python build/android-build.py -b release all') + if(ret == 0): + strip_android_libs() + db = connect_db() + stats = scan_all_libs(db) + close_db(db) + sendEmail(stats) + os.system('git clean -xdf -f') + print 'build exit' + print ret + if ret == 0: + ret = 0 + else: + ret = 1 + return ret + +# -------------- main -------------- +if __name__ == '__main__': + sys_ret = 0 + try: + sys_ret = main() + except: + traceback.print_exc() + sys_ret = 1 + finally: + sys.exit(sys_ret) + diff --git a/tools/jenkins-scripts/cocos2dx-libsize-tracking.py b/tools/jenkins-scripts/cocos2dx-libsize-tracking.py new file mode 100644 index 0000000000..8047d69d8d --- /dev/null +++ b/tools/jenkins-scripts/cocos2dx-libsize-tracking.py @@ -0,0 +1,88 @@ +import os +import MySQLdb +import datetime + +def connect_db(): + db_host = os.environ['db_host'] + db_user = os.environ['db_user'] + db_pw = os.environ['db_pw'] + db_name=os.environ['db_name'] + db = MySQLdb.connect(db_host, db_user, db_pw, db_name) + return db + +def close_db(db): + db.close() + +def list_lib_names(db): + tables=[] + cursor = db.cursor() + #sql = "SELECT TABLE_NAME,TABLE_ROWS FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA='dailybuild'" + sql = 'show tables' + cursor.execute(sql) + results = cursor.fetchall() + for row in results: + tables.append(row[0]) + return tables + +def today(): + now = datetime.datetime.now() + return now.strftime("%Y-%m-%d") + +def prev_day(aDay, gap): + t = datetime.datetime.strptime(aDay, "%Y-%m-%d") + days = datetime.timedelta(hours=24*gap) + t = t - days + return t.strftime("%Y-%m-%d") + +def next_day(aDay, gap): + t = datetime.datetime.strptime(aDay, "%Y-%m-%d") + days = datetime.timedelta(hours=24*gap) + t = t + days + return t.strftime("%Y-%m-%d") + +def query_lib_size(db, libname, date): + cursor = db.cursor() + t1 = date + ' 00:00:00' + t2 = next_day(date,1) + ' 00:00:00' + sql = "SELECT size FROM %s WHERE createdTime > '%s' AND createdTime < '%s'" % (libname, t1, t2) + cursor.execute(sql) + result = cursor.fetchone() + #print libname + ":" + str(result[0])+'kB' + data = {} + data[libname] = result[0] + return data + +def query_all_libs(db, date): + tables = list_lib_names(db) + result = {} + for t in tables: + data = query_lib_size(db, t, date) + result.update(data) + return result + +db = connect_db() +#print tables +today = today() +Monday = prev_day(today, 4) + +csv = "cocos2d-libsize-tracking-"+today+".csv" +with open(csv, "w") as stats_file: + title = 'date,' + libs = list_lib_names(db) + for name in libs: + title += name + title += ',' + stats_file.write(title) + stats_file.write('\n') + for i in range(0,5): + d = next_day(Monday, i) + stats_file.write(d) + stats_file.write(',') + stats = query_all_libs(db, d) + for name in libs: + size = str(stats[name]) + stats_file.write(size) + stats_file.write(',') + stats_file.write('\n') +close_db(db) +#print yesterday \ No newline at end of file diff --git a/tools/jenkins-scripts/github-pr-watchdog.py b/tools/jenkins-scripts/github-pr-watchdog.py new file mode 100644 index 0000000000..d5c417730e --- /dev/null +++ b/tools/jenkins-scripts/github-pr-watchdog.py @@ -0,0 +1,72 @@ +#check latest pull request statuses, it no statuses found after 3 min, rebuild the pr +import os +import requests +import datetime +import re +import json +import sys +import traceback + +url = 'https://api.github.com/repos/cocos2d/cocos2d-x/pulls?state=open&sort=created&direction=desc' +job_trigger_url=os.environ['JOB_PULL_REQUEST_BUILD_TRIGGER_URL'] +access_token = os.environ['GITHUB_ACCESS_TOKEN'] +Headers = {"Authorization":"token " + access_token} +def main(): + r = requests.get(url,headers=Headers) + payload = r.json() + #print payload + for pr in payload: + pr_num = pr['number'] + r = requests.get(pr['url']+"/commits",headers=Headers) + commits = r.json() + #print commits + last_commit = commits[len(commits)-1] + message = last_commit['commit']['message'] + + #print message + pattern = re.compile("\[ci(\s+)skip\]", re.I) + result_commit_title = pattern.search(message) + + title = pr['title'] + result_pr_title = pattern.search(title) + if result_commit_title is not None or result_pr_title is not None: + print 'skip build for pull request #' + str(pr_num) + break + #return(0) + s = pr['statuses_url'] + update_time = pr['updated_at'] + #print pr_num + #print s + #print update_time + t = datetime.datetime.strptime(update_time, "%Y-%m-%dT%H:%M:%SZ") + now = datetime.datetime.utcnow() + three_minutes = datetime.timedelta(seconds=3*60) + if (t + three_minutes < now): + #print pr_num + statuses = requests.get(s, headers=Headers) + #print statuses.json() + if(len(statuses.json()) < 1): + print pr_num + payload_forward = {} + payload_forward['number']=pr_num + payload_forward['action']=pr['state'] + payload_forward['html_url']=pr['html_url'] + payload_forward['statuses_url']=pr['statuses_url'] + payload_forward['branch']=pr['base']['ref'] + print payload_forward + post_data = {'payload':""} + post_data['payload']= json.dumps(payload_forward) + + requests.post(job_trigger_url, data=post_data) + +# -------------- main -------------- +if __name__ == '__main__': + sys_ret = 0 + try: + main() + except: + traceback.print_exc() + sys_ret = 1 + finally: + sys.exit(sys_ret) + diff --git a/tools/jenkins-scripts/job-trigger.py b/tools/jenkins-scripts/job-trigger.py index fbdcf0c3e1..fb979066ca 100755 --- a/tools/jenkins-scripts/job-trigger.py +++ b/tools/jenkins-scripts/job-trigger.py @@ -8,6 +8,9 @@ import sys import traceback from jenkinsapi.jenkins import Jenkins +access_token = os.environ['GITHUB_ACCESS_TOKEN'] +Headers = {"Authorization":"token " + access_token} + http_proxy = '' if(os.environ.has_key('HTTP_PROXY')): http_proxy = os.environ['HTTP_PROXY'] @@ -28,8 +31,6 @@ def check_queue_build(action, pr_num, statuses_url): queues.delete_item(queue) target_url = os.environ['JOB_PULL_REQUEST_BUILD_URL'] data = {"state":"error", "target_url":target_url} - access_token = os.environ['GITHUB_ACCESS_TOKEN'] - Headers = {"Authorization":"token " + access_token} try: requests.post(statuses_url, data=json.dumps(data), headers=Headers, proxies = proxyDict) except: @@ -76,7 +77,7 @@ def main(): print 'pull request #' + str(pr_num) + ' is '+action+', no build triggered' return(0) - r = requests.get(pr['url']+"/commits", proxies = proxyDict) + r = requests.get(pr['url']+"/commits", headers=Headers, proxies = proxyDict) commits = r.json() last_commit = commits[len(commits)-1] message = last_commit['commit']['message'] @@ -91,8 +92,7 @@ def main(): return(0) data = {"state":"pending", "target_url":target_url, "context":"Jenkins CI", "description":"Waiting available build machine..."} - access_token = os.environ['GITHUB_ACCESS_TOKEN'] - Headers = {"Authorization":"token " + access_token} + try: requests.post(statuses_url, data=json.dumps(data), headers=Headers, proxies = proxyDict) diff --git a/tools/jenkins-scripts/pull-request-builder.py b/tools/jenkins-scripts/pull-request-builder.py index 7402a2a425..6c77a74151 100755 --- a/tools/jenkins-scripts/pull-request-builder.py +++ b/tools/jenkins-scripts/pull-request-builder.py @@ -62,19 +62,38 @@ def check_current_3rd_libs(branch): current_file = current_files[i] copy(current_file, backup_file) -def save_build_stats(pr_num, key, value): +def connect_db(): db_host = os.environ['db_host'] db_user = os.environ['db_user'] db_pw = os.environ['db_pw'] - db = MySQLdb.connect(db_host, db_user, db_pw, "jenkins" ) + db_name=os.environ['db_name'] + db = MySQLdb.connect(db_host, db_user, db_pw, db_name) + return db + +def close_db(db): + db.close() + +def save_build_stats(db, pr, filename, size): cursor = db.cursor() - sql = '''INSERT INTO PullRequestBuild (pr_number, %s) - VALUES(%d, %d) ON DUPLICATE KEY UPDATE pr_number=VALUES(pr_number), - %s=VALUES(%s)''' % (key, pr_num, value, key, key) + sql = "INSERT INTO %s (number, size, createdTime) VALUES(%d, %d, now())" % (filename, pr, size) print sql cursor.execute(sql) db.commit() - db.close() + +def scan_all_libs(db, pr_num): + stats = {} + lib_path = './tests/cpp-tests/proj.android/obj/local/armeabi' + for root, dirs, files in os.walk(lib_path): + for _file in files: + if not _file.endswith(".a"): + continue + print _file + libfile = lib_path + '/' + _file + _filename = _file.split('.')[0] + filesize = os.path.getsize(libfile)/1024 + stats[_filename]=filesize + save_build_stats(db, pr_num, _filename, filesize) + return stats http_proxy = '' if(os.environ.has_key('HTTP_PROXY')): @@ -131,6 +150,8 @@ def main(): #reset path to workspace root os.system("cd " + os.environ['WORKSPACE']); + #pull latest code + os.system("git pull origin v3") os.system("git checkout v3") os.system("git branch -D pull" + str(pr_num)) #clean workspace @@ -142,9 +163,16 @@ def main(): if(ret != 0): return(2) - #checkout - git_checkout = "git checkout -b " + "pull" + str(pr_num) + " FETCH_HEAD" + #checkout a new branch from v3 + git_checkout = "git checkout -b " + "pull" + str(pr_num) os.system(git_checkout) + #merge pull reqeust head + p = os.popen('git merge --no-edit FETCH_HEAD') + r = p.read() + #check if merge fail + if r.find('CONFLICT') > 0: + print r + return(3) # After checkout a new branch, clean workspace again print "After checkout: git clean -xdf -f" @@ -217,13 +245,23 @@ def main(): local_apk = sample_dir + 'bin/CppTests-debug.apk' backup_apk = os.environ['BACKUP_PATH'] + 'CppTests_' + str(pr_num) + '.apk' os.system('cp ' + local_apk + ' ' + backup_apk) + db = connect_db() + scan_all_libs(db, pr_num) ret = os.system("python build/android-build.py -p 10 -b release cpp-empty-test") if(ret == 0): _path = 'tests/cpp-empty-test/proj.android/libs/armeabi/libcpp_empty_test.so' filesize = os.path.getsize(_path) pr_desc = pr_desc + '

size of libcpp_empty_test.so is:' + str(filesize/1024) + 'kb

' set_description(pr_desc, target_url) - save_build_stats(pr_num, 'cpp_empty_test_so', filesize/1024) + save_build_stats(db, pr_num, 'libcpp_empty_test', filesize/1024) + ret = os.system("python build/android-build.py -p 10 -b release lua-empty-test") + if(ret == 0): + _path = 'tests/lua-empty-test/project/proj.android/libs/armeabi/liblua_empty_test.so' + filesize = os.path.getsize(_path) + pr_desc = pr_desc + '

size of liblua_empty_test.so is:' + str(filesize/1024) + 'kb

' + set_description(pr_desc, target_url) + save_build_stats(db, pr_num, 'liblua_empty_test', filesize/1024) + close_db(db) elif(node_name == 'win32_win7'): ret = subprocess.call('"%VS110COMNTOOLS%..\IDE\devenv.com" "build\cocos2d-win32.vc2012.sln" /Build "Debug|Win32"', shell=True) elif(node_name == 'ios_mac'): diff --git a/tools/make-package/config.json b/tools/make-package/config.json index 08e78eed34..ecb66e33a7 100644 --- a/tools/make-package/config.json +++ b/tools/make-package/config.json @@ -16,5 +16,9 @@ "zip_file_path": "../cocos2d-console", "extract_to_zip_path": "tools/cocos2d-console" } + ], + "extra_dirs": + [ + "tools/fbx-conv" ] } diff --git a/tools/make-package/git-archive-all b/tools/make-package/git-archive-all index 9af9b8622e..448c855852 100755 --- a/tools/make-package/git-archive-all +++ b/tools/make-package/git-archive-all @@ -234,6 +234,16 @@ class GitArchiver(object): path_in_zip = extra_to_zip_file + file_path[(len(extra_folder_path)):] add(file_path, path_in_zip) + outfile_name, outfile_ext = path.splitext(output_path) + for extra_dir in config_data["extra_dirs"]: + dir_path = path.join(self.main_repo_abspath, extra_dir) + list_dirs = os.walk(dir_path) + for root,dirs,files in list_dirs: + for f in files: + file_path = path.join(root,f) + path_in_zip = file_path[(len(self.main_repo_abspath)+1):] + add(file_path, path_in_zip) + if not dry_run: archive.close() diff --git a/tools/missing-tools.txt b/tools/missing-tools.txt new file mode 100644 index 0000000000..f2904b550f --- /dev/null +++ b/tools/missing-tools.txt @@ -0,0 +1,8 @@ +Git user attention + +Please execute “download-deps.py” to download and install dependencies. + + $ cd cocos2d-x + $ python download-deps.py + +Please execute download-deps.py once you synchronize with this repo. If there aren't any updates, it will not download dependencies again. diff --git a/tools/tolua/cocos2dx.ini b/tools/tolua/cocos2dx.ini index 5a81a03b9a..70a3fe7618 100644 --- a/tools/tolua/cocos2dx.ini +++ b/tools/tolua/cocos2dx.ini @@ -22,11 +22,11 @@ cxxgenerator_headers = extra_arguments = %(android_headers)s %(clang_headers)s %(cxxgenerator_headers)s %(cocos_headers)s %(android_flags)s %(clang_flags)s %(cocos_flags)s %(extra_flags)s # what headers to parse -headers = %(cocosdir)s/cocos/cocos2d.h %(cocosdir)s/cocos/audio/include/SimpleAudioEngine.h %(cocosdir)s/cocos/ui/CCProtectedNode.h %(cocosdir)s/cocos/3d/CCAnimation3D.h %(cocosdir)s/cocos/3d/CCAnimate3D.h +headers = %(cocosdir)s/cocos/cocos2d.h %(cocosdir)s/cocos/2d/CCProtectedNode.h # what classes to produce code for. You can use regular expressions here. When testing the regular # expression, it will be enclosed in "^$", like this: "^Menu*$". -classes = New.* Sprite.* Scene Node.* Director Layer.* Menu.* Touch .*Action.* Move.* Rotate.* Blink.* Tint.* Sequence Repeat.* Fade.* Ease.* Scale.* Transition.* Spawn Animat.* Flip.* Delay.* Skew.* Jump.* Place.* Show.* Progress.* PointArray ToggleVisibility.* RemoveSelf Hide Particle.* Label.* Atlas.* TextureCache.* Texture2D Cardinal.* CatmullRom.* ParallaxNode TileMap.* .*TMX.* CallFunc RenderTexture GridAction Grid3DAction GridBase$ .+Grid Shaky3D Waves3D FlipX3D FlipY3D Speed ActionManager Set SimpleAudioEngine Scheduler Timer Orbit.* Follow.* Bezier.* CardinalSpline.* Camera.* DrawNode .*3D$ Liquid$ Waves$ ShuffleTiles$ TurnOffTiles$ Split.* Twirl$ FileUtils$ GLProgram ShaderCache Application ClippingNode MotionStreak ^Ref$ UserDefault GLViewProtocol GLView Image Event(?!.*(Physics).*).* Component ProtectedNode Console Mesh GLProgramCache GLProgramState +classes = New.* Sprite.* Scene Node.* Director Layer.* Menu.* Touch .*Action.* Move.* Rotate.* Blink.* Tint.* Sequence Repeat.* Fade.* Ease.* Scale.* Transition.* Spawn Animat.* Flip.* Delay.* Skew.* Jump.* Place.* Show.* Progress.* PointArray ToggleVisibility.* RemoveSelf Hide Particle.* Label.* Atlas.* TextureCache.* Texture2D Cardinal.* CatmullRom.* ParallaxNode TileMap.* .*TMX.* CallFunc RenderTexture GridAction Grid3DAction GridBase$ .+Grid Shaky3D Waves3D FlipX3D FlipY3D Speed ActionManager Set Scheduler Timer Orbit.* Follow.* Bezier.* CardinalSpline.* Camera.* DrawNode .*3D$ Liquid$ Waves$ ShuffleTiles$ TurnOffTiles$ Split.* Twirl$ FileUtils$ GLProgram ShaderCache Application ClippingNode MotionStreak ^Ref$ UserDefault GLViewImpl GLView Image Event(?!.*(Physics).*).* Component ProtectedNode Console GLProgramCache GLProgramState Camera # what should we skip? in the format ClassName::[function function] # ClassName is a regular expression, but will be used like this: "^ClassName$" functions are also @@ -108,8 +108,8 @@ skip = Node::[setGLServerState description getUserObject .*UserData getGLServerS ccFontDefinition::[*], Ref::[autorelease isEqual acceptVisitor update], UserDefault::[getInstance (s|g)etDataForKey], - GLViewProtocol::[setTouchDelegate], - GLView::[end swapBuffers], + GLView::[setTouchDelegate], + GLViewImpl::[end swapBuffers], NewTextureAtlas::[*], DisplayLinkDirector::[mainLoop setAnimationInterval startAnimation stopAnimation], RenderTexture::[listenToBackground listenToForeground], @@ -126,12 +126,7 @@ skip = Node::[setGLServerState description getUserObject .*UserData getGLServerS TurnOffTiles::[shuffle], LabelTTF::[*], LabelBMFont::[*], - Mesh::[create], - Sprite3D::[getSkin], - Animation3D::[getBoneCurveByName], - Animation3DCache::[*], - Sprite3DMaterialCache::[*], - Bone3D::[*] + Scene::[getCameras] rename_functions = SpriteFrameCache::[addSpriteFramesWithFile=addSpriteFrames getSpriteFrameByName=getSpriteFrame], ProgressTimer::[setReverseProgress=setReverseDirection], @@ -144,25 +139,23 @@ rename_functions = SpriteFrameCache::[addSpriteFramesWithFile=addSpriteFrames ge Sprite::[initWithFile=init], SpriteBatchNode::[initWithFile=init], Touch::[getID=getId], - SimpleAudioEngine::[preloadBackgroundMusic=preloadMusic setBackgroundMusicVolume=setMusicVolume getBackgroundMusicVolume=getMusicVolume playBackgroundMusic=playMusic stopBackgroundMusic=stopMusic pauseBackgroundMusic=pauseMusic resumeBackgroundMusic=resumeMusic rewindBackgroundMusic=rewindMusic isBackgroundMusicPlaying=isMusicPlaying willPlayBackgroundMusic=willPlayMusic end=destroyInstance], FileUtils::[loadFilenameLookupDictionaryFromFile=loadFilenameLookup], Director::[end=endToLua] -rename_classes = ParticleSystemQuad::ParticleSystem, - SimpleAudioEngine::AudioEngine +rename_classes = ParticleSystemQuad::ParticleSystem # for all class names, should we remove something when registering in the target VM? remove_prefix = # classes for which there will be no "parent" lookup -classes_have_no_parents = Director SimpleAudioEngine FileUtils TMXMapInfo Application +classes_have_no_parents = Director FileUtils TMXMapInfo Application # base classes which will be skipped when their sub-classes found them. base_classes_to_skip = Clonable # classes that create no constructor # Set is special and we will use a hand-written constructor -abstract_classes = Action FiniteTimeAction ActionInterval ActionEase EaseRateAction EaseElastic EaseBounce ActionInstant GridAction Grid3DAction TiledGrid3DAction Director SpriteFrameCache TransitionEaseScene Set SimpleAudioEngine FileUtils Application ClippingNode Label GLViewProtocol GLView EventAcceleration DisplayLinkDirector Component Console +abstract_classes = Action FiniteTimeAction ActionInterval ActionEase EaseRateAction EaseElastic EaseBounce ActionInstant GridAction Grid3DAction TiledGrid3DAction Director SpriteFrameCache TransitionEaseScene Set FileUtils Application ClippingNode Label GLViewImpl GLView EventAcceleration DisplayLinkDirector Component Console # Determining whether to use script object(js object) to control the lifecycle of native(cpp) object or the other way around. Supported values are 'yes' or 'no'. script_control_cpp = no diff --git a/tools/tolua/cocos2dx_3d.ini b/tools/tolua/cocos2dx_3d.ini new file mode 100644 index 0000000000..db2a91cf3f --- /dev/null +++ b/tools/tolua/cocos2dx_3d.ini @@ -0,0 +1,68 @@ +[cocos2dx_3d] +# the prefix to be added to the generated functions. You might or might not use this in your own +# templates +prefix = cocos2dx_3d + +# create a target namespace (in javascript, this would create some code like the equiv. to `ns = ns || {}`) +# all classes will be embedded in that namespace +target_namespace = cc + +android_headers = -I%(androidndkdir)s/platforms/android-14/arch-arm/usr/include -I%(androidndkdir)s/sources/cxx-stl/gnu-libstdc++/4.7/libs/armeabi-v7a/include -I%(androidndkdir)s/sources/cxx-stl/gnu-libstdc++/4.7/include -I%(androidndkdir)s/sources/cxx-stl/gnu-libstdc++/4.8/libs/armeabi-v7a/include -I%(androidndkdir)s/sources/cxx-stl/gnu-libstdc++/4.8/include +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/platform/android +cocos_flags = -DANDROID + +cxxgenerator_headers = + +# extra arguments for clang +extra_arguments = %(android_headers)s %(clang_headers)s %(cxxgenerator_headers)s %(cocos_headers)s %(android_flags)s %(clang_flags)s %(cocos_flags)s %(extra_flags)s + +# what headers to parse +headers = %(cocosdir)s/cocos/3d/cocos3d.h + +# what classes to produce code for. You can use regular expressions here. When testing the regular +# expression, it will be enclosed in "^$", like this: "^Menu*$". +classes = .*3D$ Mesh SubMeshState AttachNode + +# what should we skip? in the format ClassName::[function function] +# ClassName is a regular expression, but will be used like this: "^ClassName$" functions are also +# regular expressions, they will not be surrounded by "^$". If you want to skip a whole class, just +# add a single "*" as functions. See bellow for several examples. A special class name is "*", which +# will apply to all class names. This is a convenience wildcard to be able to skip similar named +# functions from all classes. + +skip = Mesh::[create getOriginAABB], + SubMeshState::[getSkin setSkin create], + Sprite3D::[getSkin getSubMeshState getAABB], + Animation3D::[getBoneCurveByName], + Animation3DCache::[*], + Sprite3DMaterialCache::[*], + Bone3D::[*], + Ray::[*], + AABB::[*], + OBB::[*] + +rename_functions = + +rename_classes = + +# for all class names, should we remove something when registering in the target VM? +remove_prefix = + +# classes for which there will be no "parent" lookup +classes_have_no_parents = + +# base classes which will be skipped when their sub-classes found them. +base_classes_to_skip = Clonable + +# classes that create no constructor +# Set is special and we will use a hand-written constructor +abstract_classes = + +# Determining whether to use script object(js object) to control the lifecycle of native(cpp) object or the other way around. Supported values are 'yes' or 'no'. +script_control_cpp = no + diff --git a/tools/tolua/cocos2dx_cocosbuilder.ini b/tools/tolua/cocos2dx_cocosbuilder.ini new file mode 100644 index 0000000000..40a7de384b --- /dev/null +++ b/tools/tolua/cocos2dx_cocosbuilder.ini @@ -0,0 +1,64 @@ +[cocos2dx_cocosbuilder] +# the prefix to be added to the generated functions. You might or might not use this in your own +# templates +prefix = cocos2dx_cocosbuilder + +# create a target namespace (in javascript, this would create some code like the equiv. to `ns = ns || {}`) +# all classes will be embedded in that namespace +target_namespace = cc + +android_headers = -I%(androidndkdir)s/platforms/android-14/arch-arm/usr/include -I%(androidndkdir)s/sources/cxx-stl/gnu-libstdc++/4.7/libs/armeabi-v7a/include -I%(androidndkdir)s/sources/cxx-stl/gnu-libstdc++/4.7/include -I%(androidndkdir)s/sources/cxx-stl/gnu-libstdc++/4.8/libs/armeabi-v7a/include -I%(androidndkdir)s/sources/cxx-stl/gnu-libstdc++/4.8/include +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 -I%(cocosdir)s/cocos -I%(cocosdir)s/cocos/editor-support -I%(cocosdir)s/cocos/platform/android + +cocos_flags = -DANDROID + +cxxgenerator_headers = + +# extra arguments for clang +extra_arguments = %(android_headers)s %(clang_headers)s %(cxxgenerator_headers)s %(cocos_headers)s %(android_flags)s %(clang_flags)s %(cocos_flags)s %(extra_flags)s + +# what headers to parse +headers = %(cocosdir)s/cocos/editor-support/cocosbuilder/CocosBuilder.h + +# what classes to produce code for. You can use regular expressions here. When testing the regular +# expression, it will be enclosed in "^$", like this: "^Menu*$". +classes = CCBReader.* CCBAnimationManager.* + +# what should we skip? in the format ClassName::[function function] +# ClassName is a regular expression, but will be used like this: "^ClassName$" functions are also +# regular expressions, they will not be surrounded by "^$". If you want to skip a whole class, just +# add a single "*" as functions. See bellow for several examples. A special class name is "*", which +# will apply to all class names. This is a convenience wildcard to be able to skip similar named +# functions from all classes. + +skip = CCBReader::[^CCBReader$ addOwnerCallbackName isJSControlled readByte getCCBMemberVariableAssigner readFloat getCCBSelectorResolver toLowerCase lastPathComponent deletePathExtension endsWith concat getResolutionScale getAnimatedProperties readBool readInt addOwnerCallbackNode addDocumentCallbackName readCachedString readNodeGraphFromData addDocumentCallbackNode getLoadedSpriteSheet initWithData readFileWithCleanUp getOwner$ readNodeGraphFromFile createSceneWithNodeGraphFromFile getAnimationManagers$ setAnimationManagers], + CCBAnimationManager::[setAnimationCompletedCallback setCallFunc addNode], + .*Delegate::[*], + .*Loader.*::[*], + *::[^visit$ copyWith.* onEnter.* onExit.* ^description$ getObjectType (g|s)etDelegate .*HSV] + +rename_functions = CCBReader::[getAnimationManager=getActionManager setAnimationManager=setActionManager] + +rename_classes = + +# for all class names, should we remove something when registering in the target VM? +remove_prefix = + +# classes for which there will be no "parent" lookup +classes_have_no_parents = + +# base classes which will be skipped when their sub-classes found them. +base_classes_to_skip = + +# classes that create no constructor +# Set is special and we will use a hand-written constructor +abstract_classes = + +# Determining whether to use script object(js object) to control the lifecycle of native(cpp) object or the other way around. Supported values are 'yes' or 'no'. +script_control_cpp = no + diff --git a/tools/tolua/cocos2dx_cocosdenshion.ini b/tools/tolua/cocos2dx_cocosdenshion.ini new file mode 100644 index 0000000000..b032989626 --- /dev/null +++ b/tools/tolua/cocos2dx_cocosdenshion.ini @@ -0,0 +1,59 @@ +[cocos2dx_cocosdenshion] +# the prefix to be added to the generated functions. You might or might not use this in your own +# templates +prefix = cocos2dx_cocosdenshion + +# create a target namespace (in javascript, this would create some code like the equiv. to `ns = ns || {}`) +# all classes will be embedded in that namespace +target_namespace = cc + +android_headers = -I%(androidndkdir)s/platforms/android-14/arch-arm/usr/include -I%(androidndkdir)s/sources/cxx-stl/gnu-libstdc++/4.7/libs/armeabi-v7a/include -I%(androidndkdir)s/sources/cxx-stl/gnu-libstdc++/4.7/include -I%(androidndkdir)s/sources/cxx-stl/gnu-libstdc++/4.8/libs/armeabi-v7a/include -I%(androidndkdir)s/sources/cxx-stl/gnu-libstdc++/4.8/include +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 -I%(cocosdir)s/cocos -I%(cocosdir)s/cocos/platform/android + +cocos_flags = -DANDROID + +cxxgenerator_headers = + +# extra arguments for clang +extra_arguments = %(android_headers)s %(clang_headers)s %(cxxgenerator_headers)s %(cocos_headers)s %(android_flags)s %(clang_flags)s %(cocos_flags)s %(extra_flags)s + +# what headers to parse +headers = %(cocosdir)s/cocos/audio/include/SimpleAudioEngine.h + +# what classes to produce code for. You can use regular expressions here. When testing the regular +# expression, it will be enclosed in "^$", like this: "^Menu*$". +classes = SimpleAudioEngine + +# what should we skip? in the format ClassName::[function function] +# ClassName is a regular expression, but will be used like this: "^ClassName$" functions are also +# regular expressions, they will not be surrounded by "^$". If you want to skip a whole class, just +# add a single "*" as functions. See bellow for several examples. A special class name is "*", which +# will apply to all class names. This is a convenience wildcard to be able to skip similar named +# functions from all classes. + +skip = + +rename_functions = SimpleAudioEngine::[preloadBackgroundMusic=preloadMusic setBackgroundMusicVolume=setMusicVolume getBackgroundMusicVolume=getMusicVolume playBackgroundMusic=playMusic stopBackgroundMusic=stopMusic pauseBackgroundMusic=pauseMusic resumeBackgroundMusic=resumeMusic rewindBackgroundMusic=rewindMusic isBackgroundMusicPlaying=isMusicPlaying willPlayBackgroundMusic=willPlayMusic end=destroyInstance] + +rename_classes = + +# for all class names, should we remove something when registering in the target VM? +remove_prefix = + +# classes for which there will be no "parent" lookup +classes_have_no_parents = SimpleAudioEngine + +# base classes which will be skipped when their sub-classes found them. +base_classes_to_skip = Clonable + +# classes that create no constructor +# Set is special and we will use a hand-written constructor +abstract_classes = SimpleAudioEngine + +# Determining whether to use script object(js object) to control the lifecycle of native(cpp) object or the other way around. Supported values are 'yes' or 'no'. +script_control_cpp = no diff --git a/tools/tolua/cocos2dx_extension.ini b/tools/tolua/cocos2dx_extension.ini index 5e5e1c39f6..03e0829edb 100644 --- a/tools/tolua/cocos2dx_extension.ini +++ b/tools/tolua/cocos2dx_extension.ini @@ -23,11 +23,11 @@ cxxgenerator_headers = extra_arguments = %(android_headers)s %(clang_headers)s %(cxxgenerator_headers)s %(cocos_headers)s %(android_flags)s %(clang_flags)s %(cocos_flags)s %(extra_flags)s # what headers to parse -headers = %(cocosdir)s/extensions/cocos-ext.h %(cocosdir)s/cocos/editor-support/cocosbuilder/CocosBuilder.h +headers = %(cocosdir)s/extensions/cocos-ext.h # what classes to produce code for. You can use regular expressions here. When testing the regular # expression, it will be enclosed in "^$", like this: "^Menu*$". -classes = AssetsManager.* CCBReader.* CCBAnimationManager.* Scale9Sprite Control.* ControlButton.* EditBox$ ScrollView$ TableView$ TableViewCell$ +classes = AssetsManager.* Scale9Sprite Control.* ControlButton.* EditBox$ ScrollView$ TableView$ TableViewCell$ # what should we skip? in the format ClassName::[function function] # ClassName is a regular expression, but will be used like this: "^ClassName$" functions are also @@ -36,9 +36,7 @@ classes = AssetsManager.* CCBReader.* CCBAnimationManager.* Scale9Sprite Control # will apply to all class names. This is a convenience wildcard to be able to skip similar named # functions from all classes. -skip = CCBReader::[^CCBReader$ addOwnerCallbackName isJSControlled readByte getCCBMemberVariableAssigner readFloat getCCBSelectorResolver toLowerCase lastPathComponent deletePathExtension endsWith concat getResolutionScale getAnimatedProperties readBool readInt addOwnerCallbackNode addDocumentCallbackName readCachedString readNodeGraphFromData addDocumentCallbackNode getLoadedSpriteSheet initWithData readFileWithCleanUp getOwner$ readNodeGraphFromFile createSceneWithNodeGraphFromFile getAnimationManagers$ setAnimationManagers], - CCBAnimationManager::[setAnimationCompletedCallback setCallFunc addNode], - .*Delegate::[*], +skip = .*Delegate::[*], .*Loader.*::[*], *::[^visit$ copyWith.* onEnter.* onExit.* ^description$ getObjectType (g|s)etDelegate .*HSV], EditBox::[(g|s)etDelegate ^keyboard.* touchDownAction getScriptEditBoxHandler registerScriptEditBoxHandler unregisterScriptEditBoxHandler], @@ -51,10 +49,9 @@ skip = CCBReader::[^CCBReader$ addOwnerCallbackName isJSControlled readByte getC TableView::[create (g|s)etDataSource$ (g|s)etDelegate] -rename_functions = CCBReader::[getAnimationManager=getActionManager setAnimationManager=setActionManager] +rename_functions = -rename_classes = CCBReader::_Reader, - CCBAnimationManager::AnimationManager +rename_classes = # for all class names, should we remove something when registering in the target VM? remove_prefix = @@ -67,7 +64,7 @@ base_classes_to_skip = # classes that create no constructor # Set is special and we will use a hand-written constructor -abstract_classes = ArmatureDataManager +abstract_classes = # Determining whether to use script object(js object) to control the lifecycle of native(cpp) object or the other way around. Supported values are 'yes' or 'no'. script_control_cpp = no diff --git a/tools/tolua/genbindings.py b/tools/tolua/genbindings.py index 72fa4824bd..152bff8ef4 100755 --- a/tools/tolua/genbindings.py +++ b/tools/tolua/genbindings.py @@ -135,6 +135,9 @@ def main(): 'cocos2dx_experimental_video.ini' : ('cocos2dx_experimental_video', 'lua_cocos2dx_experimental_video_auto'), \ 'cocos2dx_experimental.ini' : ('cocos2dx_experimental', 'lua_cocos2dx_experimental_auto'), \ 'cocos2dx_controller.ini' : ('cocos2dx_controller', 'lua_cocos2dx_controller_auto'), \ + 'cocos2dx_cocosbuilder.ini': ('cocos2dx_cocosbuilder', 'lua_cocos2dx_cocosbuilder_auto'), \ + 'cocos2dx_cocosdenshion.ini': ('cocos2dx_cocosdenshion', 'lua_cocos2dx_cocosdenshion_auto'), \ + 'cocos2dx_3d.ini': ('cocos2dx_3d', 'lua_cocos2dx_3d_auto'), \ } target = 'lua' generator_py = '%s/generator.py' % cxx_generator_root